Esanders has uploaded a new change for review.
https://gerrit.wikimedia.org/r/289244
Change subject: Add stylelint and make required style fixes
......................................................................
Add stylelint and make required style fixes
Change-Id: I8a9def8056a72c3da0c066413e94311a1d839f5b
---
M Gruntfile.js
M modules/ext.cite.a11y.css
M modules/ext.cite.style.css
M modules/ext.cite.style.fa.css
M modules/ext.cite.styles.css
M modules/ve-cite/ve.ui.MWReferenceGroupInputWidget.css
M modules/ve-cite/ve.ui.MWReferenceIcons.css
M package.json
8 files changed, 101 insertions(+), 57 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Cite
refs/changes/44/289244/1
diff --git a/Gruntfile.js b/Gruntfile.js
index bcccbea..4161ce9 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -11,6 +11,7 @@
grunt.loadNpmTasks( 'grunt-jscs' );
grunt.loadNpmTasks( 'grunt-jsonlint' );
grunt.loadNpmTasks( 'grunt-banana-checker' );
+ grunt.loadNpmTasks( 'grunt-stylelint' );
grunt.initConfig( {
jshint: {
options: {
@@ -38,6 +39,23 @@
src: '<%= jshint.all %>'
}
},
+ stylelint: {
+ core: {
+ src: [
+ '**/*.css',
+ '!modules/ve-cite/**',
+ '!node_modules/**'
+ ]
+ },
+ 've-cite': {
+ options: {
+ configFile:
'modules/ve-cite/.stylelintrc'
+ },
+ src: [
+ 'modules/ve-cite/**/*.css'
+ ]
+ }
+ },
jsonlint: {
all: [
'**/*.json',
@@ -46,6 +64,6 @@
}
} );
- grunt.registerTask( 'test', [ 'jshint', 'jscs:main', 'jsonlint',
'banana' ] );
+ grunt.registerTask( 'test', [ 'jshint', 'jscs:main', 'stylelint',
'jsonlint', 'banana' ] );
grunt.registerTask( 'default', 'test' );
};
diff --git a/modules/ext.cite.a11y.css b/modules/ext.cite.a11y.css
index 4ea7a81..c267815 100644
--- a/modules/ext.cite.a11y.css
+++ b/modules/ext.cite.a11y.css
@@ -3,14 +3,16 @@
* and
https://en.wikipedia.org/w/index.php?oldid=572888139#Scrolling_past_the_bottom_of_the_page...
*/
.cite-accessibility-label {
- position: absolute !important;
/* Workaround a Webkit/Blink bug about positioning within columns as
many wikis format references with several columns */
top: -99999px;
- clip: rect(1px 1px 1px 1px); /* IE6, IE7 */
- clip: rect(1px, 1px, 1px, 1px);
+ clip: rect( 1px 1px 1px 1px ); /* IE6, IE7 */
+ clip: rect( 1px, 1px, 1px, 1px );
+ /* stylelint-disable declaration-no-important */
+ position: absolute !important;
padding: 0 !important;
border: 0 !important;
height: 1px !important;
width: 1px !important;
+ /* stylelint-enable declaration-no-important */
overflow: hidden;
}
diff --git a/modules/ext.cite.style.css b/modules/ext.cite.style.css
index 6a5e7b8..55f3e4f 100644
--- a/modules/ext.cite.style.css
+++ b/modules/ext.cite.style.css
@@ -11,39 +11,41 @@
/* With a group set */
span.mw-ref a[data-mw-group]::after {
- content: "[" attr(data-mw-group) " " counter(mw-Ref, decimal) "]"}
+ content: '[' attr( data-mw-group ) ' ' counter( mw-Ref, decimal ) ']';
+}
/* Groups with special appearance */
-span.mw-ref a[data-mw-group="decimal"]::after {
- content: "[" counter(mw-Ref, decimal) "]";
+span.mw-ref a[data-mw-group='decimal']::after {
+ content: '[' counter( mw-Ref, decimal ) ']';
}
-span.mw-ref a[data-mw-group="lower-alpha"]::after {
- content: "[" counter(mw-Ref, lower-alpha) "]";
+span.mw-ref a[data-mw-group='lower-alpha']::after {
+ content: '[' counter( mw-Ref, lower-alpha ) ']';
}
-span.mw-ref a[data-mw-group="upper-alpha"]::after {
- content: "[" counter(mw-Ref, upper-alpha) "]";
+span.mw-ref a[data-mw-group='upper-alpha']::after {
+ content: '[' counter( mw-Ref, upper-alpha ) ']';
}
-span.mw-ref a[data-mw-group="lower-greek"]::after {
- content: "[" counter(mw-Ref, lower-greek) "]";
+span.mw-ref a[data-mw-group='lower-greek']::after {
+ content: '[' counter( mw-Ref, lower-greek ) ']';
}
-span.mw-ref a[data-mw-group="lower-roman"]::after {
- content: "[" counter(mw-Ref, lower-roman) "]";
+span.mw-ref a[data-mw-group='lower-roman']::after {
+ content: '[' counter( mw-Ref, lower-roman ) ']';
}
-span.mw-ref a[data-mw-group="upper-roman"]::after {
- content: "[" counter(mw-Ref, upper-roman) "]";
+span.mw-ref a[data-mw-group='upper-roman']::after {
+ content: '[' counter( mw-Ref, upper-roman ) ']';
}
-span.mw-ref a[data-mw-group="error-test"]::after {
- content: "[" counter(mw-Ref, symbols(cyclic "first" "second" "last!"))
"]";
+span.mw-ref a[data-mw-group='error-test']::after {
+ content: '[' counter( mw-Ref, symbols( cyclic 'first' 'second' 'last!'
) ) ']';
}
/* Without a group */
span.mw-ref a::after {
- content: "[" counter(mw-Ref, decimal) "]";
+ content: '[' counter( mw-Ref, decimal ) ']';
}
/* Hide the default rendering in browsers that support content
* generation by selecting for ::after pseudo-element.*/
-x-thereisnoelementwiththisname::after, span.mw-reflink-text {
+x-thereisnoelementwiththisname::after,
+span.mw-reflink-text {
display: none;
}
@@ -56,28 +58,29 @@
counter-increment: mw-ref-linkback;
}
-[rel="mw:referencedBy"] {
+[rel='mw:referencedBy'] {
counter-reset: mw-ref-linkback -1;
}
-[rel="mw:referencedBy"]::before {
- content: "↑ ";
+[rel='mw:referencedBy']::before {
+ content: '↑ ';
}
-span[rel="mw:referencedBy"] a::before {
+span[rel='mw:referencedBy'] a::before {
counter-increment: mw-ref-linkback;
- content: counters(mw-ref-linkback, ".", decimal);
+ content: counters( mw-ref-linkback, '.', decimal );
vertical-align: super;
line-height: 1;
font-size: smaller;
}
-span[rel="mw:referencedBy"] a::after {
- content: " ";
+span[rel='mw:referencedBy'] a::after {
+ content: ' ';
}
/* Hide the default rendering in browsers that support content
* generation by selecting for ::after pseudo-element.*/
-x-thereisnoelementwiththisname[rel="mw:referencedBy"]::before,
span.mw-linkback-text {
+x-thereisnoelementwiththisname[rel='mw:referencedBy']::before,
+span.mw-linkback-text {
display: none;
}
diff --git a/modules/ext.cite.style.fa.css b/modules/ext.cite.style.fa.css
index e44e05a..d7107e3 100644
--- a/modules/ext.cite.style.fa.css
+++ b/modules/ext.cite.style.fa.css
@@ -1,15 +1,15 @@
/* Farsi Cite CSS */
/* <ref>s with a group */
span.mw-ref a[data-mw-group]::after {
- content: "[" attr(data-mw-group) " " counter(mw-Ref, persian) "]";
+ content: '[' attr( data-mw-group ) ' ' counter( mw-Ref, persian ) ']';
}
/* <ref>s without a group */
span.mw-ref a::after {
- content: "[" counter(mw-Ref, persian) "]";
+ content: '[' counter( mw-Ref, persian ) ']';
}
/* Linkbacks from <references> to <ref>s */
-span[rel="mw:referencedBy"] a::before {
- content: counters(mw-ref-linkback, "٫", persian);
+span[rel='mw:referencedBy'] a::before {
+ content: counters( mw-ref-linkback, '٫', persian );
}
diff --git a/modules/ext.cite.styles.css b/modules/ext.cite.styles.css
index f52be1b..e40e4d5 100644
--- a/modules/ext.cite.styles.css
+++ b/modules/ext.cite.styles.css
@@ -21,7 +21,7 @@
ol.references li:target,
sup.reference:target {
background-color: #def; /* fallback */
- background-color: rgba(0, 127, 255, 0.133);
+ background-color: rgba( 0, 127, 255, 0.133 );
}
/* Make cite errors "strong" */
diff --git a/modules/ve-cite/ve.ui.MWReferenceGroupInputWidget.css
b/modules/ve-cite/ve.ui.MWReferenceGroupInputWidget.css
index 7da3665..91f58a0 100644
--- a/modules/ve-cite/ve.ui.MWReferenceGroupInputWidget.css
+++ b/modules/ve-cite/ve.ui.MWReferenceGroupInputWidget.css
@@ -6,5 +6,5 @@
*/
.ve-ui-mwReferenceGroupInputWidget
.oo-ui-flaggableElement-emptyGroupPlaceholder {
- color: grey;
+ color: #888;
}
diff --git a/modules/ve-cite/ve.ui.MWReferenceIcons.css
b/modules/ve-cite/ve.ui.MWReferenceIcons.css
index 0370747..813c23b 100644
--- a/modules/ve-cite/ve.ui.MWReferenceIcons.css
+++ b/modules/ve-cite/ve.ui.MWReferenceIcons.css
@@ -4,52 +4,63 @@
* @copyright 2011-2016 Cite VisualEditor Team and others; see AUTHORS.txt
* @license The MIT License (MIT); see LICENSE.txt
*/
-/*csslint duplicate-background-images:false */
/* @noflip */
.ve-ui-dir-block-rtl .oo-ui-icon-reference,
-/* HACK */ .ve-ui-surface-dir-rtl .oo-ui-icon-reference,
-/* HACK */ .oo-ui-rtl .oo-ui-icon-reference {
+/* HACK */
+.ve-ui-surface-dir-rtl .oo-ui-icon-reference,
+/* HACK */
+.oo-ui-rtl .oo-ui-icon-reference {
/* @embed */
background-image: url( icons/reference-rtl.svg );
}
/* @noflip */
.ve-ui-dir-block-ltr .oo-ui-icon-reference,
-/* HACK */ .ve-ui-surface-dir-ltr .oo-ui-icon-reference,
-/* HACK */ .oo-ui-ltr .oo-ui-icon-reference {
+/* HACK */
+.ve-ui-surface-dir-ltr .oo-ui-icon-reference,
+/* HACK */
+.oo-ui-ltr .oo-ui-icon-reference {
/* @embed */
background-image: url( icons/reference-ltr.svg );
}
/* @noflip */
.ve-ui-dir-block-rtl .oo-ui-icon-reference-existing,
-/* HACK */ .ve-ui-surface-dir-rtl .oo-ui-icon-reference-existing,
-/* HACK */ .oo-ui-rtl .oo-ui-icon-reference-existing {
+/* HACK */
+.ve-ui-surface-dir-rtl .oo-ui-icon-reference-existing,
+/* HACK */
+.oo-ui-rtl .oo-ui-icon-reference-existing {
/* @embed */
background-image: url( icons/reference-existing-rtl.svg );
}
/* @noflip */
.ve-ui-dir-block-ltr .oo-ui-icon-reference-existing,
-/* HACK */ .ve-ui-surface-dir-ltr .oo-ui-icon-reference-existing,
-/* HACK */ .oo-ui-ltr .oo-ui-icon-reference-existing {
+/* HACK */
+.ve-ui-surface-dir-ltr .oo-ui-icon-reference-existing,
+/* HACK */
+.oo-ui-ltr .oo-ui-icon-reference-existing {
/* @embed */
background-image: url( icons/reference-existing-ltr.svg );
}
/* @noflip */
.ve-ui-dir-block-rtl .oo-ui-icon-references,
-/* HACK */ .ve-ui-surface-dir-rtl .oo-ui-icon-references,
-/* HACK */ .oo-ui-rtl .oo-ui-icon-references {
+/* HACK */
+.ve-ui-surface-dir-rtl .oo-ui-icon-references,
+/* HACK */
+.oo-ui-rtl .oo-ui-icon-references {
/* @embed */
background-image: url( icons/references-rtl.svg );
}
/* @noflip */
.ve-ui-dir-block-ltr .oo-ui-icon-references,
-/* HACK */ .ve-ui-surface-dir-ltr .oo-ui-icon-references,
-/* HACK */ .oo-ui-ltr .oo-ui-icon-references {
+/* HACK */
+.ve-ui-surface-dir-ltr .oo-ui-icon-references,
+/* HACK */
+.oo-ui-ltr .oo-ui-icon-references {
/* @embed */
background-image: url( icons/references-ltr.svg );
}
@@ -61,32 +72,40 @@
/* @noflip */
.ve-ui-dir-block-rtl .oo-ui-icon-ref-cite-journal,
-/* HACK */ .ve-ui-surface-dir-rtl .oo-ui-icon-ref-cite-journal,
-/* HACK */ .oo-ui-rtl .oo-ui-icon-ref-cite-journal {
+/* HACK */
+.ve-ui-surface-dir-rtl .oo-ui-icon-ref-cite-journal,
+/* HACK */
+.oo-ui-rtl .oo-ui-icon-ref-cite-journal {
/* @embed */
background-image: url( icons/ref-cite-journal-rtl.svg );
}
/* @noflip */
.ve-ui-dir-block-ltr .oo-ui-icon-ref-cite-journal,
-/* HACK */ .ve-ui-surface-dir-ltr .oo-ui-icon-ref-cite-journal,
-/* HACK */ .oo-ui-ltr .oo-ui-icon-ref-cite-journal {
+/* HACK */
+.ve-ui-surface-dir-ltr .oo-ui-icon-ref-cite-journal,
+/* HACK */
+.oo-ui-ltr .oo-ui-icon-ref-cite-journal {
/* @embed */
background-image: url( icons/ref-cite-journal-ltr.svg );
}
/* @noflip */
.ve-ui-dir-block-rtl .oo-ui-icon-ref-cite-news,
-/* HACK */ .ve-ui-surface-dir-rtl .oo-ui-icon-ref-cite-news,
-/* HACK */ .oo-ui-rtl .oo-ui-icon-ref-cite-news {
+/* HACK */
+.ve-ui-surface-dir-rtl .oo-ui-icon-ref-cite-news,
+/* HACK */
+.oo-ui-rtl .oo-ui-icon-ref-cite-news {
/* @embed */
background-image: url( icons/ref-cite-news-rtl.svg );
}
/* @noflip */
.ve-ui-dir-block-ltr .oo-ui-icon-ref-cite-news,
-/* HACK */ .ve-ui-surface-dir-ltr .oo-ui-icon-ref-cite-news,
-/* HACK */ .oo-ui-ltr .oo-ui-icon-ref-cite-news {
+/* HACK */
+.ve-ui-surface-dir-ltr .oo-ui-icon-ref-cite-news,
+/* HACK */
+.oo-ui-ltr .oo-ui-icon-ref-cite-news {
/* @embed */
background-image: url( icons/ref-cite-news-ltr.svg );
}
diff --git a/package.json b/package.json
index f8be29d..7ff8593 100644
--- a/package.json
+++ b/package.json
@@ -12,6 +12,8 @@
"grunt-banana-checker": "0.4.0",
"grunt-contrib-jshint": "0.11.3",
"grunt-jsonlint": "1.0.7",
- "grunt-jscs": "2.5.0"
+ "grunt-jscs": "2.5.0",
+ "grunt-stylelint": "0.2.0",
+ "stylelint-config-wikimedia": "0.1.0"
}
}
--
To view, visit https://gerrit.wikimedia.org/r/289244
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8a9def8056a72c3da0c066413e94311a1d839f5b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Cite
Gerrit-Branch: master
Gerrit-Owner: Esanders <esand...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
