[gnome-shell/wip/snwh/sass-cleanup] theme: some drawing fixes to the notifications and calendar

[Sam Hewitt <snwh src gnome org>]

commit 79db19f8b2b96ea9ef39e838fa8199f5c003fad7
Author: Sam Hewitt <sam snwh org>
Date:   Tue Dec 3 13:39:04 2019 -0500

    theme: some drawing fixes to the notifications and calendar

 data/theme/gnome-shell-sass/_colors.scss           |  3 +-
 data/theme/gnome-shell-sass/_common.scss           | 33 +++++++++++-----------
 data/theme/gnome-shell-sass/_drawing.scss          | 10 +++----
 data/theme/gnome-shell-sass/widgets/_calendar.scss | 15 ++++++----
 .../gnome-shell-sass/widgets/_message-list.scss    |  1 -
 5 files changed, 32 insertions(+), 30 deletions(-)
---
diff --git a/data/theme/gnome-shell-sass/_colors.scss b/data/theme/gnome-shell-sass/_colors.scss
index ad69b1589f..38481a22bc 100644
--- a/data/theme/gnome-shell-sass/_colors.scss
+++ b/data/theme/gnome-shell-sass/_colors.scss
@@ -24,11 +24,10 @@ $osd_text_color: if($variant == 'light', #000, #fff);
 $osd_bg_color: if($variant == 'light', rgba(255,255,255,0.9), transparentize(darken(desaturate(#3d3846, 
100%), 12%),0.04));
 $osd_insensitive_bg_color: transparentize(mix($osd_fg_color, opacify($osd_bg_color, 1), 10%), 0.5);
 $osd_insensitive_fg_color: mix($osd_fg_color, opacify($osd_bg_color, 1), 50%);
-$osd_borders_color:  if($variant == 'light', rgba(255,255,255,0.1), rgba(0,0,0,0.3));
+$osd_borders_color: if($variant == 'light', rgba(255,255,255,0.1), rgba(0,0,0,0.3));
 $osd_outer_borders_color: if($variant == 'light', rgba(0,0,0,0.1), rgba(255,255,255,0.1));
 
 $shadow_color: rgba(0,0,0,0.4);
-$text_shadow_color: if($variant == 'light', rgba(255,255,255,0.3), rgba(0,0,0,0.2));
 
 //insensitive state derived colors
 $insensitive_fg_color: mix($fg_color, $bg_color, 50%);
diff --git a/data/theme/gnome-shell-sass/_common.scss b/data/theme/gnome-shell-sass/_common.scss
index 7c79055b1f..5d52f68938 100644
--- a/data/theme/gnome-shell-sass/_common.scss
+++ b/data/theme/gnome-shell-sass/_common.scss
@@ -52,6 +52,7 @@ $active_borders_color: darken($borders_color,if($variant=='light', 5%, 3%));
 
 // fonts
 $base_font_size: 11pt;
+$text_shadow_color: if($variant == 'light', rgba(255,255,255,0.3), rgba(0,0,0,0.2));
 
 // icons
 // $base_icon_size: 1.09em;
@@ -143,7 +144,7 @@ stage {
        border: 1px solid if($variant=='light', rgba(0,0,0, 0.6), $borders_color);
 
        // entry
-       StEntry { @extend %bubble_entry; }
+       StEntry { @extend %bubble_entry;}
 
        // button
        .button {
@@ -155,12 +156,12 @@ stage {
                        border-color: $bubble_borders_color;
                }
 
-               &:hover { background-color: $hover_bg_color; }
+               &:hover { background-color: $hover_bg_color;}
                &:active { 
                        background-color: $selected_bg_color;
                        color: $selected_fg_color;
                }
-               &:disabled { color: $insensitive_fg_color; }
+               &:disabled { color: $insensitive_fg_color;}
        }
 }
 
@@ -170,7 +171,7 @@ stage {
        background-color: darken($bg_color, 2%);
        border-color: $bubble_borders_color;
        box-shadow: none;
-       &:focus { border: 2px solid $selected_bg_color; }
+       &:focus { border: 2px solid $selected_bg_color;}
 }
 
 // buttons in dialogs
@@ -181,10 +182,10 @@ stage {
        border-top: 1px solid $bubble_borders_color;
        box-shadow:none !important;
 
-       &:insensitive { @include button(insensitive, $c:$bg_color, $tc:$fg_color); }
-       &:hover { @include button(hover, $c:$hover_bg_color, $tc:$fg_color); }
-       &:focus { @include button(focus, $c:$hover_bg_color, $tc:$fg_color); }
-       &:active { @include button(active, $c:$active_bg_color, $tc:$fg_color); }
+       &:insensitive { @include button(insensitive, $c:$bg_color, $tc:$fg_color);}
+       &:hover { @include button(hover, $c:$hover_bg_color, $tc:$fg_color);}
+       &:focus { @include button(focus, $c:$hover_bg_color, $tc:$fg_color);}
+       &:active { @include button(active, $c:$active_bg_color, $tc:$fg_color);}
 
        &:first-child {
                border-radius: 0px 0px 0px $modal_radius;
@@ -207,10 +208,10 @@ stage {
        padding: calc($base_padding * 0.25) calc($base_padding * 2);
 
        @include button(normal);
-       &:focus { @include button(focus); }
-       &:hover { @include button(hover); }
-       &:insensitive { @include button(insensitive); }
-       &:active { @include button(active); }
+       &:focus { @include button(focus);}
+       &:hover { @include button(hover);}
+       &:insensitive { @include button(insensitive);}
+       &:active { @include button(active);}
 }
 
 
@@ -220,17 +221,17 @@ stage {
        padding: 0;
        margin: $base_margin;
 
-       @include button(normal, $c:lighten($bg_color, 5%));
+       @include button(normal);
 
        &:focus,
        &:hover {
                margin-top: $base_margin - 1px;
                margin-bottom: $base_margin + 1px;
-               @include button(hover, $c:lighten($bg_color, 5%));
+               @include button(hover);
        }
 
-       &:active { 
-               @include button(active, $c:lighten($bg_color, 5%));
+       &:active {
+               @include button(active);
                margin: $base_margin;
        }
 }
\ No newline at end of file
diff --git a/data/theme/gnome-shell-sass/_drawing.scss b/data/theme/gnome-shell-sass/_drawing.scss
index 7c7344759f..95f3af8d7e 100644
--- a/data/theme/gnome-shell-sass/_drawing.scss
+++ b/data/theme/gnome-shell-sass/_drawing.scss
@@ -61,7 +61,7 @@
        //
        // colored buttons want the border form the base color
        //
-       @return darken($c,13%);
+       @return if($variant == 'light', darken($c, 18%), darken($c, 8%));
 }
 
 @function draw_text_shadow_color ($tc:$fg_color, $bg:$bg_color) {
@@ -133,7 +133,7 @@
        // normal button
        @if $t==normal {
                color: $tc;
-               background-color: $c;
+               background-color: lighten($c, 3%);
                border-width: 1px;
                border-style: solid;
                border-color: draw_border_color($c);
@@ -155,10 +155,10 @@
        // hover osd button
        @else if $t==hover {
                color: $tc;
-               background-color: lighten($c,3%);
+               background-color: lighten($c,5%);
                border-width: 1px;
                border-style: solid;
-               border-color: draw_border_color(lighten($c,3%));
+               border-color: draw_border_color(lighten($c,5%));
                @include draw_shadows(0 1px 1px 0 rgba(0,0,0,0.1));
                text-shadow: 0 1px $text_shadow_color;
                icon-shadow: 0 1px $text_shadow_color;
@@ -167,7 +167,7 @@
        // active osd button
        @else if $t==active {
                color: $tc;
-               background-color: darken($c,8%);
+               background-color: darken($c,3%);
                border-width: 1px;
                border-style: solid;
                border-color: draw_border_color($c);
diff --git a/data/theme/gnome-shell-sass/widgets/_calendar.scss 
b/data/theme/gnome-shell-sass/widgets/_calendar.scss
index 8af47a2aea..75b3b725a2 100644
--- a/data/theme/gnome-shell-sass/widgets/_calendar.scss
+++ b/data/theme/gnome-shell-sass/widgets/_calendar.scss
@@ -23,17 +23,20 @@
                margin: $base_margin;
                border: 1px solid transparent;
 
-               &:hover,
-               &:focus {
-                       border-color: $bubble_borders_color;
+               &:focus,
+               &:hover {
                        border-radius:$base_border_radius + 2px;
-                       background-color: $hover_bg_color;
-                       box-shadow: 0 2px 2px 0 rgba(0,0,0,0.2);
                        margin-top: $base_margin - 1px;
                        margin-bottom: $base_margin + 1px;
                }
 
-               &:active { background-color: transparentize($fg_color, 0.84) }
+               &:hover { @include button(hover);}
+               &:focus { @include button(focus);}
+
+               &:active { 
+                       @include button(active);
+                       margin: $base_margin;
+               }
 
                // weekday label
                .day-label {
diff --git a/data/theme/gnome-shell-sass/widgets/_message-list.scss 
b/data/theme/gnome-shell-sass/widgets/_message-list.scss
index 8bf86ac9ef..4c5e072910 100644
--- a/data/theme/gnome-shell-sass/widgets/_message-list.scss
+++ b/data/theme/gnome-shell-sass/widgets/_message-list.scss
@@ -111,7 +111,6 @@
        // border: 0 solid $borders_color;
        // border-left-width:1px;
 
-
        &:hover { 
                background-color: lighten($hover_bg_color, 5%);
                color: $fg_color;