Commit 58e0355c8057576aeed29a23753391573929afca
Exists in
fix_configuracion
and in
1 other branch
Merge branch 'master' into 'develop'
Master(mpuebla) See merge request !11
Showing
2 changed files
Show diff stats
src/sass/_botonera-lateral.scss
... | ... | @@ -4,87 +4,109 @@ |
4 | 4 | left: 0; |
5 | 5 | right: 0; |
6 | 6 | top: 402px; |
7 | - &.teclado{ | |
7 | + &.teclado { | |
8 | 8 | top: 449px; |
9 | 9 | z-index: 100000; |
10 | 10 | } |
11 | - .row{ | |
11 | + .row { | |
12 | 12 | margin: 0 !important; |
13 | 13 | pointer-events: none; |
14 | 14 | } |
15 | 15 | |
16 | - .container{ | |
17 | - @media (min-width: 768px){ | |
16 | + .container { | |
17 | + @media (min-width: 768px) { | |
18 | 18 | display: grid !important; |
19 | 19 | } |
20 | 20 | } |
21 | 21 | |
22 | - button{ | |
22 | + button { | |
23 | 23 | pointer-events: all; |
24 | - background-color: #DDD; | |
24 | + background-color: #ddd; | |
25 | 25 | } |
26 | 26 | |
27 | 27 | .teclado-activar { |
28 | 28 | background-color: #17d236 !important; |
29 | - color: #FFF !important; | |
29 | + color: #fff !important; | |
30 | 30 | } |
31 | - div[ladda]{ | |
32 | - background-color: #DDD; | |
31 | + div[ladda] { | |
32 | + background-color: #ddd; | |
33 | 33 | } |
34 | 34 | |
35 | - button, .btn-group-toggle{ | |
36 | - background-color: #DDD; | |
35 | + button, | |
36 | + .btn-group-toggle { | |
37 | + background-color: #ddd; | |
37 | 38 | color: #000; |
38 | 39 | text-transform: uppercase; |
39 | 40 | min-width: 109px; |
40 | - &:hover{ | |
41 | - color: #FFF; | |
42 | - .boton-activar-teclado{ | |
43 | - color: #FFF; | |
41 | + &:hover { | |
42 | + color: #fff; | |
43 | + .boton-activar-teclado { | |
44 | + color: #fff; | |
44 | 45 | } |
45 | 46 | background-color: #000; |
46 | 47 | } |
47 | 48 | } |
48 | - | |
49 | - | |
50 | - .btn-group-toggle{ | |
49 | + | |
50 | + .btn-group-toggle { | |
51 | 51 | pointer-events: all; |
52 | - &.active{ | |
52 | + &.active { | |
53 | 53 | background-color: $primary; |
54 | - .boton-activar-teclado{ | |
55 | - color: #FFF; | |
54 | + .boton-activar-teclado { | |
55 | + color: #fff; | |
56 | 56 | } |
57 | 57 | } |
58 | - | |
59 | - .boton-activar-teclado{ | |
58 | + | |
59 | + .boton-activar-teclado { | |
60 | 60 | cursor: pointer; |
61 | 61 | color: #000; |
62 | 62 | background-color: transparent; |
63 | 63 | } |
64 | 64 | |
65 | - input{ | |
65 | + input { | |
66 | 66 | display: none; |
67 | 67 | } |
68 | 68 | } |
69 | 69 | |
70 | - .guardado{ | |
71 | - animation:guardado 4s 1; | |
72 | - -webkit-animation:guardado 4s 1; /* Safari and Chrome */ | |
70 | + .guardado { | |
71 | + animation: guardado 4s 1; | |
72 | + -webkit-animation: guardado 4s 1; /* Safari and Chrome */ | |
73 | 73 | } |
74 | 74 | |
75 | - @keyframes guardado | |
76 | - { | |
77 | - 0% {background:#DDD; color: #000;} | |
78 | - 25% {background:#28a745; color: #FFF;} | |
79 | - 75% {background:#28a745; color: #FFF;} | |
80 | - 100% {background:#DDD; color: #000;} | |
75 | + @keyframes guardado { | |
76 | + 0% { | |
77 | + background: #ddd; | |
78 | + color: #000; | |
79 | + } | |
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 */ | |
84 | - { | |
85 | - 0% {background:#DDD; color: #000;} | |
86 | - 25% {background:#28a745; color: #FFF;} | |
87 | - 75% {background:#28a745; color: #FFF;} | |
88 | - 100% {background:#DDD; color: #000;} | |
94 | + @-webkit-keyframes guardado /* Safari and Chrome */ { | |
95 | + 0% { | |
96 | + background: #ddd; | |
97 | + color: #000; | |
98 | + } | |
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
... | ... | @@ -60,6 +60,7 @@ input::-webkit-inner-spin-button { |
60 | 60 | -webkit-animation: flash linear 1s infinite; |
61 | 61 | animation: flash linear 1s infinite; |
62 | 62 | } |
63 | + | |
63 | 64 | @-webkit-keyframes flash { |
64 | 65 | 0% { |
65 | 66 | opacity: 1; |
... | ... | @@ -71,6 +72,7 @@ input::-webkit-inner-spin-button { |
71 | 72 | opacity: 1; |
72 | 73 | } |
73 | 74 | } |
75 | + | |
74 | 76 | @keyframes flash { |
75 | 77 | 0% { |
76 | 78 | opacity: 1; |
... | ... | @@ -307,6 +309,7 @@ button.clear-input { |
307 | 309 | outline: none; |
308 | 310 | } |
309 | 311 | } |
312 | + | |
310 | 313 | .custom-control-input { |
311 | 314 | &:checked ~ .custom-control-label::before { |
312 | 315 | border: none !important; |
... | ... | @@ -336,6 +339,7 @@ button.clear-input { |
336 | 339 | background-color: $primaryTransparency; |
337 | 340 | } |
338 | 341 | } |
342 | + | |
339 | 343 | .disable-selection { |
340 | 344 | user-select: none; |
341 | 345 | -moz-user-select: none; /* Firefox */ |
... | ... | @@ -344,12 +348,15 @@ button.clear-input { |
344 | 348 | -webkit-user-select: none; /* Chrome, Safari, and Opera */ |
345 | 349 | -webkit-touch-callout: none; /* Disable Android and iOS callouts*/ |
346 | 350 | } |
351 | + | |
347 | 352 | .foca-text-success { |
348 | 353 | color: $textSuccess !important; |
349 | 354 | } |
355 | + | |
350 | 356 | .foca-text-danger { |
351 | 357 | color: $textDanger !important; |
352 | 358 | } |
359 | + | |
353 | 360 | .cover-spin { |
354 | 361 | width: -webkit-fill-available; |
355 | 362 | height: -webkit-fill-available; |
... | ... | @@ -360,6 +367,7 @@ button.clear-input { |
360 | 367 | top: 0; |
361 | 368 | z-index: 9999; |
362 | 369 | } |
370 | + | |
363 | 371 | .fadeIn { |
364 | 372 | opacity: 0; |
365 | 373 | animation: fadeIn 1.8s forwards; |
... | ... | @@ -379,6 +387,10 @@ button.clear-input { |
379 | 387 | } |
380 | 388 | } |
381 | 389 | |
382 | -.bg-gray-gradient { | |
390 | +.bg-gray-gradient { | |
383 | 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 | +} |