Move to grunt-sass, which which has less bells and whistles than grunt-contrib-sass but also no Ruby dependency.

see #25858, #22862, [26143].


git-svn-id: https://develop.svn.wordpress.org/trunk@26145 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Andrew Nacin 2013-11-13 23:37:30 +00:00
parent 3b82749eba
commit b0bd982f4c
2 changed files with 15 additions and 17 deletions

View File

@ -78,18 +78,14 @@ module.exports = function(grunt) {
},
sass: {
colors: {
expand: true,
cwd: SOURCE_DIR,
dest: BUILD_DIR,
ext: '.css',
src: ['wp-admin/css/color-schemes/*/colors.scss'],
options: {
style: 'expanded',
sourcemap: true,
noCache: true
},
files : [{
expand: true,
cwd: SOURCE_DIR,
dest: BUILD_DIR,
ext: '.css',
src: ['wp-admin/css/color-schemes/*/colors.scss']
}]
outputStyle: 'expanded'
}
}
},
cssmin: {
@ -328,6 +324,10 @@ module.exports = function(grunt) {
interval: 2000
}
},
colors: {
files: [SOURCE_DIR + 'wp-admin/css/color-schemes/**'],
tasks: ['sass:colors']
},
rtl: {
files: [
SOURCE_DIR + 'wp-admin/css/*.css',
@ -342,10 +342,6 @@ module.exports = function(grunt) {
test: {
files: ['tests/qunit/**'],
tasks: ['qunit']
},
colors: {
files: [SOURCE_DIR + 'wp-admin/css/color-schemes/**'],
tasks: ['sass:colors']
}
}
});
@ -358,10 +354,11 @@ module.exports = function(grunt) {
// RTL task.
grunt.registerTask('rtl', ['cssjanus:core']);
grunt.registerTask('colors', ['sass:colors', 'cssmin:colors']);
// Color schemes task.
grunt.registerTask('colors', ['sass:colors']);
// Build task.
grunt.registerTask('build', ['clean:all', 'copy:all', 'rtl', 'cssmin:core', 'cssmin:rtl',
grunt.registerTask('build', ['clean:all', 'copy:all', 'cssmin:core', 'colors', 'cssmin:colors', 'rtl', 'cssmin:rtl',
'uglify:core', 'uglify:tinymce', 'concat:tinymce', 'compress:tinymce', 'clean:tinymce']);
// Testing tasks.

View File

@ -20,6 +20,7 @@
"grunt-contrib-concat": "~0.3.0",
"grunt-contrib-jshint": "~0.7.0",
"grunt-cssjanus": "~0.1.0",
"grunt-sass": "~0.8.0",
"matchdep": "~0.1.2"
}
}