Commit 58e0355c8057576aeed29a23753391573929afca

Authored by Marcelo Puebla

Merge branch 'master' into 'develop'

Master(mpuebla)

See merge request !11
src/sass/_botonera-lateral.scss
1 .botonera-lateral { 1 .botonera-lateral {
2 pointer-events: none; 2 pointer-events: none;
3 position: absolute; 3 position: absolute;
4 left: 0; 4 left: 0;
5 right: 0; 5 right: 0;
6 top: 402px; 6 top: 402px;
7 &.teclado{ 7 &.teclado {
8 top: 449px; 8 top: 449px;
9 z-index: 100000; 9 z-index: 100000;
10 } 10 }
11 .row{ 11 .row {
12 margin: 0 !important; 12 margin: 0 !important;
13 pointer-events: none; 13 pointer-events: none;
14 } 14 }
15 15
16 .container{ 16 .container {
17 @media (min-width: 768px){ 17 @media (min-width: 768px) {
18 display: grid !important; 18 display: grid !important;
19 } 19 }
20 } 20 }
21 21
22 button{ 22 button {
23 pointer-events: all; 23 pointer-events: all;
24 background-color: #DDD; 24 background-color: #ddd;
25 } 25 }
26 26
27 .teclado-activar { 27 .teclado-activar {
28 background-color: #17d236 !important; 28 background-color: #17d236 !important;
29 color: #FFF !important; 29 color: #fff !important;
30 } 30 }
31 div[ladda]{ 31 div[ladda] {
32 background-color: #DDD; 32 background-color: #ddd;
33 } 33 }
34 34
35 button, .btn-group-toggle{ 35 button,
36 background-color: #DDD; 36 .btn-group-toggle {
37 background-color: #ddd;
37 color: #000; 38 color: #000;
38 text-transform: uppercase; 39 text-transform: uppercase;
39 min-width: 109px; 40 min-width: 109px;
40 &:hover{ 41 &:hover {
41 color: #FFF; 42 color: #fff;
42 .boton-activar-teclado{ 43 .boton-activar-teclado {
43 color: #FFF; 44 color: #fff;
44 } 45 }
45 background-color: #000; 46 background-color: #000;
46 } 47 }
47 } 48 }
48 49
49 50 .btn-group-toggle {
50 .btn-group-toggle{
51 pointer-events: all; 51 pointer-events: all;
52 &.active{ 52 &.active {
53 background-color: $primary; 53 background-color: $primary;
54 .boton-activar-teclado{ 54 .boton-activar-teclado {
55 color: #FFF; 55 color: #fff;
56 } 56 }
57 } 57 }
58 58
59 .boton-activar-teclado{ 59 .boton-activar-teclado {
60 cursor: pointer; 60 cursor: pointer;
61 color: #000; 61 color: #000;
62 background-color: transparent; 62 background-color: transparent;
63 } 63 }
64 64
65 input{ 65 input {
66 display: none; 66 display: none;
67 } 67 }
68 } 68 }
69 69
70 .guardado{ 70 .guardado {
71 animation:guardado 4s 1; 71 animation: guardado 4s 1;
72 -webkit-animation:guardado 4s 1; /* Safari and Chrome */ 72 -webkit-animation: guardado 4s 1; /* Safari and Chrome */
73 } 73 }
74 74
75 @keyframes guardado 75 @keyframes guardado {
76 { 76 0% {
77 0% {background:#DDD; color: #000;} 77 background: #ddd;
78 25% {background:#28a745; color: #FFF;} 78 color: #000;
79 75% {background:#28a745; color: #FFF;} 79 }
80 100% {background:#DDD; color: #000;} 80 25% {
81 background: #28a745;
82 color: #fff;
83 }
84 75% {
85 background: #28a745;
86 color: #fff;
87 }
88 100% {
89 background: #ddd;
90 color: #000;
91 }
81 } 92 }
82 93
83 @-webkit-keyframes guardado /* Safari and Chrome */ 94 @-webkit-keyframes guardado /* Safari and Chrome */ {
84 { 95 0% {
85 0% {background:#DDD; color: #000;} 96 background: #ddd;
86 25% {background:#28a745; color: #FFF;} 97 color: #000;
87 75% {background:#28a745; color: #FFF;} 98 }
88 100% {background:#DDD; color: #000;} 99 25% {
100 background: #28a745;
101 color: #fff;
102 }
103 75% {
104 background: #28a745;
105 color: #fff;
106 }
107 100% {
108 background: #ddd;
109 color: #000;
110 }
89 } 111 }
90 } 112 }
src/sass/general.scss
1 @import "constants"; 1 @import "constants";
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 @import "grid"; 20 @import "grid";
21 @import "paginador-abm"; 21 @import "paginador-abm";
22 @import "table-autorizar-nota-pedido"; 22 @import "table-autorizar-nota-pedido";
23 23
24 //OCULTA FLECHAS INPUT NUMBER 24 //OCULTA FLECHAS INPUT NUMBER
25 input[type="number"] { 25 input[type="number"] {
26 -moz-appearance: textfield; 26 -moz-appearance: textfield;
27 } 27 }
28 28
29 input::-webkit-outer-spin-button, 29 input::-webkit-outer-spin-button,
30 input::-webkit-inner-spin-button { 30 input::-webkit-inner-spin-button {
31 -webkit-appearance: none; 31 -webkit-appearance: none;
32 } 32 }
33 33
34 .d-md-grid { 34 .d-md-grid {
35 @media (min-width: 768px) { 35 @media (min-width: 768px) {
36 display: grid !important; 36 display: grid !important;
37 } 37 }
38 } 38 }
39 39
40 .btn-dashed { 40 .btn-dashed {
41 border-style: dashed !important; 41 border-style: dashed !important;
42 border-width: 3px; 42 border-width: 3px;
43 border-color: white; 43 border-color: white;
44 background-color: #dedfe0; 44 background-color: #dedfe0;
45 } 45 }
46 46
47 .marcador { 47 .marcador {
48 position: absolute; 48 position: absolute;
49 right: 44.5%; 49 right: 44.5%;
50 bottom: -32%; 50 bottom: -32%;
51 } 51 }
52 52
53 .informacion { 53 .informacion {
54 position: absolute; 54 position: absolute;
55 right: 18px; 55 right: 18px;
56 bottom: 5px; 56 bottom: 5px;
57 } 57 }
58 58
59 .flashit { 59 .flashit {
60 -webkit-animation: flash linear 1s infinite; 60 -webkit-animation: flash linear 1s infinite;
61 animation: flash linear 1s infinite; 61 animation: flash linear 1s infinite;
62 } 62 }
63
63 @-webkit-keyframes flash { 64 @-webkit-keyframes flash {
64 0% { 65 0% {
65 opacity: 1; 66 opacity: 1;
66 } 67 }
67 50% { 68 50% {
68 opacity: 0.6; 69 opacity: 0.6;
69 } 70 }
70 100% { 71 100% {
71 opacity: 1; 72 opacity: 1;
72 } 73 }
73 } 74 }
75
74 @keyframes flash { 76 @keyframes flash {
75 0% { 77 0% {
76 opacity: 1; 78 opacity: 1;
77 } 79 }
78 50% { 80 50% {
79 opacity: 0.6; 81 opacity: 0.6;
80 } 82 }
81 100% { 83 100% {
82 opacity: 1; 84 opacity: 1;
83 } 85 }
84 } 86 }
85 87
86 .btn-outline-debo { 88 .btn-outline-debo {
87 background-color: transparent; 89 background-color: transparent;
88 color: $primary; 90 color: $primary;
89 border-color: $primary; 91 border-color: $primary;
90 &:hover { 92 &:hover {
91 color: #fff; 93 color: #fff;
92 border-color: transparent; 94 border-color: transparent;
93 background-color: $primary; 95 background-color: $primary;
94 } 96 }
95 &:focus { 97 &:focus {
96 box-shadow: 0px 0px 0px 3px $primaryTransparency !important; 98 box-shadow: 0px 0px 0px 3px $primaryTransparency !important;
97 } 99 }
98 &:active { 100 &:active {
99 color: #fff; 101 color: #fff;
100 background-color: $primary !important; 102 background-color: $primary !important;
101 box-shadow: 0px 0px 0px 3px $primaryTransparency !important; 103 box-shadow: 0px 0px 0px 3px $primaryTransparency !important;
102 } 104 }
103 } 105 }
104 106
105 .input-group-append > button { 107 .input-group-append > button {
106 &:focus { 108 &:focus {
107 border-color: $primary !important; 109 border-color: $primary !important;
108 box-shadow: 0 0 5px $primary !important; 110 box-shadow: 0 0 5px $primary !important;
109 } 111 }
110 &:active { 112 &:active {
111 border-color: $primary !important; 113 border-color: $primary !important;
112 box-shadow: 0 0 5px $primary !important; 114 box-shadow: 0 0 5px $primary !important;
113 } 115 }
114 } 116 }
115 117
116 .line-break { 118 .line-break {
117 white-space: pre-wrap; 119 white-space: pre-wrap;
118 } 120 }
119 121
120 .input-group-append > button { 122 .input-group-append > button {
121 &:focus { 123 &:focus {
122 border-color: $primary !important; 124 border-color: $primary !important;
123 box-shadow: 0 0 5px $primary !important; 125 box-shadow: 0 0 5px $primary !important;
124 } 126 }
125 &:active { 127 &:active {
126 border-color: $primary !important; 128 border-color: $primary !important;
127 box-shadow: 0 0 5px $primary !important; 129 box-shadow: 0 0 5px $primary !important;
128 } 130 }
129 } 131 }
130 132
131 .btn-login { 133 .btn-login {
132 box-shadow: none !important; 134 box-shadow: none !important;
133 } 135 }
134 136
135 input[type="file"] { 137 input[type="file"] {
136 display: none; 138 display: none;
137 } 139 }
138 .custom-file-upload { 140 .custom-file-upload {
139 border: 1px solid #ccc; 141 border: 1px solid #ccc;
140 display: inline-block; 142 display: inline-block;
141 padding: 6px 12px; 143 padding: 6px 12px;
142 cursor: pointer; 144 cursor: pointer;
143 } 145 }
144 146
145 .btn-brown { 147 .btn-brown {
146 background-color: $primary; 148 background-color: $primary;
147 -webkit-appearance: none; 149 -webkit-appearance: none;
148 border-color: transparent; 150 border-color: transparent;
149 &:focus { 151 &:focus {
150 outline: 0 !important; 152 outline: 0 !important;
151 box-shadow: none; 153 box-shadow: none;
152 } 154 }
153 .icon-white { 155 .icon-white {
154 color: white; 156 color: white;
155 } 157 }
156 } 158 }
157 159
158 .btn-Guardar { 160 .btn-Guardar {
159 background-color: green; 161 background-color: green;
160 -webkit-appearance: none; 162 -webkit-appearance: none;
161 border-color: transparent; 163 border-color: transparent;
162 &:focus { 164 &:focus {
163 outline: 0 !important; 165 outline: 0 !important;
164 box-shadow: none; 166 box-shadow: none;
165 } 167 }
166 .icon-white { 168 .icon-white {
167 color: white; 169 color: white;
168 } 170 }
169 } 171 }
170 172
171 .page-item.active .page-link { 173 .page-item.active .page-link {
172 z-index: 1; 174 z-index: 1;
173 color: #fff; 175 color: #fff;
174 background-color: $primary; 176 background-color: $primary;
175 border-color: $primary; 177 border-color: $primary;
176 } 178 }
177 179
178 .foca-input { 180 .foca-input {
179 &:focus { 181 &:focus {
180 border-color: $primary; 182 border-color: $primary;
181 box-shadow: 0 0 5px $primary; 183 box-shadow: 0 0 5px $primary;
182 } 184 }
183 &:hover { 185 &:hover {
184 border-color: $primary; 186 border-color: $primary;
185 box-shadow: 0 0 5px $primary; 187 box-shadow: 0 0 5px $primary;
186 } 188 }
187 } 189 }
188 190
189 .btn-enviar { 191 .btn-enviar {
190 background-color: white; 192 background-color: white;
191 border-color: #2872AD; 193 border-color: #2872AD;
192 &:focus { 194 &:focus {
193 box-shadow: none !important; 195 box-shadow: none !important;
194 } 196 }
195 &:hover { 197 &:hover {
196 border-color: $primaryTransparency !important; 198 border-color: $primaryTransparency !important;
197 background-color: $primaryTransparency !important; 199 background-color: $primaryTransparency !important;
198 } 200 }
199 &:active { 201 &:active {
200 background-color: $primary !important; 202 background-color: $primary !important;
201 box-shadow: 0px 0px 0px 3px $primaryTransparency !important; 203 box-shadow: 0px 0px 0px 3px $primaryTransparency !important;
202 } 204 }
203 } 205 }
204 206
205 .btn-primary { 207 .btn-primary {
206 background-color: $primary !important; 208 background-color: $primary !important;
207 border-color: $primary !important; 209 border-color: $primary !important;
208 &:focus { 210 &:focus {
209 box-shadow: none !important; 211 box-shadow: none !important;
210 } 212 }
211 &:hover { 213 &:hover {
212 border-color: $primaryTransparency !important; 214 border-color: $primaryTransparency !important;
213 background-color: $primaryTransparency !important; 215 background-color: $primaryTransparency !important;
214 } 216 }
215 &:active { 217 &:active {
216 background-color: $primary !important; 218 background-color: $primary !important;
217 box-shadow: 0px 0px 0px 3px $primaryTransparency !important; 219 box-shadow: 0px 0px 0px 3px $primaryTransparency !important;
218 } 220 }
219 } 221 }
220 222
221 .input-group-text { 223 .input-group-text {
222 &:focus { 224 &:focus {
223 outline: none; 225 outline: none;
224 border-color: $primary; 226 border-color: $primary;
225 box-shadow: 0 0 5px $primary; 227 box-shadow: 0 0 5px $primary;
226 } 228 }
227 &:hover { 229 &:hover {
228 border-color: $primary; 230 border-color: $primary;
229 box-shadow: 0 0 5px $primary; 231 box-shadow: 0 0 5px $primary;
230 } 232 }
231 &:active { 233 &:active {
232 box-shadow: 0 0 5px $primary; 234 box-shadow: 0 0 5px $primary;
233 } 235 }
234 } 236 }
235 237
236 .btn-default { 238 .btn-default {
237 color: #fff; 239 color: #fff;
238 background-color: $default !important; 240 background-color: $default !important;
239 border-color: $default !important; 241 border-color: $default !important;
240 &:focus { 242 &:focus {
241 box-shadow: none !important; 243 box-shadow: none !important;
242 } 244 }
243 &:hover { 245 &:hover {
244 color: #fff; 246 color: #fff;
245 border-color: $defaultTransparency !important; 247 border-color: $defaultTransparency !important;
246 background-color: $defaultTransparency !important; 248 background-color: $defaultTransparency !important;
247 } 249 }
248 &:active { 250 &:active {
249 background-color: $default !important; 251 background-color: $default !important;
250 box-shadow: 0px 0px 0px 3px $defaultTransparency !important; 252 box-shadow: 0px 0px 0px 3px $defaultTransparency !important;
251 } 253 }
252 } 254 }
253 255
254 .btn-danger { 256 .btn-danger {
255 &:hover { 257 &:hover {
256 color: #fff; 258 color: #fff;
257 border-color: $dangerTransparency !important; 259 border-color: $dangerTransparency !important;
258 background-color: $dangerTransparency !important; 260 background-color: $dangerTransparency !important;
259 } 261 }
260 } 262 }
261 263
262 .table-celda-total { 264 .table-celda-total {
263 background-color: $highlightedArea; 265 background-color: $highlightedArea;
264 } 266 }
265 267
266 marquee { 268 marquee {
267 background-color: $highlightedArea; 269 background-color: $highlightedArea;
268 } 270 }
269 271
270 .front-index { 272 .front-index {
271 z-index: 9999; 273 z-index: 9999;
272 } 274 }
273 275
274 .uib-daypicker { 276 .uib-daypicker {
275 outline: 0; 277 outline: 0;
276 } 278 }
277 279
278 .right-0 { 280 .right-0 {
279 right: 0; 281 right: 0;
280 } 282 }
281 283
282 .tabla-factura { 284 .tabla-factura {
283 word-wrap: break-word; 285 word-wrap: break-word;
284 table-layout: fixed; 286 table-layout: fixed;
285 } 287 }
286 288
287 .ladda-w-100 .ladda-label { 289 .ladda-w-100 .ladda-label {
288 width: 100%; 290 width: 100%;
289 float: right; 291 float: right;
290 } 292 }
291 293
292 .btn-delete-image { 294 .btn-delete-image {
293 height: 25px; 295 height: 25px;
294 width: 25px; 296 width: 25px;
295 top: -10px; 297 top: -10px;
296 right: 0; 298 right: 0;
297 } 299 }
298 300
299 button.clear-input { 301 button.clear-input {
300 cursor: pointer; 302 cursor: pointer;
301 background: transparent; 303 background: transparent;
302 border: none; 304 border: none;
303 margin-left: -24px; 305 margin-left: -24px;
304 z-index: 9; 306 z-index: 9;
305 color: #a3a3a3; 307 color: #a3a3a3;
306 &:focus { 308 &:focus {
307 outline: none; 309 outline: none;
308 } 310 }
309 } 311 }
312
310 .custom-control-input { 313 .custom-control-input {
311 &:checked ~ .custom-control-label::before { 314 &:checked ~ .custom-control-label::before {
312 border: none !important; 315 border: none !important;
313 color: $primary !important; 316 color: $primary !important;
314 background-color: $primary !important; 317 background-color: $primary !important;
315 box-shadow: 0px 0px 0px 2px $primaryTransparency !important; 318 box-shadow: 0px 0px 0px 2px $primaryTransparency !important;
316 } 319 }
317 &:active ~ .custom-control-label::before { 320 &:active ~ .custom-control-label::before {
318 border: none !important; 321 border: none !important;
319 color: $primary !important; 322 color: $primary !important;
320 background-color: $primary !important; 323 background-color: $primary !important;
321 } 324 }
322 &:focus ~ .custom-control-label::before { 325 &:focus ~ .custom-control-label::before {
323 border: none !important; 326 border: none !important;
324 box-shadow: 0px 0px 0px 2px $primaryTransparency !important; 327 box-shadow: 0px 0px 0px 2px $primaryTransparency !important;
325 } 328 }
326 &:focus:not(:checked) ~ .custom-control-label::before { 329 &:focus:not(:checked) ~ .custom-control-label::before {
327 border: none !important; 330 border: none !important;
328 } 331 }
329 &:not(:disabled):active ~ .custom-control-label::before { 332 &:not(:disabled):active ~ .custom-control-label::before {
330 border: none !important; 333 border: none !important;
331 color: $primary !important; 334 color: $primary !important;
332 box-shadow: 0px 0px 0px 2px $primaryTransparency !important; 335 box-shadow: 0px 0px 0px 2px $primaryTransparency !important;
333 } 336 }
334 &:hover ~ .custom-control-label::before { 337 &:hover ~ .custom-control-label::before {
335 border: none !important; 338 border: none !important;
336 background-color: $primaryTransparency; 339 background-color: $primaryTransparency;
337 } 340 }
338 } 341 }
342
339 .disable-selection { 343 .disable-selection {
340 user-select: none; 344 user-select: none;
341 -moz-user-select: none; /* Firefox */ 345 -moz-user-select: none; /* Firefox */
342 -ms-user-select: none; /* Internet Explorer */ 346 -ms-user-select: none; /* Internet Explorer */
343 -khtml-user-select: none; /* KHTML browsers (e.g. Konqueror) */ 347 -khtml-user-select: none; /* KHTML browsers (e.g. Konqueror) */
344 -webkit-user-select: none; /* Chrome, Safari, and Opera */ 348 -webkit-user-select: none; /* Chrome, Safari, and Opera */
345 -webkit-touch-callout: none; /* Disable Android and iOS callouts*/ 349 -webkit-touch-callout: none; /* Disable Android and iOS callouts*/
346 } 350 }
351
347 .foca-text-success { 352 .foca-text-success {
348 color: $textSuccess !important; 353 color: $textSuccess !important;
349 } 354 }
355
350 .foca-text-danger { 356 .foca-text-danger {
351 color: $textDanger !important; 357 color: $textDanger !important;
352 } 358 }
359
353 .cover-spin { 360 .cover-spin {
354 width: -webkit-fill-available; 361 width: -webkit-fill-available;
355 height: -webkit-fill-available; 362 height: -webkit-fill-available;
356 display: flex; 363 display: flex;
357 position: absolute; 364 position: absolute;
358 background-color: rgba(255, 255, 255, 0.6); 365 background-color: rgba(255, 255, 255, 0.6);
359 left: 0; 366 left: 0;
360 top: 0; 367 top: 0;
361 z-index: 9999; 368 z-index: 9999;
362 } 369 }
370
363 .fadeIn { 371 .fadeIn {
364 opacity: 0; 372 opacity: 0;
365 animation: fadeIn 1.8s forwards; 373 animation: fadeIn 1.8s forwards;
366 } 374 }
367 375
368 @keyframes fadeIn { 376 @keyframes fadeIn {
369 0% { 377 0% {
370 opacity: 0; 378 opacity: 0;
371 transform: translateY(10px); 379 transform: translateY(10px);
372 } 380 }
373 30% { 381 30% {
374 opacity: 0.6; 382 opacity: 0.6;
375 } 383 }
376 100% { 384 100% {
377 opacity: 1; 385 opacity: 1;
378 transform: translateY(0); 386 transform: translateY(0);
379 } 387 }
380 } 388 }
381 389
382 .bg-gray-gradient { 390 .bg-gray-gradient {
383 background: linear-gradient(0deg, hsl(0, 0%, 90%),hsl(0, 0%, 70%)); 391 background: linear-gradient(0deg, hsl(0, 0%, 90%),hsl(0, 0%, 70%));
384 } 392 }
393
394 .text-transform-none {
395 text-transform: none !important;
396 }
385 397