From: Jan Drewniak Date: Fri, 7 Apr 2017 08:35:20 +0000 (+0200) Subject: Revised styling of sister-search sidebar. X-Git-Tag: 1.31.0-rc.0~3293^2 X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=commitdiff_plain;h=a0f492fffcc24bb42b41b314b18da3b673b70b03 Revised styling of sister-search sidebar. Various improvements to the sister-search sidebar: - using WM project favicons - scoping CSS specific to sister-search sidebar - making sister-search items more compact Bug: T160724, T158938 Change-Id: I2794121ab83cbd4e2b8868150e4d61db376fa63b --- diff --git a/includes/specials/SpecialSearch.php b/includes/specials/SpecialSearch.php index 3a931075b2..ceb6b7be6f 100644 --- a/includes/specials/SpecialSearch.php +++ b/includes/specials/SpecialSearch.php @@ -352,12 +352,16 @@ class SpecialSearch extends SpecialPage { $out->addHTML( $dymWidget->render( $term, $textMatches ) ); } - $out->addHTML( "
" ); - $hasErrors = $textStatus && $textStatus->getErrors(); $hasOtherResults = $textMatches && $textMatches->hasInterwikiResults( SearchResultSet::INLINE_RESULTS ); + if ( $textMatches->hasInterwikiResults( SearchResultSet::SECONDARY_RESULTS ) ) { + $out->addHTML( '
' ); + } else { + $out->addHTML( '
' ); + } + if ( $hasErrors ) { list( $error, $warning ) = $textStatus->splitByErrorType(); if ( $error->getErrors() ) { diff --git a/includes/widget/search/InterwikiSearchResultSetWidget.php b/includes/widget/search/InterwikiSearchResultSetWidget.php index 1911c7909f..3cdda0262a 100644 --- a/includes/widget/search/InterwikiSearchResultSetWidget.php +++ b/includes/widget/search/InterwikiSearchResultSetWidget.php @@ -8,6 +8,7 @@ use SearchResultSet; use SpecialSearch; use Title; use Html; +use OOUI; /** * Renders one or more SearchResultSets into a sidebar grouped by @@ -27,8 +28,6 @@ class InterwikiSearchResultSetWidget implements SearchResultSetWidget { protected $iwLookup; /** @var $output */ protected $output; - /** @var $iwPrefixDisplayTypes */ - protected $iwPrefixDisplayTypes; public function __construct( SpecialSearch $specialSearch, @@ -41,9 +40,6 @@ class InterwikiSearchResultSetWidget implements SearchResultSetWidget { $this->linkRenderer = $linkRenderer; $this->iwLookup = $iwLookup; $this->output = $specialSearch->getOutput(); - $this->iwPrefixDisplayTypes = $specialSearch->getConfig()->get( - 'InterwikiPrefixDisplayTypes' - ); } /** * @param string $term User provided search term @@ -80,22 +76,17 @@ class InterwikiSearchResultSetWidget implements SearchResultSetWidget { $position = 0; $iwResultItemOutput = ''; - $iwDisplayType = isset( $this->iwPrefixDisplayTypes[$iwPrefix] ) - ? $this->iwPrefixDisplayTypes[$iwPrefix] - : ""; - foreach ( $results as $result ) { $iwResultItemOutput .= $this->resultWidget->render( $result, $term, $position++ ); } - $headerHtml = $this->headerHtml( $term, $iwPrefix ); $footerHtml = $this->footerHtml( $term, $iwPrefix ); $iwResultListOutput .= Html::rawElement( 'li', [ - 'class' => 'iw-resultset iw-resultset--' . $iwDisplayType, + 'class' => 'iw-resultset', 'data-iw-resultset-pos' => $iwResultSetPos ], - $headerHtml . + $iwResultItemOutput . $footerHtml ); @@ -117,34 +108,6 @@ class InterwikiSearchResultSetWidget implements SearchResultSetWidget { ); } - /** - * Generates an appropriate HTML header for the given interwiki prefix - * - * @param string $term User provided search term - * @param string $iwPrefix Interwiki prefix of wiki to show header for - * @return string HTML - */ - protected function headerHtml( $term, $iwPrefix ) { - - $iwDisplayType = isset( $this->iwPrefixDisplayTypes[$iwPrefix] ) - ? $this->iwPrefixDisplayTypes[$iwPrefix] - : ""; - - if ( isset( $this->customCaptions[$iwPrefix] ) ) { - /* customCaptions composed by loadCustomCaptions() with pre-escaped content. */ - $caption = $this->customCaptions[$iwPrefix]; - } else { - $interwiki = $this->iwLookup->fetch( $iwPrefix ); - $parsed = wfParseUrl( wfExpandUrl( $interwiki ? $interwiki->getURL() : '/' ) ); - $caption = $this->specialSearch->msg( 'search-interwiki-default', $parsed['host'] )->escaped(); - } - - return Html::rawElement( 'div', [ 'class' => 'iw-result__header' ], - Html::rawElement( 'span', [ 'class' => 'iw-result__icon iw-result__icon--' . $iwDisplayType ] ) - . $caption - ); - } - /** * Generates an HTML footer for the given interwiki prefix * @@ -158,13 +121,22 @@ class InterwikiSearchResultSetWidget implements SearchResultSetWidget { [ 'search' => $term, 'fulltext' => 1 ] ); - $searchLink = Html::rawElement( - 'a', - [ 'href' => $href ], - $this->specialSearch->msg( 'search-interwiki-more-results' )->escaped() + $interwiki = $this->iwLookup->fetch( $iwPrefix ); + $parsed = wfParseUrl( wfExpandUrl( $interwiki ? $interwiki->getURL() : '/' ) ); + + if ( isset( $this->customCaptions[$iwPrefix] ) ) { + $caption = $this->customCaptions[$iwPrefix]; + } else { + $caption = $this->specialSearch->msg( 'search-interwiki-default', $parsed['host'] )->escaped(); + } + + $searchLink = Html::rawElement( 'em', null, + Html::rawElement( 'a', [ 'href' => $href, 'target' => '_blank' ], $caption ) ); - return Html::rawElement( 'div', [ 'class' => 'iw-result__footer' ], $searchLink ); + return Html::rawElement( 'div', + [ 'class' => 'iw-result__footer' ], + $this->iwIcon( $iwPrefix ) . $searchLink ); } protected function loadCustomCaptions() { @@ -181,4 +153,33 @@ class InterwikiSearchResultSetWidget implements SearchResultSetWidget { } } } + + /** + * Generates a custom OOUI icon element with a favicon as the image. + * The favicon image URL is generated by parsing the interwiki URL + * and returning the default location of the favicon for that domain, + * which is assumed to be '/favicon.ico'. + * + * @param string $iwPrefix Interwiki prefix + * @return OOUI\IconWidget + **/ + protected function iwIcon( $iwPrefix ) { + + $interwiki = $this->iwLookup->fetch( $iwPrefix ); + $parsed = wfParseUrl( wfExpandUrl( $interwiki ? $interwiki->getURL() : '/' ) ); + + $iwIconUrl = $parsed['scheme'] . + $parsed['delimiter'] . + $parsed['host'] . + ( $parsed['port'] ? ':' . $parsed['port'] : '' ) . + '/favicon.ico'; + + $iwIcon = new OOUI\IconWidget( [ + 'icon' => 'favicon' + ] ); + + $iwIcon->setAttributes( [ 'style' => "background-image:url($iwIconUrl);" ] ); + + return $iwIcon; + } } diff --git a/includes/widget/search/InterwikiSearchResultWidget.php b/includes/widget/search/InterwikiSearchResultWidget.php index 6b51db5aed..acd792d6f3 100644 --- a/includes/widget/search/InterwikiSearchResultWidget.php +++ b/includes/widget/search/InterwikiSearchResultWidget.php @@ -17,13 +17,10 @@ class InterwikiSearchResultWidget implements SearchResultWidget { protected $specialSearch; /** @var LinkRenderer */ protected $linkRenderer; - /** @var $iwPrefixDisplayTypes */ - protected $iwPrefixDisplayTypes; public function __construct( SpecialSearch $specialSearch, LinkRenderer $linkRenderer ) { $this->specialSearch = $specialSearch; $this->linkRenderer = $linkRenderer; - $this->iwPrefixDisplayTypes = $specialSearch->getConfig()->get( 'InterwikiPrefixDisplayTypes' ); } /** @@ -38,9 +35,6 @@ class InterwikiSearchResultWidget implements SearchResultWidget { $iwPrefix = $result->getTitle()->getInterwiki(); $titleSnippet = $result->getTitleSnippet(); $snippet = $result->getTextSnippet( $terms ); - $displayType = isset( $this->iwPrefixDisplayTypes[$iwPrefix] ) - ? $this->iwPrefixDisplayTypes[$iwPrefix] - : ""; if ( $titleSnippet ) { $titleSnippet = new HtmlArmor( $titleSnippet ); @@ -69,18 +63,7 @@ class InterwikiSearchResultWidget implements SearchResultWidget { ); } - switch ( $displayType ) { - case 'definition': - return "
" . - "{$link} {$redirect}: " . - $snippet . - "
"; - case 'quotation': - return "
{$snippet}
" . - "
{$link} {$redirect}
"; - default: - return "
{$link} {$redirect}
" . - "
{$snippet}
"; - } + return Html::rawElement( 'div', [ 'class' => 'iw-result__title' ], $link . ' ' . $redirect ) . + Html::rawElement( 'div', [ 'class'=> 'iw-result__content' ], $snippet ); } } diff --git a/languages/i18n/en.json b/languages/i18n/en.json index a6d3045dc4..e33ace22a6 100644 --- a/languages/i18n/en.json +++ b/languages/i18n/en.json @@ -992,7 +992,7 @@ "search-file-match": "(matches file content)", "search-suggest": "Did you mean: $1", "search-rewritten": "Showing results for $1. Search instead for $2.", - "search-interwiki-caption": "Sister projects", + "search-interwiki-caption": "Results from sister projects", "search-interwiki-default": "Results from $1:", "search-interwiki-custom": "", "search-interwiki-more": "(more)", diff --git a/resources/src/mediawiki.special/images/special.search/book-icon.png b/resources/src/mediawiki.special/images/special.search/book-icon.png deleted file mode 100644 index 07e3ec746e..0000000000 Binary files a/resources/src/mediawiki.special/images/special.search/book-icon.png and /dev/null differ diff --git a/resources/src/mediawiki.special/images/special.search/book-icon.svg b/resources/src/mediawiki.special/images/special.search/book-icon.svg deleted file mode 100644 index 6c3fa5f2aa..0000000000 --- a/resources/src/mediawiki.special/images/special.search/book-icon.svg +++ /dev/null @@ -1,36 +0,0 @@ - - - - wikisource-icon - Created with Sketch. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/resources/src/mediawiki.special/images/special.search/course-icon.png b/resources/src/mediawiki.special/images/special.search/course-icon.png deleted file mode 100644 index 9aad230aac..0000000000 Binary files a/resources/src/mediawiki.special/images/special.search/course-icon.png and /dev/null differ diff --git a/resources/src/mediawiki.special/images/special.search/course-icon.svg b/resources/src/mediawiki.special/images/special.search/course-icon.svg deleted file mode 100644 index 4fab1f3d4a..0000000000 --- a/resources/src/mediawiki.special/images/special.search/course-icon.svg +++ /dev/null @@ -1,35 +0,0 @@ - - - - wikiversity-icon - Created with Sketch. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/resources/src/mediawiki.special/images/special.search/definition-icon.png b/resources/src/mediawiki.special/images/special.search/definition-icon.png deleted file mode 100644 index b279f4ed04..0000000000 Binary files a/resources/src/mediawiki.special/images/special.search/definition-icon.png and /dev/null differ diff --git a/resources/src/mediawiki.special/images/special.search/definition-icon.svg b/resources/src/mediawiki.special/images/special.search/definition-icon.svg deleted file mode 100644 index 1d58906244..0000000000 --- a/resources/src/mediawiki.special/images/special.search/definition-icon.svg +++ /dev/null @@ -1,22 +0,0 @@ - - - - wiktionary-icon - Created with Sketch. - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/resources/src/mediawiki.special/images/special.search/dna-icon.png b/resources/src/mediawiki.special/images/special.search/dna-icon.png deleted file mode 100644 index 76ae7b97c3..0000000000 Binary files a/resources/src/mediawiki.special/images/special.search/dna-icon.png and /dev/null differ diff --git a/resources/src/mediawiki.special/images/special.search/dna-icon.svg b/resources/src/mediawiki.special/images/special.search/dna-icon.svg deleted file mode 100644 index b6472d2975..0000000000 --- a/resources/src/mediawiki.special/images/special.search/dna-icon.svg +++ /dev/null @@ -1,34 +0,0 @@ - - - - wikispecies-icon - Created with Sketch. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/resources/src/mediawiki.special/images/special.search/image-icon.png b/resources/src/mediawiki.special/images/special.search/image-icon.png deleted file mode 100644 index 1ebbc7414e..0000000000 Binary files a/resources/src/mediawiki.special/images/special.search/image-icon.png and /dev/null differ diff --git a/resources/src/mediawiki.special/images/special.search/image-icon.svg b/resources/src/mediawiki.special/images/special.search/image-icon.svg deleted file mode 100644 index b68762e09c..0000000000 --- a/resources/src/mediawiki.special/images/special.search/image-icon.svg +++ /dev/null @@ -1,16 +0,0 @@ - - - - commons-icon - Created with Sketch. - - - - - - - - - - - \ No newline at end of file diff --git a/resources/src/mediawiki.special/images/special.search/news-icon.png b/resources/src/mediawiki.special/images/special.search/news-icon.png deleted file mode 100644 index 6b79590dd3..0000000000 Binary files a/resources/src/mediawiki.special/images/special.search/news-icon.png and /dev/null differ diff --git a/resources/src/mediawiki.special/images/special.search/news-icon.svg b/resources/src/mediawiki.special/images/special.search/news-icon.svg deleted file mode 100644 index 996bc84b10..0000000000 --- a/resources/src/mediawiki.special/images/special.search/news-icon.svg +++ /dev/null @@ -1,31 +0,0 @@ - - - - wikinews-icon - Created with Sketch. - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/resources/src/mediawiki.special/images/special.search/quotation-icon.png b/resources/src/mediawiki.special/images/special.search/quotation-icon.png deleted file mode 100644 index 9d3ade30b8..0000000000 Binary files a/resources/src/mediawiki.special/images/special.search/quotation-icon.png and /dev/null differ diff --git a/resources/src/mediawiki.special/images/special.search/quotation-icon.svg b/resources/src/mediawiki.special/images/special.search/quotation-icon.svg deleted file mode 100644 index 0a24b3ef82..0000000000 --- a/resources/src/mediawiki.special/images/special.search/quotation-icon.svg +++ /dev/null @@ -1,12 +0,0 @@ - - - - wikiquote-icon - Created with Sketch. - - - - - - - \ No newline at end of file diff --git a/resources/src/mediawiki.special/images/special.search/textbook-icon.png b/resources/src/mediawiki.special/images/special.search/textbook-icon.png deleted file mode 100644 index 0de2821fad..0000000000 Binary files a/resources/src/mediawiki.special/images/special.search/textbook-icon.png and /dev/null differ diff --git a/resources/src/mediawiki.special/images/special.search/textbook-icon.svg b/resources/src/mediawiki.special/images/special.search/textbook-icon.svg deleted file mode 100644 index 52446b88b1..0000000000 --- a/resources/src/mediawiki.special/images/special.search/textbook-icon.svg +++ /dev/null @@ -1,28 +0,0 @@ - - - - wikibooks-icon - Created with Sketch. - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/resources/src/mediawiki.special/images/special.search/travel-icon.png b/resources/src/mediawiki.special/images/special.search/travel-icon.png deleted file mode 100644 index 9540e5b568..0000000000 Binary files a/resources/src/mediawiki.special/images/special.search/travel-icon.png and /dev/null differ diff --git a/resources/src/mediawiki.special/images/special.search/travel-icon.svg b/resources/src/mediawiki.special/images/special.search/travel-icon.svg deleted file mode 100644 index c61da34f03..0000000000 --- a/resources/src/mediawiki.special/images/special.search/travel-icon.svg +++ /dev/null @@ -1,15 +0,0 @@ - - - - wikivoyage-icon - Created with Sketch. - - - - - - - - - - \ No newline at end of file diff --git a/resources/src/mediawiki.special/mediawiki.special.search.commonsInterwikiWidget.js b/resources/src/mediawiki.special/mediawiki.special.search.commonsInterwikiWidget.js index f3d1fea6df..9518283d2c 100644 --- a/resources/src/mediawiki.special/mediawiki.special.search.commonsInterwikiWidget.js +++ b/resources/src/mediawiki.special/mediawiki.special.search.commonsInterwikiWidget.js @@ -30,7 +30,6 @@ return '
  • ' + '
    ' + - '' + '' + imagesText.escaped() + '' + '
    ' + '
    ' + @@ -73,7 +72,7 @@ multimediaWidgetTemplate = itemWrapperTemplate( pageUrl.query.search, itemTemplate( results ) ); /* we really only need to wait for document ready for DOM manipulation */ $( function () { - $( '.iw-results' ).prepend( multimediaWidgetTemplate ); + $( '.iw-results' ).append( multimediaWidgetTemplate ); } ); } ); diff --git a/resources/src/mediawiki.special/mediawiki.special.search.interwikiwidget.styles.less b/resources/src/mediawiki.special/mediawiki.special.search.interwikiwidget.styles.less index 3f23dc416d..92e3e1cccd 100644 --- a/resources/src/mediawiki.special/mediawiki.special.search.interwikiwidget.styles.less +++ b/resources/src/mediawiki.special/mediawiki.special.search.interwikiwidget.styles.less @@ -1,197 +1,121 @@ /* interwiki search results */ /*==========================*/ -.iw-headline { - font-weight: bold; - font-size: 1rem; - font-size: 16px; - opacity: 0.7; -} - -.iw-results { - list-style: none; - margin: 0; -} - -.iw-resultset { - margin-bottom: 1.2em; - background-color: #f2f4f7; - vertical-align: top; - width: 100%; - float: left; - list-style-type: none; - word-break: break-word; -} - -/* clearfix */ -.iw-result:after { - visibility: hidden; - display: block; - font-size: 0; - content: ' '; - clear: both; - height: 0; -} - -* html .interwiki-result { /* IE6 */ - zoom: 1; -} -*:first-child + html .iw-resultset { /* IE7 */ - zoom: 1; -} - -/* padding each .iw-resultset section seperately. -This allows us greater flexibility in the design. -For example changing the background color on the -header and footer. */ -.iw-result__header, -.iw-result__title, -.iw-result__content, -.iw-result__footer { - padding: 0.25em 0.85em; -} - -/* definition titles appear inline, -to resemble a traditional dictionary definition */ -.iw-resultset--definition .iw-result__title { - display: inline; - padding: 0; -} - -.iw-resultset > div:first-child { - padding-top: 0.85em; -} - -.iw-resultset > div:last-child { - padding-bottom: 0.85em; -} - -.iw-result__title { - font-size: 16px; /* rem fallback */ - font-size: 1rem; -} - -.iw-result__title a.extiw { - font-weight: bold; -} - -.iw-result__content:after { /* clearfix */ - visibility: hidden; - display: block; - font-size: 0; - content: ' '; - clear: both; - height: 0; -} - -.iw-result__footer { - float: right; -} - -.iw-result__icon { - display: inline-block; - width: 24px; - height: 24px; - vertical-align: middle; - margin-right: 0.25em; - background: url( images/special.search/definition-icon.svg ) no-repeat 0 0; - background-size: 100% 100%; -} +@import 'mediawiki.ui/variables.less'; +@import 'mediawiki.mixins'; -@interwikiContentTypes: definition, travel, quotation, book, course, news, textbook, image; +.mw-searchresults-has-iw { -.generate-iwIcons(); - -.generate-iwIcons( @i:1 ) when ( @i =< length( @interwikiContentTypes ) ) { - @iwIcon: extract( @interwikiContentTypes, @i ); - - .iw-result__icon--@{iwIcon} { - /* stylelint-disable-next-line function-url-quotes */ - background-image: url( 'images/special.search/@{iwIcon}-icon.png' ); - /* stylelint-disable-next-line function-url-quotes */ - background-image: url( 'images/special.search/@{iwIcon}-icon.svg' ); + .iw-headline { + font-weight: bold; } - .generate-iwIcons( @i + 1 ); -} + .iw-results { + list-style: none; + margin: 0; + } -/* image search result */ -.iw-result__mini-gallery { - position: relative; - float: left; - width: 60%; - height: 200px; - box-sizing: border-box; - padding: 0.25rem; -} + .iw-resultset { + .box-sizing(border-box); + padding: 0.5em; + vertical-align: top; + width: 100%; + float: left; + background-color: @colorGray15; + margin-bottom: 1em; + word-break: break-word; + } -/* second and third images are small */ -.iw-result__mini-gallery:nth-child( 2 ), -.iw-result__mini-gallery:nth-child( 3 ) { /* stylelint-disable-line indentation */ - width: 40%; - height: 100px; -} + .iw-result__title { + font-size: 108%; /* matching regular search title */ + } -.iw-result__mini-gallery__image { - display: block; - position: relative; - width: 100%; - height: 100%; - background-size: cover; - background-repeat: no-repeat; - background-position: center center; -} + .iw-result:after, + .iw-result__content:after { /* clearfix */ + visibility: hidden; + display: block; + font-size: 0; + content: ' '; + clear: both; + height: 0; + } -.iw-result__mini-gallery__image > .iw-result__mini-gallery__caption { /* image gallery text */ - visibility: hidden; - position: absolute; - bottom: 0; - left: 0; - text-align: center; - color: #fff; - text-shadow: 0 0 10px rgba( 0, 0, 0, 0.4 ); /* improves legibility on white background */ - font-size: 0.8em; - padding: 5px; - background-color: rgba( 0, 0, 0, 0.5 ); -} + .iw-result__footer { + float: right; + font-size: 97%; /* matching main search result font-size */ + margin-top: 0.5em; + } + .iw-result__footer a { + vertical-align: middle; + color: @colorGray7; + font-style: italic; + } -.iw-result__mini-gallery__image:hover > .iw-result__mini-gallery__caption { - visibility: visible; -} + .oo-ui-icon-favicon { + padding-right: 1em; + } -/* different types of interwiki result boxes */ -/* quotation box */ -.iw-resultset--quotation .iw-result__content { - border-left: 4px solid #afb1b5; - margin-left: 1em; - padding-top: 0; - margin-top: 0.25em; -} -.iw-resultset--quotation .iw-result__title { - margin-left: 1em; -} -.iw-result--quotation .iw-result__title:before { - content: ' — '; - display: inline-block; -} -.iw-result--quotation .iw-result__footer { - text-align: right; -} + /* image search result */ + .iw-result__mini-gallery { + position: relative; + float: left; + width: 100%; + height: 200px; + .box-sizing(border-box); + padding: 0.25rem; + } -/* desktop only */ + /* second and third images are small */ + .iw-result__mini-gallery:nth-child( 2 ), + .iw-result__mini-gallery:nth-child( 3 ) { /* stylelint-disable-line indentation */ + width: 50%; + height: 100px; + } -@media only screen and ( min-width: @deviceWidthTablet ) { + .iw-result__mini-gallery__image { + display: block; + position: relative; + width: 100%; + height: 100%; + background-size: 100% auto; + background-size: cover; + background-repeat: no-repeat; + background-position: center center; + } - #mw-interwiki-results { - width: 30%; - display: inline-block; /* used to align iw sidebar with the top of the main search results */ - margin-left: 10%; + /* image gallery text */ + .iw-result__mini-gallery__image > .iw-result__mini-gallery__caption { + visibility: hidden; + position: absolute; + bottom: 0; + left: 0; + text-align: center; + color: #fff; + font-size: 0.8em; + padding: 0.5em; + background-color: rgba( 0, 0, 0, 0.5 ); } - .searchresults .mw-search-createlink, - .searchresults .mw-search-nonefound, - .searchresults .mw-search-results { - float: left; - width: 60%; + + .iw-result__mini-gallery__image:hover > .iw-result__mini-gallery__caption { + visibility: visible; } + /* tablet and up */ + + @media only screen and ( min-width: @deviceWidthTablet ) { + + #mw-interwiki-results { + width: 30%; + display: inline-block; /* used to align interwiki sidebar with the top of the main search results */ + margin-left: 10%; + } + .mw-search-createlink, + .mw-search-nonefound, + .mw-search-results { + float: left; + width: 60%; + clear: left; + max-width: 60%; + } + } }