Bug 610071 - Stretch the app button to match the caption buttons' size. r=gavin

browser/base/content/browser.xul

@@ -434,7 +434,7 @@
 #ifdef CAN_DRAW_IN_TITLEBAR
 <vbox id="titlebar">
   <hbox id="titlebar-content">
-    <hbox id="appmenu-button-container" align="start">
+    <hbox id="appmenu-button-container">
       <button id="appmenu-button"
               type="menu"
               label="&brandShortName;"
@@ -443,7 +443,7 @@
       </button>
     </hbox>
     <spacer id="titlebar-spacer" flex="1"/>
-    <hbox id="titlebar-buttonbox">
+    <hbox id="titlebar-buttonbox" align="start">
       <toolbarbutton class="titlebar-button" id="titlebar-min" oncommand="window.minimize();"/>
       <toolbarbutton class="titlebar-button" id="titlebar-max" oncommand="onTitlebarMaxClick();"/>
       <toolbarbutton class="titlebar-button" id="titlebar-close" command="cmd_closeWindow"/>

browser/themes/winstripe/browser/browser-aero.css

@@ -29,6 +29,7 @@
     -moz-border-left-colors: rgba(255,255,255,.5) rgba(83,42,6,.9);
     -moz-border-bottom-colors: rgba(255,255,255,.5) rgba(83,42,6,.9);
     -moz-border-right-colors: rgba(255,255,255,.5) rgba(83,42,6,.9);
+    margin-bottom: -1px; /* compensate white outer border */
     box-shadow: 0 1px 0 rgba(255,255,255,.25) inset,
                 0 0 2px 1px rgba(255,255,255,.25) inset;
   }
@@ -73,7 +74,6 @@
 
 @media all and (-moz-windows-compositor) {
   /* these should be hidden w/glass enabled. windows draws it's own buttons. */
-  #titlebar-buttonbox:not(:-moz-lwtheme),
   .titlebar-button {
     display: none;
   }

browser/themes/winstripe/browser/browser.css

@@ -122,7 +122,7 @@
   text-shadow: 0 0 1px rgba(0,0,0,.7),
                0 1px 1.5px rgba(0,0,0,.5);
   font-weight: bold;
-  padding: .1em 1.5em .15em;
+  padding: 0 1.5em .05em;
   margin: 0;
 }
 
@@ -320,7 +320,6 @@
 #titlebar-content {
   margin-left: 15px;
   margin-right: 15px;
-  -moz-box-align: start;
 }
 
 @media all and (-moz-windows-classic) {