Build: Switch from grunt-css to the equivalent grunt-contrib tasks

diff --git a/Gruntfile.js b/Gruntfile.js
index 06a1855a4c4a41deeeab092bf3c3615465f95dbc..96a93ded0c9d608bf228a406e9fdda2fc7a86b5e 100644 (file)
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -127,7 +127,8 @@ grunt.loadNpmTasks( "grunt-contrib-jshint" );
 grunt.loadNpmTasks( "grunt-contrib-uglify" );
 grunt.loadNpmTasks( "grunt-contrib-concat" );
 grunt.loadNpmTasks( "grunt-contrib-qunit" );
-grunt.loadNpmTasks( "grunt-css" );
+grunt.loadNpmTasks( "grunt-contrib-csslint" );
+grunt.loadNpmTasks( "grunt-contrib-cssmin" );
 grunt.loadNpmTasks( "grunt-html" );
 grunt.loadNpmTasks( "grunt-compare-size" );
 grunt.loadNpmTasks( "grunt-git-authors" );
@@ -354,7 +355,6 @@ grunt.initConfig({
                }
        },
        csslint: {
-               // nothing: []
                // TODO figure out what to check for, then fix and enable
                base_theme: {
                        src: expandFiles( "themes/base/*.css" ).filter(function( file ) {
@@ -362,7 +362,7 @@ grunt.initConfig({
                                return !( /(button|datepicker|core|dialog|theme)\.css$/ ).test( file );
                        }),
                        // TODO consider reenabling some of these rules
-                       rules: {
+                       options: {
                                "adjoining-classes": false,
                                "import": false,
                                "outline-none": false,

diff --git a/package.json b/package.json
index 89667bf34d4f9e32c56ccf68d74431410fc67418..019e715bd506d2e000a0291f93c18ebd432a589f 100644 (file)
--- a/package.json
+++ b/package.json
@@ -58,7 +58,8 @@
                "grunt-contrib-uglify": "0.1.1",
                "grunt-contrib-concat": "0.1.3",
                "grunt-contrib-qunit": "0.1.1",
-               "grunt-css": "0.5.4",
+               "grunt-contrib-csslint": "0.1.0",
+               "grunt-contrib-cssmin": "0.4.2",
                "grunt-compare-size": "0.3.1",
                "grunt-html": "0.3.3",
                "grunt-git-authors": "1.1.0",