jenkins-bot has submitted this change and it was merged. Change subject: Explicitly float local search results left so they come first ......................................................................
Explicitly float local search results left so they come first Invert HTML output order; div#mw-search-interwiki already floats right and this way it goes up only if there is enough space for it. Clear both before the search pager, so that it stays where it is. See https://phabricator.wikimedia.org/F2610402 for Chromium test. Bug: T87631 Change-Id: Ieabb9ded4325e47a53a430c7af7d5b986bc20f2d --- M includes/specials/SpecialSearch.php M resources/src/mediawiki.special/mediawiki.special.search.css 2 files changed, 6 insertions(+), 4 deletions(-) Approvals: Bartosz Dziewoński: Looks good to me, approved jenkins-bot: Verified diff --git a/includes/specials/SpecialSearch.php b/includes/specials/SpecialSearch.php index af2dc94..f727a9a 100644 --- a/includes/specials/SpecialSearch.php +++ b/includes/specials/SpecialSearch.php @@ -369,13 +369,13 @@ $out->wrapWikiMsg( "==$1==\n", 'textmatches' ); } - // show interwiki results if any - if ( $textMatches->hasInterwikiResults() ) { - $out->addHTML( $this->showInterwiki( $textMatches->getInterwikiResults(), $term ) ); - } // show results if ( $numTextMatches > 0 ) { $out->addHTML( $this->showMatches( $textMatches ) ); + } + // show interwiki results if any + if ( $textMatches->hasInterwikiResults() ) { + $out->addHTML( $this->showInterwiki( $textMatches->getInterwikiResults(), $term ) ); } $textMatches->free(); @@ -391,6 +391,7 @@ } } + $out->addHTML( '<div class="visualClear"></div>\n' ); if ( $prevnext ) { $out->addHTML( "<p class='mw-search-pager-bottom'>{$prevnext}</p>\n" ); } diff --git a/resources/src/mediawiki.special/mediawiki.special.search.css b/resources/src/mediawiki.special/mediawiki.special.search.css index 8f845df..b869314 100644 --- a/resources/src/mediawiki.special/mediawiki.special.search.css +++ b/resources/src/mediawiki.special/mediawiki.special.search.css @@ -27,6 +27,7 @@ } .mw-search-results { margin-left: 0.4em; + float: left; } .mw-search-results li { padding-bottom: 1.2em; -- To view, visit https://gerrit.wikimedia.org/r/238808 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ieabb9ded4325e47a53a430c7af7d5b986bc20f2d Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Nemo bis <federicol...@tiscali.it> Gerrit-Reviewer: Bartosz Dziewoński <matma....@gmail.com> Gerrit-Reviewer: Edokter <er...@darcoury.nl> Gerrit-Reviewer: Jack Phoenix <j...@countervandalism.net> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
