style: Fix background color issue with menuitems

- fix missing submenu bg colors
- add submenu color definitions

Fixes: https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/7570
Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/3311>
This commit is contained in:
Sam Hewitt 2024-05-13 13:22:36 -02:30 committed by Jakub Steiner
parent 2f30f5b5f4
commit 92063e5e46
2 changed files with 6 additions and 7 deletions

View File

@ -368,9 +368,6 @@
// extend common styles
@extend %menuitem;
// lighten the background color always
$bg: lighten($bg,5%);
@if $style == 'flat' {
@include button(undecorated);
} @else {

View File

@ -1,10 +1,11 @@
/* Popovers/Menus */
$menu_bg_color: $bg_color;
$menuitem_bg_color: lighten($menu_bg_color, 4%);
$menuitem_bg_color: if($variant == 'light', darken($menu_bg_color, 5%), lighten($menu_bg_color, 5%));
$menuitem_border_radius: $base_border_radius * 1.5;
$submenu_bg_color: lighten($menu_bg_color, 7%);
$submenu_bg_color: if($variant == 'light', darken($menu_bg_color, 17%), lighten($menu_bg_color, 13%));
// the popover itself
.popup-menu-boxpointer {
@ -33,7 +34,7 @@ $submenu_bg_color: lighten($menu_bg_color, 7%);
// menu items
.popup-menu-item {
@include menuitem($bg:$menu_bg_color);
@include menuitem($bg:$menuitem_bg_color);
border-radius: $menuitem_border_radius;
@ -75,6 +76,7 @@ $submenu_bg_color: lighten($menu_bg_color, 7%);
border-radius: 0 0 $menuitem_border_radius+1px $menuitem_border_radius+1px;
margin-bottom: $base_padding;
border: 1px solid transparent;
background-color: $submenu_bg_color;
@if $contrast == 'high' {
border-color: $hc_inset_color;
@ -83,8 +85,8 @@ $submenu_bg_color: lighten($menu_bg_color, 7%);
// submenu specific styles
.popup-menu-item {
border-radius: 0;
@include menuitem($bg:$submenu_bg_color);
border-top-width:0;
@include menuitem($bg:$submenu_bg_color);
&:last-child {
border-radius: 0 0 $menuitem_border_radius $menuitem_border_radius;