From 02c6d1b509598babf450ba18b00fb9537079f301 Mon Sep 17 00:00:00 2001 From: Moriel Schottlender Date: Wed, 20 Jun 2018 14:45:58 -0700 Subject: [PATCH] RCFilters: Readjust welcome text so results don't jump after load Bug: T197833 Change-Id: If3a433c84c53d80a4470fbc112b75c00cae20bac --- .../src/mediawiki.rcfilters/styles/mw.rcfilters.less | 9 +++++++-- .../mw.rcfilters.ui.WatchlistTopSectionWidget.less | 4 ++++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.less b/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.less index c6d8d17d3a..940d665290 100644 --- a/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.less +++ b/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.less @@ -5,9 +5,9 @@ @rcfilters-spinner-size: 12px; @rcfilters-head-min-height: 210px; @rcfilters-head-margin-bottom: 20px; -@rcfilters-wl-head-min-height: 270px; +@rcfilters-wl-head-min-height: 295px; @rcfilters-head-min-height-collapsed: 130px; -@rcfilters-wl-head-min-height-collapsed: 200px; +@rcfilters-wl-head-min-height-collapsed: 220px; // Corrections for the standard special page .client-js { @@ -24,6 +24,7 @@ // On the watchlist, reserve a bit more .mw-special-Watchlist .rcfilters-head { min-height: @rcfilters-wl-head-min-height; + } .mw-rcfilters-collapsed { @@ -160,6 +161,10 @@ // space. This makes the min-height trick work better. .watchlistDetails { float: left; + // The 20em should match the min-width we are setting up + // for the .mw-rcfilters-ui-watchlistTopSectionWidget-editWatchlistButton + // in mw.rcfilters.ui.WatchlistTopSectionWidget.less + width: ~'calc( 100% - 20em )'; } } diff --git a/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.WatchlistTopSectionWidget.less b/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.WatchlistTopSectionWidget.less index 4307c6f7c6..52f7ff20fc 100644 --- a/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.WatchlistTopSectionWidget.less +++ b/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.WatchlistTopSectionWidget.less @@ -7,6 +7,10 @@ &-editWatchlistButton { vertical-align: bottom; + // Match the width that we are setting up for the loading + // of the .watchlistDetails in mw.rcfilters.less + min-width: 20em; + text-align: right; // actual button .oo-ui-buttonWidget { -- 2.20.1