[gnome-shell/wip/snwh/sass-cleanup] theme: fix button drawing function

[Sam Hewitt <snwh src gnome org>]

commit 431a7c91a757237b758b0d4330d75873157918eb
Author: Sam Hewitt <sam snwh org>
Date:   Tue Dec 3 12:50:34 2019 -0500

    theme: fix button drawing function

 data/theme/gnome-shell-sass/_common.scss  |  9 ++++-----
 data/theme/gnome-shell-sass/_drawing.scss | 16 ++++++++++++----
 data/theme/gnome-shell.scss               |  2 +-
 3 files changed, 17 insertions(+), 10 deletions(-)
---
diff --git a/data/theme/gnome-shell-sass/_common.scss b/data/theme/gnome-shell-sass/_common.scss
index 61abf8b287..035a55dca1 100644
--- a/data/theme/gnome-shell-sass/_common.scss
+++ b/data/theme/gnome-shell-sass/_common.scss
@@ -207,8 +207,8 @@ stage {
        padding: calc($base_padding * 0.25) calc($base_padding * 2);
 
        @include button(normal, $c:$bg_color, $tc:$fg_color);
-       &:focus { @include button(focus, $c:$hover_bg_color, $tc:$fg_color); }
-       &:hover { @include button(hover, $c:$hover_bg_color, $tc:$fg_color); }
+       &:focus { @include button(focus, $c:$bg_color, $tc:$fg_color); }
+       &:hover { @include button(hover, $c:$bg_color, $tc:$fg_color); }
        &:insensitive { @include button(insensitive); }
        &:active { @include button(active, $c:$active_bg_color, $tc:$fg_color); }
 }
@@ -218,7 +218,6 @@ stage {
 %notification_bubble {
        border-radius:$base_border_radius + 2px;
        padding: 0;
-       border: 1px solid;
        margin: $base_margin;
 
        @include button(normal, $c:lighten($bg_color, 5%), $tc:$fg_color);
@@ -227,11 +226,11 @@ stage {
        &:hover {
                margin-top: $base_margin - 1px;
                margin-bottom: $base_margin + 1px;
-               @include button(hover, $c:lighten($hover_bg_color, 5%), $tc:$fg_color);
+               @include button(hover, $c:lighten($bg_color, 5%), $tc:$fg_color);
        }
 
        &:active { 
-               @include button(active, $c:lighten($active_bg_color, 5%), $tc:$fg_color);
+               @include button(active, $c:lighten($bg_color, 5%), $tc:$fg_color);
                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 295405b868..7c7344759f 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,16%);
+       @return darken($c,13%);
 }
 
 @function draw_text_shadow_color ($tc:$fg_color, $bg:$bg_color) {
@@ -134,6 +134,8 @@
        @if $t==normal {
                color: $tc;
                background-color: $c;
+               border-width: 1px;
+               border-style: solid;
                border-color: draw_border_color($c);
                @include draw_shadows(0 1px 1px 0 rgba(0,0,0,0.1));
                // box-shadow: 0 1px 1px 0 rgba(0,0,0,0.1);
@@ -154,7 +156,9 @@
        @else if $t==hover {
                color: $tc;
                background-color: lighten($c,3%);
-               border-color: draw_border_color(lighten($c,5%));
+               border-width: 1px;
+               border-style: solid;
+               border-color: draw_border_color(lighten($c,3%));
                @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;
@@ -163,8 +167,10 @@
        // active osd button
        @else if $t==active {
                color: $tc;
-               background-color: darken($c,5%);
-               border-color: draw_border_color(darken($c,4%));
+               background-color: darken($c,8%);
+               border-width: 1px;
+               border-style: solid;
+               border-color: draw_border_color($c);
                text-shadow: none;
                icon-shadow: none;
                box-shadow: none;
@@ -173,6 +179,8 @@
        // insensitive button
        @else if $t==insensitive {
                color: $insensitive_fg_color;
+               border-width: 1px;
+               border-style: solid;
                border-color: $insensitive_borders_color;
                background-color: $insensitive_bg_color;
                box-shadow: none;
diff --git a/data/theme/gnome-shell.scss b/data/theme/gnome-shell.scss
index 62237fd5d3..3def5896cf 100644
--- a/data/theme/gnome-shell.scss
+++ b/data/theme/gnome-shell.scss
@@ -1,4 +1,4 @@
-$variant: 'light';
+$variant: 'dark';
 
 @import "gnome-shell-sass/_colors"; //use gtk colors
 @import "gnome-shell-sass/_drawing";