From b0bd982f4c3c68eb70cf40e6b04f739a79e6d973 Mon Sep 17 00:00:00 2001
From: Andrew Nacin <nacin@git.wordpress.org>
Date: Wed, 13 Nov 2013 23:37:30 +0000
Subject: [PATCH] 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
---
 Gruntfile.js | 31 ++++++++++++++-----------------
 package.json |  1 +
 2 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/Gruntfile.js b/Gruntfile.js
index ff17f64964..39c47f89dc 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -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.
diff --git a/package.json b/package.json
index d9136c17fd..6c49513a31 100644
--- a/package.json
+++ b/package.json
@@ -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"
   }
 }