Bug 713919 - Toolbar buttons dragged onto the stand-alone window menubar should have text-beside-icon. r=sid0,ui-r=bwinton,a=Standard8. BETA_BASE_20120131
authorMike Conley <mconley@mozilla.com>
Tue, 31 Jan 2012 13:29:39 -0500
changeset 10144 415d430378aa27647621b438ba84e4d3d475b84a
parent 10143 2247f3164ac8bd01597e8988c8fac24144529f40
child 10145 75682133bd202899b1c9ca6c022d2c51704d3da2
push id336
push userbugzilla@standard8.plus.com
push dateTue, 31 Jan 2012 22:15:45 +0000
treeherdercomm-beta@54945f5d278d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerssid0, bwinton, Standard8
bugs713919
Bug 713919 - Toolbar buttons dragged onto the stand-alone window menubar should have text-beside-icon. r=sid0,ui-r=bwinton,a=Standard8.
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"
 #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);"