jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/348592 )
Change subject: Add stylelint for css files
......................................................................
Add stylelint for css files
Fixed the following rules:
declaration-colon-space-after
declaration-property-value-blacklist
string-quotes
color-hex-length
color-hex-case
declaration-block-no-duplicate-properties
declaration-block-semicolon-newline-after
selector-list-comma-newline-after
function-parentheses-space-inside
selector-descendant-combinator-no-non-space
block-opening-brace-space
indentation
string-quotes
Change-Id: If0189001fa99f1ccc12634d20e1755b3a84f6151
---
A .stylelintrc
M Gruntfile.js
M jquery/jquery.thread_collapse.css
M lqt.css
M lqt.dialogs.css
M package.json
6 files changed, 116 insertions(+), 97 deletions(-)
Approvals:
jenkins-bot: Verified
Jforrester: Looks good to me, approved
diff --git a/.stylelintrc b/.stylelintrc
new file mode 100644
index 0000000..880ad7a
--- /dev/null
+++ b/.stylelintrc
@@ -0,0 +1,9 @@
+{
+ "extends": "stylelint-config-wikimedia",
+ "rules": {
+ "selector-no-id": null,
+ "no-duplicate-selectors": null,
+ "no-descending-specificity": null,
+ "declaration-no-important": null
+ }
+}
diff --git a/Gruntfile.js b/Gruntfile.js
index 51edef3..c3392f3 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -4,6 +4,7 @@
grunt.loadNpmTasks( 'grunt-jsonlint' );
grunt.loadNpmTasks( 'grunt-banana-checker' );
grunt.loadNpmTasks( 'grunt-jscs' );
+ grunt.loadNpmTasks( 'grunt-stylelint' );
grunt.initConfig( {
jshint: {
@@ -25,11 +26,18 @@
jsonlint: {
all: [
'**/*.json',
+ '.stylelintrc',
+ '!node_modules/**'
+ ]
+ },
+ stylelint: {
+ all: [
+ '**/*.css',
'!node_modules/**'
]
}
} );
- grunt.registerTask( 'test', [ 'jshint', 'jscs', 'jsonlint', 'banana' ]
);
+ grunt.registerTask( 'test', [ 'jshint', 'jscs', 'jsonlint', 'banana',
'stylelint' ] );
grunt.registerTask( 'default', 'test' );
};
diff --git a/jquery/jquery.thread_collapse.css
b/jquery/jquery.thread_collapse.css
index 8647db5..8725417 100644
--- a/jquery/jquery.thread_collapse.css
+++ b/jquery/jquery.thread_collapse.css
@@ -1,14 +1,14 @@
.thread-collapse-control a {
display: inline-block;
- outline: none;
+ outline: 0;
width: 17px;
height: 17px;
/* @embed */
- background: url(../images/thread_collapse_control_expanded.gif) 0 0
no-repeat;
+ background: url( ../images/thread_collapse_control_expanded.gif ) 0 0
no-repeat;
text-indent: -9999px;
overflow: hidden;
}
.thread-collapse-control a.thread-control-collapsed {
/* @embed */
- background: url(../images/thread_collapse_control_collapsed.gif) 0 0
no-repeat;
+ background: url( ../images/thread_collapse_control_collapsed.gif ) 0 0
no-repeat;
}
diff --git a/lqt.css b/lqt.css
index cf89232..0a9cd5f 100644
--- a/lqt.css
+++ b/lqt.css
@@ -1,11 +1,11 @@
.lqt_watchlist_messages_notice {
background-color: #eee;
- border: 1px solid #ddd;
- margin: 1em 0;
- padding: 0.5em 1em;
+ border: 1px solid #ddd;
+ margin: 1em 0;
+ padding: 0.5em 1em;
display: table;
- width: auto;
+ width: auto;
}
.lqt_newmessages_section {
@@ -14,7 +14,8 @@
.lqt_undo_mark_as_read {
background-color: #f0f0e3;
- display: table; width: auto;
+ display: table;
+ width: auto;
}
.lqt_newmessages_read_all_button {
@@ -23,53 +24,53 @@
}
.lqt_header_notice {
- font-size: smaller;
- float: right;
+ font-size: smaller;
+ float: right;
font-weight: bold;
}
.lqt_header_content {
border-bottom: 2px solid #ddd;
- border-right: 2px solid #ddd;
- margin: 0;
- margin-top: 0.5em;
+ border-right: 2px solid #ddd;
+ margin: 0;
+ margin-top: 0.5em;
margin-bottom: 1.5em;
- padding: 0;
+ padding: 0;
float: left;
width: 100%;
}
.lqt_thread_heading {
- border-bottom: 1px solid #AAAAAA;
+ border-bottom: 1px solid #aaa;
margin-bottom: 0.6em;
padding: 10px 0 0;
}
.lqt_thread.ui-draggable > .lqt-post-wrapper {
- border-color: Aquamarine;
- background-color: PowderBlue;
+ border-color: #7fffd4;
+ background-color: #b0e0e6;
}
.lqt_header {
- border: none;
+ border: 0;
margin-bottom: 0;
display: inline;
}
.lqt_header_commands {
- float: right;
- clear: both;
+ float: right;
+ clear: both;
list-style: none;
- margin: 0;
+ margin: 0;
margin-top: 0.5em;
font-size: 90%;
}
.lqt_header_commands li {
- display: inline;
+ display: inline;
padding-right: 0.6em;
- font-weight: bold;
+ font-weight: bold;
}
.lqt_thread_show_summary {
- margin-left: 1em;
+ margin-left: 1em;
margin-bottom: 0.5em;
}
@@ -79,24 +80,24 @@
.lqt_thread_permalink_summary_body {
background-color: #eee;
- border: 1px solid #ddd;
- clear: both;
- padding-left: 1em;
- padding-right: 1em;
- margin: 2em 1em 1em 1em;
+ border: 1px solid #ddd;
+ clear: both;
+ padding-left: 1em;
+ padding-right: 1em;
+ margin: 2em 1em 1em 1em;
}
.lqt_thread_permalink_summary_title {
- float: left;
+ float: left;
margin-left: 1em;
font-weight: bold;
}
.lqt_thread_permalink_summary_actions {
- float: right;
+ float: right;
margin-right: 1em;
- font-weight: normal;
- font-size: smaller;
+ font-weight: normal;
+ font-size: smaller;
}
.lqt_hidden {
@@ -105,24 +106,24 @@
.lqt_post_changed_by_history {
padding: 0.5em !important;
- background-color: #eeeeee;
- border: 1pt solid #66aaff;
- display: table;
+ background-color: #eee;
+ border: 1pt solid #6af;
+ display: table;
}
.lqt_post_new_message {
padding: 0.5em !important;
- background-color: #eeeeee !important;
- border: 1pt solid #66aaff;
- display: table;
- width: auto;
+ background-color: #eee !important;
+ border: 1pt solid #6af;
+ display: table;
+ width: auto;
}
.lqt_history_info {
- padding: 0.75em 1.5em;
- margin-bottom: 1em;
- background-color: #eeeeee;
- border: 1pt solid #66aaff;
+ padding: 0.75em 1.5em;
+ margin-bottom: 1em;
+ background-color: #eee;
+ border: 1pt solid #6af;
text-align: center;
margin-left: 20%;
margin-right: 20%;
@@ -136,15 +137,15 @@
}
.lqt_threadlevel_commands li {
- display: inline;
+ display: inline;
list-style-type: none;
- padding-right: 0.6em;
+ padding-right: 0.6em;
line-height: 1em;
}
#lqt_subject_field {
- margin-top: 0.7em;
+ margin-top: 0.7em;
margin-bottom: 0.5em;
- width: 80%;
+ width: 80%;
}
body.skin-monobook li#ca-nstab-thread {
@@ -161,7 +162,7 @@
}
.lqt_go_sort {
- font-weight:bold;
+ font-weight: bold;
}
.lqt_toc {
@@ -170,17 +171,18 @@
}
.lqt_toc th {
- border-bottom: 1px solid #000000;
+ border-bottom: 1px solid #000;
text-align: left;
}
-.lqt_toc td,.lqt_toc th {
+.lqt_toc td,
+.lqt_toc th {
margin: 0;
padding: 0.2em;
}
.lqt_toc td {
- border-bottom: 1px solid #aaaaaa;
+ border-bottom: 1px solid #aaa;
}
.lqt-newmessages-left {
@@ -219,8 +221,8 @@
.lqt-thread-actions-trigger {
margin-top: 8px;
- border: none;
- color: #002BB8;
+ border: 0;
+ color: #002bb8;
}
.lqt-thread-toolbar-menu ul {
@@ -228,16 +230,14 @@
position: absolute;
right: 0;
left: auto;
- background-color: white;
- border: 1px solid silver;
+ background-color: #fff;
+ border: 1px solid #c0c0c0;
margin-right: 1px;
margin-left: 10px;
margin-top: 5px;
list-style: none;
padding: 0;
z-index: 10;
- margin-top: 0;
-
}
.lqt-thread-toolbar-command-list li {
@@ -265,12 +265,12 @@
height: 2em;
padding-right: 18px; /* img is 16px */
/* @embed */
- background-image: url('icons/arrow-down-icon.png');
+ background-image: url( icons/arrow-down-icon.png );
background-position: right center;
background-repeat: no-repeat;
line-height: 2em;
margin-left: 0.5em;
- color: #666666;
+ color: #666;
cursor: pointer;
}
.lqt-talkpage-search {
@@ -295,7 +295,6 @@
.lqt-thread-replies {
padding-left: 1em;
-
}
.lqt-thread-replies-interruption {
@@ -306,14 +305,14 @@
padding: 0.5em 1em;
padding-bottom: 1em;
padding-right: 1em;
- border: 0.2em solid silver;
+ border: 0.2em solid #c0c0c0;
background: #e8e8e8;
- border-top: none;
+ border-top: 0;
position: relative;
}
.lqt-thread-topmost > .lqt-post-wrapper {
- border-top: 0.2em solid silver;
+ border-top: 0.2em solid #c0c0c0;
}
.lqt-thread-info-panel {
@@ -321,7 +320,7 @@
}
.lqt-thread-toolbar-timestamp {
- color: #778899;
+ color: #789;
}
.lqt-thread-toolbar {
@@ -349,12 +348,12 @@
.lqt-command-reply a {
padding-left: 26px;
/* @embed */
- background-image: url(icons/reply.png) !important;
+ background-image: url( icons/reply.png ) !important;
background-repeat: no-repeat;
background-position: left center !important;
}
-.lqt-thread-toolbar-commands li.lqt-command {
+.lqt-thread-toolbar-commands li.lqt-command {
margin-left: 0.5em;
margin-right: 0.5em;
line-height: 2em;
@@ -364,7 +363,7 @@
margin-left: 1em;
height: 2em;
/* @embed */
- background-image: url(icons/quote.png);
+ background-image: url( icons/quote.png );
background-position: left center !important;
background-repeat: no-repeat;
padding-left: 26px;
@@ -388,7 +387,7 @@
}
.lqt_start_discussion {
-/* float: left;*/
+ /*float: left;*/
font-weight: bold;
}
@@ -398,8 +397,8 @@
margin-right: 20%;
padding: 1em;
font-weight: bold;
- border: 1px solid #dddddd;
- background-color: #eeeeee;
+ border: 1px solid #ddd;
+ background-color: #eee;
}
.lqt-edit-form {
@@ -453,21 +452,21 @@
margin-top: 1em;
margin-bottom: 1em;
padding: 0.5em 1em;
- border: 1px solid #3333ff !important;
- background: yellow;
+ border: 1px solid #33f !important;
+ background: #ff0;
text-align: center;
- color: #444444;
+ color: #444;
font-weight: bold !important;
}
.lqt-drop-zone.lqt-drop-zone-active {
- border: 1px solid #3333ff !important;
- background: yellow;
+ border: 1px solid #33f !important;
+ background: #ff0;
}
.lqt-drop-zone.lqt-drop-zone-hover {
- border: 1px solid #3333ff !important;
- color: #3333ff !important;
+ border: 1px solid #33f !important;
+ color: #33f !important;
background: #00ff7f;
}
@@ -496,14 +495,13 @@
float: none;
line-height: 1.3em;
margin: 0.3em 0.5em;
- text-align:right;
+ text-align: right;
}
/* Float Clearing - If you confused,
http://www.positioniseverything.net/easyclearing.html */
.lqt_thread_heading:after,
.lqt-thread-toolbar-commands:after,
-.lqt-post-wrapper:after
-{
- content: "";
+.lqt-post-wrapper:after {
+ content: '';
display: block;
height: 0;
clear: both;
@@ -512,17 +510,20 @@
.lqt_thread_heading,
.lqt-thread-toolbar-commands,
-.lqt-post-wrapper
-{display: inline-block;}
+.lqt-post-wrapper {
+ display: inline-block;
+}
/* Hides from IE-mac */
* html .lqt_thread_heading,
* html .lqt-thread-toolbar-commands,
-* html .lqt-post-wrapper
-{height: 1%;}
+* html .lqt-post-wrapper {
+ height: 1%;
+}
.lqt_thread_heading,
.lqt-thread-toolbar-commands,
-.lqt-post-wrapper
-{display: block;}
+.lqt-post-wrapper {
+ display: block;
+}
/* End hide from IE-mac */
diff --git a/lqt.dialogs.css b/lqt.dialogs.css
index ee8f5bb..2e76ace 100644
--- a/lqt.dialogs.css
+++ b/lqt.dialogs.css
@@ -94,7 +94,7 @@
right: auto;
}
body.rtl .wikiEditor-toolbar-dialog .ui-dialog-title {
- float:right;
+ float: right;
}
body.rtl #wikieditor-toolbar-link-int-target-status {
float: left;
@@ -133,14 +133,14 @@
}
.wikiEditor-template-dialog-fields .wikiEditor-template-dialog-field-wrapper {
padding: 0.75em 0.33em;
- border-bottom: 1px dashed silver;
+ border-bottom: 1px dashed #c0c0c0;
clear: both;
}
.wikiEditor-template-dialog-fields
.wikiEditor-template-dialog-field-wrapper:first-child {
padding-top: 0;
}
.wikiEditor-template-dialog-fields
.wikiEditor-template-dialog-field-wrapper:last-child {
- border-bottom: none;
+ border-bottom: 0;
}
/* Self Clearing Floats */
.wikieditor-toolbar-table-dimension-fields:after,
@@ -148,7 +148,7 @@
visibility: hidden;
display: block;
font-size: 0;
- content: " ";
+ content: ' ';
clear: both;
height: 0;
}
@@ -167,7 +167,7 @@
}
/* End hide from IE-mac */
.wikiEditor-toolbar-dialog .ui-dialog-buttonpane {
- border-top: 1px solid #cccccc !important;
+ border-top: 1px solid #ccc !important;
}
.wikiEditor-toolbar-dialog .ui-dialog-content {
padding-bottom: 1em !important;
diff --git a/package.json b/package.json
index ec4be4d..f3c1a50 100644
--- a/package.json
+++ b/package.json
@@ -4,11 +4,12 @@
"test": "grunt test"
},
"devDependencies": {
- "grunt": "0.4.5",
+ "grunt": "1.0.1",
"grunt-banana-checker": "0.5.0",
- "grunt-cli": "0.1.13",
"grunt-contrib-jshint": "0.11.3",
"grunt-jscs": "2.4.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/348592
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If0189001fa99f1ccc12634d20e1755b3a84f6151
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/LiquidThreads
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
