Martin Macola / wrapper-demo

Download as
Browse Code ยป

Commit dfc231406016479e1826e27e4f971583f87f035e

Authored by Eric Fernandez
2 parents df4727811e 4b4d940654
Exists in master and in 1 other branch develop

Merge branch 'master' into 'develop' 

Master(mpuebla)

See merge request !140
Showing 2 changed files   Show diff stats
src/sass/_constants.scss
Diff comments   View file @ dfc2314
... ... @@ -6,3 +6,5 @@ $default: #6c757d;
6 6 $defaultTransparency: #6c757dcc;
7 7 $danger: #dc3545;
8 8 $dangerTransparency: #e98a94;
  9 +$textDanger: #ae4c3c;
  10 +$textSuccess: #95ac3d;
src/sass/general.scss
Diff comments   View file @ dfc2314
1   -@import 'constants';
2   -@import 'admin-seguimiento';
3   -@import 'bootstrap';
4   -@import 'botonera';
5   -@import 'botonera-lateral';
6   -@import 'botonera-principal';
7   -@import 'botonera-secundaria';
8   -@import 'contenedor';
9   -@import 'lista';
10   -@import 'login';
11   -@import 'panel-informativo';
12   -@import 'tabla';
13   -@import 'teclado';
14   -@import 'tabla-articulos';
15   -@import 'acciones-mobile';
16   -@import 'swiper';
17   -@import 'foca-crear';
18   -@import 'logistica-pedido-ruta';
19   -@import 'tabs';
20   -@import 'grid';
21   -@import 'paginador-abm';
22   -@import 'table-autorizar-nota-pedido';
23   -
  1 +@import "constants";
  2 +@import "admin-seguimiento";
  3 +@import "bootstrap";
  4 +@import "botonera";
  5 +@import "botonera-lateral";
  6 +@import "botonera-principal";
  7 +@import "botonera-secundaria";
  8 +@import "contenedor";
  9 +@import "lista";
  10 +@import "login";
  11 +@import "panel-informativo";
  12 +@import "tabla";
  13 +@import "teclado";
  14 +@import "tabla-articulos";
  15 +@import "acciones-mobile";
  16 +@import "swiper";
  17 +@import "foca-crear";
  18 +@import "logistica-pedido-ruta";
  19 +@import "tabs";
  20 +@import "grid";
  21 +@import "paginador-abm";
  22 +@import "table-autorizar-nota-pedido";
24 23  
25 24 //OCULTA FLECHAS INPUT NUMBER
26   -input[type='number'] {
27   - -moz-appearance:textfield;
  25 +input[type="number"] {
  26 + -moz-appearance: textfield;
28 27 }
29 28  
30 29 input::-webkit-outer-spin-button,
... ... @@ -32,13 +31,13 @@ input::-webkit-inner-spin-button {
32 31 -webkit-appearance: none;
33 32 }
34 33  
35   -.d-md-grid{
  34 +.d-md-grid {
36 35 @media (min-width: 768px) {
37 36 display: grid !important;
38 37 }
39 38 }
40 39  
41   -.btn-dashed{
  40 +.btn-dashed {
42 41 border-style: dashed !important;
43 42 border-width: 3px;
44 43 border-color: white;
... ... @@ -51,33 +50,45 @@ input::-webkit-inner-spin-button {
51 50 bottom: -50px;
52 51 }
53 52  
54   -.informacion{
  53 +.informacion {
55 54 position: absolute;
56 55 right: 18px;
57 56 bottom: 5px;
58 57 }
59 58  
60   -.flashit{
  59 +.flashit {
61 60 -webkit-animation: flash linear 1s infinite;
62 61 animation: flash linear 1s infinite;
63 62 }
64 63 @-webkit-keyframes flash {
65   - 0% { opacity: 1; }
66   - 50% { opacity: .6; }
67   - 100% { opacity: 1; }
  64 + 0% {
  65 + opacity: 1;
  66 + }
  67 + 50% {
  68 + opacity: 0.6;
  69 + }
  70 + 100% {
  71 + opacity: 1;
  72 + }
68 73 }
69 74 @keyframes flash {
70   - 0% { opacity: 1; }
71   - 50% { opacity: .6; }
72   - 100% { opacity: 1; }
  75 + 0% {
  76 + opacity: 1;
  77 + }
  78 + 50% {
  79 + opacity: 0.6;
  80 + }
  81 + 100% {
  82 + opacity: 1;
  83 + }
73 84 }
74 85  
75   -.btn-outline-debo{
  86 +.btn-outline-debo {
76 87 background-color: transparent;
77 88 color: $primary;
78 89 border-color: $primary;
79   - &:hover{
80   - color: #FFF;
  90 + &:hover {
  91 + color: #fff;
81 92 border-color: transparent;
82 93 background-color: $primary;
83 94 }
... ... @@ -85,7 +96,7 @@ input::-webkit-inner-spin-button {
85 96 box-shadow: 0px 0px 0px 3px $primaryTransparency !important;
86 97 }
87 98 &:active {
88   - color: #FFF;
  99 + color: #fff;
89 100 background-color: $primary !important;
90 101 box-shadow: 0px 0px 0px 3px $primaryTransparency !important;
91 102 }
... ... @@ -103,7 +114,7 @@ input::-webkit-inner-spin-button {
103 114 }
104 115  
105 116 .line-break {
106   - white-space:pre-wrap
  117 + white-space: pre-wrap;
107 118 }
108 119  
109 120 .input-group-append > button {
... ... @@ -117,7 +128,6 @@ input::-webkit-inner-spin-button {
117 128 }
118 129 }
119 130  
120   -
121 131 .btn-login {
122 132 box-shadow: none !important;
123 133 }
... ... @@ -125,15 +135,15 @@ input::-webkit-inner-spin-button {
125 135 input[type="file"] {
126 136 display: none;
127 137 }
128   - .custom-file-upload {
  138 +.custom-file-upload {
129 139 border: 1px solid #ccc;
130 140 display: inline-block;
131 141 padding: 6px 12px;
132 142 cursor: pointer;
133   - }
134   -
  143 +}
  144 +
135 145 .btn-brown {
136   - background-color:$primary;
  146 + background-color: $primary;
137 147 -webkit-appearance: none;
138 148 border-color: transparent;
139 149 &:focus {
... ... @@ -146,7 +156,7 @@ input[type="file"] {
146 156 }
147 157  
148 158 .btn-Guardar {
149   - background-color:green;
  159 + background-color: green;
150 160 -webkit-appearance: none;
151 161 border-color: transparent;
152 162 &:focus {
... ... @@ -186,7 +196,7 @@ input[type="file"] {
186 196 border-color: $primaryTransparency !important;
187 197 background-color: $primaryTransparency !important;
188 198 }
189   - &:active{
  199 + &:active {
190 200 background-color: $primary !important;
191 201 box-shadow: 0px 0px 0px 3px $primaryTransparency !important;
192 202 }
... ... @@ -202,7 +212,7 @@ input[type="file"] {
202 212 border-color: $primaryTransparency !important;
203 213 background-color: $primaryTransparency !important;
204 214 }
205   - &:active{
  215 + &:active {
206 216 background-color: $primary !important;
207 217 box-shadow: 0px 0px 0px 3px $primaryTransparency !important;
208 218 }
... ... @@ -218,24 +228,24 @@ input[type="file"] {
218 228 border-color: $primary;
219 229 box-shadow: 0 0 5px $primary;
220 230 }
221   - &:active{
  231 + &:active {
222 232 box-shadow: 0 0 5px $primary;
223 233 }
224 234 }
225 235  
226 236 .btn-default {
227   - color: #FFF;
  237 + color: #fff;
228 238 background-color: $default !important;
229 239 border-color: $default !important;
230 240 &:focus {
231 241 box-shadow: none !important;
232 242 }
233 243 &:hover {
234   - color: #FFF;
  244 + color: #fff;
235 245 border-color: $defaultTransparency !important;
236 246 background-color: $defaultTransparency !important;
237 247 }
238   - &:active{
  248 + &:active {
239 249 background-color: $default !important;
240 250 box-shadow: 0px 0px 0px 3px $defaultTransparency !important;
241 251 }
... ... @@ -243,74 +253,74 @@ input[type="file"] {
243 253  
244 254 .btn-danger {
245 255 &:hover {
246   - color: #FFF;
  256 + color: #fff;
247 257 border-color: $dangerTransparency !important;
248 258 background-color: $dangerTransparency !important;
249 259 }
250 260 }
251 261  
252 262 .table-celda-total {
253   - background-color: $highlightedArea;
  263 + background-color: $highlightedArea;
254 264 }
255 265  
256 266 marquee {
257 267 background-color: $highlightedArea;
258 268 }
259 269  
260   -.front-index{
  270 +.front-index {
261 271 z-index: 9999;
262 272 }
263 273  
264   -.uib-daypicker{
265   - outline: 0
  274 +.uib-daypicker {
  275 + outline: 0;
266 276 }
267 277  
268   -.right-0{
  278 +.right-0 {
269 279 right: 0;
270 280 }
271 281  
272   -.tabla-factura{
  282 +.tabla-factura {
273 283 word-wrap: break-word;
274 284 table-layout: fixed;
275 285 }
276 286  
277   -.ladda-w-100 .ladda-label{
  287 +.ladda-w-100 .ladda-label {
278 288 width: 100%;
279 289 float: right;
280 290 }
281 291  
282   -.btn-delete-image{
  292 +.btn-delete-image {
283 293 height: 25px;
284 294 width: 25px;
285 295 top: -10px;
286 296 right: 0;
287 297 }
288 298  
289   -button.clear-input{
  299 +button.clear-input {
290 300 cursor: pointer;
291 301 background: transparent;
292 302 border: none;
293 303 margin-left: -24px;
294 304 z-index: 9;
295 305 color: #a3a3a3;
296   - &:focus{
  306 + &:focus {
297 307 outline: none;
298 308 }
299 309 }
300 310 .custom-control-input {
301 311 &:checked ~ .custom-control-label::before {
302   - border: none !important;
  312 + border: none !important;
303 313 color: $primary !important;
304   - background-color: $primary !important;
  314 + background-color: $primary !important;
305 315 box-shadow: 0px 0px 0px 2px $primaryTransparency !important;
306 316 }
307   - &:active ~ .custom-control-label::before {
308   - border: none !important;
  317 + &:active ~ .custom-control-label::before {
  318 + border: none !important;
309 319 color: $primary !important;
310   - background-color: $primary !important;
  320 + background-color: $primary !important;
311 321 }
312 322 &:focus ~ .custom-control-label::before {
313   - border: none !important;
  323 + border: none !important;
314 324 box-shadow: 0px 0px 0px 2px $primaryTransparency !important;
315 325 }
316 326 &:focus:not(:checked) ~ .custom-control-label::before {
... ... @@ -320,11 +330,11 @@ button.clear-input{
320 330 border: none !important;
321 331 color: $primary !important;
322 332 box-shadow: 0px 0px 0px 2px $primaryTransparency !important;
323   - }
324   - &:hover ~ .custom-control-label::before {
325   - border: none !important;
326   - background-color: $primaryTransparency;
327   - }
  333 + }
  334 + &:hover ~ .custom-control-label::before {
  335 + border: none !important;
  336 + background-color: $primaryTransparency;
  337 + }
328 338 }
329 339 .disable-selection {
330 340 user-select: none;
... ... @@ -334,3 +344,9 @@ button.clear-input{
334 344 -webkit-user-select: none; /* Chrome, Safari, and Opera */
335 345 -webkit-touch-callout: none; /* Disable Android and iOS callouts*/
336 346 }
  347 +.foca-text-success {
  348 + color: $textSuccess !important;
  349 +}
  350 +.foca-text-danger {
  351 + color: $textDanger !important;
  352 +}