Fix few colors in the Manage menu in HCM (bug 2020774)

This commit is contained in:
Calixte Denizet 2026-03-04 16:47:48 +01:00
parent c41be4fd88
commit f9c50bb7ce
No known key found for this signature in database
GPG Key ID: 0C5442631EE0691F

View File

@ -35,6 +35,7 @@ button.hasPopupMenu {
transparent 79% transparent 79%
); );
--menuitem-text-active-fg: var(--menu-text-color); --menuitem-text-active-fg: var(--menu-text-color);
--menuitem-active-border-color: var(--menuitem-border-color);
--menuitem-focus-bg: color-mix( --menuitem-focus-bg: color-mix(
in srgb, in srgb,
var(--menu-text-color), var(--menu-text-color),
@ -52,6 +53,7 @@ button.hasPopupMenu {
--menuitem-border-radius: 8px; --menuitem-border-radius: 8px;
--menu-backdrop-filter: none; --menu-backdrop-filter: none;
--menu-text-color: light-dark(#15141a, #fbfbfe); --menu-text-color: light-dark(#15141a, #fbfbfe);
--menu-text-disabled-color: var(--menu-text-color);
--menuitem-text-hover-fg: var(--menu-text-color); --menuitem-text-hover-fg: var(--menu-text-color);
--menuitem-hover-bg: color-mix( --menuitem-hover-bg: color-mix(
in srgb, in srgb,
@ -59,6 +61,7 @@ button.hasPopupMenu {
transparent 86% transparent 86%
); );
--menuitem-hover-background-blend-mode: normal; --menuitem-hover-background-blend-mode: normal;
--disabled-opacity: 0.62;
@media screen and (forced-colors: active) { @media screen and (forced-colors: active) {
--menu-bg: Canvas; --menu-bg: Canvas;
@ -66,14 +69,18 @@ button.hasPopupMenu {
--menu-box-shadow: none; --menu-box-shadow: none;
--menu-backdrop-filter: none; --menu-backdrop-filter: none;
--menu-text-color: ButtonText; --menu-text-color: ButtonText;
--menu-text-disabled-color: GrayText;
--menu-border-color: CanvasText; --menu-border-color: CanvasText;
--menuitem-border-color: none; --menuitem-border-color: none;
--menuitem-hover-bg: SelectedItemText; --menuitem-hover-bg: SelectedItemText;
--menuitem-text-hover-fg: SelectedItem; --menuitem-text-hover-fg: SelectedItem;
--menuitem-active-bg: SelectedItemText; --menuitem-active-bg: SelectedItemText;
--menuitem-active-border-color: ButtonText;
--menuitem-text-active-fg: SelectedItem; --menuitem-text-active-fg: SelectedItem;
--menuitem-focus-bg: ButtonFace;
--menuitem-focus-outline-color: CanvasText; --menuitem-focus-outline-color: CanvasText;
--menuitem-focus-border-color: none; --menuitem-focus-border-color: none;
--disabled-opacity: 1;
} }
display: flex; display: flex;
@ -103,7 +110,7 @@ button.hasPopupMenu {
align-items: center; align-items: center;
list-style: none; list-style: none;
width: 100%; width: 100%;
height: 24px; height: 26px;
padding-inline: calc(var(--menu-mark-icon-size) + var(--menuitem-gap)) padding-inline: calc(var(--menu-mark-icon-size) + var(--menuitem-gap))
var(--menuitem-gap); var(--menuitem-gap);
gap: var(--menuitem-gap); gap: var(--menuitem-gap);
@ -126,8 +133,12 @@ button.hasPopupMenu {
} }
&:has(button:disabled) { &:has(button:disabled) {
opacity: 0.62; opacity: var(--disabled-opacity);
pointer-events: none; pointer-events: none;
&:has(button.selected)::before {
background-color: var(--menu-text-disabled-color);
}
} }
&:hover { &:hover {
@ -148,6 +159,7 @@ button.hasPopupMenu {
&:active { &:active {
background-color: var(--menuitem-active-bg); background-color: var(--menuitem-active-bg);
border-color: var(--menuitem-active-border-color);
> button > span { > button > span {
color: var(--menuitem-text-active-fg); color: var(--menuitem-text-active-fg);
} }
@ -200,6 +212,18 @@ button.hasPopupMenu {
font-weight: 510; font-weight: 510;
line-height: normal; line-height: normal;
} }
&:disabled {
pointer-events: none;
&:not(.noIcon)::before {
background-color: var(--menu-text-disabled-color);
}
> span {
color: var(--menu-text-disabled-color);
}
}
} }
} }
} }