diff --git a/browser/themes/shared/browser-custom-colors.css b/browser/themes/shared/browser-custom-colors.css index ef472da57814..b9c336f8325a 100644 --- a/browser/themes/shared/browser-custom-colors.css +++ b/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); diff --git a/toolkit/components/extensions/test/browser/browser_ext_themes_arrowpanels.js b/toolkit/components/extensions/test/browser/browser_ext_themes_arrowpanels.js index 5f9bf188fcc5..add6a9a6f929 100644 --- a/toolkit/components/extensions/test/browser/browser_ext_themes_arrowpanels.js +++ b/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); diff --git a/toolkit/modules/LightweightThemeConsumer.sys.mjs b/toolkit/modules/LightweightThemeConsumer.sys.mjs index 8771389dfda7..317eb0770fd7 100644 --- a/toolkit/modules/LightweightThemeConsumer.sys.mjs +++ b/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})`; - }, }, ], [ diff --git a/toolkit/themes/osx/global/global.css b/toolkit/themes/osx/global/global.css index f94e22f77293..6e200cc296c6 100644 --- a/toolkit/themes/osx/global/global.css +++ b/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; diff --git a/toolkit/themes/shared/global-shared.css b/toolkit/themes/shared/global-shared.css index 5b32f4c862a8..69a5590fc310 100644 --- a/toolkit/themes/shared/global-shared.css +++ b/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; } }