Bug 1344570 - Port bug 1344307 to TB [Clean up lightweight theme footer handling]. r=mkmelin DONTBUILD AURORA_BASE_20170307
authorRichard Marti <richard.marti@gmail.com>
Sun, 05 Mar 2017 21:26:57 +0100
changeset 27736 1b4780c4e439b8ef32b82c3a353d90d7dae45c97
parent 27735 8be1ae77d2644e401fa6480a05ff234e70d0ccdf
child 27737 3cb7c01e80ba781e96e503c0751550dbfe165c44
push idunknown
push userunknown
push dateunknown
reviewersmkmelin
bugs1344570, 1344307
Bug 1344570 - Port bug 1344307 to TB [Clean up lightweight theme footer handling]. r=mkmelin DONTBUILD
mail/base/content/messageWindow.xul
mail/base/content/messenger.css
mail/base/content/messenger.xul
mail/components/addrbook/content/addressbook.xul
mail/components/compose/content/messengercompose.xul
--- a/mail/base/content/messageWindow.xul
+++ b/mail/base/content/messageWindow.xul
@@ -32,18 +32,17 @@
         titlemenuseparator="&titleSeparator.label;"
         onload="OnLoadMessageWindow()"
         onunload="OnUnloadMessageWindow()"
         persist="width height screenX screenY sizemode"
         toggletoolbar="true"
         windowtype="mail:messageWindow"
         macanimationtype="document"
         lightweightthemes="true"
-        fullscreenbutton="true"
-        lightweightthemesfooter="status-bar">
+        fullscreenbutton="true">
 
   <stringbundleset id="stringbundleset">
     <stringbundle id="bundle_brand" src="chrome://branding/locale/brand.properties"/>
     <stringbundle id="bundle_offlinePrompts" src="chrome://messenger/locale/offline.properties"/>
   </stringbundleset>
 
   <script type="application/javascript" src="chrome://global/content/globalOverlay.js"/>
   <script type="application/javascript" src="chrome://messenger/content/shareglue.js"/>
--- a/mail/base/content/messenger.css
+++ b/mail/base/content/messenger.css
@@ -289,21 +289,21 @@ menupopup[type="folder"] {
   background-image: var(--lwt-header-image) !important;
 }
 
 #messengerWindow:-moz-lwtheme {
   background-repeat: no-repeat;
   background-position: top right;
 }
 
-#status-bar[lwthemefooter="true"] {
+:root[lwthemefooter="true"] #status-bar:-moz-lwtheme {
   background-repeat: no-repeat;
   background-position: bottom left;
   background-color: var(--lwt-accent-color);
-  background-image: var(--lwt-header-image);
+  background-image: var(--lwt-footer-image);
 }
 
 /* AppButton support */
 
 splitmenu {
   -moz-binding: url("chrome://messenger/content/mailWidgets.xml#splitmenu");
 }
 
--- a/mail/base/content/messenger.xul
+++ b/mail/base/content/messenger.xul
@@ -51,18 +51,17 @@
         onload="OnLoadMessenger()"
         onunload="OnUnloadMessenger()"
         screenX="10" screenY="10"
         persist="width height screenX screenY sizemode"
         toggletoolbar="true"
         windowtype="mail:3pane"
         macanimationtype="document"
         lightweightthemes="true"
-        fullscreenbutton="true"
-        lightweightthemesfooter="status-bar">
+        fullscreenbutton="true">
 
 <stringbundleset id="stringbundleset">
   <stringbundle id="bundle_brand" src="chrome://branding/locale/brand.properties"/>
   <stringbundle id="bundle_search" src="chrome://messenger/locale/search.properties"/>
 </stringbundleset>
 
 <script type="application/javascript" src="chrome://global/content/globalOverlay.js"/>
 <script type="application/javascript" src="chrome://messenger/content/commandglue.js"/>
--- a/mail/components/addrbook/content/addressbook.xul
+++ b/mail/components/addrbook/content/addressbook.xul
@@ -28,18 +28,17 @@
     title="&addressbookWindow.title;"
     windowtype="mail:addressbook"
     macanimationtype="document"
     persist="width height screenX screenY sizemode"
     toggletoolbar="true"
     onload="OnLoadAddressBook()"
     onunload="OnUnloadAddressBook()"
     lightweightthemes="true"
-    fullscreenbutton="true"
-    lightweightthemesfooter="status-bar">
+    fullscreenbutton="true">
 
   <stringbundleset id="stringbundleset">
     <stringbundle id="bundle_addressBook" src="chrome://messenger/locale/addressbook/addressBook.properties"/>
     <stringbundle id="bundle_messenger" src="chrome://messenger/locale/messenger.properties"/>
     <stringbundle id="bundle_brand" src="chrome://branding/locale/brand.properties"/>
   </stringbundleset>
 
 <script type="application/javascript" src="chrome://messenger/content/jsTreeView.js"/>
--- a/mail/components/compose/content/messengercompose.xul
+++ b/mail/components/compose/content/messengercompose.xul
@@ -36,18 +36,17 @@
         onclose="return DoCommandClose()"
         onfocus="EditorOnFocus()"
         title="&msgComposeWindow.title;"
         windowtype="msgcompose"
         macanimationtype="document"
         toggletoolbar="true"
         persist="screenX screenY width height sizemode"
         lightweightthemes="true"
-        fullscreenbutton="true"
-        lightweightthemesfooter="status-bar">
+        fullscreenbutton="true">
 
 <stringbundleset id="stringbundleset">
   <stringbundle id="bundle_composeMsgs" src="chrome://messenger/locale/messengercompose/composeMsgs.properties"/>
   <stringbundle id="bundle_messenger"   src="chrome://messenger/locale/messenger.properties"/>
   <stringbundle id="brandBundle"        src="chrome://branding/locale/brand.properties"/>
 </stringbundleset>
 
 <script type="application/javascript" src="chrome://global/content/printUtils.js"/>