[gnome-shell/wip/snwh/sass-cleanup] theme: button fixes for notifications and modals

[Sam Hewitt <snwh src gnome org>]

commit 4c0ca67d9a0763282d33a94399db7aedaa40fdde
Author: Sam Hewitt <sam snwh org>
Date:   Wed Dec 18 10:03:09 2019 -0500

    theme: button fixes for notifications and modals

 data/theme/gnome-shell-sass/_common.scss           | 24 +++++++++++++---------
 data/theme/gnome-shell-sass/_drawing.scss          |  2 +-
 data/theme/gnome-shell-sass/widgets/_dialogs.scss  |  2 +-
 .../gnome-shell-sass/widgets/_message-list.scss    |  9 ++++----
 .../gnome-shell-sass/widgets/_notifications.scss   | 13 ++++++------
 .../gnome-shell-sass/widgets/_search-entry.scss    |  2 +-
 6 files changed, 28 insertions(+), 24 deletions(-)
---
diff --git a/data/theme/gnome-shell-sass/_common.scss b/data/theme/gnome-shell-sass/_common.scss
index 696c4803e9..0f4c2175db 100644
--- a/data/theme/gnome-shell-sass/_common.scss
+++ b/data/theme/gnome-shell-sass/_common.scss
@@ -178,25 +178,29 @@ stage {
 %bubble_button {
        @include button(normal);
        padding: $base_padding * 2;
-       border-right-width: 1px;
-       border-top: 1px solid $bubble_borders_color;
+       border-color: $bubble_borders_color;
+       border-style: solid;
+       border-width: 0 !important;
+       border-top-width: 1px !important;
        box-shadow:none !important;
 
        &:insensitive { @include button(insensitive);}
-       &: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);}
+       &:hover { @include button(hover);}
+       &:focus { @include button(focus);}
+       &:active { @include button(active);}
 
+       // radius is 2 pixel less to fit in bubble
        &:first-child {
-               border-radius: 0px 0px 0px $modal_radius;
+               border-right-width: 1px !important;
+               border-radius: 0px 0px 0px $modal_radius - 2px;
        }
        &:last-child {
-               border-right-width: 0px;
-               border-radius: 0px 0px $modal_radius 0px;
+               border-right-width: 0 !important;
+               border-radius: 0px 0px $modal_radius - 2px 0px;
        }
+       
        &:first-child:last-child {
-               border-right-width: 0px;
-               border-radius: 0px 0px $modal_radius $modal_radius;
+               border-radius: 0px 0px $modal_radius - 2px $modal_radius - 2px;
        }
 }
 
diff --git a/data/theme/gnome-shell-sass/_drawing.scss b/data/theme/gnome-shell-sass/_drawing.scss
index 7331020af3..6dd42479e4 100644
--- a/data/theme/gnome-shell-sass/_drawing.scss
+++ b/data/theme/gnome-shell-sass/_drawing.scss
@@ -170,7 +170,7 @@
                background-color: darken($c,3%) !important;
                border-width: 1px;
                border-style: solid;
-               border-color: draw_border_color(if($variant == 'light', $c, darken($c,12%)));
+               border-color: draw_border_color(if($variant == 'light', $c, darken($c,7%)));
                text-shadow: none;
                icon-shadow: none;
                box-shadow: none;
diff --git a/data/theme/gnome-shell-sass/widgets/_dialogs.scss 
b/data/theme/gnome-shell-sass/widgets/_dialogs.scss
index 82a670d26d..80ec40ed4a 100644
--- a/data/theme/gnome-shell-sass/widgets/_dialogs.scss
+++ b/data/theme/gnome-shell-sass/widgets/_dialogs.scss
@@ -1,7 +1,7 @@
 /* Modal Dialogs */
 
 .modal-dialog {
-       border-radius: $base_border_radius + 4px;;
+       border-radius: $modal_radius;
        @extend %bubble_panel;
 
        .modal-dialog-content-box {
diff --git a/data/theme/gnome-shell-sass/widgets/_message-list.scss 
b/data/theme/gnome-shell-sass/widgets/_message-list.scss
index 61b795640c..8bd9f71b90 100644
--- a/data/theme/gnome-shell-sass/widgets/_message-list.scss
+++ b/data/theme/gnome-shell-sass/widgets/_message-list.scss
@@ -56,19 +56,19 @@
                }
        }
 
-       // message close button
+       // close button
        .message-close-button {
                color: lighten($fg_color, 15%);
                &:hover { color: darken($fg_color, 10%);}
        }
 
-       // message icon
+       // icon container
        .message-icon-bin {
                // padding: $base_padding;
                margin:$base_padding 0;
 
                &:rtl {
-                       padding: $base_padding;
+                       // padding: $base_padding;
                }
 
                // icon size and color
@@ -77,7 +77,8 @@
                        icon-size: $base_icon_size * 2; // 32px
                        -st-icon-style: symbolic;
 
-                       padding:$base_padding;
+                       padding:0;
+                       margin:$base_padding;
                }
 
                // fallback
diff --git a/data/theme/gnome-shell-sass/widgets/_notifications.scss 
b/data/theme/gnome-shell-sass/widgets/_notifications.scss
index 0581d100ae..e132c2d2e4 100644
--- a/data/theme/gnome-shell-sass/widgets/_notifications.scss
+++ b/data/theme/gnome-shell-sass/widgets/_notifications.scss
@@ -10,13 +10,10 @@ $notification_banner_width: 34em;
        font-size: $base_font_size;
        margin: $base_margin;
        border-radius: $modal_radius;
-       border: if($variant == 'light', none, $bubble_borders_color);
-       box-shadow: 0 1px 2px rgba(0,0,0,0.7);
 
        .message-title { color: $fg_color }
        .message-content { color: $fg_color; }
 
-
        &:hover { background: $bg_color; }
        &, &:focus, &:active {
                background-color: $bg_color;
@@ -24,8 +21,9 @@ $notification_banner_width: 34em;
                .message-content { color: $fg_color; }
        }
 
-       // icon color
+       // icon
        .message-icon-bin > StIcon {
+               icon-size: $base_icon_size * 2;
                color: $fg_color;
        }
 
@@ -52,10 +50,11 @@ $notification_banner_width: 34em;
 
        .notification-button {
                @extend %bubble_button;
+               min-height: $notification_banner_height * 0.5;
+               padding: $base_padding !important;
+               border-top-width: 0 !important;
+               
                &:focus { box-shadow: none; }
-               padding: 0 16px;
-               min-height: 35px;
-               border: none;
        }
 }
 
diff --git a/data/theme/gnome-shell-sass/widgets/_search-entry.scss 
b/data/theme/gnome-shell-sass/widgets/_search-entry.scss
index c1fcf5ce80..5ecba4624b 100644
--- a/data/theme/gnome-shell-sass/widgets/_search-entry.scss
+++ b/data/theme/gnome-shell-sass/widgets/_search-entry.scss
@@ -10,7 +10,6 @@ $search_entry_width: 320px;
        color: transparentize($fg_color,0.3);
        background-color: $bg_color;
        border-color: $borders_color;
-       box-shadow: inset 0 1px 2px 1px rgba(0,0,0,0.2);
 
        &:hover {
                background-color: $hover_bg_color;
@@ -23,6 +22,7 @@ $search_entry_width: 320px;
                border-width: 2px;
                color: $fg_color;
                border-color: $selected_bg_color;
+               box-shadow: inset 0 1px 2px 1px rgba(0,0,0,0.2);
        }
 
        .search-entry-icon {