Nicolás Guarnieri / wrapper-demo

Download as
Browse Code »

Commit b6c8728a66dbb7ddb77ff9130638c21f5cf81402

Authored by Eric Fernandez
2 parents abf2c06f46 d87dfc57f3
Exists in master

Merge branch 'master' of https://debo.suite.repo/Wrappers/wrapper-demo 

# Conflicts:
#	index.html
Showing 9 changed files   Show diff stats
... ... @@ -11,7 +11,7 @@ const watch = require('gulp-watch');
11 11  
12 12 var paths = {
13 13 srcHTML : 'src/views/*.html',
14   - srcJS : 'src/**/*.js',
  14 + srcJS : 'src/js/*.js',
15 15 dist : 'dist/',
16 16 distHTML : 'dist/views/'
17 17 };
... ... @@ -73,8 +73,8 @@ gulp.task('webserver', function() {
73 73 });
74 74  
75 75 gulp.task('watch', function() {
76   - gulp.watch(archivosJS, ['uglify']);
77   - gulp.watch('css/scss/*.scss', ['sass']);
  76 + gulp.watch([paths.srcJS], ['uglify']);
  77 + gulp.watch('src/sass/*.scss', ['sass']);
78 78 })
79 79  
80 80 gulp.task('reload'), function() {
... ... @@ -18,6 +18,7 @@
18 18 <script src="./node_modules/ui-bootstrap4/dist/ui-bootstrap-tpls.js"></script>
19 19 <script src="./node_modules/angular-on-screen-keyboard/dist/angular-on-screen-keyboard.min.js"></script>
20 20 <script src="./node_modules/angular-sanitize/angular-sanitize.min.js"></script>
  21 + <script src="./node_modules/angular-i18n/angular-locale_es-ar.js"></script>
21 22  
22 23 <script src="./node_modules/foca-directivas/dist/foca-directivas.min.js"></script>
23 24 <script src="./node_modules/foca-botonera-principal/dist/foca-botonera-principal.min.js"></script>
... ... @@ -31,8 +32,8 @@
31 32 <script src="./node_modules/foca-modal-busqueda-productos/dist/foca-busqueda-productos.min.js"></script>
32 33 <script src="./node_modules/foca-modal-flete/dist/foca-modal-flete.min.js"></script>
33 34 <script src="./node_modules/foca-modal-moneda/dist/foca-modal-moneda.min.js"></script>
34   - <script src="./node_modules/foca-modal-petroleras/dist/foca-modal-petroleras.min.js"></script>
35 35 <script src="./node_modules/foca-modal-precio-condiciones/dist/foca-modal-precio-condiciones.min.js"></script>
  36 + <script src="./node_modules/foca-modal-proveedor/dist/foca-modal-proveedor.min.js"></script>
36 37 <script src="./node_modules/foca-modal-vendedores/dist/foca-modal-vendedores.min.js"></script>
37 38 <script src="./node_modules/foca-busqueda-cliente/dist/foca-busqueda-cliente.min.js"></script>
38 39 <script src="./node_modules/foca-teclado/dist/foca-teclado.min.js"></script>
... ... @@ -22,6 +22,7 @@
22 22 "dependencies": {
23 23 "angular": "^1.7.5",
24 24 "angular-cookies": "^1.7.5",
  25 + "angular-i18n": "^1.7.5",
25 26 "angular-on-screen-keyboard": "git+https://github.com/ericf97/angular-on-screen-keyboard.git",
26 27 "angular-route": "^1.7.5",
27 28 "angular-sanitize": "^1.7.5",
... ... @@ -39,8 +40,8 @@
39 40 "foca-modal-domicilio": "git+https://debo.suite.repo/modulos-npm/foca-modal-domicilio.git",
40 41 "foca-modal-flete": "git+https://debo.suite.repo/modulos-npm/foca-modal-flete.git",
41 42 "foca-modal-moneda": "git+https://debo.suite.repo/modulos-npm/foca-modal-moneda.git",
42   - "foca-modal-petroleras": "git+https://debo.suite.repo/modulos-npm/foca-modal-petroleras.git",
43 43 "foca-modal-precio-condiciones": "git+https://debo.suite.repo/modulos-npm/foca-modal-precio-condiciones.git",
  44 + "foca-modal-proveedor": "git+https://debo.suite.repo/modulos-npm/foca-modal-proveedor.git",
44 45 "foca-modal-vendedores": "git+https://debo.suite.repo/modulos-npm/foca-modal-vendedores.git",
45 46 "foca-teclado": "git+https://debo.suite.repo/modulos-npm/foca-teclado.git",
46 47 "foca-turno-apertura": "git+https://debo.suite.repo/modulos-npm/foca-turno-apertura.git",
... ... @@ -15,6 +15,7 @@ angular.module(&#39;appWrapperDemo&#39;, [
15 15 'focaModalFlete',
16 16 'focaModalMoneda',
17 17 'focaModalPrecioCondicion',
  18 + 'focaModalProveedor',
18 19 'focaModalVendedores',
19 20 'focaTeclado',
20 21 'focaTurnoApertura',
src/sass/_botonera-secundaria.scss
Diff comments   View file @ b6c8728
1 1 .botonera-secundaria {
2 2 background-color: rgba(0, 0, 0, 0.8);
  3 + .row {
  4 + border-radius: 5px;
  5 + overflow: hidden;
  6 + }
  7 + .btn {
  8 + border-radius: 0;
  9 + margin-right: 1px;
  10 + width: calc(100% - 1px);
  11 + margin-bottom: 1px;
  12 + }
3 13 }
src/sass/_contenedor.scss
Diff comments   View file @ b6c8728
... ... @@ -13,7 +13,7 @@ body {
13 13 height: 300px;
14 14 }
15 15  
16   -.grilla-articulos {
  16 +.grilla-articulo {
17 17 background-color: rgba(0, 0, 0, 0.8);
18 18 height: 430px;
19 19 }
src/sass/general.scss
Diff comments   View file @ b6c8728
1 1 @import 'bootstrap';
2 2 @import 'botonera';
  3 +@import 'botonera-lateral';
3 4 @import 'botonera-principal';
4 5 @import 'botonera-secundaria';
5 6 @import 'contenedor';
... ... @@ -8,3 +9,4 @@
8 9 @import 'panel-informativo';
9 10 @import 'tabla';
10 11 @import 'teclado';
  12 +@import 'tabla-articulos';