jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/348776 )
Change subject: Migrate csslint to stylelint
......................................................................
Migrate csslint to stylelint
stylelint is used on all other wmf deployed extension for linting css or
less
Fixed the following rules:
no-missing-end-of-source-newline
color-hex-case
color-named
function-parentheses-space-inside
no-eol-whitespace
function-url-quotes
Change-Id: I7bbebaeef59807101233f6784114549615ad5afd
---
D .csslintrc
A .stylelintrc
M Gruntfile.js
M modules/ext.pageTriage.article/ext.pageTriage.article.css
M modules/ext.pageTriage.views.list/ext.pageTriage.listControlNav.css
M modules/ext.pageTriage.views.list/ext.pageTriage.listItem.css
M modules/ext.pageTriage.views.list/ext.pageTriage.listStatsNav.css
M modules/ext.pageTriage.views.list/ext.pageTriage.listView.css
M modules/ext.pageTriage.views.toolbar/ext.pageTriage.articleInfo.css
M modules/ext.pageTriage.views.toolbar/ext.pageTriage.delete.css
M modules/ext.pageTriage.views.toolbar/ext.pageTriage.tags.css
M modules/ext.pageTriage.views.toolbar/ext.pageTriage.toolView.css
M modules/ext.pageTriage.views.toolbar/ext.pageTriage.toolbarView.css
M modules/ext.pageTriage.views.toolbar/ext.pageTriage.wikilove.css
M modules/jquery.tipoff/jquery.tipoff.css
M package.json
16 files changed, 88 insertions(+), 92 deletions(-)
Approvals:
jenkins-bot: Verified
Jforrester: Looks good to me, approved
diff --git a/.csslintrc b/.csslintrc
deleted file mode 100644
index 9bc8498..0000000
--- 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,
- "universal-selector": false,
- "overqualified-elements": false,
- "unqualified-attributes": false,
- "ids": false
-}
diff --git a/.stylelintrc b/.stylelintrc
new file mode 100644
index 0000000..d80d603
--- /dev/null
+++ b/.stylelintrc
@@ -0,0 +1,8 @@
+{
+ "extends": "stylelint-config-wikimedia",
+ "rules": {
+ "selector-no-id": null,
+ "declaration-no-important": null,
+ "no-duplicate-selectors": null
+ }
+}
diff --git a/Gruntfile.js b/Gruntfile.js
index e9f0dfa..b8a50b0 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -7,7 +7,7 @@
/*jshint node:true */
module.exports = function ( grunt ) {
grunt.loadNpmTasks( 'grunt-banana-checker' );
- grunt.loadNpmTasks( 'grunt-contrib-csslint' );
+ grunt.loadNpmTasks( 'grunt-stylelint' );
grunt.loadNpmTasks( 'grunt-contrib-jshint' );
grunt.loadNpmTasks( 'grunt-contrib-watch' );
grunt.loadNpmTasks( 'grunt-jscs' );
@@ -27,33 +27,33 @@
jscs: {
src: '<%= jshint.all %>'
},
- csslint: {
- options: {
- csslintrc: '.csslintrc'
- },
- all: 'modules/**/*.css'
+ stylelint: {
+ all: [
+ '**/*.css',
+ '!node_modules/**'
+ ]
},
banana: {
all: 'i18n/'
},
watch: {
files: [
- '.{csslintrc,jscsrc,jshintignore,jshintrc}',
+ '.{jscsrc,jshintignore,jshintrc}',
'<%= jshint.all %>',
- '<%= jsonlint.all %>',
- '<%= csslint.all %>'
+ '<%= jsonlint.all %>'
],
tasks: 'test'
},
jsonlint: {
all: [
'**/*.json',
+ '.stylelintrc',
'!node_modules/**'
]
}
} );
- grunt.registerTask( 'lint', [ 'jshint', 'jscs', 'csslint', 'jsonlint',
'banana' ] );
+ grunt.registerTask( 'lint', [ 'jshint', 'jscs', 'stylelint',
'jsonlint', 'banana' ] );
grunt.registerTask( 'test', 'lint' );
grunt.registerTask( 'default', 'test' );
};
diff --git a/modules/ext.pageTriage.article/ext.pageTriage.article.css
b/modules/ext.pageTriage.article/ext.pageTriage.article.css
index b04ddf3..cbdf061 100644
--- a/modules/ext.pageTriage.article/ext.pageTriage.article.css
+++ b/modules/ext.pageTriage.article/ext.pageTriage.article.css
@@ -1,4 +1,4 @@
.mw-pagetriage-markpatrolled {
float: right;
font-size: small;
-}
\ No newline at end of file
+}
diff --git
a/modules/ext.pageTriage.views.list/ext.pageTriage.listControlNav.css
b/modules/ext.pageTriage.views.list/ext.pageTriage.listControlNav.css
index eac9404..d651230 100644
--- a/modules/ext.pageTriage.views.list/ext.pageTriage.listControlNav.css
+++ b/modules/ext.pageTriage.views.list/ext.pageTriage.listControlNav.css
@@ -3,7 +3,7 @@
}
.mwe-pt-control-gradient {
- background: #C9C9C9; /* for non-css3 browsers */
+ background: #c9c9c9; /* for non-css3 browsers */
/*
filter: progid:DXImageTransform.Microsoft.gradient(
startColorstr='#e7f1f7', endColorstr='#b6bec3' );
background: -webkit-gradient( linear, left top, left bottom, from(
#e7f1f7 ), to( #b6bec3 ) );
@@ -19,7 +19,7 @@
position: fixed;
top: 0;
z-index: 1;
- box-shadow: 0 7px 10px rgba(0, 0, 0, 0.4);
+ box-shadow: 0 7px 10px rgba( 0, 0, 0, 0.4 );
}
.mwe-pt-control-section {
@@ -49,14 +49,14 @@
visibility: hidden;
border: 1px solid #aaa;
padding: 0.5em 1em 0.2em 1em;
- color: #000000;
+ color: #000;
cursor: default;
- box-shadow: 0 7px 10px rgba(0, 0, 0, 0.4);
+ box-shadow: 0 7px 10px rgba( 0, 0, 0, 0.4 );
}
#mwe-pt-control-dropdown-pokey {
/* @embed */
- background-image: url('images/dialog_pokey_north.png');
+ background-image: url( images/dialog_pokey_north.png );
background-repeat: no-repeat;
width: 21px;
height: 11px;
@@ -69,7 +69,7 @@
}
#mwe-pt-filter-dropdown-control {
- color: #0645AD;
+ color: #0645ad;
cursor: pointer;
position: relative;
}
@@ -91,12 +91,12 @@
#mwe-pt-sort-buttons .ui-button {
/* @embed */
- background: #7e8183 url('images/sort_button_off.png') repeat-x scroll
50% 100%;
- color: #0645AD;
+ background: #7e8183 url( images/sort_button_off.png ) repeat-x scroll
50% 100%;
+ color: #0645ad;
}
#mwe-pt-sort-buttons .ui-button.ui-state-active {
/* @embed */
- background: #d9e3e8 url('images/sort_button_on.png') repeat-x scroll
50% 100%;
- color: white;
+ background: #d9e3e8 url( images/sort_button_on.png ) repeat-x scroll
50% 100%;
+ color: #fff;
border-color: #6e7273;
}
diff --git a/modules/ext.pageTriage.views.list/ext.pageTriage.listItem.css
b/modules/ext.pageTriage.views.list/ext.pageTriage.listItem.css
index d5913ab..ead3967 100644
--- a/modules/ext.pageTriage.views.list/ext.pageTriage.listItem.css
+++ b/modules/ext.pageTriage.views.list/ext.pageTriage.listItem.css
@@ -3,7 +3,7 @@
}
.mwe-pt-article-row-odd {
- background-color: white;
+ background-color: #fff;
}
.mwe-pt-info-pane {
@@ -23,7 +23,7 @@
.mwe-pt-article-row {
position: relative;
border: 1px solid #ccc;
- border-top: none;
+ border-top: 0;
}
.mwe-pt-list-triage-button {
diff --git a/modules/ext.pageTriage.views.list/ext.pageTriage.listStatsNav.css
b/modules/ext.pageTriage.views.list/ext.pageTriage.listStatsNav.css
index 6e2052b..fdb0631 100644
--- a/modules/ext.pageTriage.views.list/ext.pageTriage.listStatsNav.css
+++ b/modules/ext.pageTriage.views.list/ext.pageTriage.listStatsNav.css
@@ -1,5 +1,5 @@
#mwe-pt-list-stats-nav {
- border-top: none;
+ border-top: 0;
min-height: 50px;
}
@@ -12,11 +12,11 @@
position: fixed;
bottom: 0;
z-index: 1;
- box-shadow: 0 -7px 10px rgba(0, 0, 0, 0.4);
+ box-shadow: 0 -7px 10px rgba( 0, 0, 0, 0.4 );
}
.mwe-pt-stats-label {
- font-weight:bold;
+ font-weight: bold;
}
#mwe-pt-refresh-button-holder {
diff --git a/modules/ext.pageTriage.views.list/ext.pageTriage.listView.css
b/modules/ext.pageTriage.views.list/ext.pageTriage.listView.css
index 1ed72c3..2f5151d 100644
--- a/modules/ext.pageTriage.views.list/ext.pageTriage.listView.css
+++ b/modules/ext.pageTriage.views.list/ext.pageTriage.listView.css
@@ -7,11 +7,11 @@
text-align: center;
font-size: 17px;
line-height: 20px;
- background-color: #E8F2F8;
+ background-color: #e8f2f8;
margin: 0;
padding: 0.4em;
- border: 1px solid #CCC;
- border-top: none;
+ border: 1px solid #ccc;
+ border-top: 0;
min-height: 21px;
}
@@ -20,13 +20,13 @@
}
#mwe-pt-list-errors {
- color: #C00;
+ color: #c00;
font-size: 1.2em;
line-height: 1.3em;
margin: 0;
padding: 0.4em;
- border: 1px solid #CCC;
- border-top: none;
+ border: 1px solid #ccc;
+ border-top: 0;
}
#mwe-pt-list-warnings {
diff --git
a/modules/ext.pageTriage.views.toolbar/ext.pageTriage.articleInfo.css
b/modules/ext.pageTriage.views.toolbar/ext.pageTriage.articleInfo.css
index da946ab..de7724b 100644
--- a/modules/ext.pageTriage.views.toolbar/ext.pageTriage.articleInfo.css
+++ b/modules/ext.pageTriage.views.toolbar/ext.pageTriage.articleInfo.css
@@ -3,7 +3,7 @@
}
.mwe-pt-info-header {
- border-bottom: 1px solid black;
+ border-bottom: 1px solid #000;
margin-bottom: 0.5em;
font-weight: bold;
width: 100%;
@@ -22,12 +22,12 @@
}
.mwe-pt-info-problem-name {
- color: red;
+ color: #f00;
}
.mwe-pt-info-problem-desc {
font-size: 0.9em;
- color: #666666;
+ color: #666;
}
.mwe-pt-info-status-icon {
float: left;
diff --git a/modules/ext.pageTriage.views.toolbar/ext.pageTriage.delete.css
b/modules/ext.pageTriage.views.toolbar/ext.pageTriage.delete.css
index ced2166..46958f9 100644
--- a/modules/ext.pageTriage.views.toolbar/ext.pageTriage.delete.css
+++ b/modules/ext.pageTriage.views.toolbar/ext.pageTriage.delete.css
@@ -1,5 +1,5 @@
#mwe-pt-deletion-wizard .mwe-pt-tool-content {
- background-color: #F3F3F3;
+ background-color: #f3f3f3;
padding: 0;
}
@@ -20,17 +20,17 @@
}
.mwe-pt-delete-category.mwe-pt-active {
- color: white !important;
+ color: #fff !important;
background: #3365ba !important;
}
.mwe-pt-delete-category.mwe-pt-active a {
- color: white !important;
+ color: #fff !important;
}
#mwe-pt-delete-bottom {
- border-top: 1px solid #9F9F9F;
- /* background-color: white; */
+ border-top: 1px solid #9f9f9f;
+ /* background-color: #fff; */
padding: 10px 12px 10px 12px;
clear: both;
}
@@ -41,13 +41,13 @@
height: 265px;
overflow: auto;
padding: 8px;
- border-left: 1px solid #9F9F9F;
- background-color: white;
+ border-left: 1px solid #9f9f9f;
+ background-color: #fff;
}
.mwe-pt-category-pokey {
/* @embed */
- background-image: url('images/baby_pokey.png');
+ background-image: url( images/baby_pokey.png );
background-repeat: no-repeat;
width: 6px;
height: 10px;
@@ -81,7 +81,7 @@
/* width: 115px; */
}
#mwe-pt-delete-list .mwe-pt-delete-desc {
- color: #666666;
+ color: #666;
cursor: default;
padding: 0;
font-size: 0.92em;
@@ -98,10 +98,10 @@
}
#mwe-pt-delete-list .mwe-pt-delete-set-param-button {
margin-left: 0 !important;
- background-color: white;
+ background-color: #fff;
}
#mwe-pt-delete-category-desc {
- color: #666666;
+ color: #666;
margin: 0 0 0.8em 0.7em;
- font-size: 0.92em;
+ font-size: 0.92em;
}
diff --git a/modules/ext.pageTriage.views.toolbar/ext.pageTriage.tags.css
b/modules/ext.pageTriage.views.toolbar/ext.pageTriage.tags.css
index 5425e1a..a320e52 100644
--- a/modules/ext.pageTriage.views.toolbar/ext.pageTriage.tags.css
+++ b/modules/ext.pageTriage.views.toolbar/ext.pageTriage.tags.css
@@ -4,7 +4,7 @@
}
#mwe-pt-tag .mwe-pt-tool-content {
- background-color: #F3F3F3;
+ background-color: #f3f3f3;
padding: 0;
}
@@ -21,12 +21,12 @@
}
.mwe-pt-category.mwe-pt-active {
- color: white !important;
+ color: #fff !important;
background: #3365ba !important;
}
.mwe-pt-category.mwe-pt-active a {
- color: white !important;
+ color: #fff !important;
}
#mwe-pt-tags {
@@ -35,13 +35,13 @@
height: 293px;
overflow: auto;
padding: 8px;
- border-left: 1px solid #9F9F9F;
- background-color: white;
+ border-left: 1px solid #9f9f9f;
+ background-color: #fff;
}
.mwe-pt-category-pokey {
/* @embed */
- background-image: url('images/baby_pokey.png');
+ background-image: url( images/baby_pokey.png );
background-repeat: no-repeat;
width: 6px;
height: 10px;
@@ -53,8 +53,8 @@
}
#mwe-pt-tags-bottom {
- border-top: 1px solid #9F9F9F;
- /* background-color: white; */
+ border-top: 1px solid #9f9f9f;
+ /* background-color: #fff; */
padding: 10px 12px 10px 12px;
clear: both;
}
@@ -97,7 +97,7 @@
/* width: 115px; */
}
#mwe-pt-tag-list .mwe-pt-tag-desc {
- color: #666666;
+ color: #666;
cursor: default;
padding: 0;
font-size: 0.92em;
@@ -114,7 +114,7 @@
}
#mwe-pt-tag-list .mwe-pt-tag-set-param-button {
margin-left: 0 !important;
- background-color: white;
+ background-color: #fff;
}
#mwe-pt-tag-note {
display: none;
diff --git a/modules/ext.pageTriage.views.toolbar/ext.pageTriage.toolView.css
b/modules/ext.pageTriage.views.toolbar/ext.pageTriage.toolView.css
index c520e98..1d8ce7a 100644
--- a/modules/ext.pageTriage.views.toolbar/ext.pageTriage.toolView.css
+++ b/modules/ext.pageTriage.views.toolbar/ext.pageTriage.toolView.css
@@ -18,8 +18,8 @@
text-align: left;
z-index: 2;
border-radius: 4px;
- border: 1px solid #9F9F9F;
- box-shadow: 0 4px 8px rgba(0, 0, 0, 0.4);
+ border: 1px solid #9f9f9f;
+ box-shadow: 0 4px 8px rgba( 0, 0, 0, 0.4 );
}
.mwe-pt-tool-flyout-not-flipped {
right: 46px;
@@ -38,12 +38,12 @@
}
.mwe-pt-tool-pokey-not-flipped {
/* @embed */
- background-image: url('images/flyout_pokey.png');
+ background-image: url( images/flyout_pokey.png );
right: 38px;
}
.mwe-pt-tool-pokey-flipped {
/* @embed */
- background-image: url('images/flyout_pokey_flipped.png');
+ background-image: url( images/flyout_pokey_flipped.png );
left: 38px;
}
@@ -54,9 +54,9 @@
}
.mwe-pt-tool-content {
- background-color: white;
+ background-color: #fff;
font-size: 0.8em;
- border: 1px solid #9F9F9F;
+ border: 1px solid #9f9f9f;
padding: 6px;
}
.mwe-pt-flyout-help-link {
@@ -65,13 +65,13 @@
font-size: 0.7em;
}
.mwe-pt-tool-close {
- color: gray;
+ color: #808080;
float: right;
font-size: 0.6em;
cursor: pointer;
}
.mwe-pt-tool-warning-notice {
- color: gray;
+ color: #808080;
font-size: 0.8em;
}
diff --git
a/modules/ext.pageTriage.views.toolbar/ext.pageTriage.toolbarView.css
b/modules/ext.pageTriage.views.toolbar/ext.pageTriage.toolbarView.css
index 994f35f..55bfc58 100644
--- a/modules/ext.pageTriage.views.toolbar/ext.pageTriage.toolbarView.css
+++ b/modules/ext.pageTriage.views.toolbar/ext.pageTriage.toolbarView.css
@@ -9,8 +9,8 @@
padding-bottom: 5px;
background-color: #cacaca;
border-radius: 4px;
- border: 1px solid #9F9F9F;
- box-shadow: 0 4px 8px rgba(0, 0, 0, 0.4);
+ border: 1px solid #9f9f9f;
+ box-shadow: 0 4px 8px rgba( 0, 0, 0, 0.4 );
}
.skin-monobook #mwe-pt-toolbar {
font-size: 1.5em;
@@ -46,7 +46,7 @@
text-align: center;
}
.mwe-pt-toolbar-close-button {
- background-image: url('images/close.png');
+ background-image: url( images/close.png );
height: 12px;
width: 12px;
margin: 0 auto;
@@ -55,12 +55,12 @@
p#mwe-pt-toolbar-vertical {
color: #333;
- border: 0 solid red;
- -webkit-transform: rotate(90deg);
- -moz-transform: rotate(90deg);
- -o-transform: rotate(90deg);
- -ms-transform: rotate(90deg);
- transform: rotate(90deg);
+ border: 0 solid #f00;
+ -webkit-transform: rotate( 90deg );
+ -moz-transform: rotate( 90deg );
+ -o-transform: rotate( 90deg );
+ -ms-transform: rotate( 90deg );
+ transform: rotate( 90deg );
white-space: nowrap;
display: block;
bottom: 0;
diff --git a/modules/ext.pageTriage.views.toolbar/ext.pageTriage.wikilove.css
b/modules/ext.pageTriage.views.toolbar/ext.pageTriage.wikilove.css
index 183896d..1bbbc98 100644
--- a/modules/ext.pageTriage.views.toolbar/ext.pageTriage.wikilove.css
+++ b/modules/ext.pageTriage.views.toolbar/ext.pageTriage.wikilove.css
@@ -1,5 +1,5 @@
#mwe-pt-wikilove .mwe-pt-info-text {
- color: #666666;
+ color: #666;
}
#mwe-pt-article-contributor-list {
diff --git a/modules/jquery.tipoff/jquery.tipoff.css
b/modules/jquery.tipoff/jquery.tipoff.css
index a150cd3..f6fb2cd 100644
--- a/modules/jquery.tipoff/jquery.tipoff.css
+++ b/modules/jquery.tipoff/jquery.tipoff.css
@@ -7,7 +7,7 @@
padding: 0.8em;
margin: 0;
background-color: #c9c9c9;
- box-shadow: 0 7px 10px rgba(0, 0, 0, 0.4);
+ box-shadow: 0 7px 10px rgba( 0, 0, 0, 0.4 );
}
.mw-tipoff-pokey {
@@ -16,7 +16,7 @@
top: -10px;
left: 5px;
/* @embed */
- background-image: url('images/pokey-light.png');
+ background-image: url( images/pokey-light.png );
background-repeat: no-repeat;
height: 12px;
width: 11px;
diff --git a/package.json b/package.json
index 4bffece..9ac33a5 100644
--- a/package.json
+++ b/package.json
@@ -10,11 +10,12 @@
"devDependencies": {
"grunt": "0.4.5",
"grunt-cli": "0.1.13",
- "grunt-contrib-csslint": "0.4.0",
"grunt-contrib-jshint": "0.11.3",
"grunt-contrib-watch": "0.6.1",
"grunt-banana-checker": "0.4.0",
"grunt-jscs": "2.6.0",
- "grunt-jsonlint": "1.0.7"
+ "grunt-jsonlint": "1.0.7",
+ "grunt-stylelint": "0.6.0",
+ "stylelint-config-wikimedia": "0.4.1"
}
}
--
To view, visit https://gerrit.wikimedia.org/r/348776
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7bbebaeef59807101233f6784114549615ad5afd
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/PageTriage
Gerrit-Branch: master
Gerrit-Owner: Umherirrender <[email protected]>
Gerrit-Reviewer: Jforrester <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
