2 files changed, 25 insertions, 34 deletions
diff --git a/mod/search/views/default/search/css.php b/mod/search/views/default/search/css.php
index 644833673..d6e905bf0 100644
--- a/mod/search/views/default/search/css.php
+++ b/mod/search/views/default/search/css.php
@@ -6,43 +6,36 @@
  */
 ?>
 
-
-#elgg-search {
-	bottom:5px;
-	height:23px;
-	position:absolute;
-	right:0;
+.elgg-page-header .elgg-search {
+	bottom: 5px;
+	height: 23px;
+	position: absolute;
+	right: 0;
 }
-
-.elgg-page-header #elgg-search input.search-input {
+.elgg-page-header .elgg-search input[type=text] {
+	width: 198px;
+}
+.elgg-search input[type=text] {
 	-webkit-border-radius: 10px;
 	-moz-border-radius: 10px;
-	background-color:transparent;
-	border:1px solid #71b9f7;
-	color:white;
-	font-size:12px;
-	font-weight:bold;
-	margin:0;
-	padding:2px 4px 2px 26px;
-	width:198px;
+	border: 1px solid #71b9f7;
+	color: white;
+	font-size: 12px;
+	font-weight: bold;
+	padding: 2px 4px 2px 26px;
+	background-color: transparent;
 	background-image: url(<?php echo elgg_get_site_url(); ?>_graphics/elgg_sprites.png);
 	background-position: 2px -220px;
 	background-repeat: no-repeat;
 }
-.elgg-page-header #elgg-search input.search-input:focus {
-	background-color:white;
-	color:#0054A7;
-	border:1px solid white;
-	background-position: 2px -257px;
-}
-.elgg-page-header #elgg-search input.search-input:active {
-	background-color:white;
-	color:#0054A7;
-	border:1px solid white;
+.elgg-search input[type=text]:focus, .elgg-search input[type=text]:active {
+	background-color: white;
+	color: #0054A7;
+	border: 1px solid white;
 	background-position: 2px -257px;
 }
-.elgg-page-header #elgg-search input.search-submit-button {
-	display:none;
+.elgg-page-header .elgg-search input[type=submit] {
+	display: none;
 }
 
 .search_listing  {
diff --git a/mod/search/views/default/search/search_box.php b/mod/search/views/default/search/search_box.php
index b42319520..1a02a9861 100644
--- a/mod/search/views/default/search/search_box.php
+++ b/mod/search/views/default/search/search_box.php
@@ -12,11 +12,9 @@ $value = stripslashes($value);
 
 ?>
 
-<div id="elgg-search">
-	<form id="searchform" action="<?php echo elgg_get_site_url(); ?>pg/search/" method="get">
-		<fieldset>
+<form class="elgg-search" action="<?php echo elgg_get_site_url(); ?>pg/search/" method="get">
+	<fieldset>
 		<input type="text" size="21" name="q" value="<?php echo elgg_echo('search'); ?>" onblur="if (this.value=='') { this.value='<?php echo elgg_echo('search'); ?>' }" onfocus="if (this.value=='<?php echo elgg_echo('search'); ?>') { this.value='' };" class="search-input" />
 		<input type="submit" value="<?php echo elgg_echo('search:go'); ?>" class="search-submit-button" />
-		</fieldset>
-	</form>
-</div>
-\ No newline at end of file
+	</fieldset>
+</form>
+\ No newline at end of file