Merge branch 'master' into 'develop'

Master(benjamin) See merge request !168

Merge branch 'master' into 'develop'
Master(benjamin) See merge request !168
Marcelo Puebla
2 parents b3ba56d5ff 1edaacd3dd
Showing 2 changed files Show diff stats
src/sass/_botonera-principal.scss
src/sass/_login.scss
@@ -228,6 +228,13 @@
         }
     }
  
+    &-orden-carga {
+        & button {
+            background-image: url("../img/Orden_de_Carga.png");
+            background-size: 90px 90px;
+        }
+    }
+
     .swiper-pagination {
         bottom: 0px !important;
         background: none;
@@ -54,14 +54,14 @@
     }
 }
  
-@media (min-width: 600px) {
+@media (min-width: 768px) {
     .img-login{
         height: 190px;
         width: 211px;
     }
 }
  
-@media (max-width: 600px) {
+@media (max-width: 768px) {
     .img-login{
         height: 150px;
         width: 158px;
...	...	@@ -228,6 +228,13 @@
228	228	}
229	229	}
230	230
	231	+ &-orden-carga {
	232	+ & button {
	233	+ background-image: url("../img/Orden_de_Carga.png");
	234	+ background-size: 90px 90px;
	235	+ }
	236	+ }
	237	+
231	238	.swiper-pagination {
232	239	bottom: 0px !important;
233	240	background: none;