mirror of https://github.com/snachodog/mybuddy.git
Adjust sass process for import globbing (to limit multiple imports).
This commit is contained in:
parent
b05b268c7e
commit
b02752f52f
|
@ -1 +0,0 @@
|
|||
$body-bg: $white;
|
|
@ -0,0 +1 @@
|
|||
/* Baby Blotter site-wide custom functions. */
|
|
@ -0,0 +1,3 @@
|
|||
@import "../../../node_modules/bootstrap/scss/mixins";
|
||||
|
||||
/* Baby Blotter site-wide custom mixins. */
|
|
@ -1,4 +1,7 @@
|
|||
@import "functions";
|
||||
@import "variables";
|
||||
@import "custom";
|
||||
@import "mixins";
|
||||
@import "global";
|
||||
@import "../../../node_modules/bootstrap/scss/bootstrap";
|
||||
|
||||
@import "../../../**/static/scss/*.scss";
|
||||
|
|
|
@ -4,6 +4,7 @@ var concat = require('gulp-concat');
|
|||
var csso = require('gulp-csso');
|
||||
var pump = require('pump');
|
||||
var sass = require('gulp-sass');
|
||||
var sassGlob = require('gulp-sass-glob');
|
||||
var uglify = require('gulp-uglify');
|
||||
|
||||
/* APP FILES */
|
||||
|
@ -21,10 +22,8 @@ gulp.task('app:scripts', function() {
|
|||
|
||||
gulp.task('app:styles', function (cb) {
|
||||
pump([
|
||||
gulp.src([
|
||||
'babyblotter/static_site/scss/babyblotter.scss',
|
||||
'*/static/scss/*.scss'
|
||||
]),
|
||||
gulp.src('babyblotter/static_site/scss/babyblotter.scss'),
|
||||
sassGlob(),
|
||||
sass().on('error', sass.logError),
|
||||
concat('app.css'),
|
||||
gulp.dest('babyblotter/static/babyblotter/css/')
|
||||
|
|
|
@ -9,6 +9,7 @@
|
|||
"gulp-concat": "^2.6.1",
|
||||
"gulp-csso": "^3.0.0",
|
||||
"gulp-sass": "^3.1.0",
|
||||
"gulp-sass-glob": "^1.0.8",
|
||||
"gulp-uglify": "^3.0.0",
|
||||
"jquery": "^3.2.1",
|
||||
"moment": "^2.18.1",
|
||||
|
|
Loading…
Reference in New Issue