Commit d9188cbec9ec443f56ed497c676832f2a697920d

Authored by Pablo Marco del Pont
Exists in master

Merge branch 'master' into 'master'

Master (pmarco)

See merge request Wrappers/wrapper-demo!6
src/sass/_botonera-secundaria.scss
File was created 1 .botonera-secundaria {
2 background-color: rgba(0, 0, 0, 0.8);
3 }
4
src/sass/_botonera.scss
File was created 1 .botonera {
2 .btn {
3 margin-bottom: 5px;
4 }
5 }
6
src/sass/_panel-informativo.scss
File was created 1 .panel-informativo {
2 background: linear-gradient(#ccc, #eee);
3 .form-group {
4 margin-bottom: 5px;
5 }
6 }
7
src/sass/general.scss
1 @import 'tabla'; 1 @import 'bootstrap';
2 @import 'botonera';
3 @import 'botonera-secundaria';
4 @import 'contenedor';
2 @import 'lista'; 5 @import 'lista';
3 @import 'login'; 6 @import 'login';
4 @import 'contenedor'; 7 @import 'panel-informativo';
5 @import 'bootstrap'; 8 @import 'tabla';
6 9