[gnome-shell/wip/snwh/sass-cleanup: 462/475] theme: popovers - structured better, refine menuitems

[Sam Hewitt <snwh src gnome org>]

commit b4c788943a462c138653bef9232b5b6a51ec5e2c
Author: Sam Hewitt <sam snwh org>
Date:   Tue Dec 3 11:35:11 2019 -0500

    theme: popovers - structured better, refine menuitems

 data/theme/gnome-shell-sass/_colors.scss           | 16 ----
 data/theme/gnome-shell-sass/widgets/_app-grid.scss | 15 ++++
 data/theme/gnome-shell-sass/widgets/_popovers.scss | 95 +++++++++++-----------
 .../gnome-shell-sass/widgets/_search-results.scss  |  8 +-
 4 files changed, 66 insertions(+), 68 deletions(-)
---
diff --git a/data/theme/gnome-shell-sass/_colors.scss b/data/theme/gnome-shell-sass/_colors.scss
index a9a033c606..57d130c0c4 100644
--- a/data/theme/gnome-shell-sass/_colors.scss
+++ b/data/theme/gnome-shell-sass/_colors.scss
@@ -8,11 +8,7 @@ $fg_color: if($variant == 'light', #2e3436, #eeeeec);
 $selected_fg_color: #fff;
 $selected_bg_color: if($variant == 'light', #3584e4, darken(#3584e4, 10%));
 $selected_borders_color: if($variant== 'light', darken($selected_bg_color, 15%), darken($selected_bg_color, 
30%));
-<<<<<<< HEAD
 $borders_color: if($variant == 'light', darken($bg_color, 18%), darken($bg_color, 8%));
-=======
-$borders_color: if($variant == 'light', darken($bg_color, 18%), darken($bg_color, 10%));
->>>>>>> de7edaff5... theme: OSD refinements; overview and panel refinements
 $borders_edge: if($variant == 'light', rgba(255,255,255,0.2), transparentize($fg_color, 0.93));
 $link_color: if($variant == 'light', darken($selected_bg_color, 10%), lighten($selected_bg_color, 20%));
 $link_visited_color: if($variant == 'light', darken($selected_bg_color, 20%), lighten($selected_bg_color, 
10%));
@@ -28,22 +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%);
-<<<<<<< HEAD
 $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), lighten($osd_bg_color, 7%));
 
 $shadow_color: if($variant == 'light', rgba(0,0,0,0.1), rgba(0,0,0,0.2));
-=======
-$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));
-
-<<<<<<< HEAD
-$shadow_color: rgba(0,0,0,0.9);
->>>>>>> de7edaff5... theme: OSD refinements; overview and panel refinements
-=======
-$shadow_color: rgba(0,0,0,0.4);
-$text_shadow_color: if($variant == 'light', rgba(255,255,255,0.2), rgba(0,0,0,0.2));
->>>>>>> e0d59b5a0... theme: update keyboard to use button drawing
 
 //insensitive state derived colors
 $insensitive_fg_color: mix($fg_color, $bg_color, 50%);
diff --git a/data/theme/gnome-shell-sass/widgets/_app-grid.scss 
b/data/theme/gnome-shell-sass/widgets/_app-grid.scss
index 0216dd9071..9d293e6449 100644
--- a/data/theme/gnome-shell-sass/widgets/_app-grid.scss
+++ b/data/theme/gnome-shell-sass/widgets/_app-grid.scss
@@ -108,6 +108,21 @@ $app_grid_fg_color: #fff;
        margin-bottom: 1px;
 }
 
+// Rename popup for app folders
+.rename-folder-popup {
+       background: red;
+       .rename-folder-popup-item {
+               spacing: $base_spacing;
+               &:ltr, &:rtl { padding: 0, $base_padding * 2; }
+       }
+}
+
+// right-click app menu
+.app-menu,
+.app-well-menu {
+       max-width: 27.25em;
+}
+
 // App Grid pagination indicators
 .page-indicator {
        padding: 15px 20px;
diff --git a/data/theme/gnome-shell-sass/widgets/_popovers.scss 
b/data/theme/gnome-shell-sass/widgets/_popovers.scss
index e40862854d..8f00667ad7 100644
--- a/data/theme/gnome-shell-sass/widgets/_popovers.scss
+++ b/data/theme/gnome-shell-sass/widgets/_popovers.scss
@@ -1,38 +1,50 @@
 /* Popovers/Menus */
 
+//.the popover itself
+.popup-menu-boxpointer,
+.candidate-popup-boxpointer {
+       -arrow-border-radius: $base_border_radius+4;
+       -arrow-background-color: $bg_color;
+       -arrow-border-width: 1px;
+       -arrow-border-color: $borders_color;
+       -arrow-base: 24px;
+       -arrow-rise: 11px;
+       -arrow-box-shadow: 0 1px 3px rgba(0,0,0,0.5); // dreaming bugzilla #689995
+}
+
+// container of the popover menu
 .popup-menu {
        min-width: 15em;
        color: $fg_color;
-       border-color: $bubble_borders_color;
 
-       .popup-sub-menu {
-               background-color: darken($bg_color,5%);
-               box-shadow: inset 0 -1px 0px $bubble_borders_color;
+       .popup-menu-content {
+               padding: calc(#{$base_padding} * 2 + #{$base_margin}) 0;
        }
 
-       .popup-menu-content { padding: calc(#{$base_padding} * 2 + #{$base_margin}) 0; }
-
        // menu items
        .popup-menu-item {
                spacing: $base_padding;
+               padding: $base_padding;
 
-               &:ltr { padding: .4em 1.75em .4em 0em; }
-               &:rtl { padding: .4em 0em .4em 1.75em; }
+               &:ltr { padding-right:1.75em; padding-left: 0; }
+               &:rtl { padding-right: 0; padding-left:1.75em; }
 
                &:checked {
-                       background-color: $bg_color;
-                       box-shadow: inset 0 -1px 0px $bubble_borders_color;
-                       font-weight: bold;
+                       background-color: lighten($bg_color, 2%);
+                       box-shadow: none;
                }
+
                &.selected {
                        background-color: transparentize(white, if($variant=='light', 0.2, 0.9));
                        color: $fg_color;
                }
+
                &:active { 
                        background-color: $selected_bg_color;
                        color: $selected_fg_color;
-                }
-               &:insensitive { color: transparentize($fg_color,.5); }
+               }
+
+               &:insensitive { color: transparentize($fg_color,0.5);}
        }
 
        // all icons and other graphical elements
@@ -53,55 +65,42 @@
        .popup-menu-icon { icon-size: $base_icon_size; }
 }
 
+// popover submenus
+.popup-sub-menu {
+       background-color: darken($bg_color, 3%);
+       box-shadow: none;
+       border-top: 1px solid transparentize($borders_color, 0.2);
+       border-bottom: 1px solid transparentize($borders_color, 0.2);
+
+       .popup-menu-item {
+               &:hover {
+                       background-color: darken($bg_color, 7%);
+               }
+       }
+}
+
+// container for check marks, etc.
 .popup-menu-ornament {
        text-align: right;
        width: 1.2em;
 }
 
-.popup-menu-boxpointer,
-.candidate-popup-boxpointer {
-       -arrow-border-radius: $base_border_radius+4;
-       -arrow-background-color: $bg_color;
-       -arrow-border-width: 1px;
-       -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
-}
-
+// separator
 .popup-separator-menu-item {
        //-margin-horizontal: 24px;
        height: 1px; //not really the whole box
        margin: 6px 64px;
        background-color: transparent;
-       border-color: $bubble_borders_color;
-       border-bottom-width: 1px;
-       border-bottom-style: solid;
-}
-
-// Desktop background menu
-.background-menu { -boxpointer-gap: $base_margin; -arrow-rise: 0px; }
-
-
-// Rename popup
-.rename-folder-popup {
-       .rename-folder-popup-item {
-               spacing: $base_spacing;
-               &:ltr, &:rtl { padding: 0, $base_padding * 2; }
-       }
+       border-bottom: 1px solid $bubble_borders_color;
 }
 
-/* fallback menu
-- odd thing for styling App menu when apparently not running under shell. Light Adwaita styled app menu 
inside the main app window itself rather than the top bar
-*/
-
-// App menu
-.app-menu,
-.app-well-menu {
-       max-width: 27.25em;
+// desktop background menu
+.background-menu {
+       -boxpointer-gap: $base_margin;
+       -arrow-rise: 0px; // hide the beak on the menu
 }
 
-// System status menu
+// system status menu
 .aggregate-menu {
        min-width: 21em;
 
diff --git a/data/theme/gnome-shell-sass/widgets/_search-results.scss 
b/data/theme/gnome-shell-sass/widgets/_search-results.scss
index d4fba65d22..55bc16a5e7 100644
--- a/data/theme/gnome-shell-sass/widgets/_search-results.scss
+++ b/data/theme/gnome-shell-sass/widgets/_search-results.scss
@@ -7,7 +7,7 @@ $overview_search_container_width: 1024px;
        border-radius: $modal_radius + 3px;
        border: 1px solid $osd_outer_borders_color;
        box-shadow: 0 1px 4px 0 rgba(0,0,0,0.3);
-       text-shadow: 0 1px rgba(0,0,0,0.3);
+       text-shadow: 0 1px if($variant == 'light', rgba(255,255,255,0.2), rgba(0,0,0,0.2));
        color: $osd_fg_color;
        padding: $base_padding * 3;
 }
@@ -17,12 +17,12 @@ $overview_search_container_width: 1024px;
        max-width: $overview_search_container_width;
 }
 
-// search results section
+// search results sections "the boxes"
 .search-section {
        @extend %search_result_bubble;
        spacing:0;
-       margin-top: $base_padding * 2;
-       margin-bottom: $base_padding * 2;
+       margin-top: $base_padding;
+       margin-bottom: $base_padding;
 
        // hide separator
        &:first-child .search-section-separator,