Merge branch 'master' into 'develop'

Master See merge request !117

Merge branch 'master' into 'develop'
Master See merge request !117
Eric Fernandez
2 parents 7cd891f209 04901ca70e
Showing 6 changed files Show diff stats
img/FechaEntrega.png
img/clientePrincipal.png
img/fechaDeReparto.png
img/parametrizar.png
src/sass/_botonera-principal.scss
src/sass/general.scss
@@ -201,6 +201,14 @@
             background-size: 90px 90px;
         }
     }
+
+    &-cliente {
+        & button {
+            background-image: url('../img/clientePrincipal.png');
+            background-size: 90px 90px;
+        }
+    }
+
     &-parametros {
         & button {
             background-image: url('../img/parametrizar.png');
@@ -134,6 +134,22 @@ input[type=&quot;file&quot;] {
     }
 }
  
+.btn-enviar {
+    background-color: white;
+    border-color: #cd9035;
+    &:focus {
+        box-shadow: none !important;
+    }
+    &:hover {
+        border-color: $primaryTransparency !important;
+        background-color: $primaryTransparency !important;
+    }
+    &:active{
+        background-color: $primary !important;
+        box-shadow: 0px 0px 0px 3px $primaryTransparency !important;
+    }
+}
+
 .btn-primary {
     background-color: $primary !important;
     border-color: $primary !important;
...	...	@@ -201,6 +201,14 @@
201	201	background-size: 90px 90px;
202	202	}
203	203	}
	204	+
	205	+ &-cliente {
	206	+ & button {
	207	+ background-image: url('../img/clientePrincipal.png');
	208	+ background-size: 90px 90px;
	209	+ }
	210	+ }
	211	+
204	212	&-parametros {
205	213	& button {
206	214	background-image: url('../img/parametrizar.png');
...	...	@@ -134,6 +134,22 @@ input[type="file"] {
134	134	}
135	135	}
136	136
	137	+.btn-enviar {
	138	+ background-color: white;
	139	+ border-color: #cd9035;
	140	+ &:focus {
	141	+ box-shadow: none !important;
	142	+ }
	143	+ &:hover {
	144	+ border-color: $primaryTransparency !important;
	145	+ background-color: $primaryTransparency !important;
	146	+ }
	147	+ &:active{
	148	+ background-color: $primary !important;
	149	+ box-shadow: 0px 0px 0px 3px $primaryTransparency !important;
	150	+ }
	151	+}
	152	+
137	153	.btn-primary {
138	154	background-color: $primary !important;
139	155	border-color: $primary !important;