Merge branch 'master' into 'master'

Master (pmarco) See merge request Wrappers/wrapper-demo!12

Merge branch 'master' into 'master'
Master (pmarco) See merge request Wrappers/wrapper-demo!12
Pablo Marco del Pont
2 parents 5a9f5eaed4 3063e08216
Showing 2 changed files Show diff stats
src/sass/_botonera-lateral.scss
src/sass/general.scss
@@ -0,0 +1,5 @@
+.botonera-lateral {
+    >.row {
+        height: 420px;
+    }
+}
 @import 'bootstrap';
 @import 'botonera';
+@import 'botonera-lateral';
 @import 'botonera-principal';
 @import 'botonera-secundaria';
 @import 'contenedor';
...	...	@@ -0,0 +1,5 @@
	1	+.botonera-lateral {
	2	+ >.row {
	3	+ height: 420px;
	4	+ }
	5	+}
1	1	@import 'bootstrap';
2	2	@import 'botonera';
	3	+@import 'botonera-lateral';
3	4	@import 'botonera-principal';
4	5	@import 'botonera-secundaria';
5	6	@import 'contenedor';