Merge remote-tracking branch 'upstream/develop'

Luigi
2 parents c913173aec 82e3a31e6e
Showing 13 changed files Show diff stats
img/cruz-gris.png
img/parametrizar.png
img/tilde_.png
index.html
package.json
src/js/app.js
src/sass/_bootstrap.scss
src/sass/_botonera-lateral.scss
src/sass/_botonera-principal.scss
src/sass/_botonera-secundaria.scss
src/sass/_constants.scss
src/sass/_paginador-abm.scss
src/sass/general.scss
@@ -93,11 +93,13 @@
         <script src="./node_modules/foca-modal-tarifa-flete/dist/foca-modal-tarifa-flete.min.js"></script>
         <script src="./node_modules/foca-modal-unidad-medida/dist/foca-modal-unidad-medida.min.js"></script>
         <script src="./node_modules/foca-nombre-empresa/dist/foca-nombre-empresa.min.js"></script>
+        <script src="./node_modules/foca-parametros/dist/foca-parametros.min.js"></script>
         <script src="./node_modules/foca-seguimiento/dist/foca-seguimiento.min.js"></script>
         <script src="./node_modules/foca-teclado/dist/foca-teclado.min.js"></script>
         <script src="./src/js/app.js"></script>
         <script src="./src/js/controller.js"></script>
         <script src="./src/etc/develop.js"></script>
+
     </head>
     <body class="w-100">
         <style>
@@ -90,6 +90,7 @@
         "foca-modal-tarifa-flete": "git+ssh://git@debonline.dyndns.org:npm/foca-modal-tarifa-flete.git",
         "foca-modal-unidad-medida": "git+ssh://git@debonline.dyndns.org:npm/foca-modal-unidad-medida.git",
         "foca-nombre-empresa": "git+ssh://git@debonline.dyndns.org:npm/foca-nombre-empresa.git",
+        "foca-parametros": "git+ssh://git@debonline.dyndns.org:npm/foca-parametros.git",
         "foca-seguimiento": "git+ssh://git@debonline.dyndns.org:npm/foca-seguimiento.git",
         "foca-teclado": "git+ssh://git@debonline.dyndns.org:npm/foca-teclado.git",
         "font-awesome": "^4.7.0",
@@ -67,6 +67,7 @@ angular.module(&#39;appWrapperDemo&#39;, [
     'focaModalTarifaFlete',
     'focaModalUnidadMedida',
     'focaNombreEmpresa',
+    'focaParametros',
     'focaSeguimiento',
     'focaTeclado',
     'focaLogisticaPedidoRuta'
 button.active{
     text-decoration: none;
     outline: 0;
-    background-color: $primary-color;
+    background-color: $primary;
     &:focus{
         box-shadow: 0 0 0 0.2rem #d8b07d;
     }
@@ -50,7 +50,7 @@
     .btn-group-toggle{
         pointer-events: all;
         &.active{
-            background-color: $primary-color;
+            background-color: $primary;
             .boton-activar-teclado{
                 color: #FFF;
             }
@@ -201,6 +201,12 @@
             background-size: 90px 90px;
         }
     }
+    &-parametros {
+        & button {
+            background-image: url('../img/parametrizar.png');
+            background-size: 90px 90px;
+        }
+    }
     .swiper-pagination {
         bottom: 0px !important;
     }
@@ -62,8 +62,17 @@
  
     @media(max-width: 576px) {
         .btn-xs{
-            max-height: 13vw;
+            max-height: 22vw;
         }
     }
  
 }
+.foca-overflow-hidden{
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+}
+
+.foca-boton-facturador-right {
+    right: 5;
+}
@@ -0,0 +1,5 @@
+$primary: #cd9035;
+$primaryTransparency: #cd9137cc;
+$highlightedArea: #df9424;
+$default: #6c757d;
+$defaultTransparency: #6c757dcc;
 \ No newline at end of file
@@ -3,7 +3,7 @@
     li {
         &.active{
             > a {
-                background: $primary-color !important;
+                background: $primary !important;
                 color: #FFF !important;
             }
         }
-$primary-color: #e09125;
+@import 'constants';
 @import 'admin-seguimiento';
 @import 'bootstrap';
 @import 'botonera';
@@ -40,17 +40,25 @@ input::-webkit-inner-spin-button {
  
 .btn-outline-debo{
     background-color: transparent;
-    color: $primary-color;
-    border-color: $primary-color;
+    color: $primary;
+    border-color: $primary;
     &:hover{
         color: #FFF;
         border-color: transparent;
-        background-color: $primary-color;
+        background-color: $primary;
+    }
+    &:focus {
+        box-shadow: none !important;
+    }
+    &:active{
+        color: #FFF;
+        background-color: $primary !important;
+        box-shadow: 0px 0px 0px 3px $primaryTransparency !important;
     }
 }
  
 .btn-brown {
-    background-color:#Cd9035;
+    background-color:$primary;
     -webkit-appearance: none;
     border-color: transparent;
     &:focus {
@@ -66,45 +74,57 @@ input::-webkit-inner-spin-button {
 .page-item.active .page-link {
     z-index: 1;
     color: #fff;
-    background-color: #Cd9035;
-    border-color: #Cd9035;
+    background-color: $primary;
+    border-color: $primary;
 }
  
 .foca-input {
     &:focus {
-        border-color: #Cd9035;
-        box-shadow: 0 0 5px #Cd9035;
+        border-color: $primary;
+        box-shadow: 0 0 5px $primary;
     }
 }
  
-.btn-info {
-    background-color: #Cd9035;
-    border-color: #Cd9035;
+.btn-primary {
+    background-color: $primary !important;
+    border-color: $primary !important;
     &:focus {
-        box-shadow: none;
+        box-shadow: none !important;
     }
     &:hover {
-        background-color: #Cd9035;
+        border-color: $primaryTransparency !important;
+        background-color: $primaryTransparency !important;
+    }
+    &:active{
+        background-color: $primary !important;
+        box-shadow: 0px 0px 0px 3px $primaryTransparency !important;
     }
 }
  
-.btn-primary {
-    background-color: #Cd9035;
-    border-color: #Cd9035;
+.btn-default {
+    color: #FFF;
+    background-color: $default !important;
+    border-color: $default !important;
     &:focus {
-        box-shadow: none;
+        box-shadow: none !important;
     }
     &:hover {
-        background-color: #Cd9035;
+        color: #FFF;
+        border-color: $defaultTransparency !important;
+        background-color: $defaultTransparency !important;
+    }
+    &:active{
+        background-color: $default !important;
+        box-shadow: 0px 0px 0px 3px $defaultTransparency !important;
     }
 }
  
 .table-celda-total {
-   background-color: #E09524;
+   background-color: $highlightedArea;
 }
  
 marquee {
-    background-color: #E09524;
+    background-color: $highlightedArea;
 }
  
 .front-index{
@@ -147,3 +167,32 @@ button.clear-input{
         outline: none;
     }
 }
+.custom-control-input {
+    &:checked ~ .custom-control-label::before {
+		border: none !important;
+        color: $primary !important;
+		background-color: $primary !important;
+        box-shadow: 0px 0px 0px 2px $primaryTransparency !important;
+    }
+	&:active ~ .custom-control-label::before {
+		border: none !important;
+        color: $primary !important;
+		background-color: $primary !important;
+    }
+    &:focus ~ .custom-control-label::before {
+		border: none !important;
+        box-shadow: 0px 0px 0px 2px $primaryTransparency !important;
+    }
+    &:focus:not(:checked) ~ .custom-control-label::before {
+        border: none !important;
+    }
+    &:not(:disabled):active ~ .custom-control-label::before {
+        border: none !important;
+        color: $primary !important;
+        box-shadow: 0px 0px 0px 2px $primaryTransparency !important;
+	}
+	&:hover ~ .custom-control-label::before {
+		border: none !important;
+		background-color: $primaryTransparency;
+	}
+}
...	...	@@ -93,11 +93,13 @@
93	93	<script src="./node_modules/foca-modal-tarifa-flete/dist/foca-modal-tarifa-flete.min.js"></script>
94	94	<script src="./node_modules/foca-modal-unidad-medida/dist/foca-modal-unidad-medida.min.js"></script>
95	95	<script src="./node_modules/foca-nombre-empresa/dist/foca-nombre-empresa.min.js"></script>
	96	+ <script src="./node_modules/foca-parametros/dist/foca-parametros.min.js"></script>
96	97	<script src="./node_modules/foca-seguimiento/dist/foca-seguimiento.min.js"></script>
97	98	<script src="./node_modules/foca-teclado/dist/foca-teclado.min.js"></script>
98	99	<script src="./src/js/app.js"></script>
99	100	<script src="./src/js/controller.js"></script>
100	101	<script src="./src/etc/develop.js"></script>
	102	+
101	103	</head>
102	104	<body class="w-100">
103	105	<style>
...	...	@@ -90,6 +90,7 @@
90	90	"foca-modal-tarifa-flete": "git+ssh://git@debonline.dyndns.org:npm/foca-modal-tarifa-flete.git",
91	91	"foca-modal-unidad-medida": "git+ssh://git@debonline.dyndns.org:npm/foca-modal-unidad-medida.git",
92	92	"foca-nombre-empresa": "git+ssh://git@debonline.dyndns.org:npm/foca-nombre-empresa.git",
	93	+ "foca-parametros": "git+ssh://git@debonline.dyndns.org:npm/foca-parametros.git",
93	94	"foca-seguimiento": "git+ssh://git@debonline.dyndns.org:npm/foca-seguimiento.git",
94	95	"foca-teclado": "git+ssh://git@debonline.dyndns.org:npm/foca-teclado.git",
95	96	"font-awesome": "^4.7.0",
...	...	@@ -67,6 +67,7 @@ angular.module('appWrapperDemo', [
67	67	'focaModalTarifaFlete',
68	68	'focaModalUnidadMedida',
69	69	'focaNombreEmpresa',
	70	+ 'focaParametros',
70	71	'focaSeguimiento',
71	72	'focaTeclado',
72	73	'focaLogisticaPedidoRuta'
1	1	button.active{
2	2	text-decoration: none;
3	3	outline: 0;
4		- background-color: $primary-color;
	4	+ background-color: $primary;
5	5	&:focus{
6	6	box-shadow: 0 0 0 0.2rem #d8b07d;
7	7	}
...	...	@@ -50,7 +50,7 @@
50	50	.btn-group-toggle{
51	51	pointer-events: all;
52	52	&.active{
53		- background-color: $primary-color;
	53	+ background-color: $primary;
54	54	.boton-activar-teclado{
55	55	color: #FFF;
56	56	}
...	...	@@ -201,6 +201,12 @@
201	201	background-size: 90px 90px;
202	202	}
203	203	}
	204	+ &-parametros {
	205	+ & button {
	206	+ background-image: url('../img/parametrizar.png');
	207	+ background-size: 90px 90px;
	208	+ }
	209	+ }
204	210	.swiper-pagination {
205	211	bottom: 0px !important;
206	212	}
...	...	@@ -62,8 +62,17 @@
62	62
63	63	@media(max-width: 576px) {
64	64	.btn-xs{
65		- max-height: 13vw;
	65	+ max-height: 22vw;
66	66	}
67	67	}
68	68
69	69	}
	70	+.foca-overflow-hidden{
	71	+ overflow: hidden;
	72	+ text-overflow: ellipsis;
	73	+ white-space: nowrap;
	74	+}
	75	+
	76	+.foca-boton-facturador-right {
	77	+ right: 5;
	78	+}
...	...	@@ -0,0 +1,5 @@
	1	+$primary: #cd9035;
	2	+$primaryTransparency: #cd9137cc;
	3	+$highlightedArea: #df9424;
	4	+$default: #6c757d;
	5	+$defaultTransparency: #6c757dcc;
0	6	\ No newline at end of file
...	...	@@ -3,7 +3,7 @@
3	3	li {
4	4	&.active{
5	5	> a {
6		- background: $primary-color !important;
	6	+ background: $primary !important;
7	7	color: #FFF !important;
8	8	}
9	9	}
1		-$primary-color: #e09125;
	1	+@import 'constants';
2	2	@import 'admin-seguimiento';
3	3	@import 'bootstrap';
4	4	@import 'botonera';
...	...	@@ -40,17 +40,25 @@ input::-webkit-inner-spin-button {
40	40
41	41	.btn-outline-debo{
42	42	background-color: transparent;
43		- color: $primary-color;
44		- border-color: $primary-color;
	43	+ color: $primary;
	44	+ border-color: $primary;
45	45	&:hover{
46	46	color: #FFF;
47	47	border-color: transparent;
48		- background-color: $primary-color;
	48	+ background-color: $primary;
	49	+ }
	50	+ &:focus {
	51	+ box-shadow: none !important;
	52	+ }
	53	+ &:active{
	54	+ color: #FFF;
	55	+ background-color: $primary !important;
	56	+ box-shadow: 0px 0px 0px 3px $primaryTransparency !important;
49	57	}
50	58	}
51	59
52	60	.btn-brown {
53		- background-color:#Cd9035;
	61	+ background-color:$primary;
54	62	-webkit-appearance: none;
55	63	border-color: transparent;
56	64	&:focus {
...	...	@@ -66,45 +74,57 @@ input::-webkit-inner-spin-button {
66	74	.page-item.active .page-link {
67	75	z-index: 1;
68	76	color: #fff;
69		- background-color: #Cd9035;
70		- border-color: #Cd9035;
	77	+ background-color: $primary;
	78	+ border-color: $primary;
71	79	}
72	80
73	81	.foca-input {
74	82	&:focus {
75		- border-color: #Cd9035;
76		- box-shadow: 0 0 5px #Cd9035;
	83	+ border-color: $primary;
	84	+ box-shadow: 0 0 5px $primary;
77	85	}
78	86	}
79	87
80		-.btn-info {
81		- background-color: #Cd9035;
82		- border-color: #Cd9035;
	88	+.btn-primary {
	89	+ background-color: $primary !important;
	90	+ border-color: $primary !important;
83	91	&:focus {
84		- box-shadow: none;
	92	+ box-shadow: none !important;
85	93	}
86	94	&:hover {
87		- background-color: #Cd9035;
	95	+ border-color: $primaryTransparency !important;
	96	+ background-color: $primaryTransparency !important;
	97	+ }
	98	+ &:active{
	99	+ background-color: $primary !important;
	100	+ box-shadow: 0px 0px 0px 3px $primaryTransparency !important;
88	101	}
89	102	}
90	103
91		-.btn-primary {
92		- background-color: #Cd9035;
93		- border-color: #Cd9035;
	104	+.btn-default {
	105	+ color: #FFF;
	106	+ background-color: $default !important;
	107	+ border-color: $default !important;
94	108	&:focus {
95		- box-shadow: none;
	109	+ box-shadow: none !important;
96	110	}
97	111	&:hover {
98		- background-color: #Cd9035;
	112	+ color: #FFF;
	113	+ border-color: $defaultTransparency !important;
	114	+ background-color: $defaultTransparency !important;
	115	+ }
	116	+ &:active{
	117	+ background-color: $default !important;
	118	+ box-shadow: 0px 0px 0px 3px $defaultTransparency !important;
99	119	}
100	120	}
101	121
102	122	.table-celda-total {
103		- background-color: #E09524;
	123	+ background-color: $highlightedArea;
104	124	}
105	125
106	126	marquee {
107		- background-color: #E09524;
	127	+ background-color: $highlightedArea;
108	128	}
109	129
110	130	.front-index{
...	...	@@ -147,3 +167,32 @@ button.clear-input{
147	167	outline: none;
148	168	}
149	169	}
	170	+.custom-control-input {
	171	+ &:checked ~ .custom-control-label::before {
	172	+ border: none !important;
	173	+ color: $primary !important;
	174	+ background-color: $primary !important;
	175	+ box-shadow: 0px 0px 0px 2px $primaryTransparency !important;
	176	+ }
	177	+ &:active ~ .custom-control-label::before {
	178	+ border: none !important;
	179	+ color: $primary !important;
	180	+ background-color: $primary !important;
	181	+ }
	182	+ &:focus ~ .custom-control-label::before {
	183	+ border: none !important;
	184	+ box-shadow: 0px 0px 0px 2px $primaryTransparency !important;
	185	+ }
	186	+ &:focus:not(:checked) ~ .custom-control-label::before {
	187	+ border: none !important;
	188	+ }
	189	+ &:not(:disabled):active ~ .custom-control-label::before {
	190	+ border: none !important;
	191	+ color: $primary !important;
	192	+ box-shadow: 0px 0px 0px 2px $primaryTransparency !important;
	193	+ }
	194	+ &:hover ~ .custom-control-label::before {
	195	+ border: none !important;
	196	+ background-color: $primaryTransparency;
	197	+ }
	198	+}