Merge branch 'master' into 'master'

Master See merge request !15

Merge branch 'master' into 'master'
Master See merge request !15
Nicolás Guarnieri
2 parents 258b595b14 24c5be2776
Showing 3 changed files Show diff stats
img/seguimientoHojaRuta.png
img/seguimientoNotaPedido.png
src/sass/_botonera-principal.scss
@@ -102,18 +102,33 @@
             }
         }
     }
+    &-hoja-ruta-transportista {
+        & button {
+            background-image: url('../img/hojaRutaVolante.png');
+            background-size: 90px 90px;
+            &:hover {
+                background-color: rgb(250,250,250);
+            }
+        }
+    }
     &-seguimiento {
         & button {
-            background-position: -4470px 0px;
+            background-image: url('../img/seguimientoNotaPedido.png');
+            background-size: 90px 90px;
+            background-position: 15px 10px;
             &:hover {
-                background-position: -4470px -90px;
+                background-color: rgb(250,250,250);
             }
         }
     }
     &-seguimiento-hoja-ruta {
         & button {
-            background-image: url('../img/hojaRutaVolante.png');
+            background-image: url('../img/seguimientoHojaRuta.png');
             background-size: 90px 90px;
+            background-position: 15px 10px;
+            &:hover {
+                background-color: rgb(250,250,250);
+            }
         }
     }
     &-cobranzas {
@@ -128,6 +143,10 @@
         & button {
             background-image: url('../img/seguimientoCobranza.png');
             background-size: 90px 90px;
+            background-position: 15px 10px;
+            &:hover {
+                background-color: rgb(250,250,250);
+            }
         }
     }
     &-vehiculo {
...	...	@@ -102,18 +102,33 @@
102	102	}
103	103	}
104	104	}
	105	+ &-hoja-ruta-transportista {
	106	+ & button {
	107	+ background-image: url('../img/hojaRutaVolante.png');
	108	+ background-size: 90px 90px;
	109	+ &:hover {
	110	+ background-color: rgb(250,250,250);
	111	+ }
	112	+ }
	113	+ }
105	114	&-seguimiento {
106	115	& button {
107		- background-position: -4470px 0px;
	116	+ background-image: url('../img/seguimientoNotaPedido.png');
	117	+ background-size: 90px 90px;
	118	+ background-position: 15px 10px;
108	119	&:hover {
109		- background-position: -4470px -90px;
	120	+ background-color: rgb(250,250,250);
110	121	}
111	122	}
112	123	}
113	124	&-seguimiento-hoja-ruta {
114	125	& button {
115		- background-image: url('../img/hojaRutaVolante.png');
	126	+ background-image: url('../img/seguimientoHojaRuta.png');
116	127	background-size: 90px 90px;
	128	+ background-position: 15px 10px;
	129	+ &:hover {
	130	+ background-color: rgb(250,250,250);
	131	+ }
117	132	}
118	133	}
119	134	&-cobranzas {
...	...	@@ -128,6 +143,10 @@
128	143	& button {
129	144	background-image: url('../img/seguimientoCobranza.png');
130	145	background-size: 90px 90px;
	146	+ background-position: 15px 10px;
	147	+ &:hover {
	148	+ background-color: rgb(250,250,250);
	149	+ }
131	150	}
132	151	}
133	152	&-vehiculo {