jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/348298 )
Change subject: Add stylelint for css files
......................................................................
Add stylelint for css files
Fixed the following rules:
color-hex-case
color-hex-length
color-named
font-family-name-quotes
number-leading-zero
selector-list-comma-newline-after
Change-Id: I9115dbefb9eef97449fd3eb9ee22dc7e435d4723
---
A .stylelintrc
M Gruntfile.js
M package.json
M resources/screen.css
4 files changed, 85 insertions(+), 44 deletions(-)
Approvals:
jenkins-bot: Verified
Jforrester: Looks good to me, approved
diff --git a/.stylelintrc b/.stylelintrc
new file mode 100644
index 0000000..ce409b6
--- /dev/null
+++ b/.stylelintrc
@@ -0,0 +1,8 @@
+{
+ "extends": "stylelint-config-wikimedia",
+ "rules": {
+ "selector-no-id": null,
+ "no-descending-specificity": null,
+ "no-duplicate-selectors": null
+ }
+}
diff --git a/Gruntfile.js b/Gruntfile.js
index 9c56558..0ce27d0 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -2,6 +2,7 @@
module.exports = function ( grunt ) {
grunt.loadNpmTasks( 'grunt-banana-checker' );
grunt.loadNpmTasks( 'grunt-jsonlint' );
+ grunt.loadNpmTasks( 'grunt-stylelint' );
grunt.initConfig( {
banana: {
@@ -10,11 +11,18 @@
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/package.json b/package.json
index d399433..ab60955 100644
--- a/package.json
+++ b/package.json
@@ -4,9 +4,10 @@
"test": "grunt test"
},
"devDependencies": {
- "grunt": "0.4.5",
- "grunt-cli": "0.1.13",
+ "grunt": "1.0.1",
"grunt-banana-checker": "0.2.2",
- "grunt-jsonlint": "1.0.7"
+ "grunt-jsonlint": "1.0.7",
+ "grunt-stylelint": "0.6.0",
+ "stylelint-config-wikimedia": "0.4.1"
}
}
diff --git a/resources/screen.css b/resources/screen.css
index cd5d76d..5ed1ec3 100644
--- a/resources/screen.css
+++ b/resources/screen.css
@@ -1,7 +1,7 @@
body {
margin: 0;
padding: 0;
- color: black;
+ color: #000;
font-family: serif;
}
@@ -16,13 +16,13 @@
}
#mw-data-after-content {
- font-family: Verdana, Arial, sans-serif;
- color: black;
+ font-family: 'Verdana', 'Arial', sans-serif;
+ color: #000;
font-size: 8pt;
}
#powersearch {
- background: #DDEEFF;
+ background-color: #def;
border-style: solid;
border-width: 1px;
padding: 2px;
@@ -35,10 +35,13 @@
visibility: visible;
}
-#article, #article td, #article th, #article p {
- font-family: Verdana, Arial, sans-serif;
+#article,
+#article td,
+#article th,
+#article p {
+ font-family: 'Verdana', 'Arial', sans-serif;
font-size: 10pt;
- color: black;
+ color: #000;
}
#article p {
@@ -48,7 +51,14 @@
margin-bottom: 0;
}
-p, pre, .mw-code, td, th, li, dd, dt {
+p,
+pre,
+.mw-code,
+td,
+th,
+li,
+dd,
+dt {
line-height: 12pt;
}
@@ -65,7 +75,7 @@
margin-right: 2%;
margin-top: 1em;
padding: 4px;
- font-family: verdana, arial, sans-serif;
+ font-family: 'Verdana', 'Arial', sans-serif;
font-size: 10pt;
text-align: center;
}
@@ -79,24 +89,24 @@
}
#pagestats {
- font-family: Verdana, Arial, sans-serif;
- color: black;
+ font-family: 'Verdana', 'Arial', sans-serif;
+ color: #000;
font-size: 9pt;
}
#quickbar {
- font-family: Verdana, Arial, sans-serif;
+ font-family: 'Verdana', 'Arial', sans-serif;
font-size: 8pt;
font-weight: bold;
line-height: 9.5pt;
text-decoration: none;
- color: black;
+ color: #000;
padding: 0;
margin-top: 0;
}
#quickbar a {
- color: #446688;
+ color: #468;
}
/* Hide, but keep accessible for screen-readers */
@@ -106,12 +116,12 @@
}
#quickbar h3 {
- font-family: Verdana, Arial, sans-serif;
+ font-family: 'Verdana', 'Arial', sans-serif;
font-size: 10pt;
font-weight: bold;
line-height: 12pt;
text-decoration: none;
- color: #666666;
+ color: #666;
padding: 0;
margin-bottom: 2px;
margin-top: 6px;
@@ -132,12 +142,12 @@
div.after-portlet {
display: inline;
- padding-left: .5em;
+ padding-left: 0.5em;
}
h1 {
- color: #666666;
- font-family: Verdana, Arial, sans-serif;
+ color: #666;
+ font-family: 'Verdana', 'Arial', sans-serif;
font-size: 180%;
line-height: 21pt;
}
@@ -155,11 +165,13 @@
display: -moz-inline-block;
display: inline-block;
zoom: 1;
- *display: inline;
+ *display: inline; /* stylelint-disable-line
declaration-block-no-duplicate-properties */
}
-#article p.subtitle, #article p.subpages, #article p.tagline {
- color: #666666;
+#article p.subtitle,
+#article p.subpages,
+#article p.tagline {
+ color: #666;
font-size: 11pt;
font-weight: bold;
padding-top: 0;
@@ -168,31 +180,38 @@
}
a {
- color: #223366;
+ color: #236;
}
a.external {
- color: #336644;
+ color: #364;
}
a:visited {
- color: #8D0749;
+ color: #8d0749;
}
a.printable {
text-decoration: underline;
}
-a.stub, #quickbar a.stub {
- color: #772233;
+a.stub,
+#quickbar a.stub {
+ color: #723;
text-decoration: none;
}
-a.new, #quickbar span.new a, #footer span.new a {
- color: #CC2200;
+a.new,
+#quickbar span.new a,
+#footer span.new a {
+ color: #c20;
}
-h2, h3, h4, h5, h6 {
+h2,
+h3,
+h4,
+h5,
+h6 {
margin-bottom: 0;
}
@@ -219,28 +238,33 @@
margin-left: 152px;
}
-#sitetitle, #sitesub, #toplinks, #linkcollection {
+#sitetitle,
+#sitesub,
+#toplinks,
+#linkcollection {
margin-top: 0;
margin-bottom: 0;
}
-#sitetitle, #toplinks {
- color: white;
+#sitetitle,
+#toplinks {
+ color: #fff;
text-transform: uppercase;
height: 32pt;
}
#sitetitle {
padding-left: 8px;
- font-family: Times, serif;
+ font-family: 'Times', serif;
font-weight: normal;
font-size: 32pt;
line-height: 32pt;
- background-color: #6688AA;
+ background-color: #68a;
}
-#sitetitle a, #toplinks a {
- color: white;
+#sitetitle a,
+#toplinks a {
+ color: #fff;
text-decoration: none;
}
@@ -251,7 +275,7 @@
}
#toplinks {
- font-family: Verdana, Arial, sans-serif;
+ font-family: 'Verdana', 'Arial', sans-serif;
position: absolute;
top: 0;
right: 8px;
@@ -282,10 +306,10 @@
#sitesub {
float: left;
margin-left: 8px;
- font-family: Verdana, Arial, sans-serif;
+ font-family: 'Verdana', 'Arial', sans-serif;
font-size: 9pt;
font-weight: bold;
- color: black;
+ color: #000;
}
#linkcollection {
--
To view, visit https://gerrit.wikimedia.org/r/348298
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9115dbefb9eef97449fd3eb9ee22dc7e435d4723
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/skins/CologneBlue
Gerrit-Branch: master
Gerrit-Owner: Umherirrender <umherirrender_de...@web.de>
Gerrit-Reviewer: Jforrester <jforres...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
