Skip to content
This repository has been archived by the owner on Apr 28, 2020. It is now read-only.

Commit

Permalink
Remove css minification task.
Browse files Browse the repository at this point in the history
The node-sass dependency has been updated in grunt-sass, which
basically means that the 'compressed' option works again (among
other perks).

So we can revert 518b32e
  • Loading branch information
yellowled committed Dec 5, 2014
1 parent 38a5a68 commit 01cfaeb
Show file tree
Hide file tree
Showing 7 changed files with 23 additions and 28 deletions.
6 changes: 2 additions & 4 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,8 @@ module.exports = function(grunt) {
'assemble:stage',
'copy:stage',
'concat',
'sass:build',
'sass:deploy',
'autoprefixer:deploy',
'cssmin:deploy',
'uglify',
'imagemin:deploy',
'svgmin:deploy',
Expand All @@ -45,9 +44,8 @@ module.exports = function(grunt) {
'assemble:deploy',
'copy:deploy',
'concat',
'sass:build',
'sass:deploy',
'autoprefixer:deploy',
'cssmin:deploy',
'uglify',
'imagemin:deploy',
'svgmin:deploy',
Expand Down
1 change: 0 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@ The only difference between `grunt stage` and `grunt deploy` is that the first o
* [grunt-contrib-concat](https://npmjs.org/package/grunt-contrib-concat)
* [grunt-contrib-connect](https://npmjs.org/package/grunt-contrib-connect)
* [grunt-contrib-copy](https://npmjs.org/package/grunt-contrib-copy)
* [grunt-contrib-cssmin](https://www.npmjs.org/package/grunt-contrib-cssmin)
* [grunt-contrib-imagemin](https://npmjs.org/package/grunt-contrib-imagemin)
* [grunt-contrib-jshint](https://npmjs.org/package/grunt-contrib-jshint)
* [grunt-contrib-uglify](https://npmjs.org/package/grunt-contrib-uglify)
Expand Down
6 changes: 2 additions & 4 deletions grunt/contrib-copy.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,7 @@ module.exports = function(grunt) {
'font/*',
// 'scripts/helpers/boxsizing.htc',
'scripts/jquery/dist/jquery.min.js',
'scripts/jquery/dist/jquery.min.map',
'styles/*.map'],
'scripts/jquery/dist/jquery.min.map'],
dest: 'dist/'
}],
},
Expand All @@ -24,8 +23,7 @@ module.exports = function(grunt) {
'font/*',
// 'scripts/helpers/boxsizing.htc',
'scripts/jquery/dist/jquery.min.js',
'scripts/jquery/dist/jquery.min.map',
'styles/*.map'],
'scripts/jquery/dist/jquery.min.map'],
dest: 'dist/'
}],
},
Expand Down
14 changes: 0 additions & 14 deletions grunt/contrib-cssmin.js

This file was deleted.

4 changes: 2 additions & 2 deletions grunt/contrib-watch.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ module.exports = function(grunt) {
grunt.config('watch', {
icons: {
files: 'fontello.json',
tasks: ['fontello:build', 'sass:build', 'autoprefixer:dev'],
tasks: ['fontello:build', 'sass:dev', 'autoprefixer:dev'],
options: {
atBegin: true,
livereload: true,
Expand Down Expand Up @@ -39,7 +39,7 @@ module.exports = function(grunt) {
},
scss: {
files: 'scss/**/*.scss',
tasks: ['sass:build', 'autoprefixer:dev'],
tasks: ['sass:dev', 'autoprefixer:dev'],
options: {
atBegin: true,
livereload: false,
Expand Down
17 changes: 16 additions & 1 deletion grunt/sass.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Compile SCSS files to CSS
module.exports = function(grunt) {
grunt.config('sass', {
build: {
dev: {
options: {
outputStyle: 'nested',
imagePath: 'img',
Expand All @@ -16,6 +16,21 @@ module.exports = function(grunt) {
ext: '.css'
}],
},
deploy: {
options: {
outputStyle: 'compressed',
imagePath: 'img',
sourceMap: true,
precision: 5
},
files: [{
expand: true,
cwd: 'scss',
src: ['*.scss'],
dest: 'dist/styles',
ext: '.css'
}],
},
});

grunt.loadNpmTasks('grunt-sass');
Expand Down
3 changes: 1 addition & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
"grunt-contrib-concat": "~0.5.0",
"grunt-contrib-connect": "~0.9.0",
"grunt-contrib-copy": "~0.7.0",
"grunt-contrib-cssmin": "~0.10.0",
"grunt-contrib-imagemin": "~0.9.2",
"grunt-contrib-jshint": "~0.10.0",
"grunt-contrib-uglify": "~0.6.0",
Expand All @@ -37,7 +36,7 @@
"grunt-hashres": "~0.4.1",
"grunt-htmlhint": "~0.4.1",
"grunt-modernizr": "~0.6.0",
"grunt-sass": "~0.16.1",
"grunt-sass": "~0.17.0",
"grunt-scss-lint": "~0.3.4",
"grunt-svgmin": "~2.0.0",
"assemble": "~0.4.42"
Expand Down

0 comments on commit 01cfaeb

Please sign in to comment.