Commit 76a7a1b037ef712eccb71442fbfcefb53a34e4dc

Authored by Eric Fernandez
Exists in master

Merge branch 'develop' into 'master'

Develop

See merge request !129

3.28 KB | W: | H:

4.98 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

256 KB | W: | H:

736 KB | W: | H:

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