Commit 92013acec5469f2d94d8cc0743eba2f08e95502a

Authored by Pablo Marco del Pont
Exists in master

Merge branch 'master' into 'master'

Master(efernandez)

See merge request Wrappers/wrapper-demo!25
... ... @@ -8,6 +8,7 @@
8 8 <link href="./node_modules/bootstrap/dist/css/bootstrap.min.css" rel="stylesheet"/>
9 9 <link href="./node_modules/font-awesome/css/font-awesome.min.css" rel="stylesheet"/>
10 10 <link rel="stylesheet" href="node_modules/angular-ui-swiper/dist/angular-ui-swiper.css">
  11 + <link href="./node_modules/ladda/dist/ladda-themeless.min.css" rel="stylesheet">
11 12 <link href="css/general.css" rel="stylesheet"/>
12 13  
13 14 <!--VENDOR JS-->
... ... @@ -21,6 +22,9 @@
21 22 <script src="./node_modules/angular-sanitize/angular-sanitize.min.js"></script>
22 23 <script src="./node_modules/angular-i18n/angular-locale_es-ar.js"></script>
23 24 <script src="./node_modules/angular-ui-swiper/dist/angular-ui-swiper.js"></script>
  25 + <script src="./node_modules/ladda/dist/spin.min.js"></script>
  26 + <script src="./node_modules/ladda/dist/ladda.min.js"></script>
  27 + <script src="./node_modules/angular-ladda/dist/angular-ladda.min.js"></script>
24 28  
25 29 <script src="./node_modules/foca-directivas/dist/foca-directivas.min.js"></script>
26 30 <script src="./node_modules/foca-botonera-principal/dist/foca-botonera-principal.min.js"></script>
... ... @@ -23,6 +23,7 @@
23 23 "angular": "^1.7.5",
24 24 "angular-cookies": "^1.7.5",
25 25 "angular-i18n": "^1.7.5",
  26 + "angular-ladda": "^0.4.3",
26 27 "angular-on-screen-keyboard": "git+https://github.com/ericf97/angular-on-screen-keyboard.git",
27 28 "angular-route": "^1.7.5",
28 29 "angular-sanitize": "^1.7.5",
... ... @@ -52,6 +53,7 @@
52 53 "gulp-htmlmin": "^5.0.1",
53 54 "gulp-uglify": "^3.0.1",
54 55 "jquery": "^3.3.1",
  56 + "ladda": "1.0.6",
55 57 "node-sass": "^4.9.4",
56 58 "uglify": "^0.1.5",
57 59 "ui-bootstrap4": "^3.0.5"
1 1 angular.module('appWrapperDemo', [
  2 + 'angular-ladda',
2 3 'ngCookies',
3 4 'ngRoute',
4 5 'ui.bootstrap',