Commit c46c2f60ae6b6c1d1731c9dd65d60f6735475c2d
Exists in
master
Merge branch 'master' into 'master'
Master (pmarco) See merge request Wrappers/wrapper-demo!31
Showing
7 changed files
Show diff stats
img/botonera.png
index.html
... | ... | @@ -9,6 +9,7 @@ |
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 | 11 | <link href="./node_modules/ladda/dist/ladda-themeless.min.css" rel="stylesheet"> |
12 | + <link href="./node_modules/leaflet/dist/leaflet.css" rel="stylesheet"/> | |
12 | 13 | <link href="css/general.css" rel="stylesheet"/> |
13 | 14 | |
14 | 15 | <!--VENDOR JS--> |
... | ... | @@ -25,8 +26,10 @@ |
25 | 26 | <script src="./node_modules/ladda/dist/spin.min.js"></script> |
26 | 27 | <script src="./node_modules/ladda/dist/ladda.min.js"></script> |
27 | 28 | <script src="./node_modules/angular-ladda/dist/angular-ladda.min.js"></script> |
29 | + <script src="./node_modules/leaflet/dist/leaflet.js"></script> | |
28 | 30 | <script src="./vendor/cordovaGeolocationModule.min.js"></script> |
29 | 31 | |
32 | + <script src="./node_modules/foca-admin-seguimiento/dist/foca-admin-seguimiento.min.js"></script> | |
30 | 33 | <script src="./node_modules/foca-abm-plazo-pago/dist/foca-abm-plazo-pago.min.js"></script> |
31 | 34 | <script src="./node_modules/foca-abm-precios-condiciones/dist/foca-abm-precios-condiciones.min.js"></script> |
32 | 35 | <script src="./node_modules/foca-abm-sectores/dist/foca-abm-sectores.min.js"></script> |
package.json
... | ... | @@ -32,6 +32,7 @@ |
32 | 32 | "foca-abm-plazo-pago": "git+https://debo.suite.repo/modulos-npm/foca-abm-plazo-pago.git", |
33 | 33 | "foca-abm-precios-condiciones": "git+https://debo.suite.repo/modulos-npm/foca-abm-precios-condiciones.git", |
34 | 34 | "foca-abm-sectores": "git+https://debo.suite.repo/modulos-npm/foca-abm-sectores", |
35 | + "foca-admin-seguimiento": "git+https://debo.suite.repo/modulos-npm/foca-admin-seguimiento.git", | |
35 | 36 | "foca-botonera-principal": "git+https://debo.suite.repo/modulos-npm/foca-botonera-principal.git", |
36 | 37 | "foca-busqueda-cliente": "git+https://debo.suite.repo/modulos-npm/foca-busqueda-cliente.git", |
37 | 38 | "foca-crear-nota-pedido": "git+https://debo.suite.repo/modulos-npm/foca-crear-nota-pedido.git", |
... | ... | @@ -56,6 +57,7 @@ |
56 | 57 | "gulp-uglify-es": "^1.0.4", |
57 | 58 | "jquery": "^3.3.1", |
58 | 59 | "ladda": "1.0.6", |
60 | + "leaflet": "1.3.4", | |
59 | 61 | "node-sass": "^4.9.4", |
60 | 62 | "uglify": "^0.1.5", |
61 | 63 | "ui-bootstrap4": "^3.0.5" |
src/js/app.js
src/sass/_admin-seguimiento.scss
src/sass/_botonera-principal.scss
src/sass/general.scss