Commit 94ea56868934426af5f7e82992a86e2bcb421235

Authored by Eric Fernandez
Exists in master and in 1 other branch develop

Merge branch 'master' into 'develop'

Master(mpuebla)

See merge request !142
src/sass/_botonera-principal.scss
... ... @@ -7,12 +7,13 @@
7 7 @media (max-width: 576px) {
8 8 width: 100%;
9 9 }
10   - @media (min-width: 992px) and (max-width: 1200px){
  10 + @media (min-width: 992px) and (max-width: 1200px) {
11 11 width: 150px;
12 12 }
13 13 }
14 14 button {
15   - background-image: url('../img/botonera.png');
  15 + cursor: pointer;
  16 + background-image: url("../img/botonera.png");
16 17 border-radius: 12px;
17 18 border-width: 0;
18 19 height: 90px;
... ... @@ -29,12 +30,16 @@
29 30 color: #777777;
30 31 }
31 32 &:hover {
32   - background-color:rgb(250,250,250);
33   - filter:drop-shadow(4px 4px 4px gray);
  33 + background-color: rgb(250, 250, 250);
  34 + filter: drop-shadow(4px 4px 4px gray);
34 35 }
35 36 &:active {
36 37 background-color: rgb(230, 230, 230);
37   - filter:drop-shadow(4px 4px 4px gray);
  38 + filter: drop-shadow(4px 4px 4px gray);
  39 + }
  40 + &:focus {
  41 + background-color: rgb(250, 250, 250);
  42 + filter: drop-shadow(4px 4px 4px gray);
38 43 }
39 44 }
40 45 &-menu {
... ... @@ -47,7 +52,7 @@
47 52 &-logo {
48 53 width: 100%;
49 54 margin-left: 50%;
50   - opacity: .8;
  55 + opacity: 0.8;
51 56 @media (max-width: 576px) {
52 57 width: 180%;
53 58 margin-left: 20%;
... ... @@ -87,14 +92,14 @@
87 92 }
88 93 &-estado-cisterna {
89 94 & button {
90   - background-image: url('../img/control_stock.png');
  95 + background-image: url("../img/control_stock.png");
91 96 background-size: 90px 90px;
92 97 }
93 98 }
94 99 &-logistica {
95 100 & button {
96   - background-image: url('../img/logistica.png');
97   - background-size: 90px 90px;
  101 + background-image: url("../img/logistica.png");
  102 + background-size: 90px 90px;
98 103 }
99 104 }
100 105 &-facturador {
... ... @@ -107,111 +112,111 @@
107 112 }
108 113 &-nota-pedido {
109 114 & button {
110   - background-image: url('../img/notaPedido.png');
  115 + background-image: url("../img/notaPedido.png");
111 116 background-size: 90px 90px;
112 117 }
113 118 }
114 119 &-remito {
115 120 & button {
116   - background-image: url('../img/remito.png');
  121 + background-image: url("../img/remito.png");
117 122 background-size: 90px 90px;
118 123 }
119 124 }
120 125 &-hoja-ruta {
121 126 & button {
122   - background-image: url('../img/hoja-ruta.png');
  127 + background-image: url("../img/hoja-ruta.png");
123 128 background-size: 86px 90px;
124 129 }
125 130 }
126 131 &-activar-hoja-ruta {
127 132 & button {
128   - background-image: url('../img/activar_hoja.png');
  133 + background-image: url("../img/activar_hoja.png");
129 134 background-size: 90px 90px;
130 135 }
131 136 }
132 137 &-hoja-ruta-transportista {
133 138 & button {
134   - background-image: url('../img/hojaRutaVolante.png');
  139 + background-image: url("../img/hojaRutaVolante.png");
135 140 background-size: 90px 90px;
136 141 }
137 142 }
138 143 &-seguimiento {
139 144 & button {
140   - background-image: url('../img/seguimientoNotaPedido.png');
  145 + background-image: url("../img/seguimientoNotaPedido.png");
141 146 background-size: 90px 90px;
142 147 }
143 148 }
144 149 &-seguimiento-hoja-ruta {
145 150 & button {
146   - background-image: url('../img/seguimientoHojaRuta.png');
  151 + background-image: url("../img/seguimientoHojaRuta.png");
147 152 background-size: 90px 90px;
148 153 }
149 154 }
150 155 &-cobranzas {
151 156 & button {
152   - background-image: url('../img/cobranzas.png');
  157 + background-image: url("../img/cobranzas.png");
153 158 background-size: 90px 90px;
154 159 }
155 160 }
156 161 &-seguimiento-cobranzas {
157 162 & button {
158   - background-image: url('../img/seguimientoCobranza.png');
  163 + background-image: url("../img/seguimientoCobranza.png");
159 164 background-size: 90px 90px;
160 165 }
161 166 }
162 167 &-vehiculo {
163 168 & button {
164   - background-image: url('../img/abmVehiculos.png');
  169 + background-image: url("../img/abmVehiculos.png");
165 170 background-size: 90px 90px;
166 171 }
167 172 }
168 173 &-precio-condicion {
169 174 & button {
170   - background-image: url('../img/abmPrecios.png');
  175 + background-image: url("../img/abmPrecios.png");
171 176 background-size: 90px 90px;
172 177 }
173 178 }
174 179 &-chofer {
175 180 & button {
176   - background-image: url('../img/abmChofer.png');
  181 + background-image: url("../img/abmChofer.png");
177 182 background-size: 90px 90px;
178 183 }
179 184 }
180 185 &-agendar-visita {
181 186 & button {
182   - background-image: url('../img/agendarVisita.png');
  187 + background-image: url("../img/agendarVisita.png");
183 188 background-size: 90px 90px;
184 189 }
185 190 }
186 191 &-informes {
187 192 & button {
188   - background-image: url('../img/informes.png');
  193 + background-image: url("../img/informes.png");
189 194 background-size: 90px 90px;
190 195 }
191 196 }
192 197 &-vendedor-cobrador {
193 198 & button {
194   - background-image: url('../img/abmVendedorCobrador.png');
  199 + background-image: url("../img/abmVendedorCobrador.png");
195 200 background-size: 90px 90px;
196 201 }
197 202 }
198 203 &-autorizar-nota {
199 204 & button {
200   - background-image: url('../img/autorizarNota.png');
  205 + background-image: url("../img/autorizarNota.png");
201 206 background-size: 90px 90px;
202 207 }
203 208 }
204 209  
205 210 &-cliente {
206 211 & button {
207   - background-image: url('../img/clientePrincipal.png');
  212 + background-image: url("../img/clientePrincipal.png");
208 213 background-size: 90px 90px;
209 214 }
210 215 }
211 216  
212 217 &-parametros {
213 218 & button {
214   - background-image: url('../img/parametrizar.png');
  219 + background-image: url("../img/parametrizar.png");
215 220 background-size: 90px 90px;
216 221 }
217 222 }
... ... @@ -220,20 +225,20 @@
220 225 }
221 226  
222 227 .swiper-button-next {
223   - background-image: url('../img/derecha.png');
224   - &:hover{
225   - filter:drop-shadow(4px 4px 4px gray);
  228 + background-image: url("../img/derecha.png");
  229 + &:hover {
  230 + filter: drop-shadow(4px 4px 4px gray);
226 231 }
227 232 }
228 233  
229 234 .swiper-button-prev {
230   - background-image: url('../img/izquierda.png');
231   - &:hover{
232   - filter:drop-shadow(4px 4px 4px gray);
  235 + background-image: url("../img/izquierda.png");
  236 + &:hover {
  237 + filter: drop-shadow(4px 4px 4px gray);
233 238 }
234 239 }
235   - @media (min-width: 992px){
236   - a{
  240 + @media (min-width: 992px) {
  241 + a {
237 242 margin-top: 2.5rem;
238 243 }
239 244 }
src/sass/general.scss
... ... @@ -350,3 +350,13 @@ button.clear-input {
350 350 .foca-text-danger {
351 351 color: $textDanger !important;
352 352 }
  353 +.cover-spin {
  354 + width: -webkit-fill-available;
  355 + height: -webkit-fill-available;
  356 + display: flex;
  357 + position: absolute;
  358 + background-color: rgba(255,255,255,0.6);
  359 + left: 0;
  360 + top: 0;
  361 + z-index: 9999;
  362 +}