Merge branch 'master' into 'master'

nuevas imgs, estilos tabs y general See merge request !35

Merge branch 'master' into 'master'
nuevas imgs, estilos tabs y general See merge request !35
Eric Fernandez
2 parents 04146272d5 dab5ef6cd4
Showing 10 changed files Show diff stats
img/cliente.png
img/flete.png
img/moneda.png
img/precios-condiciones.png
img/productos.png
img/proveedor.png
img/vendedor.png
package.json
src/sass/_tabs.scss
src/sass/general.scss
@@ -93,6 +93,7 @@
         "jquery": "^3.3.1",
         "ladda": "1.0.6",
         "leaflet": "1.3.4",
+        "moment": "2.23.0",
         "ngstorage": "^0.3.11",
         "node-sass": "^4.10.0",
         "uglify": "^0.1.5",
 .tabs-right{
-    margin-top: -58px;
+    @media (min-width: 576px){
+        margin-top: -58px;
+    }
     > ul >li:first-child{
         margin-left: auto;
     }
@@ -44,3 +44,7 @@ input::-webkit-inner-spin-button {
         background-color: $primary-color;
     }
 }
+
+.front-index{
+    z-index: 9999;
+}
...	...	@@ -93,6 +93,7 @@
93	93	"jquery": "^3.3.1",
94	94	"ladda": "1.0.6",
95	95	"leaflet": "1.3.4",
	96	+ "moment": "2.23.0",
96	97	"ngstorage": "^0.3.11",
97	98	"node-sass": "^4.10.0",
98	99	"uglify": "^0.1.5",
1	1	.tabs-right{
2		- margin-top: -58px;
	2	+ @media (min-width: 576px){
	3	+ margin-top: -58px;
	4	+ }
3	5	> ul >li:first-child{
4	6	margin-left: auto;
5	7	}
...	...	@@ -44,3 +44,7 @@ input::-webkit-inner-spin-button {
44	44	background-color: $primary-color;
45	45	}
46	46	}
	47	+
	48	+.front-index{
	49	+ z-index: 9999;
	50	+}