Skip to content

Commit

Permalink
Modify scratchlibs gulp task to change bootstrap to sass.
Browse files Browse the repository at this point in the history
  • Loading branch information
jaclynperrone committed May 15, 2015
1 parent 1d2a5be commit 7eaea87
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 2 deletions.
2 changes: 1 addition & 1 deletion cycledash/static/scss/style.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import 'bootstrap.min';
@import '../lib/bootstrap/scss/bootstrap';
@import 'header';

body {
Expand Down
10 changes: 9 additions & 1 deletion gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@ var _ = require('underscore'),
source = require('vinyl-source-stream'),
uglifyify = require('uglifyify'),
watchify = require('watchify'),
sass = require('gulp-sass');
sass = require('gulp-sass'),
ext_replace = require('gulp-ext-replace');


var PATHS = {
Expand Down Expand Up @@ -100,6 +101,11 @@ gulp.task('staticlibs', function() {
{base: './node_modules/bootstrap/dist'})
.pipe(gulp.dest('./cycledash/static/lib/bootstrap'));

// Change bootstrap.min.css to bootstrap.min.scss
gulp.src('./cycledash/static/lib/bootstrap/css/bootstrap.min.css')
.pipe(ext_replace('.scss', '.min.css'))
.pipe(gulp.dest('./cycledash/static/lib/bootstrap/scss'));

// BioDalliance
gulp.src('./node_modules/dalliance/{css,fonts,img,help}/*.*',
{base: './node_modules/dalliance'})
Expand All @@ -111,6 +117,8 @@ gulp.task('staticlibs', function() {
});




// Default task which compiles the JS and then watches the JS and CSS for
// changes.
gulp.task('default', ['watch', 'js', 'sass']);
Expand Down
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
"es5-shim": "^4.0.3",
"glob": "^4.2.1",
"gulp": "^3.8.8",
"gulp-ext-replace": "^0.2.0",
"gulp-livereload": "^2.1.1",
"gulp-peg": "^0.1.2",
"gulp-react": "^1.0.1",
Expand Down

0 comments on commit 7eaea87

Please sign in to comment.