Backout patch for Bug 755793 - Allow for drawing in window titlebar for Austrailis. a=Standard8 (over IRC)
authorRichard Marti <richard.marti@gmail.com>
Tue, 17 Jul 2012 13:31:00 -0400
changeset 12882 6c2c3ee473c6c0e6aacde81ecb357fafb9c032b7
parent 12881 e442aac96ecb28513b1ccd9e19537e9a21fb741b
child 12883 41952791300e1d34d52505d1bec44b5c1725fc96
push id654
push userbugzilla@standard8.plus.com
push dateMon, 27 Aug 2012 20:27:17 +0000
treeherdercomm-beta@f9b6f18872f3 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersStandard8
bugs755793
Backout patch for Bug 755793 - Allow for drawing in window titlebar for Austrailis. a=Standard8 (over IRC)
mail/Makefile.in
mail/base/Makefile.in
mail/base/content/mailWindowOverlay.xul
mail/base/content/messenger.xul
mail/base/content/msgMail3PaneWindow.js
mail/base/jar.mn
mail/themes/qute/mail/icons/closeTab.png
mail/themes/qute/mail/mailWindow1-aero.css
mail/themes/qute/mail/mailWindow1.css
mail/themes/qute/mail/primaryToolbar-aero.css
mail/themes/qute/mail/primaryToolbar.css
mail/themes/qute/mail/tabmail.css
--- a/mail/Makefile.in
+++ b/mail/Makefile.in
@@ -32,9 +32,9 @@ include $(topsrcdir)/config/rules.mk
 ifeq ($(OS_ARCH),WINNT)
 # For Windows build the uninstaller during the application build since the
 # uninstaller is included with the application for mar file generation.
 libs::
 	$(MAKE) -C installer/windows uninstaller
 ifdef MOZ_MAINTENANCE_SERVICE
 	$(MAKE) -C installer/windows maintenanceservice_installer
 endif
-endif
+endif
\ No newline at end of file
--- a/mail/base/Makefile.in
+++ b/mail/base/Makefile.in
@@ -29,20 +29,16 @@ endif
 ifdef MOZ_UPDATER
 DEFINES += -DMOZ_UPDATER=1
 endif
 
 ifdef ENABLE_TESTS
 DIRS += test
 endif
 
-ifneq (,$(filter windows, $(MOZ_WIDGET_TOOLKIT)))
-DEFINES += -DCAN_DRAW_IN_TITLEBAR=1
-endif
-
 abs_srcdir = $(call core_abspath,$(srcdir))
 
 CHROME_DEPS += $(abs_srcdir)/content/overrides/app-license.html
 
 DEFINES += -DAPP_LICENSE_BLOCK=$(abs_srcdir)/content/overrides/app-license.html
 
 include $(topsrcdir)/config/rules.mk
 
--- a/mail/base/content/mailWindowOverlay.xul
+++ b/mail/base/content/mailWindowOverlay.xul
@@ -1719,19 +1719,16 @@
 #endif
 
       <!-- Help -->
       <menu id="helpMenu"/>
 
       <spacer id="menubar_spacer" flex="100%"/>
       </menubar>
     </toolbaritem>
-#ifdef CAN_DRAW_IN_TITLEBAR
-    <hbox class="titlebar-placeholder" type="caption-buttons" ordinal="1000"/>
-#endif
   </toolbar>
 </toolbox>
 
 <toolbox id="mail-toolbox"
          class="mail-toolbox"
          mode="full"
          defaultmode="full"
 #ifdef XP_MACOSX
--- a/mail/base/content/messenger.xul
+++ b/mail/base/content/messenger.xul
@@ -49,18 +49,17 @@
         onload="OnLoadMessenger()"
         onunload="OnUnloadMessenger()"
         screenX="10" screenY="10"
         persist="width height screenX screenY sizemode"
         toggletoolbar="true"
         windowtype="mail:3pane"
         macanimationtype="document"
         lightweightthemes="true"
-        lightweightthemesfooter="status-bar"
-        chromemargin="0,2,2,2">
+        lightweightthemesfooter="status-bar">
 
 <stringbundleset id="stringbundleset">
   <stringbundle id="bundle_brand" src="chrome://branding/locale/brand.properties"/>
   <stringbundle id="bundle_search" src="chrome://messenger/locale/search.properties"/>
   <stringbundle id="bundle_multimessages" src="chrome://messenger/locale/multimessageview.properties"/>
 </stringbundleset>
 
 <script type="application/javascript" src="chrome://global/content/globalOverlay.js"/>
@@ -248,31 +247,16 @@
 </menupopup>
 
 <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);"/>
 
-#ifdef CAN_DRAW_IN_TITLEBAR
-<vbox id="titlebar">
-  <hbox id="titlebar-content">
-    <spacer id="titlebar-spacer" flex="1"/>
-    <hbox id="titlebar-buttonbox-container" align="start">
-      <hbox id="titlebar-buttonbox">
-        <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_quit"/>
-      </hbox>
-    </hbox>
-  </hbox>
-</vbox>
-#endif
-
   <!-- navigation-toolbox is augmented by mailWindowOverlay.xul -->
   <toolbox id="navigation-toolbox" class="toolbox-top">
 
     <toolbar id="tabs-toolbar" class="toolbar-primary">
 
       <tabs flex="1"
             id="tabcontainer"
             align="end"
@@ -303,19 +287,16 @@
       <toolbarbutton class="tabs-alltabs-button"
                      id="alltabs-button"
                      type="menu"
                      tooltiptext="&listAllTabs.label;">
         <menupopup class="tabs-alltabs-popup"
                    id="alltabs-popup" position="after_end"
                    tabcontainer="tabcontainer"/>
       </toolbarbutton>
-#ifdef CAN_DRAW_IN_TITLEBAR
-      <hbox class="titlebar-placeholder" type="caption-buttons" ordinal="1000"/>
-#endif
     </toolbar>
 
   </toolbox>
 
   <!-- XXX This extension point (tabmail-container) is only temporary!
        Horizontal space shouldn't be wasted if it isn't absolutely critical.
        A mechanism for adding sidebar panes will be added in bug 476154. -->
   <hbox id="tabmail-container" flex="1">
--- a/mail/base/content/msgMail3PaneWindow.js
+++ b/mail/base/content/msgMail3PaneWindow.js
@@ -325,22 +325,22 @@ function AutoConfigWizard(okCallback)
 }
 
 /**
  * Called on startup to initialize various parts of the main window
  */
 function OnLoadMessenger()
 {
   migrateMailnews();
-  // Rig up our TabsInTitlebar early so that we can catch any resize events.
-  TabsInTitlebar.init();
+
   // update the pane config before we exit onload otherwise the user may see a flicker if we poke the document
   // in delayedOnLoadMessenger...
   UpdateMailPaneConfig(false);
   document.loadBindingDocument('chrome://global/content/bindings/textbox.xml');
+
   // Set a sane starting width/height for all resolutions on new profiles.
   // Do this before the window loads.
   if (!document.documentElement.hasAttribute("width"))
   {
     // Prefer 1024xfull height.
     let defaultHeight = screen.availHeight;
     let defaultWidth = (screen.availWidth <= 1024) ? screen.availWidth : 1024;
 
@@ -596,18 +596,16 @@ function OnUnloadMessenger()
 {
   Services.obs.notifyObservers(window, "mail-unloading-messenger", null);
   accountManager.removeIncomingServerListener(gThreePaneIncomingServerListener);
   gPrefBranch.removeObserver("mail.pane_config.dynamic", MailPrefObserver);
   gPrefBranch.removeObserver("mail.showCondensedAddresses", MailPrefObserver);
 
   sessionStoreManager.unloadingWindow(window);
 
-  TabsInTitlebar.uninit();
-
   let tabmail = document.getElementById("tabmail");
   tabmail._teardown();
 
   webSearchTabType.shutdown();
 
   var mailSession = Components.classes["@mozilla.org/messenger/services/session;1"]
                               .getService(Components.interfaces.nsIMsgMailSession);
   mailSession.RemoveFolderListener(folderListener);
@@ -1586,84 +1584,8 @@ function InitPageMenu(menuPopup, event) 
   if (event.target != menuPopup)
     return;
 
   PageMenu.maybeBuildAndAttachMenu(menuPopup.triggerNode, menuPopup);
 
   if (menuPopup.children.length == 0)
     event.preventDefault();
 }
-
-let TabsInTitlebar = {
-  init: function () {
-#ifdef CAN_DRAW_IN_TITLEBAR
-    // Don't trust the initial value of the sizemode attribute; wait for the resize event.
-    this.allowedBy("sizemode", false);
-    window.addEventListener("resize", function (event) {
-      if (event.target != window)
-        return;
-      TabsInTitlebar.allowedBy("sizemode", true);
-    }, false);
-
-    this._initialized = true;
-#endif
-  },
-
-  allowedBy: function (condition, allow) {
-#ifdef CAN_DRAW_IN_TITLEBAR
-    if (allow) {
-      if (condition in this._disallowed) {
-        delete this._disallowed[condition];
-        this._update();
-      }
-    } else {
-      if (!(condition in this._disallowed)) {
-        this._disallowed[condition] = null;
-        this._update();
-      }
-    }
-#endif
-  },
-
-  _initialized: false,
-  _disallowed: {},
-
-  _update: function () {
-#ifdef CAN_DRAW_IN_TITLEBAR
-    if (!this._initialized || window.fullScreen)
-      return;
-
-    function $(id) document.getElementById(id);
-    let titlebar = $("titlebar");
-
-    function rect(ele)   ele.getBoundingClientRect();
-
-    let titlebar       = $("titlebar");
-    let captionButtonsBox = $("titlebar-buttonbox");
-    this._sizePlaceholder("caption-buttons", rect(captionButtonsBox).width);
-
-    let titlebarRect = rect(titlebar);
-    titlebar.style.marginBottom = - (titlebarRect.height - 16) + "px";
-#endif
-  },
-
-#ifdef CAN_DRAW_IN_TITLEBAR
-  _sizePlaceholder: function (type, width) {
-
-    Array.forEach(document.querySelectorAll(".titlebar-placeholder[type='"+ type +"']"),
-                  function (node) { node.width = width; });
-  },
-#endif
-
-  uninit: function () {
-#ifdef CAN_DRAW_IN_TITLEBAR
-    this._initialized = false;
-#endif
-  }
-};
-
-/* Draw */
-function onTitlebarMaxClick() {
-  if (window.windowState == window.STATE_MAXIMIZED)
-    window.restore();
-  else
-    window.maximize();
-}
--- a/mail/base/jar.mn
+++ b/mail/base/jar.mn
@@ -27,17 +27,17 @@ messenger.jar:
 *   content/messenger/hiddenWindow.xul              (content/hiddenWindow.xul)
     content/messenger/hiddenWindow.js               (content/hiddenWindow.js)
     content/messenger/msgHdrViewOverlay.js          (content/msgHdrViewOverlay.js)
     content/messenger/msgHdrViewOverlay.xul         (content/msgHdrViewOverlay.xul)
     content/messenger/msgViewNavigation.js          (content/msgViewNavigation.js)
     content/messenger/mailWidgets.xml               (content/mailWidgets.xml)
     content/messenger/editContactOverlay.js         (content/editContactOverlay.js)
 *   content/messenger/editContactOverlay.xul        (content/editContactOverlay.xul)
-*   content/messenger/msgMail3PaneWindow.js         (content/msgMail3PaneWindow.js)
+    content/messenger/msgMail3PaneWindow.js         (content/msgMail3PaneWindow.js)
     content/messenger/mail3PaneWindowCommands.js    (content/mail3PaneWindowCommands.js)
     content/messenger/mailCommands.js               (content/mailCommands.js)
 *   content/messenger/mailCore.js                   (content/mailCore.js)
     content/messenger/customizeToolbarOverlay.xul   (content/customizeToolbarOverlay.xul)
     content/messenger/mailTabs.js                   (content/mailTabs.js)
     content/messenger/commandglue.js                (content/commandglue.js)
     content/messenger/widgetglue.js                 (content/widgetglue.js)
 *   content/messenger/SearchDialog.xul              (content/SearchDialog.xul)
index bfd53d29df60f20cf646447ce81478d6f1e819e8..1a89f4d8d87b2cd86623f76999a1fed1b5aa16d2
GIT binary patch
literal 1030
zc$@(S1o``kP)<h;3K|Lk000e1NJLTq001xm000mO1^@s6P_F#3000BcNkl<Zc-pO&
zUu;ul7{<Mn3lc&gAq`o=pEW=l=+=b>#@Nb)WGm~|m93I>voc4s!9*A^1tb$8=n!Kx
znO=y9k-_E|24nC77Bw@Pu%6X!i_RO3=%$EX7^992AJ5MVb28hL#<j_l@BQBQ_axub
zo-aKQNSc%QNOJri;hn1=^IYZVsHkY#lb1KRd-ZB%B3L|l(V_hOrbiYo9Nal?o-z?E
z9=urz(BgIv-a68*pU<Ar-4{A-1p|u*FXBMW4u_7fS)&e@%T_S3c(N9t(dpDrC!f{C
z!GoG;YqJ#$EFQdwZ}m(;fqKiz)aUox3I-O>e*#S0{q;dp^ATd7sy92puH0Nr9y_XU
zT3a>V+^mtNCRX+-d$4${0bVUE)b(Ic?^jjnS|A|S52~w?wFd*6Ho$z(L!lFHU$Ea(
z8alxqQPX3_es+N9iWT~{{jkPkG5s<+ra$jZ>rOJMcr+?RO^+E2EFNost_>UXo_WZx
zuD+|u;e@`t(yuG!<%pUdGZ@(Pzrb&QOyz8kG(TNjS^q}i_PV2pnjW)Mzd*yXW%~NS
zetpr{sGB=>=sRQBJn)QuOnfdxO^+E2EFNosSJtoBHS@4<mzHYuojy$(35}U6qNc|T
z1~y%Qe?!!@9B!+Kw7iU{=`n+u9UzjEqw&_g8f|D$vc6u|0|DKR8=9J)5u&EY3<egD
zHNZ<AkFIXprv9y4b$;_^C3|`_VHk*-9y1tN`v5#9;n<-A^{r1mkErRT3$SzPQjNxT
z%Ls=xR9mZo%1V77kL%vdeIaUk%wS;gSOc70w@$r2pL$A4^j1-kl9w-QB5ojRddy&8
z?Jsdj^{(TA=)Tut?I-smYI^A|aoFKd;?bx+H80r>zh6HXhNjJf-yVt!QPX1v1B=HR
zpws12_ohvHbK^#hTrv-D`V!sUh?*WV7})fexFqygM|ouLg~;Q_j_}wZYI@94UE-Q0
zOLQwzrw_}@bjKLh%>BQ_!F!8~g{bK<gMr0k4e;EmRl4ByYUG~-4=Hi+qPjdDL`{zw
z46OYn{(WlN$;v)eZ+3vt;>G&x;jjkGXSC0JR?m68tn5?vVDVT3oN_vKzMw!|Zns`s
zyOx!G${sA9to@M%7cJ5!wKclAWs7e3e71st#bXWd%<|=W-8|sAygWO>z-Bi<jl(f;
z$zQIIgH`&dGGHqhSUi?jiGe+4pwlZ?sxvp&Rxq%5vKC-pQBgFOpFb8@ut1pz77t$Z
zq}LmL!sQyv^kohf58iCPPKQjjWGGk%-nsh!2Jf+<l8AAY{r~^~07*qoM6N<$f?hlJ
A!2kdN
--- a/mail/themes/qute/mail/mailWindow1-aero.css
+++ b/mail/themes/qute/mail/mailWindow1-aero.css
@@ -1,73 +1,14 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 %include mailWindow1.css
 
-@media (-moz-windows-default-theme) {
-  #messengerWindow[sizemode="maximized"] > #navigation-toolbox{
-    margin-top: -6px;
-  }
-}
-
-@media (-moz-windows-compositor) {
-  #messengerWindow[sizemode="normal"] > #titlebar > #titlebar-content {
-    border-top-width: 0;
-  }
-
-  #messengerWindow[sizemode="normal"] #titlebar-buttonbox {
-    margin-top: 0;
-  }
-
-  #messengerWindow[sizemode="normal"] > #titlebar > #titlebar-content:-moz-lwtheme {
-    margin-bottom: -2px;
-    border-top: 2px solid;
-    -moz-border-top-colors: rgb(37, 44, 51) rgba(255, 255, 255, .6);
-  }
-
-  .titlebar-button {
-    display: none;
-  }
-
-  #main-window[sizemode="maximized"] #titlebar-buttonbox {
-    -moz-margin-end: 3px;
-  }
-
-  #titlebar-buttonbox-container:-moz-lwtheme {
-    -moz-appearance: -moz-window-button-box;
-  }
-
-  #messengerWindow:not(:-moz-lwtheme) {
-    -moz-appearance: -moz-win-borderless-glass;
-    background-color: transparent;
-  }
-}
-
-@media not all and (-moz-windows-compositor) {
-  @media (-moz-windows-default-theme) {
-    #messengerWindow:not(:-moz-lwtheme) {
-      background-color: rgb(185, 209, 234);
-    }
-    #messengerWindow:not(:-moz-lwtheme):-moz-window-inactive {
-      background-color: rgb(215, 228, 242);
-    }
-
-    #messengerWindow[sizemode="normal"] > #titlebar > #titlebar-content {
-      border-top-width: 2px;
-      -moz-border-top-colors: #4D4D4D #E9ECF3;
-    }
-
-    #messengerWindow[sizemode="normal"] #titlebar-buttonbox {
-      margin-top: -2px;
-    }
-  }
-}
-
 #subjectCol {
   -moz-padding-start: 20px;
 }
 
 #subjectCol[primary="true"] {
   -moz-padding-start: 30px;
 }
 
--- a/mail/themes/qute/mail/mailWindow1.css
+++ b/mail/themes/qute/mail/mailWindow1.css
@@ -384,145 +384,8 @@ treechildren::-moz-tree-cell-text(subjec
   -moz-image-region: rect(0 16px 16px 0);
 }
 
 /* ..... tabs ..... */
 
 #tabpanelcontainer {
   -moz-appearance: none;
 }
-
-/* ..... Draw in titlebar ..... */
-
-@media (-moz-windows-default-theme) {
-  #messengerWindow {
-    background-color: ActiveCaption;
-  }
-
-  #messengerWindow:-moz-window-inactive {
-    background-color: InactiveCaption;
-  }
-}
-
-/* Luna silver needs special colors. Default doesn't look good */
-@media (-moz-windows-theme: luna-silver) {
-  #messengerWindow {
-    background-color: #D6D8E1;
-  }
-
-  #messengerWindow:-moz-window-inactive {
-    background-color: #E8E9F1;
-  }
-}
-
-#messengerWindow:-moz-lwtheme {
-  background-color: transparent;
-}
-
-#titlebar {
-  -moz-binding: url("chrome://global/content/bindings/general.xml#windowdragbox");
-}
-
-#titlebar:-moz-lwtheme {
-  visibility: hidden;
-}
-
-#titlebar-content:-moz-lwtheme {
-  -moz-binding: url("chrome://global/content/bindings/general.xml#windowdragbox");
-  visibility: visible;
-}
-
-#titlebar-spacer {
-  pointer-events: none;
-}
-
-#tabs-toolbar {
-  -moz-binding: url("chrome://global/content/bindings/toolbar.xml#toolbar-drag");
-}
-
-#titlebar-buttonbox {
-  -moz-appearance: -moz-window-button-box;
-  position: relative;
-}
-
-#titlebar-min {
-  -moz-appearance: -moz-window-button-minimize;
-}
-
-@media not all and (-moz-windows-classic) {
-  #titlebar-min {
-    -moz-margin-end: 2px;
-  }
-}
-
-#titlebar-max {
-  -moz-appearance: -moz-window-button-maximize;
-}
-
-#messengerWindow[sizemode="maximized"] #titlebar-max {
-  -moz-appearance: -moz-window-button-restore;
-}
-
-#titlebar-close {
-  -moz-appearance: -moz-window-button-close;
-}
-
-.titlebar-placeholder[type="caption-buttons"] {
-  margin-left: 10px; /* additional space for Aero Snap */
-}
-
-/* Window titlebar drawn by TB. So needs border like system windows */
-#messengerWindow[sizemode="normal"] > #titlebar > #titlebar-content {
-  border-top: 3px solid;
-  -moz-border-top-colors: ThreeDLightShadow ThreeDHighlight ActiveBorder;
-}
-
-#messengerWindow[sizemode="normal"] #titlebar-buttonbox {
-  margin-top: -3px;
-}
-
-#messengerWindow[sizemode="normal"] > #titlebar >
-#titlebar-content:-moz-window-inactive {
-  -moz-border-top-colors: ThreeDLightShadow ThreeDHighlight InactiveBorder;
-}
-
-@media (-moz-windows-default-theme) {
-  #messengerWindow[sizemode="normal"] > #titlebar > #titlebar-content {
-    -moz-border-top-colors: rgba(0, 0, 0, .1) rgba(255, 255, 255, .3)
-                            rgba(255, 255, 255, .2);
-  }
-
-  #messengerWindow[sizemode="normal"] > #titlebar >
-  #titlebar-content:-moz-window-inactive {
-    -moz-border-top-colors: rgba(255, 255, 255, .4) rgba(255, 255, 255, .3)
-                            rgba(255, 255, 255, .2);
-  }
-}
-
-@media (-moz-windows-theme: luna-silver) {
-  #messengerWindow[sizemode="normal"] > #titlebar > #titlebar-content {
-    -moz-border-top-colors: rgba(0, 0, 0, .4) rgba(255, 255, 255, .3)
-                            rgba(255, 255, 255, .2);
-  }
-}
-
-/* Black on dark background doesn't look good */
-@media (-moz-windows-theme: luna-blue) {
-  menubar:not(:-moz-lwtheme) > menu {
-    color: white;
-  }
-}
-
-@media (-moz-windows-theme: royale) {
-  menubar:not(:-moz-lwtheme) > menu {
-    color: white;
-  }
-}
-
-@media (-moz-windows-theme: zune) {
-  menubar:not(:-moz-lwtheme) > menu {
-    color: white;
-  }
-}
-
-#messengerWindow[sizemode="maximized"] > #navigation-toolbox{
-  margin-top: -12px;
-}
--- a/mail/themes/qute/mail/primaryToolbar-aero.css
+++ b/mail/themes/qute/mail/primaryToolbar-aero.css
@@ -18,20 +18,16 @@
 .mail-toolbox:not(:-moz-lwtheme),
 #navigation-toolbox:not(:-moz-lwtheme),
 .contentTabToolbox:not(:-moz-lwtheme) {
   -moz-appearance: none;
   border-top: none;
   background-color: -moz-Dialog;
 }
 
-#navigation-toolbox {
-  background-color: transparent !important;
-}
-
 .mail-toolbox,
 .contentTabToolbox {
   border-bottom: 1px solid ThreeDShadow;
 }
 
 .mail-toolbox > toolbar {
   -moz-margin-start: 0;
   border-bottom: none;
@@ -43,17 +39,17 @@
 #navigation-toolbox > toolbar:not(:-moz-lwtheme),
 .contentTabToolbox:not(:-moz-lwtheme) > toolbar:not(:-moz-lwtheme) {
   -moz-appearance: none;
   border-style: none;
   background-color: transparent;
 }
 
 #navigation-toolbox #tabs-toolbar:not(:-moz-lwtheme) {
-  border-bottom: 1px solid rgba(10, 31, 51, .35);
+  border-bottom: 1px solid ThreeDShadow;
 }
 
 #navigation-toolbox #tabs-toolbar:-moz-lwtheme {
   border-bottom: 1px solid transparent;
 }
 
 .mail-toolbox:-moz-lwtheme,
 .contentTabToolbox:-moz-lwtheme {
@@ -62,27 +58,33 @@
 }
 
 #mail-bar3 {
   padding: 1px 0;
 }
 
 @media (-moz-windows-default-theme) {
   .mail-toolbox:not(:-moz-lwtheme),
+  #navigation-toolbox:not(:-moz-lwtheme),
   .contentTabToolbox:not(:-moz-lwtheme) {
     background-color: hsl(210, 75%, 92%);
   }
 }
 
 .mail-toolbox:not(:-moz-lwtheme),
 .contentTabToolbox:not(:-moz-lwtheme) {
   background-image: -moz-linear-gradient(rgba(255, 255, 255, .5),
                     rgba(255, 255, 255, 0));
 }
 
+#navigation-toolbox:not(:-moz-lwtheme) {
+  background-image: -moz-linear-gradient(rgba(255, 255, 255, 0),
+                    rgba(255, 255, 255, .5));
+}
+
 .chromeclass-toolbar {
   /* Toolbar buttons have a margin of 3px; adjust the toolbar so the leftmost
      button lines up with the rest of the window. */
   -moz-margin-start: -3px;
 }
 
 /* ::::: primary toolbar buttons ::::: */
 
--- a/mail/themes/qute/mail/primaryToolbar.css
+++ b/mail/themes/qute/mail/primaryToolbar.css
@@ -8,28 +8,22 @@
    == native-OS-style toolbars at the top of various windows, as well as
    == the specifically about the ones that appear on the 3-pane window and
    == the standalone message window.  The other native-OS-style toolbars
    == (addressbook and compose) are already styled elsewhere.
    ====================================================================== */
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
-#navigation-toolbox {
+#navigation-toolbox #tabs-toolbar {
   -moz-appearance: none;
-  border-top-width: 0;
-  background-color: transparent;
+  border-bottom: 1px solid ThreeDShadow;
 }
 
-#tabs-toolbar {
-  -moz-appearance: none;
-  border-bottom: 1px solid rgba(10, 31, 51, .35);
-}
-
-#tabs-toolbar:-moz-lwtheme {
+#navigation-toolbox #tabs-toolbar:-moz-lwtheme {
   border-bottom-color: transparent;
 }
 
 #tabs-toolbar {
   -moz-box-ordinal-group: 20;
 }
 
 #mail-toolbar-menubar2 {
--- a/mail/themes/qute/mail/tabmail.css
+++ b/mail/themes/qute/mail/tabmail.css
@@ -33,34 +33,16 @@
   background: none;
 }
 
 .tabmail-tab[selected] {
   position: relative;
   text-shadow: none;
 }
 
-@media (-moz-windows-theme: luna-blue) {
-  .tabmail-tab:not([selected]):not(:-moz-lwtheme) {
-    color: white;
-  }
-}
-
-@media (-moz-windows-theme: royale) {
-  .tabmail-tab:not([selected]):not(:-moz-lwtheme) {
-    color: white;
-  }
-}
-
-@media (-moz-windows-theme: zune) {
-  .tabmail-tab:not([selected]):not(:-moz-lwtheme) {
-    color: white;
-  }
-}
-
 .tabmail-tab:-moz-lwtheme {
   color: inherit;
   text-shadow: inherit;
 }
 
 .tab-stack {
   height: 31px;
 }
@@ -239,40 +221,16 @@ tabpanels {
 .tabs-closebutton {
   -moz-appearance: none;
   -moz-image-region: rect(0, 16px, 16px, 0);
   border: none;
   cursor: default;
   list-style-image: url(icons/closeTab.png);
 }
 
-@media (-moz-windows-theme: luna-blue) {
-  .tabmail-tab:not([selected]) > .tab-stack > .tab-content >
-  .tab-close-button:not(:hover):not(:active),
-  .tabs-closebutton {
-    -moz-image-region: rect(0, 64px, 16px, 48px);
-  }
-}
-
-@media (-moz-windows-theme: royale) {
-  .tabmail-tab:not([selected]) > .tab-stack > .tab-content >
-  .tab-close-button:not(:hover):not(:active),
-  .tabs-closebutton {
-    -moz-image-region: rect(0, 64px, 16px, 48px);
-  }
-}
-
-@media (-moz-windows-theme: zune) {
-  .tabmail-tab:not([selected]) > .tab-stack > .tab-content >
-  .tab-close-button:not(:hover):not(:active),
-  .tabs-closebutton {
-    -moz-image-region: rect(0, 64px, 16px, 48px);
-  }
-}
-
 .tabs-closebutton {
   padding: 0 2px;
 }
 
 .tab-close-button {
   -moz-margin-start: 6px;
   -moz-padding-start: 0 !important;
   -moz-padding-end: 0 !important;
@@ -386,34 +344,16 @@ tabpanels {
   list-style-image: url(chrome://messenger/skin/icons/mainwindow-dropdown-arrow.png);
   -moz-image-region: rect(0, 13px, 11px, 0);
 }
 
 .tabs-alltabs-button > .toolbarbutton-menu-dropmarker:-moz-lwtheme-brighttext {
   list-style-image: url(chrome://messenger/skin/icons/mainwindow-dropdown-arrow-inverted.png);
 }
 
-@media (-moz-windows-theme: luna-blue) {
-  .tabs-alltabs-button:not(:hover) > .toolbarbutton-menu-dropmarker:not(:-moz-lwtheme) {
-    list-style-image: url(chrome://messenger/skin/icons/mainwindow-dropdown-arrow-inverted.png);
-  }
-}
-
-@media (-moz-windows-theme: royale) {
-  .tabs-alltabs-button:not(:-moz-lwtheme) > .toolbarbutton-menu-dropmarker:not(:-moz-lwtheme) {
-    list-style-image: url(chrome://messenger/skin/icons/mainwindow-dropdown-arrow-inverted.png);
-  }
-}
-
-@media (-moz-windows-theme: zune) {
-  .tabs-alltabs-button:not(:-moz-lwtheme) > .toolbarbutton-menu-dropmarker:not(:-moz-lwtheme) {
-    list-style-image: url(chrome://messenger/skin/icons/mainwindow-dropdown-arrow-inverted.png);
-  }
-}
-
 /**
  * All Tabs Menupopup
  */
 
 .alltabs-item {
   list-style-image: url("chrome://global/skin/icons/folder-item.png");
   -moz-image-region: rect(0px, 16px, 16px, 0px);
 }