[gnome-shell/wip/snwh/sass-cleanup: 448/475] theme: fixes to notifications and popovers

[Sam Hewitt <snwh src gnome org>]

commit 6a7d9c3e012e517bb3095e5d9efee4ce0d7c13e3
Author: Sam Hewitt <sam snwh org>
Date:   Wed Sep 18 11:26:42 2019 -0400

    theme: fixes to notifications and popovers

 data/theme/gnome-shell-sass/_drawing.scss          | 95 +---------------------
 .../gnome-shell-sass/widgets/_notifications.scss   | 22 +++--
 data/theme/gnome-shell-sass/widgets/_popovers.scss |  2 +-
 data/theme/gnome-shell.scss                        |  2 +-
 4 files changed, 20 insertions(+), 101 deletions(-)
---
diff --git a/data/theme/gnome-shell-sass/_drawing.scss b/data/theme/gnome-shell-sass/_drawing.scss
index 27dfe2cf81..6dd42479e4 100644
--- a/data/theme/gnome-shell-sass/_drawing.scss
+++ b/data/theme/gnome-shell-sass/_drawing.scss
@@ -71,15 +71,9 @@
 // $tc is the text color
 // $bg is the background color
 //
-<<<<<<< HEAD
        $lbg: lightness($bg)/100%;
        @if lightness($tc)<50% { @return rgba(255,255,255,1-$lbg/($lbg*1.3)); }
        @else { @return rgba(0,0,0,$lbg*0.8); }
-=======
-  $_lbg: lightness($bg)/100%;
-  @if lightness($tc)<50% { @return rgba(255,255,255,1-$_lbg/($_lbg*1.3)); }
-  @else { @return rgba(0,0,0,$_lbg*0.8); }
->>>>>>> de7edaff5... theme: OSD refinements; overview and panel refinements
 }
 
 @function draw_button_hilight_color($c) {
@@ -88,19 +82,11 @@
 //
 // $c: base color;
 //
-<<<<<<< HEAD
        @if lightness($c)>90% { @return white; }
        @else if lightness($c)>80% { @return rgba(255,255,255, 0.3); }
        @else if lightness($c)>50% { @return rgba(255,255,255, 0.5); }
        @else if lightness($c)>40% { @return rgba(255,255,255, 0.7); }
        @else { @return rgba(255,255,255, 0.9); }
-=======
-  @if lightness($c)>90% { @return white; }
-  @else if lightness($c)>80% { @return rgba(255,255,255, 0.3); }
-  @else if lightness($c)>50% { @return rgba(255,255,255, 0.5); }
-  @else if lightness($c)>40% { @return rgba(255,255,255, 0.7); }
-  @else { @return rgba(255,255,255, 0.9); }
->>>>>>> de7edaff5... theme: OSD refinements; overview and panel refinements
 }
 
 @mixin draw_button_text_shadow ($tc:$fg_color, $bg:$bg_color) {
@@ -140,7 +126,6 @@
 // osd, osd-hover, osd-active, osd-insensitive, osd-backdrop, undecorated
 //
 
-<<<<<<< HEAD
        $hilight_color: draw_button_hilight_color($c);
        $button_edge: if($edge == none, none, draw_widget_edge($edge));
        $blank_edge: if($edge == none, none, draw_widget_edge(transparentize($edge,1)));
@@ -212,82 +197,4 @@
                text-shadow: none;
                icon-shadow: none;
        }
-}
-=======
-  $_hilight_color: _button_hilight_color($c);
-  $_button_edge: if($edge == none, none, _widget_edge($edge));
-  $_blank_edge: if($edge == none, none, _widget_edge(transparentize($edge,1)));
-  $_button_shadow: 0 1px 2px transparentize($shadow_color, 0.03);
-
-  @if $t==normal {
-  //
-  // normal button
-  //
-
-    color: $tc;
-    background-color: $c;
-    border-color: $borders_color;
-    box-shadow: $_button_shadow;
-    text-shadow: 0 1px black;
-    icon-shadow: 0 1px black;
-  }
-  @if $t==focus {
-  //
-  // focused button
-  //  
-    color: $tc;
-    text-shadow: 0 1px black;
-    icon-shadow: 0 1px black;
-    box-shadow: inset 0px 0px 0px 2px $selected_bg_color;
-    //border-color: $selected_bg_color;
-  }
-
-  @else if $t==hover {
-  //
-  // active osd button
-  //
-    color: $tc;
-    border-color: $borders_color;
-    background-color: $c;
-    box-shadow: $_button_shadow;
-    text-shadow: 0 1px black;
-    icon-shadow: 0 1px black;
-
-  }
-  @else if $t==active {
-  //
-  // active osd button
-  //
-    color: $tc;
-    border-color: $borders_color;
-    background-color: $c;
-    text-shadow: none;
-    icon-shadow: none;
-    box-shadow: none;
-  }
-  @else if $t==insensitive {
-
-    color: $insensitive_fg_color;
-    border-color: $insensitive_borders_color;
-    background-color: $insensitive_bg_color;
-    box-shadow: none;
-    text-shadow: none;
-    icon-shadow: none;
-  }
-  @else if $t==undecorated {
-  //
-  // reset
-  //
-    border-color: transparent;
-    background-color: transparent;
-    background-image: none;
-
-    @include _shadows(inset 0 1px rgba(255,255,255,1),
-                      $_blank_edge);
-
-    text-shadow: none;
-    icon-shadow: none;
-  }
-}
-
->>>>>>> de7edaff5... theme: OSD refinements; overview and panel refinements
+}
\ No newline at end of file
diff --git a/data/theme/gnome-shell-sass/widgets/_notifications.scss 
b/data/theme/gnome-shell-sass/widgets/_notifications.scss
index cb7c3a2d39..1da5342ef4 100644
--- a/data/theme/gnome-shell-sass/widgets/_notifications.scss
+++ b/data/theme/gnome-shell-sass/widgets/_notifications.scss
@@ -5,13 +5,17 @@ $notification_banner_width: 34em;
 
 // Banner notifications
 .notification-banner {
-       font-size: $base_font_size;
+       min-height: $notification_banner_height;
        width: $notification_banner_width;
+       font-size: $base_font_size;
        margin: $base_margin;
        border-radius: $dialog_border_radius;
        border: if($variant == 'light', none, $bubble_borders_color);
-       min-height: $notification_banner_height;
-       box-shadow: 0 1px 2px rgba(0,0,0, 0.7);
+       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 {
@@ -28,9 +32,17 @@ $notification_banner_width: 34em;
        // entries
        StEntry { @extend %bubble_entry; }
 
-       .notification-icon { padding: 5px; }
-       .notification-content { padding: 5px; spacing: 5px; }
+       .notification-icon {
+               padding: 5px;
+       }
+
+       .notification-content {
+               padding: 5px;
+               spacing: 5px;
+       }
+
        .secondary-icon { icon-size: $base_icon_size; }
+
        .notification-actions {
                padding-top: 0;
                color: $fg_color;
diff --git a/data/theme/gnome-shell-sass/widgets/_popovers.scss 
b/data/theme/gnome-shell-sass/widgets/_popovers.scss
index 51ff69afb4..b663e3e57e 100644
--- a/data/theme/gnome-shell-sass/widgets/_popovers.scss
+++ b/data/theme/gnome-shell-sass/widgets/_popovers.scss
@@ -63,7 +63,7 @@
        -arrow-border-radius: $base_border_radius+4;
        -arrow-background-color: $bg_color;
        -arrow-border-width: 1px;
-       -arrow-border-color: if($variant=='light', rgba(0,0,0,0.6), $borders_color);
+       -arrow-border-color: if($variant=='light', $bg_color, $bubble_borders_color);
        -arrow-base: 24px;
        -arrow-rise: 11px;
        -arrow-box-shadow: 0 1px 3px rgba(0,0,0,0.5); //dreaming. bug #689995
diff --git a/data/theme/gnome-shell.scss b/data/theme/gnome-shell.scss
index 3def5896cf..62237fd5d3 100644
--- a/data/theme/gnome-shell.scss
+++ b/data/theme/gnome-shell.scss
@@ -1,4 +1,4 @@
-$variant: 'dark';
+$variant: 'light';
 
 @import "gnome-shell-sass/_colors"; //use gtk colors
 @import "gnome-shell-sass/_drawing";