From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Sat, 9 Nov 2013 00:58:50 +0000 (+0000)
Subject: Merge "Give the search page a little UI love"
X-Git-Tag: 1.31.0-rc.0~18213
X-Git-Url: http://git.cyclocoop.org/%7B%24admin_url%7Dmembres/cotisations/gestion/rappel_supprimer.php?a=commitdiff_plain;h=2a18e8dc655413fca645a080dad0d7faed0b491f;hp=da4dab226d5155b08bdc78ae2881798fd81541df;p=lhc%2Fweb%2Fwiklou.git

Merge "Give the search page a little UI love"
---

diff --git a/includes/specials/SpecialSearch.php b/includes/specials/SpecialSearch.php
index 8c8de8e7dd..dd326569ec 100644
--- a/includes/specials/SpecialSearch.php
+++ b/includes/specials/SpecialSearch.php
@@ -88,7 +88,9 @@ class SpecialSearch extends SpecialPage {
 		$this->outputHeader();
 		$out = $this->getOutput();
 		$out->allowClickjacking();
-		$out->addModuleStyles( 'mediawiki.special' );
+		$out->addModuleStyles( array(
+			'mediawiki.special', 'mediawiki.special.search', 'mediawiki.ui'
+		) );
 
 		// Strip underscores from title parameter; most of the time we'll want
 		// text form here. But don't strip underscores from actual text params!
@@ -1093,10 +1095,14 @@ class SpecialSearch extends SpecialPage {
 		$out .= Html::input( 'search', $term, 'search', array(
 			'id' => $this->profile === 'advanced' ? 'powerSearchText' : 'searchText',
 			'size' => '50',
-			'autofocus'
+			'autofocus',
+			'class' => 'mw-ui-input',
 		) ) . "\n";
 		$out .= Html::hidden( 'fulltext', 'Search' ) . "\n";
-		$out .= Xml::submitButton( $this->msg( 'searchbutton' )->text() ) . "\n";
+		$out .= Xml::submitButton(
+			$this->msg( 'searchbutton' )->text(),
+			array( 'class' => array( 'mw-ui-button', 'mw-ui-primary' ) )
+		) . "\n";
 		return $out . $this->didYouMeanHtml;
 	}
 
diff --git a/resources/mediawiki.special/mediawiki.special.search.css b/resources/mediawiki.special/mediawiki.special.search.css
index 914e47e341..7e6e8e6af0 100644
--- a/resources/mediawiki.special/mediawiki.special.search.css
+++ b/resources/mediawiki.special/mediawiki.special.search.css
@@ -12,3 +12,9 @@
 .searchresult {
 	display: inline !ie;
 }
+
+/** Add some extra padding keep browser's "clear field"
+ UI from rubbing up against the side of the field */
+input[type="search"] {
+	padding-right: 0.5em;
+}