Commit c4763ecff7bbe1dd3a891942386178b83cf30ca2

Authored by Eric Fernandez
Exists in master

Merge branch 'master' into 'master'

nuevas imgs, estilos tabs y general

See merge request !35

3.8 KB

3.28 KB

4.53 KB

img/precios-condiciones.png

5.75 KB

2.95 KB

4.81 KB

4.3 KB

1 { 1 {
2 "name": "wrapper-demo", 2 "name": "wrapper-demo",
3 "version": "0.0.1", 3 "version": "0.0.1",
4 "description": "", 4 "description": "",
5 "main": "main.js", 5 "main": "main.js",
6 "scripts": { 6 "scripts": {
7 "initdev": "npm install gulp --global && npm install && npm install -g jshint", 7 "initdev": "npm install gulp --global && npm install && npm install -g jshint",
8 "gulp-pre-commit": "gulp pre-commit", 8 "gulp-pre-commit": "gulp pre-commit",
9 "compile": "gulp uglify && gulp sass", 9 "compile": "gulp uglify && gulp sass",
10 "actualizar": "git pull origin master", 10 "actualizar": "git pull origin master",
11 "install-dev": "gulp pre-install && npm install && gulp post-install" 11 "install-dev": "gulp pre-install && npm install && gulp post-install"
12 }, 12 },
13 "pre-commit": [ 13 "pre-commit": [
14 "gulp-pre-commit" 14 "gulp-pre-commit"
15 ], 15 ],
16 "repository": { 16 "repository": {
17 "type": "git", 17 "type": "git",
18 "url": "ssh://git@debonline.dyndns.org:npm/wrapper-demo.git" 18 "url": "ssh://git@debonline.dyndns.org:npm/wrapper-demo.git"
19 }, 19 },
20 "author": "Foca Software", 20 "author": "Foca Software",
21 "license": "ISC", 21 "license": "ISC",
22 "dependencies": { 22 "dependencies": {
23 "angular": "^1.7.5", 23 "angular": "^1.7.5",
24 "angular-cookies": "^1.7.5", 24 "angular-cookies": "^1.7.5",
25 "angular-i18n": "^1.7.5", 25 "angular-i18n": "^1.7.5",
26 "angular-ladda": "^0.4.3", 26 "angular-ladda": "^0.4.3",
27 "angular-route": "^1.7.5", 27 "angular-route": "^1.7.5",
28 "angular-sanitize": "^1.7.5", 28 "angular-sanitize": "^1.7.5",
29 "angular-ui-swiper": "^2.3.8", 29 "angular-ui-swiper": "^2.3.8",
30 "bootstrap": "^4.1.3", 30 "bootstrap": "^4.1.3",
31 "foca-abm-chofer": "git+ssh://git@debonline.dyndns.org:npm/foca-abm-chofer.git", 31 "foca-abm-chofer": "git+ssh://git@debonline.dyndns.org:npm/foca-abm-chofer.git",
32 "foca-abm-plazo-pago": "git+ssh://git@debonline.dyndns.org:npm/foca-abm-plazo-pago.git", 32 "foca-abm-plazo-pago": "git+ssh://git@debonline.dyndns.org:npm/foca-abm-plazo-pago.git",
33 "foca-abm-precios-condiciones": "git+ssh://git@debonline.dyndns.org:npm/foca-abm-precios-condiciones.git", 33 "foca-abm-precios-condiciones": "git+ssh://git@debonline.dyndns.org:npm/foca-abm-precios-condiciones.git",
34 "foca-abm-sectores": "git+ssh://git@debonline.dyndns.org:npm/foca-abm-sectores.git", 34 "foca-abm-sectores": "git+ssh://git@debonline.dyndns.org:npm/foca-abm-sectores.git",
35 "foca-abm-vehiculo": "git+ssh://git@debonline.dyndns.org:npm/foca-abm-vehiculo.git", 35 "foca-abm-vehiculo": "git+ssh://git@debonline.dyndns.org:npm/foca-abm-vehiculo.git",
36 "foca-admin-seguimiento": "git+ssh://git@debonline.dyndns.org:npm/foca-admin-seguimiento.git", 36 "foca-admin-seguimiento": "git+ssh://git@debonline.dyndns.org:npm/foca-admin-seguimiento.git",
37 "foca-botonera-facturador": "git+ssh://git@debonline.dyndns.org:npm/foca-botonera-facturador.git", 37 "foca-botonera-facturador": "git+ssh://git@debonline.dyndns.org:npm/foca-botonera-facturador.git",
38 "foca-botonera-lateral": "git+ssh://git@debonline.dyndns.org:npm/foca-botonera-lateral.git", 38 "foca-botonera-lateral": "git+ssh://git@debonline.dyndns.org:npm/foca-botonera-lateral.git",
39 "foca-botonera-principal": "git+ssh://git@debonline.dyndns.org:npm/foca-botonera-principal.git", 39 "foca-botonera-principal": "git+ssh://git@debonline.dyndns.org:npm/foca-botonera-principal.git",
40 "foca-busqueda-cliente": "git+ssh://git@debonline.dyndns.org:npm/foca-busqueda-cliente.git", 40 "foca-busqueda-cliente": "git+ssh://git@debonline.dyndns.org:npm/foca-busqueda-cliente.git",
41 "foca-cabecera-facturador": "git+ssh://git@debonline.dyndns.org:npm/foca-cabecera-facturador.git", 41 "foca-cabecera-facturador": "git+ssh://git@debonline.dyndns.org:npm/foca-cabecera-facturador.git",
42 "foca-configuracion": "git+ssh://git@debonline.dyndns.org:npm/foca-configuracion.git", 42 "foca-configuracion": "git+ssh://git@debonline.dyndns.org:npm/foca-configuracion.git",
43 "foca-crear-cobranza": "git+ssh://git@debonline.dyndns.org:npm/foca-crear-cobranza.git", 43 "foca-crear-cobranza": "git+ssh://git@debonline.dyndns.org:npm/foca-crear-cobranza.git",
44 "foca-crear-hoja-ruta": "git+ssh://git@debonline.dyndns.org:npm/foca-crear-hoja-ruta.git", 44 "foca-crear-hoja-ruta": "git+ssh://git@debonline.dyndns.org:npm/foca-crear-hoja-ruta.git",
45 "foca-crear-nota-pedido": "git+ssh://git@debonline.dyndns.org:npm/foca-crear-nota-pedido.git", 45 "foca-crear-nota-pedido": "git+ssh://git@debonline.dyndns.org:npm/foca-crear-nota-pedido.git",
46 "foca-crear-remito": "git+ssh://git@debonline.dyndns.org:npm/foca-crear-remito.git", 46 "foca-crear-remito": "git+ssh://git@debonline.dyndns.org:npm/foca-crear-remito.git",
47 "foca-directivas": "git+ssh://git@debonline.dyndns.org:npm/foca-directivas.git", 47 "foca-directivas": "git+ssh://git@debonline.dyndns.org:npm/foca-directivas.git",
48 "foca-filtros": "git+ssh://git@debonline.dyndns.org:npm/foca-filtros.git", 48 "foca-filtros": "git+ssh://git@debonline.dyndns.org:npm/foca-filtros.git",
49 "foca-hoja-ruta": "git+ssh://git@debonline.dyndns.org:npm/foca-hoja-ruta.git", 49 "foca-hoja-ruta": "git+ssh://git@debonline.dyndns.org:npm/foca-hoja-ruta.git",
50 "foca-login": "git+ssh://git@debonline.dyndns.org:npm/foca-login.git", 50 "foca-login": "git+ssh://git@debonline.dyndns.org:npm/foca-login.git",
51 "foca-logistica-pedido-ruta": "git+ssh://git@debonline.dyndns.org:npm/foca-logistica-pedido-ruta.git", 51 "foca-logistica-pedido-ruta": "git+ssh://git@debonline.dyndns.org:npm/foca-logistica-pedido-ruta.git",
52 "foca-modal": "git+ssh://git@debonline.dyndns.org:npm/foca-modal.git", 52 "foca-modal": "git+ssh://git@debonline.dyndns.org:npm/foca-modal.git",
53 "foca-modal-actividad": "git+ssh://git@debonline.dyndns.org:npm/foca-modal-actividad.git", 53 "foca-modal-actividad": "git+ssh://git@debonline.dyndns.org:npm/foca-modal-actividad.git",
54 "foca-modal-banco": "git+ssh://git@debonline.dyndns.org:npm/foca-modal-banco.git", 54 "foca-modal-banco": "git+ssh://git@debonline.dyndns.org:npm/foca-modal-banco.git",
55 "foca-modal-busqueda-productos": "git+ssh://git@debonline.dyndns.org:npm/foca-modal-busqueda-productos.git", 55 "foca-modal-busqueda-productos": "git+ssh://git@debonline.dyndns.org:npm/foca-modal-busqueda-productos.git",
56 "foca-modal-cheque": "git+ssh://git@debonline.dyndns.org:npm/foca-modal-cheque.git", 56 "foca-modal-cheque": "git+ssh://git@debonline.dyndns.org:npm/foca-modal-cheque.git",
57 "foca-modal-chofer": "git+ssh://git@debonline.dyndns.org:npm/foca-modal-chofer.git", 57 "foca-modal-chofer": "git+ssh://git@debonline.dyndns.org:npm/foca-modal-chofer.git",
58 "foca-modal-cobrador": "git+ssh://git@debonline.dyndns.org:npm/foca-modal-cobrador.git", 58 "foca-modal-cobrador": "git+ssh://git@debonline.dyndns.org:npm/foca-modal-cobrador.git",
59 "foca-modal-cobranza": "git+ssh://git@debonline.dyndns.org:npm/foca-modal-cobranza.git", 59 "foca-modal-cobranza": "git+ssh://git@debonline.dyndns.org:npm/foca-modal-cobranza.git",
60 "foca-modal-cotizacion": "git+ssh://git@debonline.dyndns.org:npm/foca-modal-cotizacion.git", 60 "foca-modal-cotizacion": "git+ssh://git@debonline.dyndns.org:npm/foca-modal-cotizacion.git",
61 "foca-modal-detalle-hoja-ruta": "git+ssh://git@debonline.dyndns.org:npm/foca-modal-detalle-hoja-ruta.git", 61 "foca-modal-detalle-hoja-ruta": "git+ssh://git@debonline.dyndns.org:npm/foca-modal-detalle-hoja-ruta.git",
62 "foca-modal-domicilio": "git+ssh://git@debonline.dyndns.org:npm/foca-modal-domicilio.git", 62 "foca-modal-domicilio": "git+ssh://git@debonline.dyndns.org:npm/foca-modal-domicilio.git",
63 "foca-modal-efectivo": "git+ssh://git@debonline.dyndns.org:npm/foca-modal-efectivo.git", 63 "foca-modal-efectivo": "git+ssh://git@debonline.dyndns.org:npm/foca-modal-efectivo.git",
64 "foca-modal-factura": "git+ssh://git@debonline.dyndns.org:npm/foca-modal-factura.git", 64 "foca-modal-factura": "git+ssh://git@debonline.dyndns.org:npm/foca-modal-factura.git",
65 "foca-modal-flete": "git+ssh://git@debonline.dyndns.org:npm/foca-modal-flete.git", 65 "foca-modal-flete": "git+ssh://git@debonline.dyndns.org:npm/foca-modal-flete.git",
66 "foca-modal-forma-pago": "git+ssh://git@debonline.dyndns.org:npm/foca-modal-forma-pago.git", 66 "foca-modal-forma-pago": "git+ssh://git@debonline.dyndns.org:npm/foca-modal-forma-pago.git",
67 "foca-modal-iva": "git+ssh://git@debonline.dyndns.org:npm/foca-modal-iva.git", 67 "foca-modal-iva": "git+ssh://git@debonline.dyndns.org:npm/foca-modal-iva.git",
68 "foca-modal-lista-precio": "git+ssh://git@debonline.dyndns.org:npm/foca-modal-lista-precio.git", 68 "foca-modal-lista-precio": "git+ssh://git@debonline.dyndns.org:npm/foca-modal-lista-precio.git",
69 "foca-modal-localidad": "git+ssh://git@debonline.dyndns.org:npm/foca-modal-localidad.git", 69 "foca-modal-localidad": "git+ssh://git@debonline.dyndns.org:npm/foca-modal-localidad.git",
70 "foca-modal-moneda": "git+ssh://git@debonline.dyndns.org:npm/foca-modal-moneda.git", 70 "foca-modal-moneda": "git+ssh://git@debonline.dyndns.org:npm/foca-modal-moneda.git",
71 "foca-modal-nota-pedido": "git+ssh://git@debonline.dyndns.org:npm/foca-modal-nota-pedido.git", 71 "foca-modal-nota-pedido": "git+ssh://git@debonline.dyndns.org:npm/foca-modal-nota-pedido.git",
72 "foca-modal-precio-condiciones": "git+ssh://git@debonline.dyndns.org:npm/foca-modal-precio-condiciones.git", 72 "foca-modal-precio-condiciones": "git+ssh://git@debonline.dyndns.org:npm/foca-modal-precio-condiciones.git",
73 "foca-modal-proveedor": "git+ssh://git@debonline.dyndns.org:npm/foca-modal-proveedor.git", 73 "foca-modal-proveedor": "git+ssh://git@debonline.dyndns.org:npm/foca-modal-proveedor.git",
74 "foca-modal-provincia": "git+ssh://git@debonline.dyndns.org:npm/foca-modal-provincia.git", 74 "foca-modal-provincia": "git+ssh://git@debonline.dyndns.org:npm/foca-modal-provincia.git",
75 "foca-modal-punto-descarga": "git+ssh://git@debonline.dyndns.org:npm/foca-modal-punto-descarga.git", 75 "foca-modal-punto-descarga": "git+ssh://git@debonline.dyndns.org:npm/foca-modal-punto-descarga.git",
76 "foca-modal-remito": "git+ssh://git@debonline.dyndns.org:npm/foca-modal-remito.git", 76 "foca-modal-remito": "git+ssh://git@debonline.dyndns.org:npm/foca-modal-remito.git",
77 "foca-modal-tarifa-flete": "git+ssh://git@debonline.dyndns.org:npm/foca-modal-tarifa-flete.git", 77 "foca-modal-tarifa-flete": "git+ssh://git@debonline.dyndns.org:npm/foca-modal-tarifa-flete.git",
78 "foca-modal-tipo-comprobante": "git+ssh://git@debonline.dyndns.org:npm/foca-modal-tipo-comprobante.git", 78 "foca-modal-tipo-comprobante": "git+ssh://git@debonline.dyndns.org:npm/foca-modal-tipo-comprobante.git",
79 "foca-modal-tipo-factura": "git+ssh://git@debonline.dyndns.org:npm/foca-modal-tipo-factura.git", 79 "foca-modal-tipo-factura": "git+ssh://git@debonline.dyndns.org:npm/foca-modal-tipo-factura.git",
80 "foca-modal-transportista": "git+ssh://git@debonline.dyndns.org:npm/foca-modal-transportista.git", 80 "foca-modal-transportista": "git+ssh://git@debonline.dyndns.org:npm/foca-modal-transportista.git",
81 "foca-modal-unidad-medida": "git+ssh://git@debonline.dyndns.org:npm/foca-modal-unidad-medida.git", 81 "foca-modal-unidad-medida": "git+ssh://git@debonline.dyndns.org:npm/foca-modal-unidad-medida.git",
82 "foca-modal-vehiculo": "git+ssh://git@debonline.dyndns.org:npm/foca-modal-vehiculo.git", 82 "foca-modal-vehiculo": "git+ssh://git@debonline.dyndns.org:npm/foca-modal-vehiculo.git",
83 "foca-modal-vendedores": "git+ssh://git@debonline.dyndns.org:npm/foca-modal-vendedores.git", 83 "foca-modal-vendedores": "git+ssh://git@debonline.dyndns.org:npm/foca-modal-vendedores.git",
84 "foca-modal-zona": "git+ssh://git@debonline.dyndns.org:npm/foca-modal-zona.git", 84 "foca-modal-zona": "git+ssh://git@debonline.dyndns.org:npm/foca-modal-zona.git",
85 "foca-nombre-empresa": "git+ssh://git@debonline.dyndns.org:npm/foca-nombre-empresa.git", 85 "foca-nombre-empresa": "git+ssh://git@debonline.dyndns.org:npm/foca-nombre-empresa.git",
86 "foca-seguimiento": "git+ssh://git@debonline.dyndns.org:npm/foca-seguimiento.git", 86 "foca-seguimiento": "git+ssh://git@debonline.dyndns.org:npm/foca-seguimiento.git",
87 "foca-teclado": "git+ssh://git@debonline.dyndns.org:npm/foca-teclado.git", 87 "foca-teclado": "git+ssh://git@debonline.dyndns.org:npm/foca-teclado.git",
88 "font-awesome": "^4.7.0", 88 "font-awesome": "^4.7.0",
89 "gulp-angular-templatecache": "^2.2.1", 89 "gulp-angular-templatecache": "^2.2.1",
90 "gulp-htmlmin": "^5.0.1", 90 "gulp-htmlmin": "^5.0.1",
91 "gulp-uglify": "^3.0.1", 91 "gulp-uglify": "^3.0.1",
92 "gulp-uglify-es": "^1.0.4", 92 "gulp-uglify-es": "^1.0.4",
93 "jquery": "^3.3.1", 93 "jquery": "^3.3.1",
94 "ladda": "1.0.6", 94 "ladda": "1.0.6",
95 "leaflet": "1.3.4", 95 "leaflet": "1.3.4",
96 "moment": "2.23.0",
96 "ngstorage": "^0.3.11", 97 "ngstorage": "^0.3.11",
97 "node-sass": "^4.10.0", 98 "node-sass": "^4.10.0",
98 "uglify": "^0.1.5", 99 "uglify": "^0.1.5",
99 "ui-bootstrap4": "^3.0.5" 100 "ui-bootstrap4": "^3.0.5"
100 }, 101 },
101 "devDependencies": { 102 "devDependencies": {
102 "electron": "^3.0.2", 103 "electron": "^3.0.2",
103 "gulp": "3.9.1", 104 "gulp": "3.9.1",
104 "gulp-clean": "^0.4.0", 105 "gulp-clean": "^0.4.0",
105 "gulp-concat": "^2.6.1", 106 "gulp-concat": "^2.6.1",
106 "gulp-connect": "^5.6.1", 107 "gulp-connect": "^5.6.1",
107 "gulp-jshint": "^2.1.0", 108 "gulp-jshint": "^2.1.0",
108 "gulp-rename": "^1.4.0", 109 "gulp-rename": "^1.4.0",
109 "gulp-replace": "^1.0.0", 110 "gulp-replace": "^1.0.0",
110 "gulp-sass": "^4.0.1", 111 "gulp-sass": "^4.0.1",
111 "gulp-uglify": "^1.0.4", 112 "gulp-uglify": "^1.0.4",
112 "gulp-watch": "^5.0.1", 113 "gulp-watch": "^5.0.1",
113 "jasmine-core": "^3.2.1", 114 "jasmine-core": "^3.2.1",
114 "jshint": "^2.9.6", 115 "jshint": "^2.9.6",
115 "pre-commit": "^1.2.2", 116 "pre-commit": "^1.2.2",
116 "pump": "^3.0.0" 117 "pump": "^3.0.0"
117 } 118 }
118 } 119 }
119 120
1 .tabs-right{ 1 .tabs-right{
2 margin-top: -58px; 2 @media (min-width: 576px){
3 margin-top: -58px;
4 }
3 > ul >li:first-child{ 5 > ul >li:first-child{
4 margin-left: auto; 6 margin-left: auto;
5 } 7 }
6 } 8 }
src/sass/general.scss
1 $primary-color: #e09125; 1 $primary-color: #e09125;
2 @import 'admin-seguimiento'; 2 @import 'admin-seguimiento';
3 @import 'bootstrap'; 3 @import 'bootstrap';
4 @import 'botonera'; 4 @import 'botonera';
5 @import 'botonera-lateral'; 5 @import 'botonera-lateral';
6 @import 'botonera-principal'; 6 @import 'botonera-principal';
7 @import 'botonera-secundaria'; 7 @import 'botonera-secundaria';
8 @import 'contenedor'; 8 @import 'contenedor';
9 @import 'lista'; 9 @import 'lista';
10 @import 'login'; 10 @import 'login';
11 @import 'panel-informativo'; 11 @import 'panel-informativo';
12 @import 'tabla'; 12 @import 'tabla';
13 @import 'teclado'; 13 @import 'teclado';
14 @import 'tabla-articulos'; 14 @import 'tabla-articulos';
15 @import 'acciones-mobile'; 15 @import 'acciones-mobile';
16 @import 'swiper'; 16 @import 'swiper';
17 @import 'foca-crear'; 17 @import 'foca-crear';
18 @import 'logistica-pedido-ruta'; 18 @import 'logistica-pedido-ruta';
19 @import 'tabs'; 19 @import 'tabs';
20 20
21 21
22 //OCULTA FLECHAS INPUT NUMBER 22 //OCULTA FLECHAS INPUT NUMBER
23 input[type='number'] { 23 input[type='number'] {
24 -moz-appearance:textfield; 24 -moz-appearance:textfield;
25 } 25 }
26 input::-webkit-outer-spin-button, 26 input::-webkit-outer-spin-button,
27 input::-webkit-inner-spin-button { 27 input::-webkit-inner-spin-button {
28 -webkit-appearance: none; 28 -webkit-appearance: none;
29 } 29 }
30 30
31 .d-md-grid{ 31 .d-md-grid{
32 @media (min-width: 768px) { 32 @media (min-width: 768px) {
33 display: grid !important; 33 display: grid !important;
34 } 34 }
35 } 35 }
36 36
37 .btn-outline-debo{ 37 .btn-outline-debo{
38 background-color: transparent; 38 background-color: transparent;
39 color: $primary-color; 39 color: $primary-color;
40 border-color: $primary-color; 40 border-color: $primary-color;
41 &:hover{ 41 &:hover{
42 color: #FFF; 42 color: #FFF;
43 border-color: transparent; 43 border-color: transparent;
44 background-color: $primary-color; 44 background-color: $primary-color;
45 } 45 }
46 } 46 }
47
48 .front-index{
49 z-index: 9999;
50 }
47 51