From: Volker E Date: Sat, 18 Feb 2017 13:08:56 +0000 (-0800) Subject: build: Enable declaration-block-no-duplicate-properties stylelint rule X-Git-Tag: 1.31.0-rc.0~4047^2~1 X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=commitdiff_plain;h=0f5ee958730812be6ded70348e3686dc76d4be8e build: Enable declaration-block-no-duplicate-properties stylelint rule Enabling declaration-block-no-duplicate-properties stylelint rule and making it pass. Amongst others, removing IE 7 specific debug CSS rules. Depends-on: I3859e04797203a64d82206a379dbb320e5e113d5 Change-Id: I0fa611fff61c13646a81193b7fa079f3427a0080 --- diff --git a/.stylelintrc b/.stylelintrc index b7e81d0ca9..d9b9a606c7 100644 --- a/.stylelintrc +++ b/.stylelintrc @@ -1,7 +1,6 @@ { "extends": "stylelint-config-wikimedia", "rules": { - "declaration-block-no-duplicate-properties": null, "declaration-no-important": null, "indentation": null, diff --git a/resources/src/jquery/jquery.badge.css b/resources/src/jquery/jquery.badge.css index 8b4bd7b3eb..7833979b41 100644 --- a/resources/src/jquery/jquery.badge.css +++ b/resources/src/jquery/jquery.badge.css @@ -21,7 +21,7 @@ display: inline-block; /* Hack for IE6 and IE7 (bug 47926) */ zoom: 1; - *display: inline; + *display: inline; /* stylelint-disable-line declaration-block-no-duplicate-properties */ } .mw-badge-overlay { diff --git a/resources/src/jquery/jquery.spinner.css b/resources/src/jquery/jquery.spinner.css index 76b48456bc..6c7bd0e660 100644 --- a/resources/src/jquery/jquery.spinner.css +++ b/resources/src/jquery/jquery.spinner.css @@ -36,5 +36,5 @@ /* IE < 8 */ zoom: 1; - *display: inline; + *display: inline; /* stylelint-disable-line declaration-block-no-duplicate-properties */ } diff --git a/resources/src/jquery/jquery.suggestions.css b/resources/src/jquery/jquery.suggestions.css index c32f25aa02..2cc0cc90ac 100644 --- a/resources/src/jquery/jquery.suggestions.css +++ b/resources/src/jquery/jquery.suggestions.css @@ -17,7 +17,6 @@ background-color: #fff; cursor: pointer; border: solid 1px #aaa; - padding: 0; margin: 0; margin-top: -2px; display: none; diff --git a/resources/src/mediawiki.action/mediawiki.action.edit.css b/resources/src/mediawiki.action/mediawiki.action.edit.css index 9b0c430c68..f68dbfafef 100644 --- a/resources/src/mediawiki.action/mediawiki.action.edit.css +++ b/resources/src/mediawiki.action/mediawiki.action.edit.css @@ -11,5 +11,5 @@ display: inline-block; /* IE7 */ zoom: 1; - *display: inline; + *display: inline; /* stylelint-disable declaration-block-no-duplicate-properties */ } diff --git a/resources/src/mediawiki.legacy/oldshared.css b/resources/src/mediawiki.legacy/oldshared.css index c36ddd977d..9434ce17ca 100644 --- a/resources/src/mediawiki.legacy/oldshared.css +++ b/resources/src/mediawiki.legacy/oldshared.css @@ -165,7 +165,7 @@ img { .toc { border: 1px solid #bba; background-color: #f7f8ff; - padding: 5px; + padding: 7px; font-size: 95%; text-align: center; display: inline-block; @@ -173,9 +173,7 @@ img { /* IE7 and earlier */ zoom: 1; - *display: inline; - - padding: 7px; + *display: inline; /* stylelint-disable-line declaration-block-no-duplicate-properties */ } /* CSS for backwards-compatibility with cached page renders and creative uses in wikitext */ diff --git a/resources/src/mediawiki.legacy/shared.css b/resources/src/mediawiki.legacy/shared.css index a9cd9477a7..2b79a5722d 100644 --- a/resources/src/mediawiki.legacy/shared.css +++ b/resources/src/mediawiki.legacy/shared.css @@ -266,7 +266,7 @@ input#wpSummary:active { margin: 0.125em 0; padding: 0 0.5em; zoom: 1; - display: inline !ie; + display: inline !ie; /* stylelint-disable-line declaration-block-no-duplicate-properties */ } .catlinks li:first-child { @@ -422,7 +422,7 @@ table.wikitable > caption { margin-bottom: 1em; display: inline-block; zoom: 1; - *display: inline; + *display: inline; /* stylelint-disable-line declaration-block-no-duplicate-properties */ } .errorbox h2, diff --git a/resources/src/mediawiki.skinning/content.css b/resources/src/mediawiki.skinning/content.css index 2cf2cb7a45..4cc2f09c89 100644 --- a/resources/src/mediawiki.skinning/content.css +++ b/resources/src/mediawiki.skinning/content.css @@ -35,7 +35,7 @@ /* IE7 and earlier */ zoom: 1; - *display: inline; + *display: inline; /* stylelint-disable declaration-block-no-duplicate-properties */ padding: 7px; } diff --git a/resources/src/mediawiki.ui/components/buttons.less b/resources/src/mediawiki.ui/components/buttons.less index 85795f44db..0e97a366ed 100644 --- a/resources/src/mediawiki.ui/components/buttons.less +++ b/resources/src/mediawiki.ui/components/buttons.less @@ -43,7 +43,7 @@ // IE 6 & 7 hack // https://stackoverflow.com/a/5838575/365238 - *display: inline; + *display: inline; /* stylelint-disable-line declaration-block-no-duplicate-properties */ zoom: 1; // Ensure that buttons and inputs are nicely aligned when they have differing heights diff --git a/resources/src/mediawiki.widgets.datetime/DateTimeInputWidget.less b/resources/src/mediawiki.widgets.datetime/DateTimeInputWidget.less index 183694f231..6317e9ed59 100644 --- a/resources/src/mediawiki.widgets.datetime/DateTimeInputWidget.less +++ b/resources/src/mediawiki.widgets.datetime/DateTimeInputWidget.less @@ -52,7 +52,6 @@ margin: 0; background-color: #fff; color: #000; - border: solid 1px #ccc; box-shadow: inset 0 0 0 0 @progressive; border-radius: 0.1em; .oo-ui-transition(box-shadow @quick-ease); diff --git a/resources/src/mediawiki/mediawiki.debug.less b/resources/src/mediawiki/mediawiki.debug.less index e1c8406555..a282a50d31 100644 --- a/resources/src/mediawiki/mediawiki.debug.less +++ b/resources/src/mediawiki/mediawiki.debug.less @@ -63,9 +63,6 @@ display: inline-block; padding: 10px 5px; font-size: 13px; - /* IE-hack for display: inline-block */ - zoom: 1; - *display: inline; } .mw-debug-panelink { diff --git a/resources/src/mediawiki/mediawiki.feedback.css b/resources/src/mediawiki/mediawiki.feedback.css index c392f2a377..6a93fddd67 100644 --- a/resources/src/mediawiki/mediawiki.feedback.css +++ b/resources/src/mediawiki/mediawiki.feedback.css @@ -1,7 +1,7 @@ .feedback-spinner { display: inline-block; zoom: 1; - *display: inline; /* IE7 and below */ + *display: inline; /* IE7 and below */ /* stylelint-disable declaration-block-no-duplicate-properties */ /* @embed */ background: url( mediawiki.feedback.spinner.gif ); width: 18px;