jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/348527 )
Change subject: Add stylelint for css files
......................................................................
Add stylelint for css files
Fixed the following rules:
color-named
font-family-name-quotes
selector-list-comma-newline-after
color-hex-case
indentation
Change-Id: If6b1fa9a68449d8bf8d3bfd1a4da97f2200c51d1
---
A .stylelintrc
M Gruntfile.js
M modules/JsonConfig.css
M package.json
4 files changed, 25 insertions(+), 12 deletions(-)
Approvals:
jenkins-bot: Verified
Jforrester: Looks good to me, approved
diff --git a/.stylelintrc b/.stylelintrc
new file mode 100644
index 0000000..2c90730
--- /dev/null
+++ b/.stylelintrc
@@ -0,0 +1,3 @@
+{
+ "extends": "stylelint-config-wikimedia"
+}
diff --git a/Gruntfile.js b/Gruntfile.js
index 27599ae..dfde1e5 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -9,17 +9,25 @@
var conf = grunt.file.readJSON( 'extension.json' );
grunt.loadNpmTasks( 'grunt-banana-checker' );
grunt.loadNpmTasks( 'grunt-jsonlint' );
+ grunt.loadNpmTasks( 'grunt-stylelint' );
grunt.initConfig( {
banana: conf.MessagesDirs,
jsonlint: {
all: [
'**/*.json',
+ '.stylelintrc',
+ '!node_modules/**'
+ ]
+ },
+ stylelint: {
+ all: [
+ '**/*.css',
'!node_modules/**'
]
}
} );
- grunt.registerTask( 'test', [ 'jsonlint', 'banana' ] );
+ grunt.registerTask( 'test', [ 'jsonlint', 'banana', 'stylelint' ] );
grunt.registerTask( 'default', 'test' );
};
diff --git a/modules/JsonConfig.css b/modules/JsonConfig.css
index 59b5815..d7d0200 100644
--- a/modules/JsonConfig.css
+++ b/modules/JsonConfig.css
@@ -15,7 +15,7 @@
.mw-jsonconfig th,
.mw-jsonconfig td {
- border: 1px solid gray;
+ border: 1px solid #808080;
padding: 0.5em 1em;
}
@@ -25,7 +25,7 @@
}
.mw-jsonconfig .mw-jsonconfig-value {
- font-family: 'Bitstream Vera Sans Mono', 'DejaVu Sans Mono', Monaco,
Courier, monospace;
+ font-family: 'Bitstream Vera Sans Mono', 'DejaVu Sans Mono', 'Monaco',
'Courier', monospace;
background-color: #dcfae3;
}
@@ -40,7 +40,8 @@
color: #800080;
}
-.mw-jsonconfig-description, .mw-jsonconfig-license {
+.mw-jsonconfig-description,
+.mw-jsonconfig-license {
display: inline-block;
font-style: italic;
}
@@ -59,18 +60,18 @@
}
.mw-jsonconfig-same {
- color: purple;
+ color: #800080;
font-weight: bold;
}
.mw-jsonconfig-error {
- color: red;
+ color: #f00;
font-weight: bold;
}
.mw-jsonconfig-unknown {
color: #ffa100;
- font-weight: bold;
+ font-weight: bold;
}
.mw-jsonconfig caption {
@@ -79,7 +80,7 @@
}
.mw-jsonconfig table caption {
- color: gray;
+ color: #808080;
display: inline-block;
font-size: 10px;
font-style: italic;
@@ -89,10 +90,10 @@
.mw-jsonconfig-editnotice {
color: #000;
- border: solid 1px #A8A8A8;
+ border: solid 1px #a8a8a8;
padding: 0.5em;
margin: 0.5em 0;
- background-color: #FFF;
+ background-color: #fff;
font-size: 95%;
vertical-align: middle;
}
diff --git a/package.json b/package.json
index dc97112..d70d8e7 100644
--- a/package.json
+++ b/package.json
@@ -8,10 +8,11 @@
"build-lib": ". ./bin/build.sh"
},
"devDependencies": {
- "grunt": "0.4.5",
+ "grunt": "1.0.1",
"grunt-banana-checker": "0.4.0",
- "grunt-cli": "0.1.13",
"grunt-jsonlint": "1.0.7",
+ "grunt-stylelint": "0.6.0",
+ "stylelint-config-wikimedia": "0.4.1",
"wmui-base":
"git+https://phabricator.wikimedia.org/diffusion/WMUI/wikimedia-ui-base.git#v0.7.1";
}
}
--
To view, visit https://gerrit.wikimedia.org/r/348527
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If6b1fa9a68449d8bf8d3bfd1a4da97f2200c51d1
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/JsonConfig
Gerrit-Branch: master
Gerrit-Owner: Umherirrender <[email protected]>
Gerrit-Reviewer: Jforrester <[email protected]>
Gerrit-Reviewer: Umherirrender <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
