From c30aaf35ad72daef408a6f327289bf4cbf972d1c Mon Sep 17 00:00:00 2001 From: Sam Hewitt Date: Mon, 17 Oct 2022 13:43:46 -0230 Subject: [PATCH] css: Tidy up the card style - remove the drop shadow - clean up mixin references Part-of: --- data/theme/gnome-shell-sass/_colors.scss | 1 + data/theme/gnome-shell-sass/_drawing.scss | 2 +- data/theme/gnome-shell-sass/_high-contrast-colors.scss | 1 + data/theme/gnome-shell-sass/widgets/_calendar.scss | 2 +- 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/data/theme/gnome-shell-sass/_colors.scss b/data/theme/gnome-shell-sass/_colors.scss index c42a95543..b83b1edf1 100644 --- a/data/theme/gnome-shell-sass/_colors.scss +++ b/data/theme/gnome-shell-sass/_colors.scss @@ -40,6 +40,7 @@ $button_mix_factor: 5%; // cards $card_bg_color: if($variant == 'light', darken($bg_color, 5%), lighten($bg_color, 2%)); +$card_outer_borders_color: transparentize($fg_color, 0.98); // notifications $bubble_buttons_color: if($variant == 'light', darken($bg_color, 12%), lighten($bg_color, 10%)); diff --git a/data/theme/gnome-shell-sass/_drawing.scss b/data/theme/gnome-shell-sass/_drawing.scss index 8d9a33071..0e51f935b 100644 --- a/data/theme/gnome-shell-sass/_drawing.scss +++ b/data/theme/gnome-shell-sass/_drawing.scss @@ -310,7 +310,7 @@ @mixin card($flat: false) { border-radius: $base_border_radius; margin: $base_margin; - box-shadow: 0 1px 1px 0 $shadow_color; + box-shadow: inset 0 0 0 1px $card_outer_borders_color; @if $flat { @include button(undecorated); diff --git a/data/theme/gnome-shell-sass/_high-contrast-colors.scss b/data/theme/gnome-shell-sass/_high-contrast-colors.scss index 0d48644a1..15fdec3ec 100644 --- a/data/theme/gnome-shell-sass/_high-contrast-colors.scss +++ b/data/theme/gnome-shell-sass/_high-contrast-colors.scss @@ -38,6 +38,7 @@ $button_mix_factor: 10%; // cards $card_bg_color: if($variant == 'light', darken($bg_color, 12%), lighten($bg_color, 12%)); +$card_outer_borders_color: $card_bg_color; // notifications $bubble_buttons_color: if($variant == 'light', darken($bg_color, 22%), lighten($bg_color, 31%)); diff --git a/data/theme/gnome-shell-sass/widgets/_calendar.scss b/data/theme/gnome-shell-sass/widgets/_calendar.scss index 336372cd6..fa7080b44 100644 --- a/data/theme/gnome-shell-sass/widgets/_calendar.scss +++ b/data/theme/gnome-shell-sass/widgets/_calendar.scss @@ -15,7 +15,7 @@ /* today button (the date) */ .datemenu-today-button { - @include card($flat: true); + @include card(flat); padding: $base_padding * 1.5; // weekday label