From d1d85f72ff2d044fcd7aa9f5fa1938259a62af4a Mon Sep 17 00:00:00 2001 From: Volker E Date: Mon, 20 Feb 2017 22:42:38 -0800 Subject: [PATCH] build: Enable no-duplicate-selectors stylelint rule Enabling no-duplicate-selectors stylelint rule and making it pass. Change-Id: Ib62b463898098eea1301f0ddfcd4837498272dd4 --- .stylelintrc | 1 - .../mediawiki.action.view.filepage.css | 20 ++++++------------- .../src/mediawiki.legacy/commonPrint.css | 14 ++++--------- resources/src/mediawiki.legacy/oldshared.css | 18 +++++------------ resources/src/mediawiki.legacy/shared.css | 8 +------- .../CalendarWidget.less | 1 + .../DateTimeInputWidget.less | 1 + .../mw.widgets.CalendarWidget.less | 1 + 8 files changed, 19 insertions(+), 45 deletions(-) diff --git a/.stylelintrc b/.stylelintrc index 5c01b67427..41702aad98 100644 --- a/.stylelintrc +++ b/.stylelintrc @@ -6,7 +6,6 @@ "indentation": null, "no-descending-specificity": null, - "no-duplicate-selectors": null, "selector-list-comma-newline-after": null, "selector-no-id": null, diff --git a/resources/src/mediawiki.action/mediawiki.action.view.filepage.css b/resources/src/mediawiki.action/mediawiki.action.view.filepage.css index 185523a660..d4662161fc 100644 --- a/resources/src/mediawiki.action/mediawiki.action.view.filepage.css +++ b/resources/src/mediawiki.action/mediawiki.action.view.filepage.css @@ -76,6 +76,8 @@ font-size: 0.8em; margin-left: 0.5em; margin-bottom: 0.5em; + border: 0; + border-collapse: collapse; width: 400px; } @@ -83,20 +85,6 @@ font-weight: bold; } -.mw_metadata th { - font-weight: normal; - text-align: center; -} - -.mw_metadata td { - padding: 0.1em; -} - -.mw_metadata { - border: 0; - border-collapse: collapse; -} - .mw_metadata td, .mw_metadata th { border: 1px solid #a2a9b1; @@ -106,10 +94,14 @@ .mw_metadata th { background-color: #f8f9fa; + font-weight: normal; + text-align: center; } .mw_metadata td { background-color: #fcfcfc; + padding-top: 0.1em; + padding-bottom: 0.1em; } .mw_metadata ul.metadata-langlist { diff --git a/resources/src/mediawiki.legacy/commonPrint.css b/resources/src/mediawiki.legacy/commonPrint.css index ed21303f1e..7c2f92bca9 100644 --- a/resources/src/mediawiki.legacy/commonPrint.css +++ b/resources/src/mediawiki.legacy/commonPrint.css @@ -182,22 +182,16 @@ a { content: " (https:" attr( href ) ")"; } -/* MSIE/Win doesn't understand 'inherit' */ a, a.external, a.new, a.stub { + /* IE 6 & 7 don't understand `inherit` */ color: #000 !important; text-decoration: none !important; -} - -/* Continue ... */ -a, -a.external, -a.new, -a.stub { - color: inherit !important; - text-decoration: inherit !important; + /* Modern browser will apply this, IE 6 & 7 ignore the unknown */ + color: inherit !important; /* stylelint-disable-line declaration-block-no-duplicate-properties */ + text-decoration: inherit !important; /* stylelint-disable-line declaration-block-no-duplicate-properties */ } /** diff --git a/resources/src/mediawiki.legacy/oldshared.css b/resources/src/mediawiki.legacy/oldshared.css index e4e3977b17..d1f58c2207 100644 --- a/resources/src/mediawiki.legacy/oldshared.css +++ b/resources/src/mediawiki.legacy/oldshared.css @@ -329,25 +329,14 @@ li span.deleted { /* Classes for Exif data display */ table.mw_metadata { margin-left: 0.5em; + border: 0; + border-collapse: collapse; } table.mw_metadata caption { font-weight: bold; } -table.mw_metadata th { - font-weight: normal; -} - -table.mw_metadata td { - padding: 0.1em; -} - -table.mw_metadata { - border: 0; - border-collapse: collapse; -} - table.mw_metadata td, table.mw_metadata th { border: 1px solid #aaa; @@ -357,10 +346,13 @@ table.mw_metadata th { table.mw_metadata th { background-color: #f9f9f9; + font-weight: normal; } table.mw_metadata td { background-color: #fcfcfc; + padding-top: 0.1em; + padding-bottom: 0.1em; } table.mw_metadata td.spacer { diff --git a/resources/src/mediawiki.legacy/shared.css b/resources/src/mediawiki.legacy/shared.css index 80bdf1a09e..1a7070ea6b 100644 --- a/resources/src/mediawiki.legacy/shared.css +++ b/resources/src/mediawiki.legacy/shared.css @@ -166,6 +166,7 @@ div.patrollink { */ td.mw-label { text-align: right; + vertical-align: middle; } td.mw-input { @@ -174,13 +175,6 @@ td.mw-input { td.mw-submit { text-align: left; -} - -td.mw-label { - vertical-align: middle; -} - -td.mw-submit { white-space: nowrap; } diff --git a/resources/src/mediawiki.widgets.datetime/CalendarWidget.less b/resources/src/mediawiki.widgets.datetime/CalendarWidget.less index 413efd46ed..b5b9cbed2f 100644 --- a/resources/src/mediawiki.widgets.datetime/CalendarWidget.less +++ b/resources/src/mediawiki.widgets.datetime/CalendarWidget.less @@ -1,3 +1,4 @@ +/* stylelint-disable no-duplicate-selectors */ @import "mediawiki.widgets.datetime.definitions"; .mw-widgets-datetime-calendarWidget { diff --git a/resources/src/mediawiki.widgets.datetime/DateTimeInputWidget.less b/resources/src/mediawiki.widgets.datetime/DateTimeInputWidget.less index 6317e9ed59..1c6c490f7b 100644 --- a/resources/src/mediawiki.widgets.datetime/DateTimeInputWidget.less +++ b/resources/src/mediawiki.widgets.datetime/DateTimeInputWidget.less @@ -1,3 +1,4 @@ +/* stylelint-disable no-duplicate-selectors */ @import "mediawiki.widgets.datetime.definitions"; .mw-widgets-datetime-dateTimeInputWidget { diff --git a/resources/src/mediawiki.widgets/mw.widgets.CalendarWidget.less b/resources/src/mediawiki.widgets/mw.widgets.CalendarWidget.less index aa5c60a0e9..b929a5aa2b 100644 --- a/resources/src/mediawiki.widgets/mw.widgets.CalendarWidget.less +++ b/resources/src/mediawiki.widgets/mw.widgets.CalendarWidget.less @@ -5,6 +5,7 @@ * @license The MIT License (MIT); see LICENSE.txt */ +/* stylelint-disable no-duplicate-selectors */ @import 'mediawiki.mixins'; @calendarWidth: 21em; -- 2.20.1