diff --git a/babyblotter/static_src/scss/babyblotter.scss b/babyblotter/static_src/scss/babyblotter.scss index 110f6229..ad35508e 100644 --- a/babyblotter/static_src/scss/babyblotter.scss +++ b/babyblotter/static_src/scss/babyblotter.scss @@ -4,4 +4,4 @@ @import 'global'; @import '../../../node_modules/bootstrap/scss/bootstrap'; -@import '../../../**/static/scss/*'; +@import '../../../**/static_src/scss/*'; diff --git a/gulpfile.js/config.js b/gulpfile.js/config.js index 3cbbb032..7977fd7d 100644 --- a/gulpfile.js/config.js +++ b/gulpfile.js/config.js @@ -41,7 +41,10 @@ module.exports = { 'node_modules/tempusdominus-bootstrap-4/build/css/tempusdominus-bootstrap-4.css', 'node_modules/font-awesome/css/font-awesome.css' ], - app: 'babyblotter/static_src/scss/babyblotter.scss' + app: 'babyblotter/static_src/scss/babyblotter.scss', + ignore: [ + 'babyblotter.scss' + ] }, watchConfig: { scriptsGlob: [ diff --git a/gulpfile.js/tasks/styles.js b/gulpfile.js/tasks/styles.js index 6cbbf65f..3b5e3552 100644 --- a/gulpfile.js/tasks/styles.js +++ b/gulpfile.js/tasks/styles.js @@ -21,7 +21,7 @@ gulp.task('styles:vendor', function(cb) { gulp.task('styles:app', function (cb) { pump([ gulp.src(stylesConfig.app), - sassGlob(), + sassGlob({ignorePaths: stylesConfig.ignore}), sass().on('error', sass.logError), concat('app.css'), gulp.dest(stylesConfig.dest)