- Patch #777728 by Jeff Burnz: improve formatting of default search block.

4 files changed, 27 insertions, 20 deletions

diff --git a/themes/bartik/css/ie.css b/themes/bartik/css/ie.css
index 0ea7e0953..7df95b3ac 100644
--- a/themes/bartik/css/ie.css
+++ b/themes/bartik/css/ie.css
@@ -19,3 +19,8 @@ fieldset legend {
 #footer-wrapper #footer .block {
   height: 100%;
 }
+#search-block-form input.form-submit,
+#search-form input.form-submit {
+  text-transform: capitalize; /* Trigger text indent. */
+  height: 26px;
+}
diff --git a/themes/bartik/css/ie6.css b/themes/bartik/css/ie6.css
index f49745aba..ac7280660 100644
--- a/themes/bartik/css/ie6.css
+++ b/themes/bartik/css/ie6.css
@@ -9,3 +9,6 @@
 .tabs ul.primary {
   zoom: 1;
 }
+#block-search-form .form-item-search-block-form input {
+  width: 67%;
+}
diff --git a/themes/bartik/css/style-rtl.css b/themes/bartik/css/style-rtl.css
index 9a4f1294a..a578c316c 100644
--- a/themes/bartik/css/style-rtl.css
+++ b/themes/bartik/css/style-rtl.css
@@ -152,9 +152,14 @@ a.button {
 
 /* --------------- Search Form ---------------- */
 
+#search-form input#edit-keys,
+#block-search-form .form-item-search-block-form input {
+  float: right;
+}
 #search-block-form input.form-submit,
 #search-form input.form-submit {
   margin-left: 0;
+  margin-right: 5px;
 }
 
 /* ------------------ Footer ------------------ */
diff --git a/themes/bartik/css/style.css b/themes/bartik/css/style.css
index 7240606c9..318391455 100644
--- a/themes/bartik/css/style.css
+++ b/themes/bartik/css/style.css
@@ -1158,36 +1158,30 @@ div.vertical-tabs .vertical-tabs-panes fieldset.vertical-tabs-pane {
 
 /* --------------- Search Form ---------------- */
 
+#block-search-form {
+  padding-bottom: 7px;
+}
 #block-search-form .content {
   margin-top: 0;
 }
+#search-form input#edit-keys,
 #block-search-form .form-item-search-block-form input {
-  width: 70%;
-}
-.region-content #block-search-form .form-item-search-block-form input,
-.region-footer #block-search-form .form-item-search-block-form input {
-  width: auto;
-}
-#block-search-form #edit-actions {
-  float: right;
-}
-.region-content #block-search-form #edit-actions,
-.region-footer #block-search-form #edit-actions {
-  float: none;
-}
-#block-search-form .form-actions {
-  padding-top: 0;
+  float: left; /* LTR */
 }
 #search-block-form input.form-submit,
 #search-form input.form-submit {
+  margin-left: 5px; /* LTR */
   margin-right: 0; /* LTR */
-  height: 24px;
-  width: 14px;
-  overflow: hidden;
+  height: 25px;
+  width: 34px;
+  padding: 0;
   cursor: pointer;
   text-indent: -9999px;
-  border: none;
-  background: url(../images/search-button.png) no-repeat left center;
+  border: 1px solid #ccc;
+  background: url(../images/search-button.png) no-repeat center center;
+}
+#search-form .form-item-keys label {
+  display: block;
 }
 
 /* -------------- Shortcut Links -------------- */