Bug 1818356 - Clean up --panel-description-color and --panel-disabled-color. r=sfoster

Differential Revision: https://phabricator.services.mozilla.com/D172270

browser/themes/shared/browser-custom-colors.css

@@ -29,7 +29,6 @@
 
     --arrowpanel-dimmed: color-mix(in srgb, currentColor 12%, transparent);
     --arrowpanel-dimmed-further: color-mix(in srgb, currentColor 20%, transparent);
-    --panel-disabled-color: color-mix(in srgb, currentColor 40%, transparent);
     --panel-shortcut-color: rgb(91,91,102);
 
     --input-color: rgb(21,20,26);

toolkit/components/extensions/test/browser/browser_ext_themes_arrowpanels.js

@@ -72,12 +72,6 @@ add_task(async function test_popup_styling(browser, accDoc) {
         "Popup text color should have been themed"
       );
 
-      Assert.equal(
-        arrowContentComputedStyle.getPropertyValue("--panel-description-color"),
-        `rgba(${hexToRGB(POPUP_TEXT_COLOR).join(", ")}, 0.7)`,
-        "Popup text description color should have been themed"
-      );
-
       // Ensure popup border color was set properly
       testBorderColor(arrowContent, POPUP_BORDER_COLOR);
 

toolkit/modules/LightweightThemeConsumer.sys.mjs

@@ -75,28 +75,6 @@ const toolkitVariableMap = [
     "--arrowpanel-color",
     {
       lwtProperty: "popup_text",
-      processColor(rgbaChannels, element) {
-        const disabledColorVariable = "--panel-disabled-color";
-        const descriptionColorVariable = "--panel-description-color";
-
-        if (!rgbaChannels) {
-          element.style.removeProperty(disabledColorVariable);
-          element.style.removeProperty(descriptionColorVariable);
-          return null;
-        }
-
-        let { r, g, b, a } = rgbaChannels;
-
-        element.style.setProperty(
-          disabledColorVariable,
-          `rgba(${r}, ${g}, ${b}, 0.5)`
-        );
-        element.style.setProperty(
-          descriptionColorVariable,
-          `rgba(${r}, ${g}, ${b}, 0.7)`
-        );
-        return `rgba(${r}, ${g}, ${b}, ${a})`;
-      },
     },
   ],
   [

toolkit/themes/osx/global/global.css

@@ -8,9 +8,6 @@
 @namespace html url("http://www.w3.org/1999/xhtml");
 
 :root {
-  /* ::::: Variables ::::: */
-  --panel-description-color: hsl(0,0%,50%);
-
   /* ::::: Styles ::::: */
   appearance: auto;
   -moz-default-appearance: dialog;

toolkit/themes/shared/global-shared.css

@@ -30,8 +30,8 @@
   --arrowpanel-dimmed: color-mix(in srgb, currentColor 17%, transparent);
   --arrowpanel-dimmed-further: color-mix(in srgb, currentColor 30%, transparent);
 
-  --panel-description-color: GrayText;
-  --panel-disabled-color: GrayText;
+  --panel-description-color: color-mix(in srgb, currentColor 60%, transparent);;
+  --panel-disabled-color: color-mix(in srgb, currentColor 40%, transparent);;
 
   --popup-notification-body-width: calc(31em - calc(2 * var(--arrowpanel-padding)));
 
@@ -56,6 +56,9 @@
 @media (prefers-contrast) {
   :root:not(:-moz-lwtheme) {
     --toolbarbutton-disabled-opacity: 0.3;
+
+    --panel-description-color: inherit;
+    --panel-disabled-color: GrayText;
   }
 }