Bug 713919 - Toolbar buttons dragged onto the stand-alone window menubar should have text-beside-icon. r=sid0,ui-r=bwinton.
authorMike Conley <mconley@mozilla.com>
Wed, 18 Jan 2012 09:48:37 -0500
changeset 10450 ef508aa563580a09cdabb4797a8a050cf6d4f07f
parent 10449 7bddc0e90669a8ba2aa1663e7f258c35fdbd48e2
child 10451 243812475f89ad3d3e6b646f768b0d4791c7f4f1
push idunknown
push userunknown
push dateunknown
reviewerssid0, bwinton
bugs713919
Bug 713919 - Toolbar buttons dragged onto the stand-alone window menubar should have text-beside-icon. r=sid0,ui-r=bwinton.
mail/base/content/mailWindowOverlay.xul
mail/base/content/messenger.xul
--- a/mail/base/content/mailWindowOverlay.xul
+++ b/mail/base/content/mailWindowOverlay.xul
@@ -955,17 +955,17 @@
      parent toolboxes.  This lets us control how toolbar buttons appear in the
      toolbars by default.
 
      We also put the toolbars inside a toolbox named "navigation-toolbox" to
      leverage overlays, since we currently have several windows (3pane,
      message reader, compose, address book) that take advantage of these
      toolbars.
 -->
-<toolbox id="navigation-toolbox" class="toolbox-top">
+<toolbox id="navigation-toolbox" class="toolbox-top" labelalign="end" defaultlabelalign="end">
   <!-- Menu -->
   <toolbar type="menubar" id="mail-toolbar-menubar2" class="chromeclass-menubar" customizable="true"
            toolboxid="mail-toolbox"
 #ifdef XP_MACOSX
            defaultset="menubar-items"
 #else
           defaultset="menubar-items,spring,throbber-box"
 #endif
--- a/mail/base/content/messenger.xul
+++ b/mail/base/content/messenger.xul
@@ -290,17 +290,17 @@
 
 <tooltip id="tabmail-tabs-tooltip" onpopupshowing="document.getElementById('tabmail').createTooltip(event);"/>
 <tooltip id="folderpopup" class="folderSummaryPopup"/>
 
 <tooltip id="aHTMLTooltip" onpopupshowing="return FillInHTMLTooltip(document.tooltipNode);"/>
 <tooltip id="tabmail-tabs-tooltip" onpopupshowing="document.getElementById('tabmail').createTooltip(event);"/>
 
   <!-- navigation-toolbox is augmented by mailWindowOverlay.xul -->
-  <toolbox id="navigation-toolbox" class="toolbox-top" labelalign="end" defaultlabelalign="end">
+  <toolbox id="navigation-toolbox" class="toolbox-top">
 
     <toolbar id="tabs-toolbar" class="toolbar-primary">
 
       <tabs flex="1"
             id="tabcontainer"
             align="end"
             setfocus="false"
             onclick="document.getElementById('tabmail').onTabClick(event);"