From dbb49fd425c0a71c68b74667b7fe25a59b3ce17e Mon Sep 17 00:00:00 2001 From: Volker E Date: Fri, 18 Jan 2019 16:15:52 -0800 Subject: [PATCH] Reduce selector specificity of `.wikitable` Reducing selector specificity by removing `table` from `.wikitable`. All use cases seem to be covered by direct child `>` selectors anyways. Bug: T214218 Change-Id: Iae532d6389348972a85404926aaa0c45de7e02e1 --- ...mediawiki.action.edit.collapsibleFooter.css | 4 ++-- resources/src/mediawiki.legacy/commonPrint.css | 18 +++++++++--------- resources/src/mediawiki.legacy/shared.css | 16 ++++++++-------- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/resources/src/mediawiki.action/mediawiki.action.edit.collapsibleFooter.css b/resources/src/mediawiki.action/mediawiki.action.edit.collapsibleFooter.css index 1af4a7a0a0..b5a96654f9 100644 --- a/resources/src/mediawiki.action/mediawiki.action.edit.collapsibleFooter.css +++ b/resources/src/mediawiki.action/mediawiki.action.edit.collapsibleFooter.css @@ -11,7 +11,7 @@ } /* Show/hide animation is incorrect if the table has a margin set. Extra - * "table.wikitable" is needed in the selector for CSS specificity. */ -table.wikitable.preview-limit-report { + * ".wikitable" is needed in the selector for CSS specificity. */ +.wikitable.preview-limit-report { margin: 0; } diff --git a/resources/src/mediawiki.legacy/commonPrint.css b/resources/src/mediawiki.legacy/commonPrint.css index acec9ca95d..c21b254216 100644 --- a/resources/src/mediawiki.legacy/commonPrint.css +++ b/resources/src/mediawiki.legacy/commonPrint.css @@ -283,8 +283,8 @@ img.thumbborder { /** * Table rendering */ -/* Compare `table.wikitable` in shared.css */ -table.wikitable, +/* Compare `.wikitable` in shared.css */ +.wikitable, .mw_metadata { background: #fff; margin: 1em 0; @@ -293,16 +293,16 @@ table.wikitable, font-size: 10pt; } -table.wikitable > caption, +.wikitable > caption, .mw_metadata caption { padding: 5px; font-size: 10pt; } -table.wikitable > tr > th, -table.wikitable > tr > td, -table.wikitable > * > tr > th, -table.wikitable > * > tr > td, +.wikitable > tr > th, +.wikitable > tr > td, +.wikitable > * > tr > th, +.wikitable > * > tr > td, .mw_metadata th, .mw_metadata td { /* Important is required to override any inline styles provided by editors */ @@ -313,8 +313,8 @@ table.wikitable > * > tr > td, padding: 0.4em 0.6em; } -table.wikitable > tr > th, -table.wikitable > * > tr > th, +.wikitable > tr > th, +.wikitable > * > tr > th, .mw_metadata th { text-align: center; } diff --git a/resources/src/mediawiki.legacy/shared.css b/resources/src/mediawiki.legacy/shared.css index a98a73f1e1..0e08ef8e1d 100644 --- a/resources/src/mediawiki.legacy/shared.css +++ b/resources/src/mediawiki.legacy/shared.css @@ -326,7 +326,7 @@ a.new { * wikitable class for skinning normal tables * keep in sync with commonPrint.css */ -table.wikitable { +.wikitable { background-color: #f8f9fa; color: #222; margin: 1em 0; @@ -334,21 +334,21 @@ table.wikitable { border-collapse: collapse; } -table.wikitable > tr > th, -table.wikitable > tr > td, -table.wikitable > * > tr > th, -table.wikitable > * > tr > td { +.wikitable > tr > th, +.wikitable > tr > td, +.wikitable > * > tr > th, +.wikitable > * > tr > td { border: 1px solid #a2a9b1; padding: 0.2em 0.4em; } -table.wikitable > tr > th, -table.wikitable > * > tr > th { +.wikitable > tr > th, +.wikitable > * > tr > th { background-color: #eaecf0; text-align: center; } -table.wikitable > caption { +.wikitable > caption { font-weight: bold; } -- 2.20.1