Merge branch 'master' into 'master'

mejoras en el panel informativo css See merge request Wrappers/wrapper-demo!10

Merge branch 'master' into 'master'
mejoras en el panel informativo css See merge request Wrappers/wrapper-demo!10
Pablo Marco del Pont
2 parents 040ecba05a cd9c85ec0f
Showing 3 changed files Show diff stats
src/sass/_bootstrap.scss
src/sass/_botonera-secundaria.scss
src/sass/_panel-informativo.scss
@@ -4,3 +4,9 @@
     outline: 0;
     background-color: #337ab7;
 }
+.btn-xs {
+    padding: .15rem .5rem;
+    font-size: .8rem;
+    line-height: 1.5;
+    border-radius: .2rem;
+}
 \ No newline at end of file
 .botonera-secundaria {
     background-color: rgba(0, 0, 0, 0.8);
-    .btn-xs {
-        padding: .15rem .5rem;
-        font-size: .8rem;
-        line-height: 1.5;
-        border-radius: .2rem;
-    }
 }
 .panel-informativo {
     background: linear-gradient(#ccc, #eee);
+    min-height: 32px;
     .form-group {
         margin-bottom: 5px;
     }
...	...	@@ -4,3 +4,9 @@
4	4	outline: 0;
5	5	background-color: #337ab7;
6	6	}
	7	+.btn-xs {
	8	+ padding: .15rem .5rem;
	9	+ font-size: .8rem;
	10	+ line-height: 1.5;
	11	+ border-radius: .2rem;
	12	+}
7	13	\ No newline at end of file
1	1	.botonera-secundaria {
2	2	background-color: rgba(0, 0, 0, 0.8);
3		- .btn-xs {
4		- padding: .15rem .5rem;
5		- font-size: .8rem;
6		- line-height: 1.5;
7		- border-radius: .2rem;
8		- }
9	3	}
1	1	.panel-informativo {
2	2	background: linear-gradient(#ccc, #eee);
	3	+ min-height: 32px;
3	4	.form-group {
4	5	margin-bottom: 5px;
5	6	}