Bug 455524 - location bar is higher than the search bar, star and rss icons aren't vertically centered. r=gavin

browser/themes/gnomestripe/browser/browser.css

@@ -786,6 +786,17 @@ toolbar[iconsize="small"] #paste-button[disabled="true"] {
 #urlbar {
   width: 7em;
   min-width: 7em;
+  -moz-appearance: textfield;
+}
+
+#urlbar > .autocomplete-textbox-container {
+  -moz-appearance: none;
+  /* keep the URL bar content LTR */
+  direction: ltr;
+}
+
+#urlbar > .autocomplete-history-dropmarker {
+  -moz-appearance: toolbarbutton-dropdown;
 }
 
 #urlbar-container {
@@ -818,18 +829,11 @@ toolbar[iconsize="small"] #paste-button[disabled="true"] {
   cursor: -moz-grab;
 }
 
-#wrapper-urlbar-container #urlbar > .autocomplete-textbox-container {
-  -moz-appearance: textfield;
-}
-
 #wrapper-urlbar-container #urlbar > .autocomplete-history-dropmarker {
   display: none;
 }
 
-#PopupAutoComplete {
-  direction: ltr !important;
-}
-
+#PopupAutoComplete,
 #PopupAutoCompleteRichResult {
   direction: ltr !important;
 }
@@ -876,6 +880,10 @@ toolbar[iconsize="small"] #paste-button[disabled="true"] {
   -moz-border-end: 1px solid ThreeDShadow;
 }
 
+#identity-box[chromedir="rtl"] {
+  -moz-border-start: 1px solid ThreeDShadow;
+}
+
 #identity-box:focus {
   outline: 1px dotted -moz-DialogText;
 }
@@ -976,27 +984,6 @@ toolbar[iconsize="small"] #paste-button[disabled="true"] {
   padding: 10px;
 }
 
-#urlbar > .autocomplete-textbox-container {
-  -moz-binding: url(chrome://browser/skin/browser.xml#autocomplete-security-wrapper);
-}
-
-#autocomplete-security-wrapper {
-  /* keep the URL bar content LTR */
-  direction: ltr;
-  /* cover the white gap between the text field and the drop down button */
-  margin-right: -3px;
-}
-
-#urlbar[chromedir="rtl"] > .autocomplete-textbox-container > #autocomplete-security-wrapper {
-  margin-right: 0px;
-  margin-left: -3px;
-}
-
-#wrapper-urlbar-container #urlbar >
-.autocomplete-textbox-container > #autocomplete-security-wrapper {
-  margin: 0px;
-}
-
 /* Feed icon */
 #feed-button,
 #feed-button > .button-box,
@@ -1014,11 +1001,6 @@ toolbar[iconsize="small"] #paste-button[disabled="true"] {
   list-style-image: url("chrome://browser/skin/page-livemarks.png");
 }
 
-/* Autocomplete */
-#urlbar .autocomplete-textbox-container {
-  -moz-box-align: stretch;
-}
-
 #treecolAutoCompleteImage {
   max-width : 36px; 
 }

browser/themes/gnomestripe/browser/browser.xml

@@ -1,18 +0,0 @@
-<?xml version="1.0"?>
-
-<bindings id="globalBindings"
-          xmlns="http://www.mozilla.org/xbl"
-          xmlns:html="http://www.w3.org/1999/xhtml"
-          xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-          xmlns:xbl="http://www.mozilla.org/xbl">
-
-  <!-- :::/ widgets \ ::::::::::::::::::::::::::::::::::::::::::::::::::::: -->
-
-  <binding id="autocomplete-security-wrapper" extends="xul:hbox">
-    <content>
-      <xul:hbox id="autocomplete-security-wrapper" flex="1">
-        <children/>
-      </xul:hbox>
-    </content>
-  </binding>
-</bindings>