Merge branch 'pr/11779' into drop_recess_for_less

Conflicts:
	Gruntfile.js
	package.json

3 files changed, 27 insertions, 0 deletions

diff --git a/.csslintrc b/.csslintrc
new file mode 100644
index 000000000..8cf2f846d
--- /dev/null
+++ b/.csslintrc
@@ -0,0 +1,18 @@
+{
+  "adjoining-classes": false,
+  "box-sizing": false,
+  "box-model": false,
+  "compatible-vendor-prefixes": false,
+  "floats": false,
+  "font-sizes": false,
+  "gradients": false,
+  "important": false,
+  "known-properties": false,
+  "outline-none": false,
+  "qualified-headings": false,
+  "regex-selectors": false,
+  "text-indent": false,
+  "unique-headings": false,
+  "universal-selector": false,
+  "unqualified-attributes": false
+}
diff --git a/Gruntfile.js b/Gruntfile.js
index 35ad76394..36112c840 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -58,6 +58,13 @@ module.exports = function (grunt) {
       }
     },
 
+    csslint: {
+      options: {
+        csslintrc: '.csslintrc'
+      },
+      src: ['dist/css/bootstrap.css', 'dist/css/bootstrap-theme.css']
+    },
+
     concat: {
       options: {
         banner: '<%= banner %><%= jqueryCheck %>',
@@ -322,6 +329,7 @@ module.exports = function (grunt) {
   grunt.loadNpmTasks('grunt-contrib-concat');
   grunt.loadNpmTasks('grunt-contrib-connect');
   grunt.loadNpmTasks('grunt-contrib-copy');
+  grunt.loadNpmTasks('grunt-contrib-csslint');
   grunt.loadNpmTasks('grunt-contrib-cssmin');
   grunt.loadNpmTasks('grunt-contrib-jshint');
   grunt.loadNpmTasks('grunt-contrib-less');
diff --git a/package.json b/package.json
index 0d414000f..5cd7c90ec 100644
--- a/package.json
+++ b/package.json
@@ -27,6 +27,7 @@
     , "grunt-contrib-concat": "~0.3.0"
     , "grunt-contrib-connect": "~0.5.0"
     , "grunt-contrib-copy": "~0.4.1"
+    , "grunt-contrib-csslint": "~0.2.0"
     , "grunt-contrib-cssmin": "~0.7.0"
     , "grunt-contrib-jshint": "~0.7.0"
     , "grunt-contrib-less": "~0.8.0"