Merge branch 'master' into 'develop'

Master See merge request !111

Merge branch 'master' into 'develop'
Master See merge request !111
Eric Fernandez
2 parents 1ac628ad71 516c69bc52
Showing 5 changed files Show diff stats
package.json
src/sass/_bootstrap.scss
src/sass/_constants.scss
src/sass/_tabla.scss
src/sass/general.scss
@@ -94,18 +94,18 @@
         "foca-seguimiento": "git+ssh://git@debonline.dyndns.org:npm/foca-seguimiento.git",
         "foca-teclado": "git+ssh://git@debonline.dyndns.org:npm/foca-teclado.git",
         "font-awesome": "^4.7.0",
-        "gulp-angular-templatecache": "^2.2.6",
+        "gulp-angular-templatecache": "^2.2.7",
         "gulp-htmlmin": "^5.0.1",
         "gulp-sequence": "^1.0.0",
         "gulp-uglify-es": "^1.0.4",
-        "jquery": "^3.4.0",
+        "jquery": "^3.4.1",
         "jszip": "2.6.1",
         "ladda": "1.0.6",
         "leaflet": "1.3.4",
         "lodash": "4.17.11",
         "moment": "2.23.0",
         "ngstorage": "^0.3.11",
-        "node-sass": "^4.11.0",
+        "node-sass": "^4.12.0",
         "pdfmake": "0.1.41",
         "uglify": "^0.1.5",
         "ui-bootstrap4": "^3.0.6"
@@ -13,6 +13,7 @@ button.active{
     line-height: 1.5;
     border-radius: .2rem;
 }
+
 .no-border-bottom {
     border-bottom: 0 !important;
 }
 $primary: #cd9035;
-$primaryTransparency: #cd9137cc;
+$primaryTransparency: #d6a55bcc;
 $highlightedArea: #df9424;
 $default: #6c757d;
-$defaultTransparency: #6c757dcc;
 \ No newline at end of file
+
+$defaultTransparency: #6c757dcc;
+$danger: #dc3545;
+$dangerTransparency: #e98a94;
@@ -26,3 +26,9 @@
     }
  
 }
+.table-sm {
+    th,
+    td {
+      white-space: nowrap !important;
+    }
+}
@@ -57,6 +57,20 @@ input::-webkit-inner-spin-button {
     }
 }
  
+.btn-login {
+    box-shadow: none !important;
+}
+
+input[type="file"] {
+    display: none;
+}
+ .custom-file-upload {
+    border: 1px solid #ccc;
+    display: inline-block;
+    padding: 6px 12px;
+    cursor: pointer;
+ }
+ 
 .btn-brown {
     background-color:$primary;
     -webkit-appearance: none;
@@ -70,6 +84,18 @@ input::-webkit-inner-spin-button {
     }
 }
  
+.btn-Guardar {
+    background-color:green;
+    -webkit-appearance: none;
+    border-color: transparent;
+    &:focus {
+        outline: 0 !important;
+        box-shadow: none;
+    }
+    .icon-white {
+        color: white;
+    }
+}
  
 .page-item.active .page-link {
     z-index: 1;
@@ -119,6 +145,14 @@ input::-webkit-inner-spin-button {
     }
 }
  
+.btn-danger {
+    &:hover {
+        color: #FFF;
+        border-color: $dangerTransparency !important;
+        background-color: $dangerTransparency !important;
+    }
+}
+
 .table-celda-total {
    background-color: $highlightedArea;
 }
...	...	@@ -94,18 +94,18 @@
94	94	"foca-seguimiento": "git+ssh://git@debonline.dyndns.org:npm/foca-seguimiento.git",
95	95	"foca-teclado": "git+ssh://git@debonline.dyndns.org:npm/foca-teclado.git",
96	96	"font-awesome": "^4.7.0",
97		- "gulp-angular-templatecache": "^2.2.6",
	97	+ "gulp-angular-templatecache": "^2.2.7",
98	98	"gulp-htmlmin": "^5.0.1",
99	99	"gulp-sequence": "^1.0.0",
100	100	"gulp-uglify-es": "^1.0.4",
101		- "jquery": "^3.4.0",
	101	+ "jquery": "^3.4.1",
102	102	"jszip": "2.6.1",
103	103	"ladda": "1.0.6",
104	104	"leaflet": "1.3.4",
105	105	"lodash": "4.17.11",
106	106	"moment": "2.23.0",
107	107	"ngstorage": "^0.3.11",
108		- "node-sass": "^4.11.0",
	108	+ "node-sass": "^4.12.0",
109	109	"pdfmake": "0.1.41",
110	110	"uglify": "^0.1.5",
111	111	"ui-bootstrap4": "^3.0.6"
...	...	@@ -13,6 +13,7 @@ button.active{
13	13	line-height: 1.5;
14	14	border-radius: .2rem;
15	15	}
	16	+
16	17	.no-border-bottom {
17	18	border-bottom: 0 !important;
18	19	}
1	1	$primary: #cd9035;
2		-$primaryTransparency: #cd9137cc;
	2	+$primaryTransparency: #d6a55bcc;
3	3	$highlightedArea: #df9424;
4	4	$default: #6c757d;
5		-$defaultTransparency: #6c757dcc;
6	5	\ No newline at end of file
	6	+
	7	+$defaultTransparency: #6c757dcc;
	8	+$danger: #dc3545;
	9	+$dangerTransparency: #e98a94;
...	...	@@ -26,3 +26,9 @@
26	26	}
27	27
28	28	}
	29	+.table-sm {
	30	+ th,
	31	+ td {
	32	+ white-space: nowrap !important;
	33	+ }
	34	+}
...	...	@@ -57,6 +57,20 @@ input::-webkit-inner-spin-button {
57	57	}
58	58	}
59	59
	60	+.btn-login {
	61	+ box-shadow: none !important;
	62	+}
	63	+
	64	+input[type="file"] {
	65	+ display: none;
	66	+}
	67	+ .custom-file-upload {
	68	+ border: 1px solid #ccc;
	69	+ display: inline-block;
	70	+ padding: 6px 12px;
	71	+ cursor: pointer;
	72	+ }
	73	+
60	74	.btn-brown {
61	75	background-color:$primary;
62	76	-webkit-appearance: none;
...	...	@@ -70,6 +84,18 @@ input::-webkit-inner-spin-button {
70	84	}
71	85	}
72	86
	87	+.btn-Guardar {
	88	+ background-color:green;
	89	+ -webkit-appearance: none;
	90	+ border-color: transparent;
	91	+ &:focus {
	92	+ outline: 0 !important;
	93	+ box-shadow: none;
	94	+ }
	95	+ .icon-white {
	96	+ color: white;
	97	+ }
	98	+}
73	99
74	100	.page-item.active .page-link {
75	101	z-index: 1;
...	...	@@ -119,6 +145,14 @@ input::-webkit-inner-spin-button {
119	145	}
120	146	}
121	147
	148	+.btn-danger {
	149	+ &:hover {
	150	+ color: #FFF;
	151	+ border-color: $dangerTransparency !important;
	152	+ background-color: $dangerTransparency !important;
	153	+ }
	154	+}
	155	+
122	156	.table-celda-total {
123	157	background-color: $highlightedArea;
124	158	}