From 464990270920975d56709a6e01b363da72c6d35c Mon Sep 17 00:00:00 2001 From: =?utf8?q?Bartosz=20Dziewo=C5=84ski?= Date: Thu, 5 Sep 2019 21:09:00 +0200 Subject: [PATCH] rcfilters: Use default styling for the overlay MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit The class .oo-ui-defaultOverlay is used by OOUI, and all the skins already define reasonable font-size and z-index for it, so we can remove that here. Keep the existing class .mw-rcfilters-ui-overlay because apparently `right: 0; left: 0;` is required (that's weird…) and because Minerva also wants to override it (I221f6c2d637c7d2a843bfc4a2f7cd9877e2a5b12). Depends-On: I221f6c2d637c7d2a843bfc4a2f7cd9877e2a5b12 Change-Id: I672fdcebbdc586765de2c10f9a9a21796db57cc5 --- resources/Resources.php | 4 ---- .../mediawiki.rcfilters/styles/mw.rcfilters.ui.Overlay.less | 2 -- .../styles/mw.rcfilters.ui.Overlay.monobook.less | 3 --- .../styles/mw.rcfilters.ui.Overlay.vector.less | 4 ---- resources/src/mediawiki.rcfilters/ui/MainWrapperWidget.js | 2 +- 5 files changed, 1 insertion(+), 14 deletions(-) delete mode 100644 resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.Overlay.monobook.less delete mode 100644 resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.Overlay.vector.less diff --git a/resources/Resources.php b/resources/Resources.php index 8234e8970c..1eee348645 100644 --- a/resources/Resources.php +++ b/resources/Resources.php @@ -1860,11 +1860,7 @@ return [ 'styles/mw.rcfilters.ui.FilterTagMultiselectWidgetMobile.less' ], 'skinStyles' => [ - 'vector' => [ - 'styles/mw.rcfilters.ui.Overlay.vector.less', - ], 'monobook' => [ - 'styles/mw.rcfilters.ui.Overlay.monobook.less', 'styles/mw.rcfilters.ui.CapsuleItemWidget.monobook.less', 'styles/mw.rcfilters.ui.FilterMenuOptionWidget.monobook.less', ], diff --git a/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.Overlay.less b/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.Overlay.less index 06840da79b..c883309319 100644 --- a/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.Overlay.less +++ b/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.Overlay.less @@ -1,8 +1,6 @@ .mw-rcfilters-ui-overlay { - font-size: 0.875em; position: absolute; top: 0; right: 0; left: 0; - z-index: 1; } diff --git a/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.Overlay.monobook.less b/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.Overlay.monobook.less deleted file mode 100644 index fae2b321b8..0000000000 --- a/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.Overlay.monobook.less +++ /dev/null @@ -1,3 +0,0 @@ -.mw-rcfilters-ui-overlay { - font-size: 1.28em; /* 0.8em / x-small */ -} diff --git a/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.Overlay.vector.less b/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.Overlay.vector.less deleted file mode 100644 index 528707bed1..0000000000 --- a/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.Overlay.vector.less +++ /dev/null @@ -1,4 +0,0 @@ -// Fix z-index for the overlay in Vector, see T183442 -.mw-rcfilters-ui-overlay { - z-index: 101; -} diff --git a/resources/src/mediawiki.rcfilters/ui/MainWrapperWidget.js b/resources/src/mediawiki.rcfilters/ui/MainWrapperWidget.js index 31edb77b64..85794cdbb7 100644 --- a/resources/src/mediawiki.rcfilters/ui/MainWrapperWidget.js +++ b/resources/src/mediawiki.rcfilters/ui/MainWrapperWidget.js @@ -42,7 +42,7 @@ MainWrapperWidget = function MwRcfiltersUiMainWrapperWidget( this.$filtersContainer = config.$filtersContainer; this.$changesListContainer = config.$changesListContainer; this.$formContainer = config.$formContainer; - this.$overlay = $( '
' ).addClass( 'mw-rcfilters-ui-overlay' ); + this.$overlay = $( '
' ).addClass( 'mw-rcfilters-ui-overlay oo-ui-defaultOverlay' ); this.$wrapper = config.$wrapper || this.$element; this.savedLinksListWidget = new SavedLinksListWidget( -- 2.20.1