Merge branch 'master' into 'master'

Unifico estilos foca-crear-* See merge request !22

Merge branch 'master' into 'master'
Unifico estilos foca-crear-* See merge request !22
Eric Fernandez
2 parents fd8c7e2a63 476361004f
Showing 4 changed files Show diff stats
src/sass/_crear-nota-pedido.scss
src/sass/_crear-remito.scss
src/sass/_foca-crear.scss
src/sass/general.scss
@@ -1,22 +0,0 @@
-.crear-nota-pedido {
-    background-color: #ccc;
-    
-    padding-bottom: 2rem;
-    &-fecha {
-        input[type="date"]::-webkit-clear-button {
-            display: none;
-        }
-    }
-
-    .titulares>div{
-        display: flex;
-        line-height: 30px;
-        h5{
-            line-height: 30px;
-        }
-        button{
-            margin: auto;
-            margin-right: 0;
-        }
-    }
-}
@@ -1,16 +0,0 @@
-.crear-nota-remito{
-    background: #CCC;
-    padding-bottom: 2rem;
-
-    .titulares>div{
-        display: flex;
-        line-height: 30px;
-        h5{
-            line-height: 30px;
-        }
-        button{
-            margin: auto;
-            margin-right: 0;
-        }
-    }
-}
@@ -0,0 +1,23 @@
+.foca-crear{
+    background: #CCC;
+
+    .titulares>div{
+        display: flex;
+        line-height: 30px;
+        h5{
+            line-height: 30px;
+        }
+        button{
+            margin: auto;
+            margin-right: 0;
+        }
+    }
+
+    @media(min-width: 992px){
+        padding-bottom: 2rem;
+
+        &.one-row{
+            padding-bottom: 8rem !important;
+        }
+    }
+}
@@ -13,8 +13,7 @@
 @import 'tabla-articulos';
 @import 'acciones-mobile';
 @import 'swiper';
-@import 'crear-nota-pedido';
-@import 'crear-remito';
+@import 'foca-crear';
  
  
 //OCULTA FLECHAS INPUT NUMBER
...	...	@@ -1,22 +0,0 @@
1		-.crear-nota-pedido {
2		- background-color: #ccc;
3		-
4		- padding-bottom: 2rem;
5		- &-fecha {
6		- input[type="date"]::-webkit-clear-button {
7		- display: none;
8		- }
9		- }
10		-
11		- .titulares>div{
12		- display: flex;
13		- line-height: 30px;
14		- h5{
15		- line-height: 30px;
16		- }
17		- button{
18		- margin: auto;
19		- margin-right: 0;
20		- }
21		- }
22		-}
...	...	@@ -1,16 +0,0 @@
1		-.crear-nota-remito{
2		- background: #CCC;
3		- padding-bottom: 2rem;
4		-
5		- .titulares>div{
6		- display: flex;
7		- line-height: 30px;
8		- h5{
9		- line-height: 30px;
10		- }
11		- button{
12		- margin: auto;
13		- margin-right: 0;
14		- }
15		- }
16		-}
...	...	@@ -0,0 +1,23 @@
	1	+.foca-crear{
	2	+ background: #CCC;
	3	+
	4	+ .titulares>div{
	5	+ display: flex;
	6	+ line-height: 30px;
	7	+ h5{
	8	+ line-height: 30px;
	9	+ }
	10	+ button{
	11	+ margin: auto;
	12	+ margin-right: 0;
	13	+ }
	14	+ }
	15	+
	16	+ @media(min-width: 992px){
	17	+ padding-bottom: 2rem;
	18	+
	19	+ &.one-row{
	20	+ padding-bottom: 8rem !important;
	21	+ }
	22	+ }
	23	+}
...	...	@@ -13,8 +13,7 @@
13	13	@import 'tabla-articulos';
14	14	@import 'acciones-mobile';
15	15	@import 'swiper';
16		-@import 'crear-nota-pedido';
17		-@import 'crear-remito';
	16	+@import 'foca-crear';
18	17
19	18
20	19	//OCULTA FLECHAS INPUT NUMBER