From c0c6ed738a4a2e70745f4e3981ef392fbe6b935b Mon Sep 17 00:00:00 2001
From: Trevor Parscal <tparscal@users.mediawiki.org>
Date: Thu, 16 Jul 2009 18:05:27 +0000
Subject: [PATCH] Improved the apearance, behavior and consistency accross
 browsers of simple search.

---
 skins/Vector.php               |   2 +-
 skins/vector/images/search.png | Bin 506 -> 325 bytes
 skins/vector/main-ltr.css      |  33 ++++++++++++++++++++++++++-------
 skins/vector/main-rtl.css      |  33 ++++++++++++++++++++++++++-------
 4 files changed, 53 insertions(+), 15 deletions(-)

diff --git a/skins/Vector.php b/skins/Vector.php
index f9f1c09ed2..1094a26983 100644
--- a/skins/Vector.php
+++ b/skins/Vector.php
@@ -779,7 +779,7 @@ class VectorTemplate extends QuickTemplate {
 		<?php if ( $wgVectorUseSimpleSearch ): ?>
 		<div id="simpleSearch">
 			<input id="searchInput" name="search" type="text" <?php echo $this->skin->tooltipAndAccesskey( 'search' ); ?> <?php if( isset( $this->data['search'] ) ): ?> value="<?php $this->text( 'search' ) ?>"<?php endif; ?> />
-			<input  id="searchButton" type='image' name='fulltext' src="<?php echo $wgStylePath ?>/vector/images/search.png" <?php echo $this->skin->tooltipAndAccesskey( 'search-fulltext' ); ?> align="top" />
+			<input id="searchButton" type='submit' name='fulltext' value="&nbsp;" src="<?php echo $wgStylePath ?>/vector/images/search.png" <?php echo $this->skin->tooltipAndAccesskey( 'search-fulltext' ); ?> />
 		</div>
 		<?php else: ?>
 		<input id="searchInput" name="search" type="text" <?php echo $this->skin->tooltipAndAccesskey( 'search' ); ?> <?php if( isset( $this->data['search'] ) ): ?> value="<?php $this->text( 'search' ) ?>"<?php endif; ?> />
diff --git a/skins/vector/images/search.png b/skins/vector/images/search.png
index 665492f6b03b07a2013e4d0fcea47871bd989046..6f21f426c1fe78a26853da48451093dcd02a0b9a 100644
GIT binary patch
delta 274
zcmV+t0qy?!1H}R%iBL{Q4GJ0x0000DNk~Le0000C0000D2m=5B0IK(YaFHP>WmHg1
zR7G}nc6)n!y1KfOl9GLWec#{Tyu7@Wl$622!SV6&^78Vks;YBybMy1_nVFgI@9+Kn
z{npmj`T6;YiHUA*Zf|dI^z`(dot@p?-M_!TY;0`*|NpXWEE50#0338uPE(P=7=Qo&
z{{R=V;@1EG0AEQ&K~#9!T+LYyfFKM6(4vTdyRx?Tzo!L*G0xv>n<)^bC}m8<0m@jD
z3zGB780Fo-=<AI4BLgrL1cWc<{}~r(YxPsms<A8Jr$R(g1oULPSPgWpIK80#SZ)CZ
Y09^<TNP>j$ng9R*07*qoM6N<$f|M|WhX4Qo

delta 467
zcmV;^0WAK-0{R0XiBL{Q4GJ0x0000DNk~Le0000M0000M2m=5B0P|{`36UWve_&8d
zR7H)DjFh(7#MbS*#LJ_;+|10(>+I~=+1R<fy=ZD?tgft-yy~UH<%_fA;o;$z!}Pez
z;o9Nn&)es~((13s<<8dJw$117@9&_bq?(_ezR%~Oqo9MS)#&Ky<mc)0^Yb(vaIXLW
z03dWyPE-H?|NsC0|NsC0|NsC0k-rL&zz2T-TwELN00035Nkl<Zc-lnJS(bz#3<c0o
zAVd@!6mej1|GO-RTK&%9=Z1s<t`>zmz>eyA19eG#@U@hcA6ovi0xVWACTu}aFH2Zw
z=0ga6Wb+F0VU05jr#(+AJeyJ9td7FY<)qk=m4n6ra_h-j$qLJncwa?0mp4MJJ28J0
z=9kZt#is%<k3J9vFH*|z4oSw0ErUtv9fEwROc{(x%X6eUvS7m<V_1GJcxmp08UAX9
zK{&2|k9W?S#>N*1D1TqYrJFyW*+~vj_ub7~*0GzUoVpkzAU1Ej<qjjjp^;<XL-WQm
zmuXU}tHJ$t+AVWqDsWBSo?4w6Ch8-p9*J9_l{V^Ab-w-zFaV(0Am-8q0}22D002ov
JPDHLkV1fbn>b(E}

diff --git a/skins/vector/main-ltr.css b/skins/vector/main-ltr.css
index de2f85d097..9252ddbffe 100644
--- a/skins/vector/main-ltr.css
+++ b/skins/vector/main-ltr.css
@@ -292,19 +292,38 @@ div#head h5 {
 		margin: 0;
 		margin-top: 0.4em;
 	}
-	div#p-search div#simpleSearch input#searchInput {
-		margin-top: 0.33em;
+	div#p-search div#simpleSearch {
+		margin-top: 0.75em;
+		position: relative;
 		border: solid 1px #AAAAAA;
-		height: 1.25em;
-		width: 10em;
-		padding: 0.33em;
+		background-color: white;
 		background-image: url(images/search-fade.png);
-		background-repeat: repeat-x;
 		background-position: top left;
+		background-repeat: repeat-x;
+	}
+	div#p-search div#simpleSearch input#searchInput {
+		margin: 0;
+		border-width: 0;
+		padding: 0.25em;
+		line-height: 1em;
+		font-size: 9.75pt;
+		width: 10em;
+		background-color: transparent;
 	}
 	div#p-search div#simpleSearch input#searchButton {
+		position: absolute;
+		top: 0;
+		right: 0;
+		margin: 0;
+		padding: 0;
+		width: 1.75em;
+		height: 100%;
 		border: none;
-		margin-left: 0.25em;
+		cursor: pointer;
+		background-color: transparent;
+		background-image: url(images/search.png);
+		background-position: center center;
+		background-repeat: no-repeat;
 	}
 /* Panel */
 div#panel {
diff --git a/skins/vector/main-rtl.css b/skins/vector/main-rtl.css
index 9558c9c76f..472b51f931 100644
--- a/skins/vector/main-rtl.css
+++ b/skins/vector/main-rtl.css
@@ -292,19 +292,38 @@ div#head h5 {
 		margin: 0;
 		margin-top: 0.4em;
 	}
-	div#p-search div#simpleSearch input#searchInput {
-		margin-top: 0.33em;
+	div#p-search div#simpleSearch {
+		margin-top: 0.75em;
+		position: relative;
 		border: solid 1px #AAAAAA;
-		height: 1.25em;
-		width: 10em;
-		padding: 0.33em;
+		background-color: white;
 		background-image: url(images/search-fade.png);
-		background-repeat: repeat-x;
 		background-position: top right;
+		background-repeat: repeat-x;
+	}
+	div#p-search div#simpleSearch input#searchInput {
+		margin: 0;
+		border-width: 0;
+		padding: 0.25em;
+		line-height: 1em;
+		font-size: 9.75pt;
+		width: 10em;
+		background-color: transparent;
 	}
 	div#p-search div#simpleSearch input#searchButton {
+		position: absolute;
+		top: 0;
+		left: 0;
+		margin: 0;
+		padding: 0;
+		width: 1.75em;
+		height: 100%;
 		border: none;
-		margin-right: 0.25em;
+		cursor: pointer;
+		background-color: transparent;
+		background-image: url(images/search.png);
+		background-position: center center;
+		background-repeat: no-repeat;
 	}
 /* Panel */
 div#panel {
-- 
2.20.1