Commit a51cb24ec83abdec21f1daf239a7ce925dd1e11d

Authored by Eric Fernandez
Exists in master

Merge branch 'master' into 'master'

Master (pmarco)

See merge request Wrappers/wrapper-demo!14
... ... @@ -11,7 +11,7 @@ const watch = require('gulp-watch');
11 11  
12 12 var paths = {
13 13 srcHTML : 'src/views/*.html',
14   - srcJS : 'src/**/*.js',
  14 + srcJS : 'src/js/*.js',
15 15 dist : 'dist/',
16 16 distHTML : 'dist/views/'
17 17 };
... ... @@ -73,8 +73,8 @@ gulp.task('webserver', function() {
73 73 });
74 74  
75 75 gulp.task('watch', function() {
76   - gulp.watch(archivosJS, ['uglify']);
77   - gulp.watch('css/scss/*.scss', ['sass']);
  76 + gulp.watch([paths.srcJS], ['uglify']);
  77 + gulp.watch('src/sass/*.scss', ['sass']);
78 78 })
79 79  
80 80 gulp.task('reload'), function() {
src/sass/_botonera-secundaria.scss
1 1 .botonera-secundaria {
2 2 background-color: rgba(0, 0, 0, 0.8);
  3 + .row {
  4 + border-radius: 5px;
  5 + overflow: hidden;
  6 + }
  7 + .btn {
  8 + border-radius: 0;
  9 + margin-right: 1px;
  10 + width: calc(100% - 1px);
  11 + margin-bottom: 1px;
  12 + }
3 13 }