summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam Hewitt <sam@snwh.org>2022-07-22 16:11:45 -0230
committerFlorian Müllner <fmuellner@gnome.org>2022-08-10 16:28:30 +0200
commita36f20dc4372b8830efeb64b261d209233b54b0e (patch)
tree5912c6e086a069ee7aa59776a9facf5b7d4658bb
parent195d55f394131f269bb9630a3dd9a4ca7c2075ae (diff)
downloadgnome-shell-sass-a36f20dc4372b8830efeb64b261d209233b54b0e.tar.gz
style: Make menuitems less bright when in checked state
Fixes #5665 Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2388>
-rw-r--r--_colors.scss8
-rw-r--r--_high-contrast-colors.scss8
-rw-r--r--widgets/_popovers.scss6
3 files changed, 11 insertions, 11 deletions
diff --git a/_colors.scss b/_colors.scss
index 0ca123b..c22bfea 100644
--- a/_colors.scss
+++ b/_colors.scss
@@ -56,6 +56,10 @@ $backdrop_borders_color: mix($borders_color, $bg_color, 90%);
$backdrop_dark_fill: mix($backdrop_borders_color,$backdrop_bg_color, 35%);
+// derived checked colors
+$checked_bg_color: if($variant=='light', darken($bg_color, 7%), lighten($bg_color, 7%));
+$checked_fg_color: if($variant=='light', darken($fg_color, 7%), lighten($fg_color, 7%));
+
// derived hover colors
$hover_bg_color: if($variant=='light', darken($bg_color, 3%), lighten($bg_color, 10%));
$hover_fg_color: if($variant=='light', darken($fg_color, 5%), lighten($fg_color, 10%));
@@ -63,7 +67,3 @@ $hover_fg_color: if($variant=='light', darken($fg_color, 5%), lighten($fg_color,
// derived active colors
$active_bg_color: if($variant=='light', darken($bg_color, 5%), lighten($bg_color, 12%));
$active_fg_color: if($variant=='light', darken($fg_color, 5%), lighten($fg_color, 12%));
-
-// derived checked colors
-$checked_bg_color: if($variant=='light', darken($bg_color, 7%), lighten($bg_color, 15%));
-$checked_fg_color: if($variant=='light', darken($fg_color, 7%), lighten($fg_color, 15%)); \ No newline at end of file
diff --git a/_high-contrast-colors.scss b/_high-contrast-colors.scss
index d418e47..35e2d85 100644
--- a/_high-contrast-colors.scss
+++ b/_high-contrast-colors.scss
@@ -52,6 +52,10 @@ $backdrop_insensitive_color: lighten($backdrop_bg_color,15%);
$backdrop_borders_color: mix($borders_color, $bg_color, 90%);
$backdrop_dark_fill: mix($backdrop_borders_color,$backdrop_bg_color, 35%);
+// derived checked colors
+$checked_bg_color: if($variant=='light', darken($bg_color, 12%), lighten($bg_color, 18%));
+$checked_fg_color: if($variant=='light', darken($fg_color, 12%), lighten($fg_color, 18%));
+
// derived hover colors
$hover_bg_color: if($variant=='light', darken($bg_color, 8%), lighten($bg_color, 20%));
$hover_fg_color: if($variant=='light', darken($fg_color, 10%), lighten($fg_color, 20%));
@@ -59,7 +63,3 @@ $hover_fg_color: if($variant=='light', darken($fg_color, 10%), lighten($fg_color
// derived active colors
$active_bg_color: if($variant=='light', darken($bg_color, 10%), lighten($bg_color, 22%));
$active_fg_color: if($variant=='light', darken($fg_color, 10%), lighten($fg_color, 22%));
-
-// derived checked colors
-$checked_bg_color: if($variant=='light', darken($bg_color, 12%), lighten($bg_color, 25%));
-$checked_fg_color: if($variant=='light', darken($fg_color, 12%), lighten($fg_color, 25%)); \ No newline at end of file
diff --git a/widgets/_popovers.scss b/widgets/_popovers.scss
index 4e6813a..4a86dd3 100644
--- a/widgets/_popovers.scss
+++ b/widgets/_popovers.scss
@@ -100,12 +100,12 @@
border-radius: 0 0 $base_border_radius $base_border_radius;
}
- &:focus,&:hover { background-color: lighten($hover_bg_color, 10%) !important;}
+ &:focus,&:hover { background-color: $hover_bg_color !important;}
&:checked {
- background-color: lighten($checked_bg_color, 10%) !important;
+ background-color: $checked_bg_color !important;
&:focus,&:hover { background-color: lighten($checked_bg_color, 8%) !important;}
}
- &:active { background-color: lighten($active_bg_color, 10%) !important;}
+ &:active { background-color: $active_bg_color !important;}
}
.popup-menu-section {