Merge branch 'master' into 'master'

clase .table-title See merge request !28

Merge branch 'master' into 'master'
clase .table-title See merge request !28
Eric Fernandez
2 parents 895651db1c 3a729d3a5b
Showing 6 changed files Show diff stats
src/sass/_acciones-mobile.scss
src/sass/_admin-seguimiento.scss
src/sass/_bootstrap.scss
src/sass/_contenedor.scss
src/sass/_tabla.scss
src/sass/general.scss
@@ -2,4 +2,4 @@
     line-height: 2.5em; 
     color: orange;
     font-size: 1.25em
-}
 \ No newline at end of file
+}
 .foca-admin-seguimiento {
     osm {
         &>div {
-            height: 600px;
+            height: 535px;
         }
     }
 }
-.active{
-    color: #fff;
+button.active{
     text-decoration: none;
     outline: 0;
-    background-color: #337ab7;
+    background-color: $primary-color;
+    &:focus{
+        box-shadow: 0 0 0 0.2rem #d8b07d;
+    }
 }
 .btn-xs {
     padding: .15rem .5rem;
 body {
-    @media (min-width: 768px) {
-        background-color: #cccccc;
-    }
+    background-color: #cccccc;
 }
  
 .contenedor {
@@ -6,9 +6,23 @@
         color: #000000;
         background-color: #FF9900;
     }
+    &-title{
+        background-color: #67615e;
+        color: #FFF;
+        margin-bottom: 0;
+        padding: 0.25rem 0;
+        font-size: 1rem;
+    }
  
     thead th{
         font-size: 13px;
     }
+
+    &.table-abm{
+        thead{
+            color: #FFF;
+            background-color: #67615e;
+        }
+    }
  
 }
@@ -31,3 +31,14 @@ input::-webkit-inner-spin-button {
         display: grid !important;
     }
 }
+
+.btn-outline-debo{
+    background-color: transparent;
+    color: $primary-color;
+    border-color: $primary-color;
+    &:hover{
+        color: #FFF;
+        border-color: transparent;
+        background-color: $primary-color;
+    }
+}
...	...	@@ -2,4 +2,4 @@
2	2	line-height: 2.5em;
3	3	color: orange;
4	4	font-size: 1.25em
5		-}
6	5	\ No newline at end of file
	6	+}
1	1	.foca-admin-seguimiento {
2	2	osm {
3	3	&>div {
4		- height: 600px;
	4	+ height: 535px;
5	5	}
6	6	}
7	7	}
1		-.active{
2		- color: #fff;
	1	+button.active{
3	2	text-decoration: none;
4	3	outline: 0;
5		- background-color: #337ab7;
	4	+ background-color: $primary-color;
	5	+ &:focus{
	6	+ box-shadow: 0 0 0 0.2rem #d8b07d;
	7	+ }
6	8	}
7	9	.btn-xs {
8	10	padding: .15rem .5rem;
1	1	body {
2		- @media (min-width: 768px) {
3		- background-color: #cccccc;
4		- }
	2	+ background-color: #cccccc;
5	3	}
6	4
7	5	.contenedor {
...	...	@@ -6,9 +6,23 @@
6	6	color: #000000;
7	7	background-color: #FF9900;
8	8	}
	9	+ &-title{
	10	+ background-color: #67615e;
	11	+ color: #FFF;
	12	+ margin-bottom: 0;
	13	+ padding: 0.25rem 0;
	14	+ font-size: 1rem;
	15	+ }
9	16
10	17	thead th{
11	18	font-size: 13px;
12	19	}
	20	+
	21	+ &.table-abm{
	22	+ thead{
	23	+ color: #FFF;
	24	+ background-color: #67615e;
	25	+ }
	26	+ }
13	27
14	28	}
...	...	@@ -31,3 +31,14 @@ input::-webkit-inner-spin-button {
31	31	display: grid !important;
32	32	}
33	33	}
	34	+
	35	+.btn-outline-debo{
	36	+ background-color: transparent;
	37	+ color: $primary-color;
	38	+ border-color: $primary-color;
	39	+ &:hover{
	40	+ color: #FFF;
	41	+ border-color: transparent;
	42	+ background-color: $primary-color;
	43	+ }
	44	+}