Bug 1505311 - Stop overriding --toolbarbutton-icon-fill-opacity for Dark and Light themes. r=ntim
authorDão Gottwald <dao@mozilla.com>
Wed, 07 Nov 2018 10:45:17 +0000
changeset 444821 78f9d59c280f7f407ee934174add3c3597657c7c
parent 444820 e860d0d115d04d12cbc60723c40cd38671305946
child 444822 bae65a2ae47d8a4462ca842e29b155166404f594
push id35003
push userncsoregi@mozilla.com
push dateWed, 07 Nov 2018 16:16:52 +0000
treeherdermozilla-central@4407a6d3e374 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersntim
bugs1505311
milestone65.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1505311 - Stop overriding --toolbarbutton-icon-fill-opacity for Dark and Light themes. r=ntim Differential Revision: https://phabricator.services.mozilla.com/D11151
browser/components/nsBrowserGlue.js
browser/themes/shared/compacttheme.inc.css
--- a/browser/components/nsBrowserGlue.js
+++ b/browser/components/nsBrowserGlue.js
@@ -1022,17 +1022,18 @@ BrowserGlue.prototype = {
 
     let vendorShortName = gBrandBundle.GetStringFromName("vendorShortName");
 
     LightweightThemeManager.addBuiltInTheme({
       id: "firefox-compact-light@mozilla.org",
       name: gBrowserBundle.GetStringFromName("lightTheme.name"),
       description: gBrowserBundle.GetStringFromName("lightTheme.description"),
       iconURL: "resource:///chrome/browser/content/browser/defaultthemes/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",
@@ -1040,16 +1041,17 @@ BrowserGlue.prototype = {
       author: vendorShortName,
     });
     LightweightThemeManager.addBuiltInTheme({
       id: "firefox-compact-dark@mozilla.org",
       name: gBrowserBundle.GetStringFromName("darkTheme.name"),
       description: gBrowserBundle.GetStringFromName("darkTheme.description"),
       iconURL: "resource:///chrome/browser/content/browser/defaultthemes/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: "hsl(240, 5%, 5%)",
       toolbar_field: "rgb(71, 71, 73)",
--- a/browser/themes/shared/compacttheme.inc.css
+++ b/browser/themes/shared/compacttheme.inc.css
@@ -5,18 +5,16 @@
 /* compacttheme.css is loaded in browser.xul after browser.css when it 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;
-
-  --toolbarbutton-icon-fill-opacity: .7;
 }
 
 :root:-moz-lwtheme-brighttext {
   /* !important to override LightweightThemeManager.addBuiltInTheme in
      nsBrowserGlue.js */
   --autocomplete-popup-background: #2A2A2E !important;
   --autocomplete-popup-highlight-background: #0060DF;
 }