diff options
| author | Hakim El Hattab <hakim.elhattab@gmail.com> | 2014-10-04 09:00:45 +0200 |
|---|---|---|
| committer | Hakim El Hattab <hakim.elhattab@gmail.com> | 2014-10-04 09:00:45 +0200 |
| commit | a34fa7599564498c0f976a026479307fb7c51816 (patch) | |
| tree | 9b9d36b7792efbf6874a3686b92af9a6015cbdad | |
| parent | f28b380fac76583c1572c82abc229b49f54dc2fc (diff) | |
| parent | 9ae36e9d0fc1c5f1c617fd0b08ea075858b17f88 (diff) | |
| download | freenode-live-2017-presentation-a34fa7599564498c0f976a026479307fb7c51816.tar freenode-live-2017-presentation-a34fa7599564498c0f976a026479307fb7c51816.tar.gz | |
merge #975 into dev
| -rw-r--r-- | Gruntfile.js | 4 | ||||
| -rw-r--r-- | package.json | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/Gruntfile.js b/Gruntfile.js index c8ee644..a15e737 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -38,7 +38,7 @@ module.exports = function(grunt) { }, sass: { - main: { + dist: { files: { 'css/theme/default.css': 'css/theme/source/default.scss', 'css/theme/black.css': 'css/theme/source/black.scss', @@ -126,7 +126,7 @@ module.exports = function(grunt) { grunt.loadNpmTasks( 'grunt-contrib-cssmin' ); grunt.loadNpmTasks( 'grunt-contrib-uglify' ); grunt.loadNpmTasks( 'grunt-contrib-watch' ); - grunt.loadNpmTasks( 'grunt-contrib-sass' ); + grunt.loadNpmTasks( 'grunt-sass' ); grunt.loadNpmTasks( 'grunt-contrib-connect' ); grunt.loadNpmTasks( 'grunt-zip' ); diff --git a/package.json b/package.json index c646e19..4734a79 100644 --- a/package.json +++ b/package.json @@ -32,10 +32,11 @@ "grunt-contrib-cssmin": "~0.4.1", "grunt-contrib-uglify": "~0.2.4", "grunt-contrib-watch": "~0.5.3", - "grunt-contrib-sass": "~0.5.0", + "grunt-sass": "~0.14.0", "grunt-contrib-connect": "~0.5.0", "grunt-zip": "~0.7.0", - "grunt": "~0.4.0" + "grunt": "~0.4.0", + "node-sass": "~0.9.3" }, "licenses": [ { |