From 4a89811211ba491ec0677dd6bb0d6d920ba65a80 Mon Sep 17 00:00:00 2001 From: Sam Hewitt Date: Mon, 18 Nov 2024 16:31:09 -0330 Subject: [PATCH] style: Tweak menuitem drawing function to fix hover color - drop the flat style if statement, since it's unused/redundant - use same style for hover, selected and checked Closes: https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/7939 Part-of: --- data/theme/gnome-shell-sass/_drawing.scss | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/data/theme/gnome-shell-sass/_drawing.scss b/data/theme/gnome-shell-sass/_drawing.scss index a2fa5f2b2..b4aa80308 100644 --- a/data/theme/gnome-shell-sass/_drawing.scss +++ b/data/theme/gnome-shell-sass/_drawing.scss @@ -372,23 +372,15 @@ } // styling for all menuitems in popovers -@mixin menuitem($bg, $style: flat) { +@mixin menuitem($bg) { // extend common styles @extend %menuitem; - @if $style == 'flat' { - @include button(undecorated); - } @else { - @include button(normal, $c:$bg); - } - &:hover { - @include button(hover, $c:$bg); - } - &:active {@include button(active, $c:$bg);} - &:selected, - &:checked {@include button(checked, $c:$bg);} - &:insensitive {@include button(insensitive, $c:$bg);} + @include button(undecorated, $c:$bg, $style: flat); + &:active { @include button(active, $c:$bg, $style: flat);} + &:hover, &:selected, &:checked { @include button(hover, $c:$bg, $style: flat);} + &:insensitive { @include button(insensitive, $c:$bg, $style: flat);} } // Panel menu/button drawing function