Skip to content

Commit

Permalink
replace gulp-ruby-sass with gulp-sass
Browse files Browse the repository at this point in the history
  • Loading branch information
sh committed Dec 25, 2015
1 parent 06e8b20 commit 9cabead
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 6 deletions.
7 changes: 4 additions & 3 deletions gulpfile.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,16 @@ gulp.task 'dev-css', ->
app (
streamqueue
gulpConcat
gulpRubySass
gulpSass
) ->
loadPaths = [
includePaths = [
'bower_components/bootstrap-sass/assets/stylesheets'
'bower_components/font-awesome/scss'
]
streamqueue({objectMode: true},
# custom sass
gulpRubySass('sass/public.sass', {loadPath: loadPaths})
gulp.src('sass/public.sass')
.pipe(gulpSass({includePaths: includePaths, indentedSyntax: true}).on('error', gulpSass.logError))
# gulp.src('bower_components/nprogress/nprogress.css')
)
.pipe(gulpConcat('public.css'))
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
"gulp": "3.9.0",
"gulp-coffee": "2.3.1",
"gulp-concat": "2.6.0",
"gulp-ruby-sass": "2.0.5",
"gulp-sass": "2.1.1",
"gulp-uglify": "1.4.2",
"gulp-watch": "4.3.5",
"hinoki": "1.0.0-rc.6",
Expand Down
4 changes: 2 additions & 2 deletions src/server/require-gulp.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,5 @@ module.exports.gulpWatch = ->
module.exports.streamqueue = ->
require('streamqueue')

module.exports.gulpRubySass = ->
require('gulp-ruby-sass')
module.exports.gulpSass = ->
require('gulp-sass')

0 comments on commit 9cabead

Please sign in to comment.