Commit dfc231406016479e1826e27e4f971583f87f035e
Exists in
master
Merge branch 'master' into 'develop'
Master(mpuebla) See merge request !140
Showing
2 changed files
Show diff stats
src/sass/_constants.scss
1 | $primary: #cd9035; | 1 | $primary: #cd9035; |
2 | $primaryTransparency: #d6a55bcc; | 2 | $primaryTransparency: #d6a55bcc; |
3 | $highlightedArea: #df9424; | 3 | $highlightedArea: #df9424; |
4 | $default: #6c757d; | 4 | $default: #6c757d; |
5 | 5 | ||
6 | $defaultTransparency: #6c757dcc; | 6 | $defaultTransparency: #6c757dcc; |
7 | $danger: #dc3545; | 7 | $danger: #dc3545; |
8 | $dangerTransparency: #e98a94; | 8 | $dangerTransparency: #e98a94; |
9 | $textDanger: #ae4c3c; | ||
10 | $textSuccess: #95ac3d; | ||
9 | 11 |
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 | |||
24 | 23 | ||
25 | //OCULTA FLECHAS INPUT NUMBER | 24 | //OCULTA FLECHAS INPUT NUMBER |
26 | input[type='number'] { | 25 | input[type="number"] { |
27 | -moz-appearance:textfield; | 26 | -moz-appearance: textfield; |
28 | } | 27 | } |
29 | 28 | ||
30 | input::-webkit-outer-spin-button, | 29 | input::-webkit-outer-spin-button, |
31 | input::-webkit-inner-spin-button { | 30 | input::-webkit-inner-spin-button { |
32 | -webkit-appearance: none; | 31 | -webkit-appearance: none; |
33 | } | 32 | } |
34 | 33 | ||
35 | .d-md-grid{ | 34 | .d-md-grid { |
36 | @media (min-width: 768px) { | 35 | @media (min-width: 768px) { |
37 | display: grid !important; | 36 | display: grid !important; |
38 | } | 37 | } |
39 | } | 38 | } |
40 | 39 | ||
41 | .btn-dashed{ | 40 | .btn-dashed { |
42 | border-style: dashed !important; | 41 | border-style: dashed !important; |
43 | border-width: 3px; | 42 | border-width: 3px; |
44 | border-color: white; | 43 | border-color: white; |
45 | background-color: #dedfe0; | 44 | background-color: #dedfe0; |
46 | } | 45 | } |
47 | 46 | ||
48 | .marcador { | 47 | .marcador { |
49 | position: absolute; | 48 | position: absolute; |
50 | right: 97px; | 49 | right: 97px; |
51 | bottom: -50px; | 50 | bottom: -50px; |
52 | } | 51 | } |
53 | 52 | ||
54 | .informacion{ | 53 | .informacion { |
55 | position: absolute; | 54 | position: absolute; |
56 | right: 18px; | 55 | right: 18px; |
57 | bottom: 5px; | 56 | bottom: 5px; |
58 | } | 57 | } |
59 | 58 | ||
60 | .flashit{ | 59 | .flashit { |
61 | -webkit-animation: flash linear 1s infinite; | 60 | -webkit-animation: flash linear 1s infinite; |
62 | animation: flash linear 1s infinite; | 61 | animation: flash linear 1s infinite; |
63 | } | 62 | } |
64 | @-webkit-keyframes flash { | 63 | @-webkit-keyframes flash { |
65 | 0% { opacity: 1; } | 64 | 0% { |
66 | 50% { opacity: .6; } | 65 | opacity: 1; |
67 | 100% { opacity: 1; } | 66 | } |
67 | 50% { | ||
68 | opacity: 0.6; | ||
69 | } | ||
70 | 100% { | ||
71 | opacity: 1; | ||
72 | } | ||
68 | } | 73 | } |
69 | @keyframes flash { | 74 | @keyframes flash { |
70 | 0% { opacity: 1; } | 75 | 0% { |
71 | 50% { opacity: .6; } | 76 | opacity: 1; |
72 | 100% { 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 | background-color: transparent; | 87 | background-color: transparent; |
77 | color: $primary; | 88 | color: $primary; |
78 | border-color: $primary; | 89 | border-color: $primary; |
79 | &:hover{ | 90 | &:hover { |
80 | color: #FFF; | 91 | color: #fff; |
81 | border-color: transparent; | 92 | border-color: transparent; |
82 | background-color: $primary; | 93 | background-color: $primary; |
83 | } | 94 | } |
84 | &:focus { | 95 | &:focus { |
85 | box-shadow: 0px 0px 0px 3px $primaryTransparency !important; | 96 | box-shadow: 0px 0px 0px 3px $primaryTransparency !important; |
86 | } | 97 | } |
87 | &:active { | 98 | &:active { |
88 | color: #FFF; | 99 | color: #fff; |
89 | background-color: $primary !important; | 100 | background-color: $primary !important; |
90 | box-shadow: 0px 0px 0px 3px $primaryTransparency !important; | 101 | box-shadow: 0px 0px 0px 3px $primaryTransparency !important; |
91 | } | 102 | } |
92 | } | 103 | } |
93 | 104 | ||
94 | .input-group-append > button { | 105 | .input-group-append > button { |
95 | &:focus { | 106 | &:focus { |
96 | border-color: $primary !important; | 107 | border-color: $primary !important; |
97 | box-shadow: 0 0 5px $primary !important; | 108 | box-shadow: 0 0 5px $primary !important; |
98 | } | 109 | } |
99 | &:active { | 110 | &:active { |
100 | border-color: $primary !important; | 111 | border-color: $primary !important; |
101 | box-shadow: 0 0 5px $primary !important; | 112 | box-shadow: 0 0 5px $primary !important; |
102 | } | 113 | } |
103 | } | 114 | } |
104 | 115 | ||
105 | .line-break { | 116 | .line-break { |
106 | white-space:pre-wrap | 117 | white-space: pre-wrap; |
107 | } | 118 | } |
108 | 119 | ||
109 | .input-group-append > button { | 120 | .input-group-append > button { |
110 | &:focus { | 121 | &:focus { |
111 | border-color: $primary !important; | 122 | border-color: $primary !important; |
112 | box-shadow: 0 0 5px $primary !important; | 123 | box-shadow: 0 0 5px $primary !important; |
113 | } | 124 | } |
114 | &:active { | 125 | &:active { |
115 | border-color: $primary !important; | 126 | border-color: $primary !important; |
116 | box-shadow: 0 0 5px $primary !important; | 127 | box-shadow: 0 0 5px $primary !important; |
117 | } | 128 | } |
118 | } | 129 | } |
119 | 130 | ||
120 | |||
121 | .btn-login { | 131 | .btn-login { |
122 | box-shadow: none !important; | 132 | box-shadow: none !important; |
123 | } | 133 | } |
124 | 134 | ||
125 | input[type="file"] { | 135 | input[type="file"] { |
126 | display: none; | 136 | display: none; |
127 | } | 137 | } |
128 | .custom-file-upload { | 138 | .custom-file-upload { |
129 | border: 1px solid #ccc; | 139 | border: 1px solid #ccc; |
130 | display: inline-block; | 140 | display: inline-block; |
131 | padding: 6px 12px; | 141 | padding: 6px 12px; |
132 | cursor: pointer; | 142 | cursor: pointer; |
133 | } | 143 | } |
134 | 144 | ||
135 | .btn-brown { | 145 | .btn-brown { |
136 | background-color:$primary; | 146 | background-color: $primary; |
137 | -webkit-appearance: none; | 147 | -webkit-appearance: none; |
138 | border-color: transparent; | 148 | border-color: transparent; |
139 | &:focus { | 149 | &:focus { |
140 | outline: 0 !important; | 150 | outline: 0 !important; |
141 | box-shadow: none; | 151 | box-shadow: none; |
142 | } | 152 | } |
143 | .icon-white { | 153 | .icon-white { |
144 | color: white; | 154 | color: white; |
145 | } | 155 | } |
146 | } | 156 | } |
147 | 157 | ||
148 | .btn-Guardar { | 158 | .btn-Guardar { |
149 | background-color:green; | 159 | background-color: green; |
150 | -webkit-appearance: none; | 160 | -webkit-appearance: none; |
151 | border-color: transparent; | 161 | border-color: transparent; |
152 | &:focus { | 162 | &:focus { |
153 | outline: 0 !important; | 163 | outline: 0 !important; |
154 | box-shadow: none; | 164 | box-shadow: none; |
155 | } | 165 | } |
156 | .icon-white { | 166 | .icon-white { |
157 | color: white; | 167 | color: white; |
158 | } | 168 | } |
159 | } | 169 | } |
160 | 170 | ||
161 | .page-item.active .page-link { | 171 | .page-item.active .page-link { |
162 | z-index: 1; | 172 | z-index: 1; |
163 | color: #fff; | 173 | color: #fff; |
164 | background-color: $primary; | 174 | background-color: $primary; |
165 | border-color: $primary; | 175 | border-color: $primary; |
166 | } | 176 | } |
167 | 177 | ||
168 | .foca-input { | 178 | .foca-input { |
169 | &:focus { | 179 | &:focus { |
170 | border-color: $primary; | 180 | border-color: $primary; |
171 | box-shadow: 0 0 5px $primary; | 181 | box-shadow: 0 0 5px $primary; |
172 | } | 182 | } |
173 | &:hover { | 183 | &:hover { |
174 | border-color: $primary; | 184 | border-color: $primary; |
175 | box-shadow: 0 0 5px $primary; | 185 | box-shadow: 0 0 5px $primary; |
176 | } | 186 | } |
177 | } | 187 | } |
178 | 188 | ||
179 | .btn-enviar { | 189 | .btn-enviar { |
180 | background-color: white; | 190 | background-color: white; |
181 | border-color: #cd9035; | 191 | border-color: #cd9035; |
182 | &:focus { | 192 | &:focus { |
183 | box-shadow: none !important; | 193 | box-shadow: none !important; |
184 | } | 194 | } |
185 | &:hover { | 195 | &:hover { |
186 | border-color: $primaryTransparency !important; | 196 | border-color: $primaryTransparency !important; |
187 | background-color: $primaryTransparency !important; | 197 | background-color: $primaryTransparency !important; |
188 | } | 198 | } |
189 | &:active{ | 199 | &:active { |
190 | background-color: $primary !important; | 200 | background-color: $primary !important; |
191 | box-shadow: 0px 0px 0px 3px $primaryTransparency !important; | 201 | box-shadow: 0px 0px 0px 3px $primaryTransparency !important; |
192 | } | 202 | } |
193 | } | 203 | } |
194 | 204 | ||
195 | .btn-primary { | 205 | .btn-primary { |
196 | background-color: $primary !important; | 206 | background-color: $primary !important; |
197 | border-color: $primary !important; | 207 | border-color: $primary !important; |
198 | &:focus { | 208 | &:focus { |
199 | box-shadow: none !important; | 209 | box-shadow: none !important; |
200 | } | 210 | } |
201 | &:hover { | 211 | &:hover { |
202 | border-color: $primaryTransparency !important; | 212 | border-color: $primaryTransparency !important; |
203 | background-color: $primaryTransparency !important; | 213 | background-color: $primaryTransparency !important; |
204 | } | 214 | } |
205 | &:active{ | 215 | &:active { |
206 | background-color: $primary !important; | 216 | background-color: $primary !important; |
207 | box-shadow: 0px 0px 0px 3px $primaryTransparency !important; | 217 | box-shadow: 0px 0px 0px 3px $primaryTransparency !important; |
208 | } | 218 | } |
209 | } | 219 | } |
210 | 220 | ||
211 | .input-group-text { | 221 | .input-group-text { |
212 | &:focus { | 222 | &:focus { |
213 | outline: none; | 223 | outline: none; |
214 | border-color: $primary; | 224 | border-color: $primary; |
215 | box-shadow: 0 0 5px $primary; | 225 | box-shadow: 0 0 5px $primary; |
216 | } | 226 | } |
217 | &:hover { | 227 | &:hover { |
218 | border-color: $primary; | 228 | border-color: $primary; |
219 | box-shadow: 0 0 5px $primary; | 229 | box-shadow: 0 0 5px $primary; |
220 | } | 230 | } |
221 | &:active{ | 231 | &:active { |
222 | box-shadow: 0 0 5px $primary; | 232 | box-shadow: 0 0 5px $primary; |
223 | } | 233 | } |
224 | } | 234 | } |
225 | 235 | ||
226 | .btn-default { | 236 | .btn-default { |
227 | color: #FFF; | 237 | color: #fff; |
228 | background-color: $default !important; | 238 | background-color: $default !important; |
229 | border-color: $default !important; | 239 | border-color: $default !important; |
230 | &:focus { | 240 | &:focus { |
231 | box-shadow: none !important; | 241 | box-shadow: none !important; |
232 | } | 242 | } |
233 | &:hover { | 243 | &:hover { |
234 | color: #FFF; | 244 | color: #fff; |
235 | border-color: $defaultTransparency !important; | 245 | border-color: $defaultTransparency !important; |
236 | background-color: $defaultTransparency !important; | 246 | background-color: $defaultTransparency !important; |
237 | } | 247 | } |
238 | &:active{ | 248 | &:active { |
239 | background-color: $default !important; | 249 | background-color: $default !important; |
240 | box-shadow: 0px 0px 0px 3px $defaultTransparency !important; | 250 | box-shadow: 0px 0px 0px 3px $defaultTransparency !important; |
241 | } | 251 | } |
242 | } | 252 | } |
243 | 253 | ||
244 | .btn-danger { | 254 | .btn-danger { |
245 | &:hover { | 255 | &:hover { |
246 | color: #FFF; | 256 | color: #fff; |
247 | border-color: $dangerTransparency !important; | 257 | border-color: $dangerTransparency !important; |
248 | background-color: $dangerTransparency !important; | 258 | background-color: $dangerTransparency !important; |
249 | } | 259 | } |
250 | } | 260 | } |
251 | 261 | ||
252 | .table-celda-total { | 262 | .table-celda-total { |
253 | background-color: $highlightedArea; | 263 | background-color: $highlightedArea; |
254 | } | 264 | } |
255 | 265 | ||
256 | marquee { | 266 | marquee { |
257 | background-color: $highlightedArea; | 267 | background-color: $highlightedArea; |
258 | } | 268 | } |
259 | 269 | ||
260 | .front-index{ | 270 | .front-index { |
261 | z-index: 9999; | 271 | z-index: 9999; |
262 | } | 272 | } |
263 | 273 | ||
264 | .uib-daypicker{ | 274 | .uib-daypicker { |
265 | outline: 0 | 275 | outline: 0; |
266 | } | 276 | } |
267 | 277 | ||
268 | .right-0{ | 278 | .right-0 { |
269 | right: 0; | 279 | right: 0; |
270 | } | 280 | } |
271 | 281 | ||
272 | .tabla-factura{ | 282 | .tabla-factura { |
273 | word-wrap: break-word; | 283 | word-wrap: break-word; |
274 | table-layout: fixed; | 284 | table-layout: fixed; |
275 | } | 285 | } |
276 | 286 | ||
277 | .ladda-w-100 .ladda-label{ | 287 | .ladda-w-100 .ladda-label { |
278 | width: 100%; | 288 | width: 100%; |
279 | float: right; | 289 | float: right; |
280 | } | 290 | } |
281 | 291 | ||
282 | .btn-delete-image{ | 292 | .btn-delete-image { |
283 | height: 25px; | 293 | height: 25px; |
284 | width: 25px; | 294 | width: 25px; |
285 | top: -10px; | 295 | top: -10px; |
286 | right: 0; | 296 | right: 0; |
287 | } | 297 | } |
288 | 298 | ||
289 | button.clear-input{ | 299 | button.clear-input { |
290 | cursor: pointer; | 300 | cursor: pointer; |
291 | background: transparent; | 301 | background: transparent; |
292 | border: none; | 302 | border: none; |
293 | margin-left: -24px; | 303 | margin-left: -24px; |
294 | z-index: 9; | 304 | z-index: 9; |
295 | color: #a3a3a3; | 305 | color: #a3a3a3; |
296 | &:focus{ | 306 | &:focus { |
297 | outline: none; | 307 | outline: none; |
298 | } | 308 | } |
299 | } | 309 | } |
300 | .custom-control-input { | 310 | .custom-control-input { |
301 | &:checked ~ .custom-control-label::before { | 311 | &:checked ~ .custom-control-label::before { |
302 | border: none !important; | 312 | border: none !important; |
303 | color: $primary !important; | 313 | color: $primary !important; |
304 | background-color: $primary !important; | 314 | background-color: $primary !important; |
305 | box-shadow: 0px 0px 0px 2px $primaryTransparency !important; | 315 | box-shadow: 0px 0px 0px 2px $primaryTransparency !important; |
306 | } | 316 | } |
307 | &:active ~ .custom-control-label::before { | 317 | &:active ~ .custom-control-label::before { |
308 | border: none !important; | 318 | border: none !important; |
309 | color: $primary !important; | 319 | color: $primary !important; |
310 | background-color: $primary !important; | 320 | background-color: $primary !important; |
311 | } | 321 | } |
312 | &:focus ~ .custom-control-label::before { | 322 | &:focus ~ .custom-control-label::before { |
313 | border: none !important; | 323 | border: none !important; |
314 | box-shadow: 0px 0px 0px 2px $primaryTransparency !important; | 324 | box-shadow: 0px 0px 0px 2px $primaryTransparency !important; |
315 | } | 325 | } |
316 | &:focus:not(:checked) ~ .custom-control-label::before { | 326 | &:focus:not(:checked) ~ .custom-control-label::before { |
317 | border: none !important; | 327 | border: none !important; |
318 | } | 328 | } |
319 | &:not(:disabled):active ~ .custom-control-label::before { | 329 | &:not(:disabled):active ~ .custom-control-label::before { |
320 | border: none !important; | 330 | border: none !important; |
321 | color: $primary !important; | 331 | color: $primary !important; |
322 | box-shadow: 0px 0px 0px 2px $primaryTransparency !important; | 332 | box-shadow: 0px 0px 0px 2px $primaryTransparency !important; |
323 | } | 333 | } |
324 | &:hover ~ .custom-control-label::before { | 334 | &:hover ~ .custom-control-label::before { |
325 | border: none !important; | 335 | border: none !important; |
326 | background-color: $primaryTransparency; | 336 | background-color: $primaryTransparency; |
327 | } | 337 | } |
328 | } | 338 | } |
329 | .disable-selection { | 339 | .disable-selection { |
330 | user-select: none; | 340 | user-select: none; |
331 | -moz-user-select: none; /* Firefox */ | 341 | -moz-user-select: none; /* Firefox */ |
332 | -ms-user-select: none; /* Internet Explorer */ | 342 | -ms-user-select: none; /* Internet Explorer */ |
333 | -khtml-user-select: none; /* KHTML browsers (e.g. Konqueror) */ | 343 | -khtml-user-select: none; /* KHTML browsers (e.g. Konqueror) */ |
334 | -webkit-user-select: none; /* Chrome, Safari, and Opera */ | 344 | -webkit-user-select: none; /* Chrome, Safari, and Opera */ |
335 | -webkit-touch-callout: none; /* Disable Android and iOS callouts*/ | 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; |