Bug 1400575 - Port bug 1387582 to TB [Add toolbar_text color property to theming API]. r=jorgk
authorRichard Marti <richard.marti@gmail.com>
Sat, 16 Sep 2017 12:31:39 +0200
changeset 29746 5a2d4268fbd557403d9274ac041bf24cb7da7c0f
parent 29745 b182a7a28b128b34bcbf96fb1a2a5116b323c0e3
child 29747 175495e6ca8eea0137edd572b26e1e3dcf83ba42
push id378
push userclokep@gmail.com
push dateMon, 13 Nov 2017 18:45:35 +0000
reviewersjorgk
bugs1400575, 1387582
Bug 1400575 - Port bug 1387582 to TB [Add toolbar_text color property to theming API]. r=jorgk
mail/themes/linux/mail/addrbook/addressbook.css
mail/themes/linux/mail/compose/messengercompose.css
mail/themes/linux/mail/primaryToolbar.css
mail/themes/osx/mail/addrbook/addressbook.css
mail/themes/osx/mail/compose/messengercompose.css
mail/themes/osx/mail/primaryToolbar.css
mail/themes/shared/mail/addressbook.css
mail/themes/shared/mail/messenger.css
mail/themes/shared/mail/tabmail.css
mail/themes/windows/mail/addrbook/addressbook.css
mail/themes/windows/mail/compose/messengercompose.css
mail/themes/windows/mail/primaryToolbar.css
--- a/mail/themes/linux/mail/addrbook/addressbook.css
+++ b/mail/themes/linux/mail/addrbook/addressbook.css
@@ -10,20 +10,16 @@
 @import url("chrome://messenger/skin/shared/addressbook.css");
 
 #ab-toolbox {
   -moz-appearance: none;
   background-color: var(--toolbar-bgcolor);
   border-bottom: 1px solid hsl(0, 0%, 60%);
 }
 
-#ab-toolbox:-moz-lwtheme {
-  background-color: transparent;
-}
-
 #ab-toolbox > toolbar {
   /* force iconsize="small" on these toolbars */
   counter-reset: smallicons;
 }
 
 /* ::::: primary toolbar buttons ::::: */
 
 #button-newcard {
--- a/mail/themes/linux/mail/compose/messengercompose.css
+++ b/mail/themes/linux/mail/compose/messengercompose.css
@@ -17,17 +17,18 @@
 
 #compose-toolbox {
   -moz-appearance: none;
   background-color: var(--toolbar-bgcolor);
   border-bottom: 1px solid ThreeDShadow;
 }
 
 #compose-toolbox:-moz-lwtheme {
-  background-color: transparent;
+  background-color: var(--toolbar-bgcolor);
+  color: var(--toolbar-color, inherit);
 }
 
 #compose-toolbox > toolbar {
   /* force iconsize="small" on these toolbars */
   counter-reset: smallicons;
 }
 
 /** Stock icons for the menu items. */
--- a/mail/themes/linux/mail/primaryToolbar.css
+++ b/mail/themes/linux/mail/primaryToolbar.css
@@ -17,16 +17,21 @@
 
 .mail-toolbox,
 .contentTabToolbox {
   -moz-appearance: none;
   background-color: var(--toolbar-bgcolor);
   background-image: var(--toolbar-bgimage);
 }
 
+.mail-toolbox:-moz-lwtheme,
+.contentTabToolbox:-moz-lwtheme {
+  color: var(--toolbar-color, inherit);
+}
+
 .mail-toolbox::after,
 .contentTabToolbox::after {
   content: "";
   display: -moz-box;
   height: 1px;
   border-bottom: 1px solid ThreeDShadow;
 }
 
--- a/mail/themes/osx/mail/addrbook/addressbook.css
+++ b/mail/themes/osx/mail/addrbook/addressbook.css
@@ -8,16 +8,20 @@
 
 @import url("chrome://messenger/skin/");
 @import url("chrome://messenger/skin/shared/addressbook.css");
 
 #ab-bar2 {
   padding: 0 4px;
 }
 
+#ab-toolbox:-moz-lwtheme {
+  -moz-appearance: none;
+}
+
 #ab-toolbox > toolbar {
   /* force iconsize="small" on these toolbars */
   counter-reset: smallicons;
 }
 
 @media not all and (-moz-mac-yosemite-theme) {
   #button-newcard {
     list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbook-toolbar-osxlion.svg#newcard");
--- a/mail/themes/osx/mail/compose/messengercompose.css
+++ b/mail/themes/osx/mail/compose/messengercompose.css
@@ -5,16 +5,22 @@
 /* ===== messengercompose.css ===========================================
   == Styles for the main Messenger Compose window.
   ======================================================================= */
 
 @import url("chrome://messenger/skin/");
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
+#compose-toolbox:-moz-lwtheme {
+  -moz-appearance: none;
+  background-color: var(--toolbar-bgcolor);
+  color: var(--toolbar-color, inherit);
+}
+
 #attachmentBucket {
   width: 15em;
   min-width: 15em;
 }
 
 #compose-toolbox toolbarbutton[checked="true"] {
   background-color: transparent;
 }
--- a/mail/themes/osx/mail/primaryToolbar.css
+++ b/mail/themes/osx/mail/primaryToolbar.css
@@ -16,16 +16,21 @@
 /* ::::: Mail Toolbars and Menubars ::::: */
 
 .mail-toolbox,
 .contentTabToolbox {
   -moz-appearance: none;
   background: var(--toolbar-bgcolor);
 }
 
+.mail-toolbox:-moz-lwtheme,
+.contentTabToolbox:-moz-lwtheme {
+  color: var(--toolbar-color, inherit);
+}
+
 .mail-toolbox::after,
 .contentTabToolbox::after {
   content: "";
   display: -moz-box;
   margin-top: -1px;
   height: 1px;
   border-bottom: 1px solid hsl(0, 0%, 60%);
 }
--- a/mail/themes/shared/mail/addressbook.css
+++ b/mail/themes/shared/mail/addressbook.css
@@ -1,15 +1,20 @@
 /* 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/. */
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 @namespace html url("http://www.w3.org/1999/xhtml");
 
+#ab-toolbox:-moz-lwtheme {
+  background-color: var(--toolbar-bgcolor);
+  color: var(--toolbar-color, inherit);
+}
+
 toolbox[labelalign="end"] > toolbar[mode="full"] deck .toolbarbutton-text {
   text-align: start;
 }
 
 #abContent {
   text-shadow: none;
   color: -moz-DialogText;
   background-color: -moz-Dialog;
--- a/mail/themes/shared/mail/messenger.css
+++ b/mail/themes/shared/mail/messenger.css
@@ -37,16 +37,23 @@ toolbar[printpreview="true"] {
 #throbber-box[busy="true"] {
   list-style-image: url("chrome://global/skin/icons/loading.png");
 }
 
 #wrapper-throbber-box > #throbber-box {
   list-style-image: url("chrome://messenger/skin/icons/notloading.png");
 }
 
+/* ::::: Status bar ::::: */
+
+#status-bar:-moz-lwtheme {
+  background-color: var(--toolbar-bgcolor);
+  color: var(--toolbar-color, inherit);
+}
+
 /* ::::: online/offline icons ::::: */
 
 #offline-status[offline="true"] {
   list-style-image: url("chrome://messenger/skin/icons/offline.png");
 }
 
 #offline-status {
   padding: 0 2px;
--- a/mail/themes/shared/mail/tabmail.css
+++ b/mail/themes/shared/mail/tabmail.css
@@ -84,16 +84,20 @@
 .tabmail-tab:not([selected]):not(:-moz-lwtheme) {
   color: inherit;
 }
 
 .tabmail-tab:-moz-lwtheme {
   color: inherit;
 }
 
+.tabmail-tab[visuallyselected=true]:-moz-lwtheme {
+  color: var(--toolbar-color, inherit);
+}
+
 .tab-line {
   height: 2px;
 }
 
 /* Selected tab */
 
 .tab-background {
   border: 1px none transparent;
--- a/mail/themes/windows/mail/addrbook/addressbook.css
+++ b/mail/themes/windows/mail/addrbook/addressbook.css
@@ -70,20 +70,16 @@
   @media (-moz-os-version: windows-win8),
          (-moz-os-version: windows-win10) {
     #ab-toolbox {
       border-bottom-color: #c2c2c2;
     }
   }
 }
 
-#ab-toolbox:-moz-lwtheme {
-  background-color: transparent;
-}
-
 toolbar:not(:-moz-lwtheme) {
   -moz-appearance: none;
 }
 
 #ab-toolbox > toolbar {
   /* force iconsize="small" on these toolbars */
   counter-reset: smallicons;
 }
--- a/mail/themes/windows/mail/compose/messengercompose.css
+++ b/mail/themes/windows/mail/compose/messengercompose.css
@@ -587,17 +587,18 @@ toolbarbutton.formatting-button,
          (-moz-os-version: windows-win10) {
     #compose-toolbox {
       border-bottom-color: #c2c2c2;
     }
   }
 }
 
 #compose-toolbox:-moz-lwtheme {
-  background-color: transparent;
+  background-color: var(--toolbar-bgcolor);
+  color: var(--toolbar-color, inherit);
 }
 
 toolbar:not(:-moz-lwtheme) {
   -moz-appearance: none;
 }
 
 #compose-toolbox > toolbar {
   /* force iconsize="small" on these toolbars */
--- a/mail/themes/windows/mail/primaryToolbar.css
+++ b/mail/themes/windows/mail/primaryToolbar.css
@@ -142,16 +142,22 @@
 .mail-toolbox,
 .contentTabToolbox {
   -moz-appearance: none;
   background-color: var(--toolbar-bgcolor);
   background-image: var(--toolbar-bgimage);
   box-shadow: 0 1px 0 rgba(253, 253, 253, 0.45) inset;
 }
 
+.mail-toolbox:-moz-lwtheme,
+.contentTabToolbox:-moz-lwtheme {
+  color: var(--toolbar-color, inherit);
+  box-shadow: none;
+}
+
 .mail-toolbox::after,
 .contentTabToolbox::after {
   content: "";
   display: -moz-box;
   height: 1px;
   border-bottom: 1px solid ThreeDShadow;
 }
 
@@ -930,16 +936,22 @@ toolbar:not([mode="text"]) > toolbarpale
     -moz-window-dragging: no-drag;
     box-shadow: 0 1px 0 rgba(253, 253, 253, 0.45) inset;
     background-image: var(--toolbar-bgimage);
     background-color: var(--toolbar-bgcolor);
     padding-bottom: 1px !important;
     padding-top: 2px;
   }
 
+  #mail-toolbar-menubar2:-moz-lwtheme {
+    background-color: var(--toolbar-bgcolor);
+    color: var(--toolbar-color, inherit);
+    box-shadow: none;
+  }
+
   #navigation-toolbox > #mail-toolbar-menubar2:not(:-moz-lwtheme) {
     -moz-appearance: none;
     border-bottom: 1px solid #aabccf;
   }
 
   #tabs-toolbar:not(:-moz-lwtheme) {
     position: relative;
   }