Merge pull request #922 from matthojo/SASS-Compress

This commit is contained in:
Hannah Wolfe 2013-10-10 15:40:27 +01:00
commit 03ee256da6

View File

@ -233,6 +233,14 @@ var path = require('path'),
files: { files: {
'<%= paths.adminAssets %>/css/screen.css': '<%= paths.adminAssets %>/sass/screen.scss' '<%= paths.adminAssets %>/css/screen.css': '<%= paths.adminAssets %>/sass/screen.scss'
} }
},
compress: {
options: {
style: 'compressed'
},
files: {
'<%= paths.adminAssets %>/css/screen.css': '<%= paths.adminAssets %>/sass/screen.scss'
}
} }
}, },
@ -766,51 +774,53 @@ var path = require('path'),
* - Zip files in build folder to dist-folder/#{version} directory * - Zip files in build folder to dist-folder/#{version} directory
*/ */
grunt.registerTask("nightly", [ grunt.registerTask("nightly", [
'setCurrentBuildType:Nightly', "setCurrentBuildType:Nightly",
'shell:bourbon', "shell:bourbon",
'sass:admin', "sass:compress",
'handlebars', "handlebars",
'concat', "concat",
'uglify', "uglify",
'bump:build', "bump:build",
'updateCurrentPackageInfo', "updateCurrentPackageInfo",
'changelog', "changelog",
'copy:nightly', "copy:nightly",
'compress:nightly' "compress:nightly"
]); ]);
grunt.registerTask("weekly", [ grunt.registerTask("weekly", [
'setCurrentBuildType:Weekly', "setCurrentBuildType:Weekly",
'shell:bourbon', "shell:bourbon",
'sass:admin', "sass:compress",
'handlebars', "handlebars",
'concat', "concat",
'uglify', "uglify",
'bump:build', "bump:build",
'updateCurrentPackageInfo', "updateCurrentPackageInfo",
'changelog', "changelog",
'copy:weekly', "copy:weekly",
'compress:weekly' "compress:weekly"
]); ]);
grunt.registerTask('build', [ grunt.registerTask("build", [
'shell:bourbon', "shell:bourbon",
'sass:admin', "sass:compress",
'handlebars', "handlebars",
'concat', "concat",
'uglify', "uglify",
'changelog', "changelog",
'clean:build', "clean:build",
'copy:build', "copy:build",
'compress:build' "compress:build"
]); ]);
// Dev Mode; watch files and restart server on changes // Dev Mode; watch files and restart server on changes
grunt.registerTask('dev', [ grunt.registerTask("dev", [
'default', "sass:admin",
'express:dev', "handlebars",
'open', "concat",
'watch' "express:dev",
"open",
"watch"
]); ]);
// Prepare the project for development // Prepare the project for development
@ -831,10 +841,10 @@ var path = require('path'),
// TODO: Production build task that minifies with uglify:prod // TODO: Production build task that minifies with uglify:prod
grunt.registerTask('prod', ['sass:admin', 'handlebars', 'concat', 'uglify']); grunt.registerTask("prod", ['sass:compress', 'handlebars', 'concat', "uglify"]);
// When you just say 'grunt' // When you just say "grunt"
grunt.registerTask('default', ['sass:admin', 'handlebars', 'concat']); grunt.registerTask("default", ['sass:compress', 'handlebars', 'concat']);
}; };
module.exports = configureGrunt; module.exports = configureGrunt;