From 0ea9d4ca33d152a11e57b1bccdcbb1f9716b3ba2 Mon Sep 17 00:00:00 2001 From: Volker E Date: Mon, 20 Feb 2017 23:08:12 -0800 Subject: [PATCH] build: Enable selector-list-comma-newline-after stylelint rule Enabling selector-list-comma-newline-after stylelint rule and making it pass. Change-Id: I8fa3fbe03fcce57d555c47f39361c2a8d9828c3c --- .stylelintrc | 1 - mw-config/config-cc.css | 6 ++- mw-config/config.css | 3 +- resources/src/jquery/jquery.farbtastic.css | 6 ++- resources/src/mediawiki.legacy/oldshared.css | 7 ++- resources/src/mediawiki.legacy/shared.css | 5 +- resources/src/mediawiki.skinning/content.css | 8 +++- .../content.externallinks.css | 39 ++++++++++----- .../mediawiki.skinning/content.parsoid.less | 3 +- resources/src/mediawiki.skinning/elements.css | 16 +++++-- .../mediawiki.special/mediawiki.special.css | 3 +- .../mw.widgets.TitleWidget.less | 3 +- resources/src/mediawiki/mediawiki.apihelp.css | 3 +- resources/src/mediawiki/mediawiki.hlist.css | 48 ++++++++++++++----- .../src/mediawiki/page/gallery.print.css | 3 +- 15 files changed, 111 insertions(+), 43 deletions(-) diff --git a/.stylelintrc b/.stylelintrc index 5c01b67427..704b0cb7e6 100644 --- a/.stylelintrc +++ b/.stylelintrc @@ -8,7 +8,6 @@ "no-descending-specificity": null, "no-duplicate-selectors": null, - "selector-list-comma-newline-after": null, "selector-no-id": null, "selector-pseudo-element-colon-notation": null, diff --git a/mw-config/config-cc.css b/mw-config/config-cc.css index f9c61178aa..3b2798fc1e 100644 --- a/mw-config/config-cc.css +++ b/mw-config/config-cc.css @@ -29,7 +29,11 @@ body { margin: 0 0 10px 10px; } -td, h3, p, h1, pre { +h1, +h3, +p, +pre, +td { margin: 0 20px 20px 20px; font-size: 11px; line-height: 140%; diff --git a/mw-config/config.css b/mw-config/config.css index 151de3e0db..10a6de8067 100644 --- a/mw-config/config.css +++ b/mw-config/config.css @@ -18,7 +18,8 @@ margin-bottom: 0.2em; } -.config-block-label label, .config-label { +.config-block-label label, +.config-label { font-weight: bold; padding-right: 0.5em; padding-top: 0.2em; diff --git a/resources/src/jquery/jquery.farbtastic.css b/resources/src/jquery/jquery.farbtastic.css index b7e0af531b..0cba34f496 100644 --- a/resources/src/jquery/jquery.farbtastic.css +++ b/resources/src/jquery/jquery.farbtastic.css @@ -23,11 +23,13 @@ position: absolute; cursor: crosshair; } -.farbtastic, .farbtastic .wheel { +.farbtastic, +.farbtastic .wheel { width: 195px; height: 195px; } -.farbtastic .color, .farbtastic .overlay { +.farbtastic .color, +.farbtastic .overlay { top: 47px; left: 47px; width: 101px; diff --git a/resources/src/mediawiki.legacy/oldshared.css b/resources/src/mediawiki.legacy/oldshared.css index e4e3977b17..a46e51d6ae 100644 --- a/resources/src/mediawiki.legacy/oldshared.css +++ b/resources/src/mediawiki.legacy/oldshared.css @@ -32,7 +32,12 @@ h6 { font-size: 1em; } -h1, h2, h3, h4, h5, h6 { +h1, +h2, +h3, +h4, +h5, +h6 { font-weight: bolder; } diff --git a/resources/src/mediawiki.legacy/shared.css b/resources/src/mediawiki.legacy/shared.css index 80bdf1a09e..15bf67622c 100644 --- a/resources/src/mediawiki.legacy/shared.css +++ b/resources/src/mediawiki.legacy/shared.css @@ -602,6 +602,7 @@ h1:lang( te ) { line-height: 1.6em !important; } +/* stylelint-disable selector-list-comma-newline-after */ h2:lang( anp ), h3:lang( anp ), h4:lang( anp ), h5:lang( anp ), h6:lang( anp ), h2:lang( as ), h3:lang( as ), h4:lang( as ), h5:lang( as ), h6:lang( as ), h2:lang( bho ), h3:lang( bho ), h4:lang( bho ), h5:lang( bho ), h6:lang( bho ), @@ -625,6 +626,7 @@ h2:lang( ta ), h3:lang( ta ), h4:lang( ta ), h5:lang( ta ), h6:lang( ta ), h2:lang( te ), h3:lang( te ), h4:lang( te ), h5:lang( te ), h6:lang( te ) { line-height: 1.2em; } +/* stylelint-enable selector-list-comma-newline-after */ /* Localised ordered list numbering for some languages */ ol:lang( azb ) li, @@ -664,7 +666,8 @@ ol:lang( or ) li { list-style-type: oriya; } -#toc ul, .toc ul { +#toc ul, +.toc ul { margin: 0.3em 0; } diff --git a/resources/src/mediawiki.skinning/content.css b/resources/src/mediawiki.skinning/content.css index 23c01ad0e6..5ded184f1f 100644 --- a/resources/src/mediawiki.skinning/content.css +++ b/resources/src/mediawiki.skinning/content.css @@ -121,7 +121,9 @@ table.toc td { } /* Images */ -/* @noflip */div.floatright, table.floatright { +/* @noflip */ +div.floatright, +table.floatright { margin: 0 0 0.5em 0.5em; } @@ -129,7 +131,9 @@ div.floatright p { font-style: italic; } -/* @noflip */div.floatleft, table.floatleft { +/* @noflip */ +div.floatleft, +table.floatleft { margin: 0 0.5em 0.5em 0; } diff --git a/resources/src/mediawiki.skinning/content.externallinks.css b/resources/src/mediawiki.skinning/content.externallinks.css index a744e29b9a..823ce05b4c 100644 --- a/resources/src/mediawiki.skinning/content.externallinks.css +++ b/resources/src/mediawiki.skinning/content.externallinks.css @@ -44,12 +44,18 @@ padding-right: 15px; } -.mw-body a.external[href$=".ogg"], .mw-body a.external[href$=".OGG"], -.mw-body a.external[href$=".mid"], .mw-body a.external[href$=".MID"], -.mw-body a.external[href$=".midi"], .mw-body a.external[href$=".MIDI"], -.mw-body a.external[href$=".mp3"], .mw-body a.external[href$=".MP3"], -.mw-body a.external[href$=".wav"], .mw-body a.external[href$=".WAV"], -.mw-body a.external[href$=".wma"], .mw-body a.external[href$=".WMA"], +.mw-body a.external[href$=".ogg"], +.mw-body a.external[href$=".OGG"], +.mw-body a.external[href$=".mid"], +.mw-body a.external[href$=".MID"], +.mw-body a.external[href$=".midi"], +.mw-body a.external[href$=".MIDI"], +.mw-body a.external[href$=".mp3"], +.mw-body a.external[href$=".MP3"], +.mw-body a.external[href$=".wav"], +.mw-body a.external[href$=".WAV"], +.mw-body a.external[href$=".wma"], +.mw-body a.external[href$=".WMA"], .link-audio { background: url( images/audio-ltr.png ) center right no-repeat; /* @embed */ @@ -57,10 +63,14 @@ padding-right: 15px; } -.mw-body a.external[href$=".ogm"], .mw-body a.external[href$=".OGM"], -.mw-body a.external[href$=".avi"], .mw-body a.external[href$=".AVI"], -.mw-body a.external[href$=".mpeg"], .mw-body a.external[href$=".MPEG"], -.mw-body a.external[href$=".mpg"], .mw-body a.external[href$=".MPG"], +.mw-body a.external[href$=".ogm"], +.mw-body a.external[href$=".OGM"], +.mw-body a.external[href$=".avi"], +.mw-body a.external[href$=".AVI"], +.mw-body a.external[href$=".mpeg"], +.mw-body a.external[href$=".MPEG"], +.mw-body a.external[href$=".mpg"], +.mw-body a.external[href$=".MPG"], .link-video { background: url( images/video.png ) center right no-repeat; /* @embed */ @@ -68,9 +78,12 @@ padding-right: 15px; } -.mw-body a.external[href$=".pdf"], .mw-body a.external[href$=".PDF"], -.mw-body a.external[href*=".pdf#"], .mw-body a.external[href*=".PDF#"], -.mw-body a.external[href*=".pdf?"], .mw-body a.external[href*=".PDF?"], +.mw-body a.external[href$=".pdf"], +.mw-body a.external[href$=".PDF"], +.mw-body a.external[href*=".pdf#"], +.mw-body a.external[href*=".PDF#"], +.mw-body a.external[href*=".pdf?"], +.mw-body a.external[href*=".PDF?"], .link-document { background: url( images/document-ltr.png ) center right no-repeat; /* @embed */ diff --git a/resources/src/mediawiki.skinning/content.parsoid.less b/resources/src/mediawiki.skinning/content.parsoid.less index 72126f3e84..31bb318682 100644 --- a/resources/src/mediawiki.skinning/content.parsoid.less +++ b/resources/src/mediawiki.skinning/content.parsoid.less @@ -38,7 +38,8 @@ span.reference { unicode-bidi: isolate; } -sup, sub { +sup, +sub { line-height: 1; } diff --git a/resources/src/mediawiki.skinning/elements.css b/resources/src/mediawiki.skinning/elements.css index 3fbbbc95d7..46de7b5085 100644 --- a/resources/src/mediawiki.skinning/elements.css +++ b/resources/src/mediawiki.skinning/elements.css @@ -25,7 +25,8 @@ a:active { color: #faa700; } -a:hover, a:focus { +a:hover, +a:focus { text-decoration: underline; } @@ -41,11 +42,13 @@ a.stub { color: #723; } -a.new, #p-personal a.new { +a.new, +#p-personal a.new { color: #ba0000; } -a.new:visited, #p-personal a.new:visited { +a.new:visited, +#p-personal a.new:visited { color: #a55858; } @@ -194,7 +197,12 @@ dd { margin-bottom: 0.1em; } -pre, code, tt, kbd, samp, .mw-code { +pre, +code, +tt, +kbd, +samp, +.mw-code { /* * Some browsers will render the monospace text too small, namely Firefox, Chrome and Safari. * Specifying any valid, second value will trigger correct behavior without forcing a different font. diff --git a/resources/src/mediawiki.special/mediawiki.special.css b/resources/src/mediawiki.special/mediawiki.special.css index 4b8eced6fd..3ad8005458 100644 --- a/resources/src/mediawiki.special/mediawiki.special.css +++ b/resources/src/mediawiki.special/mediawiki.special.css @@ -16,7 +16,8 @@ } /* Common for Special:Allpages and Special:PrefixIndex */ -.mw-allpages-body, .mw-prefixindex-body { +.mw-allpages-body, +.mw-prefixindex-body { columns: 22em 3; -moz-columns: 22em 3; -webkit-columns: 22em 3; diff --git a/resources/src/mediawiki.widgets/mw.widgets.TitleWidget.less b/resources/src/mediawiki.widgets/mw.widgets.TitleWidget.less index b1c0f90d87..bbffe28920 100644 --- a/resources/src/mediawiki.widgets/mw.widgets.TitleWidget.less +++ b/resources/src/mediawiki.widgets/mw.widgets.TitleWidget.less @@ -48,7 +48,8 @@ } } - &.oo-ui-optionWidget-highlighted, &.oo-ui-optionWidget-selected { + &.oo-ui-optionWidget-highlighted, + &.oo-ui-optionWidget-selected { &.oo-ui-iconElement > .mw-widget-titleOptionWidget-hasImage { opacity: 1; } diff --git a/resources/src/mediawiki/mediawiki.apihelp.css b/resources/src/mediawiki/mediawiki.apihelp.css index 25ab2d0e7b..9a5a66f1aa 100644 --- a/resources/src/mediawiki/mediawiki.apihelp.css +++ b/resources/src/mediawiki/mediawiki.apihelp.css @@ -33,7 +33,8 @@ div.apihelp-linktrail { width: 20em; } -.apihelp-deprecated, .apihelp-flag-deprecated, +.apihelp-deprecated, +.apihelp-flag-deprecated, .apihelp-flag-internal strong { font-weight: bold; color: #f00; diff --git a/resources/src/mediawiki/mediawiki.hlist.css b/resources/src/mediawiki/mediawiki.hlist.css index 1662f0f0cd..5a37f45ef9 100644 --- a/resources/src/mediawiki/mediawiki.hlist.css +++ b/resources/src/mediawiki/mediawiki.hlist.css @@ -16,9 +16,15 @@ display: inline; } /* Display nested lists inline */ -.hlist dl dl, .hlist dl ol, .hlist dl ul, -.hlist ol dl, .hlist ol ol, .hlist ol ul, -.hlist ul dl, .hlist ul ol, .hlist ul ul { +.hlist dl dl, +.hlist dl ol, +.hlist dl ul, +.hlist ol dl, +.hlist ol ol, +.hlist ol ul, +.hlist ul dl, +.hlist ul ol, +.hlist ul ul { display: inline; } /* Generate interpuncts */ @@ -42,22 +48,40 @@ content: none; } /* Add parentheses around nested lists */ -.hlist dd dd:first-child:before, .hlist dd dt:first-child:before, .hlist dd li:first-child:before, -.hlist dt dd:first-child:before, .hlist dt dt:first-child:before, .hlist dt li:first-child:before, -.hlist li dd:first-child:before, .hlist li dt:first-child:before, .hlist li li:first-child:before { +.hlist dd dd:first-child:before, +.hlist dd dt:first-child:before, +.hlist dd li:first-child:before, +.hlist dt dd:first-child:before, +.hlist dt dt:first-child:before, +.hlist dt li:first-child:before, +.hlist li dd:first-child:before, +.hlist li dt:first-child:before, +.hlist li li:first-child:before { content: "("; font-weight: normal; } -.hlist dd dd:last-child:after, .hlist dd dt:last-child:after, .hlist dd li:last-child:after, -.hlist dt dd:last-child:after, .hlist dt dt:last-child:after, .hlist dt li:last-child:after, -.hlist li dd:last-child:after, .hlist li dt:last-child:after, .hlist li li:last-child:after { +.hlist dd dd:last-child:after, +.hlist dd dt:last-child:after, +.hlist dd li:last-child:after, +.hlist dt dd:last-child:after, +.hlist dt dt:last-child:after, +.hlist dt li:last-child:after, +.hlist li dd:last-child:after, +.hlist li dt:last-child:after, +.hlist li li:last-child:after { content: ")"; font-weight: normal; } /* For IE8 */ -.hlist dd dd.hlist-last-child:after, .hlist dd dt.hlist-last-child:after, .hlist dd li.hlist-last-child:after, -.hlist dt dd.hlist-last-child:after, .hlist dt dt.hlist-last-child:after, .hlist dt li.hlist-last-child:after, -.hlist li dd.hlist-last-child:after, .hlist li dt.hlist-last-child:after, .hlist li li.hlist-last-child:after { +.hlist dd dd.hlist-last-child:after, +.hlist dd dt.hlist-last-child:after, +.hlist dd li.hlist-last-child:after, +.hlist dt dd.hlist-last-child:after, +.hlist dt dt.hlist-last-child:after, +.hlist dt li.hlist-last-child:after, +.hlist li dd.hlist-last-child:after, +.hlist li dt.hlist-last-child:after, +.hlist li li.hlist-last-child:after { content: ")"; font-weight: normal; } diff --git a/resources/src/mediawiki/page/gallery.print.css b/resources/src/mediawiki/page/gallery.print.css index 0c14865e79..80fc96491f 100644 --- a/resources/src/mediawiki/page/gallery.print.css +++ b/resources/src/mediawiki/page/gallery.print.css @@ -3,7 +3,8 @@ li.gallerybox { display: inline-block; } -ul.gallery, li.gallerybox { +ul.gallery, +li.gallerybox { zoom: 1; *display: inline; } -- 2.20.1