Bug 631812 - URLBar broken on certain themes; r=gavin a=blocking-final+
authorDão Gottwald <dao@mozilla.com>
Thu, 10 Feb 2011 19:59:40 -0500
changeset 62317 5c77943a504d44f99c6a694e2f9fc0aa913f485b
parent 62316 0a3f2dd6870f9f4803c9a9c74313eaf700a8bc10
child 62318 9e8f138a8b9e73a1e350ef6b77932230d228a06a
push idunknown
push userunknown
push dateunknown
reviewersgavin, blocking-final
bugs631812
milestone2.0b12pre
Bug 631812 - URLBar broken on certain themes; r=gavin a=blocking-final+
browser/base/content/urlbarBindings.xml
browser/themes/gnomestripe/browser/browser.css
browser/themes/winstripe/browser/browser.css
--- a/browser/base/content/urlbarBindings.xml
+++ b/browser/base/content/urlbarBindings.xml
@@ -47,22 +47,22 @@
 <bindings id="urlbarBindings" 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">
 
   <binding id="urlbar" extends="chrome://global/content/bindings/autocomplete.xml#autocomplete">
 
     <content sizetopopup="pref">
-      <children includes="image|deck|stack|box">
-        <xul:image class="autocomplete-icon" allowevents="true"/>
-      </children>
       <xul:hbox anonid="textbox-container"
                 class="autocomplete-textbox-container urlbar-textbox-container"
                 flex="1" xbl:inherits="focused">
+        <children includes="image|deck|stack|box">
+          <xul:image class="autocomplete-icon" allowevents="true"/>
+        </children>
         <xul:hbox anonid="textbox-input-box"
                   class="textbox-input-box urlbar-input-box"
                   flex="1" xbl:inherits="tooltiptext=inputtooltiptext">
           <children/>
           <html:input anonid="input"
                       class="autocomplete-textbox urlbar-input textbox-input uri-element-right-align"
                       flex="1" allowevents="true"
                       xbl:inherits="tooltiptext=inputtooltiptext,onfocus,onblur,value,type,maxlength,disabled,size,readonly,placeholder,tabindex,accesskey"/>
--- a/browser/themes/gnomestripe/browser/browser.css
+++ b/browser/themes/gnomestripe/browser/browser.css
@@ -903,16 +903,17 @@ toolbar[iconsize="small"] #feed-button {
   width: 7em;
   min-width: 7em;
   -moz-appearance: textfield;
   padding: 0;
 }
 
 .urlbar-textbox-container {
   -moz-appearance: none;
+  -moz-box-align: stretch;
 }
 
 .urlbar-history-dropmarker {
   -moz-appearance: toolbarbutton-dropdown;
 }
 
 #urlbar-container {
   -moz-box-orient: horizontal;
--- a/browser/themes/winstripe/browser/browser.css
+++ b/browser/themes/winstripe/browser/browser.css
@@ -1100,16 +1100,20 @@ html|*.urlbar-input:-moz-lwtheme:-moz-pl
   background-color: white;
 }
 
 #urlbar-container {
   -moz-box-orient: horizontal;
   -moz-box-align: stretch;
 }
 
+.urlbar-textbox-container {
+  -moz-box-align: stretch;
+}
+
 #urlbar-icons {
   height: 18px;
   -moz-box-align: center;
 }
 
 .urlbar-icon {
   padding: 0 2px !important;
 }