From d6794698406431c7f442e71ffbaf8bc1f0c50fda Mon Sep 17 00:00:00 2001
From: Ed Sanders <esanders@wikimedia.org>
Date: Wed, 18 May 2016 14:28:55 +0100
Subject: [PATCH] Introduce stylelint

Change-Id: Iea4d20abb8aa9d656639c8e128df0e963291cace
---
 .csslintrc                                    | 13 ------------
 .stylelintrc                                  |  3 +++
 Gruntfile.js                                  | 20 ++++++++++---------
 .../ve.ce.MWSyntaxHighlightNode.css           |  2 +-
 .../ve.ui.MWSyntaxHighlightDialog.css         |  2 +-
 .../ve.ui.MWSyntaxHighlightInspector.css      |  2 +-
 package.json                                  | 17 ++++++++--------
 7 files changed, 26 insertions(+), 33 deletions(-)
 delete mode 100644 .csslintrc
 create mode 100644 .stylelintrc

diff --git a/.csslintrc b/.csslintrc
deleted file mode 100644
index 68d60d22..00000000
--- a/.csslintrc
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"adjoining-classes": false,
-	"box-model": false,
-	"box-sizing": false,
-	"fallback-colors": false,
-	"important": false,
-	"outline-none": false,
-	"qualified-headings": false,
-	"unique-headings": false,
-	"universal-selector": false,
-	"unqualified-attributes": false,
-	"gradients": false
-}
diff --git a/.stylelintrc b/.stylelintrc
new file mode 100644
index 00000000..2c907302
--- /dev/null
+++ b/.stylelintrc
@@ -0,0 +1,3 @@
+{
+	"extends": "stylelint-config-wikimedia"
+}
diff --git a/Gruntfile.js b/Gruntfile.js
index b52dfe44..ecb0138c 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -7,11 +7,11 @@
 /*jshint node:true */
 module.exports = function ( grunt ) {
 	grunt.loadNpmTasks( 'grunt-banana-checker' );
-	grunt.loadNpmTasks( 'grunt-contrib-csslint' );
 	grunt.loadNpmTasks( 'grunt-contrib-jshint' );
 	grunt.loadNpmTasks( 'grunt-contrib-watch' );
 	grunt.loadNpmTasks( 'grunt-jscs' );
 	grunt.loadNpmTasks( 'grunt-jsonlint' );
+	grunt.loadNpmTasks( 'grunt-stylelint' );
 
 	grunt.initConfig( {
 		jshint: {
@@ -33,11 +33,13 @@ module.exports = function ( grunt ) {
 		jscs: {
 			src: '<%= jshint.all %>'
 		},
-		csslint: {
-			options: {
-				csslintrc: '.csslintrc'
-			},
-			all: 'modules/**/*.css'
+		stylelint: {
+			src: [
+				'**/*.css',
+				'!**/*.generated.css',
+				'!vendor/**',
+				'!node_modules/**'
+			]
 		},
 		banana: {
 			options: {
@@ -47,14 +49,14 @@ module.exports = function ( grunt ) {
 		},
 		watch: {
 			files: [
-				'.{csslintrc,jscsrc,jshintignore,jshintrc}',
+				'.{stylelintrc,jscsrc,jshintignore,jshintrc}',
 				'<%= jshint.all %>',
-				'<%= csslint.all %>'
+				'<%= stylelint.all %>'
 			],
 			tasks: 'test'
 		}
 	} );
 
-	grunt.registerTask( 'test', [ 'jshint', 'jsonlint', 'jscs', 'csslint', 'banana' ] );
+	grunt.registerTask( 'test', [ 'jshint', 'jsonlint', 'jscs', 'stylelint', 'banana' ] );
 	grunt.registerTask( 'default', 'test' );
 };
diff --git a/modules/ve-syntaxhighlight/ve.ce.MWSyntaxHighlightNode.css b/modules/ve-syntaxhighlight/ve.ce.MWSyntaxHighlightNode.css
index 2c5bb4a8..d768b232 100644
--- a/modules/ve-syntaxhighlight/ve.ce.MWSyntaxHighlightNode.css
+++ b/modules/ve-syntaxhighlight/ve.ce.MWSyntaxHighlightNode.css
@@ -5,7 +5,7 @@
  * @license The MIT License (MIT); see LICENSE.txt
  */
 
- .ve-ce-mwSyntaxHighlightNode pre {
+.ve-ce-mwSyntaxHighlightNode pre {
 	/* Prevent silly wrapping on Safari and Chrome (https://bugs.webkit.org/show_bug.cgi?id=35935) */
 	word-wrap: normal;
 }
diff --git a/modules/ve-syntaxhighlight/ve.ui.MWSyntaxHighlightDialog.css b/modules/ve-syntaxhighlight/ve.ui.MWSyntaxHighlightDialog.css
index dd7591dc..e4c07c48 100644
--- a/modules/ve-syntaxhighlight/ve.ui.MWSyntaxHighlightDialog.css
+++ b/modules/ve-syntaxhighlight/ve.ui.MWSyntaxHighlightDialog.css
@@ -10,7 +10,7 @@
 }
 
 .ve-ui-mwSyntaxHighlightDialog-content .ve-ui-mwExtensionWindow-input textarea {
-	font-family: monospace, Courier;
+	font-family: monospace, 'Courier';
 }
 
 .ve-ui-mwSyntaxHighlightDialog-content .oo-ui-comboBoxWidget > .oo-ui-menuSelectWidget {
diff --git a/modules/ve-syntaxhighlight/ve.ui.MWSyntaxHighlightInspector.css b/modules/ve-syntaxhighlight/ve.ui.MWSyntaxHighlightInspector.css
index 88501559..e4dff7a5 100644
--- a/modules/ve-syntaxhighlight/ve.ui.MWSyntaxHighlightInspector.css
+++ b/modules/ve-syntaxhighlight/ve.ui.MWSyntaxHighlightInspector.css
@@ -6,5 +6,5 @@
  */
 
 .ve-ui-mwSyntaxHighlightInspector-content .ve-ui-mwExtensionWindow-input textarea {
-	font-family: monospace, Courier;
+	font-family: monospace, 'Courier';
 }
diff --git a/package.json b/package.json
index 09e941b6..30ba885b 100644
--- a/package.json
+++ b/package.json
@@ -7,13 +7,14 @@
     "test": "grunt test"
   },
   "devDependencies": {
-    "grunt": "0.4.5",
-    "grunt-cli": "0.1.13",
-    "grunt-banana-checker": "0.4.0",
-    "grunt-contrib-csslint": "0.5.0",
-    "grunt-contrib-jshint": "0.11.3",
-    "grunt-contrib-watch": "0.6.1",
-    "grunt-jscs": "2.1.0",
-    "grunt-jsonlint": "1.0.7"
+    "grunt": "1.0.1",
+    "grunt-banana-checker": "0.5.0",
+    "grunt-cli": "1.2.0",
+    "grunt-contrib-jshint": "1.0.0",
+    "grunt-contrib-watch": "1.0.0",
+    "grunt-jscs": "2.8.0",
+    "grunt-jsonlint": "1.0.7",
+    "grunt-stylelint": "0.2.0",
+    "stylelint-config-wikimedia": "0.1.0"
   }
 }