Bug 1505503 - Port bug 1505311, bug 1505334 and bug 1505324 to TB. r=jorgk
authorRichard Marti <richard.marti@gmail.com>
Wed, 07 Nov 2018 19:19:10 +0100
changeset 33677 24e632421a17a766666f4653b767781cb0753fa4
parent 33676 a5fe17002ce32b945b3cdba35ef0a2e16f932e4e
child 33678 a286542912546c3dc22761d1dd6a7939623c6635
push id388
push userclokep@gmail.com
push dateMon, 28 Jan 2019 20:54:56 +0000
reviewersjorgk
bugs1505503, 1505311, 1505334, 1505324
Bug 1505503 - Port bug 1505311, bug 1505334 and bug 1505324 to TB. r=jorgk Bug 1505311: Stop overriding --toolbarbutton-icon-fill-opacity for Dark and Light themes. Bug 1505334: Fix --toolbarbutton-icon-fill-opacity override for the tabs toolbar using the Dark / Light themes on Aero Glass. Bug 1505324: Remove redundant compacttheme.css rules on Linux.
mail/components/mailGlue.js
mail/themes/linux/mail/compacttheme.css
mail/themes/shared/mail/compacttheme.css
mail/themes/windows/mail/compacttheme.css
--- a/mail/components/mailGlue.js
+++ b/mail/components/mailGlue.js
@@ -165,17 +165,18 @@ MailGlue.prototype = {
 
     let vendorShortName = gBrandBundle.GetStringFromName("vendorShortName");
 
     LightweightThemeManager.addBuiltInTheme({
       id: "thunderbird-compact-light@mozilla.org",
       name: gMailBundle.GetStringFromName("lightTheme.name"),
       description: gMailBundle.GetStringFromName("lightTheme.description"),
       iconURL: "resource:///chrome/messenger/content/messenger/light.icon.svg",
-      textcolor: "#18191a",
+      textcolor: "rgb(24, 25, 26)",
+      icon_color: "rgb(24, 25, 26, 0.7)",
       accentcolor: "#E3E4E6",
       popup: "#fff",
       popup_text: "#0c0c0d",
       popup_border: "#ccc",
       tab_line: "#0a84ff",
       toolbarColor: "#f5f6f7",
       toolbar_bottom_separator: "#ccc",
       toolbar_field: "#fff",
@@ -183,23 +184,24 @@ MailGlue.prototype = {
       author: vendorShortName,
     });
     LightweightThemeManager.addBuiltInTheme({
       id: "thunderbird-compact-dark@mozilla.org",
       name: gMailBundle.GetStringFromName("darkTheme.name"),
       description: gMailBundle.GetStringFromName("darkTheme.description"),
       iconURL: "resource:///chrome/messenger/content/messenger/dark.icon.svg",
       textcolor: "rgb(249, 249, 250)",
+      icon_color: "rgb(249, 249, 250, 0.7)",
       accentcolor: "hsl(240, 5%, 5%)",
       popup: "#4a4a4f",
       popup_text: "rgb(249, 249, 250)",
       popup_border: "#27272b",
       tab_line: "#0a84ff",
       toolbarColor: "hsl(240, 1%, 20%)",
-      toolbar_bottom_separator: "hsla(240, 5%, 5%, .2",
+      toolbar_bottom_separator: "hsla(240, 5%, 5%, 0.2",
       toolbar_field: "rgb(71, 71, 73)",
       toolbar_field_border: "rgba(249, 249, 250, 0.2)",
       toolbar_field_separator: "#5F6670",
       toolbar_field_text: "rgb(249, 249, 250)",
       sidebar: "#38383D",
       sidebar_text: "rgb(249, 249, 250)",
       sidebar_border: "rgba(255, 255, 255, 0.2)",
       author: vendorShortName,
--- a/mail/themes/linux/mail/compacttheme.css
+++ b/mail/themes/linux/mail/compacttheme.css
@@ -1,23 +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/. */
 
 @import url("chrome://messenger/skin/shared/compacttheme.css");
 
-#tabs-toolbar,
-#mail-toolbar-menubar2 {
-  -moz-appearance: none !important;
-}
-
-#mail-menubar > menu:not([open]) {
-  color: inherit;
-}
-
 /* Quick-Filter-Bar */
 #quick-filter-bar {
   border-bottom-color: var(--toolbox-border-bottom-color);
 }
 
 #MsgHeadersToolbar {
   background-image: none;
 }
--- a/mail/themes/shared/mail/compacttheme.css
+++ b/mail/themes/shared/mail/compacttheme.css
@@ -6,18 +6,16 @@
    is preffed on.  The bulk of the styling is here in the shared file, but
    there are overrides for each platform in their compacttheme.css files. */
 
 :root:-moz-lwtheme {
   --toolbar-non-lwt-bgcolor: var(--toolbar-bgcolor);
   --toolbar-non-lwt-textcolor: var(--lwt-text-color);
   --toolbar-non-lwt-bgimage: none;
   --lwt-toolbar-field-border-color: hsla(240,5%,5%,.25);
-
-  --toolbarbutton-icon-fill-opacity: .7;
 }
 
 :root:-moz-lwtheme-brighttext {
   /* Toolbar buttons */
   --lwt-toolbarbutton-hover-background: rgba(179, 179, 179, 0.4);
   --lwt-toolbarbutton-active-background: rgba(179, 179, 179, 0.6);
 
   /* !important to override LightweightThemeManager.addBuiltInTheme in
--- a/mail/themes/windows/mail/compacttheme.css
+++ b/mail/themes/windows/mail/compacttheme.css
@@ -53,19 +53,19 @@
     }
     .tabmail-tab:hover > .tab-stack > .tab-background > .tab-line:not([selected=true]):-moz-lwtheme-darktext {
       background-color: rgba(0,0,0,.2) !important;
     }
   }
 }
 
 @media (-moz-windows-glass) {
-  /* Set to full fill-opacity to improve visibility of toolbar buttons on aero glass. */
+  /* Use opaque white icons on Aero Glass. */
   #tabs-toolbar {
-    --toolbarbutton-icon-fill-opacity: 1;
+    --lwt-toolbarbutton-icon-fill: white;
   }
 
   #navigation-toolbox {
     background-color: transparent;
   }
 }
 
 @media (-moz-os-version: windows-win7),