[gnome-shell/wip/snwh/sass-cleanup] theme: fix some nesting

[Sam Hewitt <snwh src gnome org>]

commit 2524a6750ca8875a469bb17b2cdeee77252e64fd
Author: Sam Hewitt <sam snwh org>
Date:   Wed Dec 18 15:48:59 2019 -0500

    theme: fix some nesting

 data/theme/gnome-shell-sass/_colors.scss           |   2 +-
 data/theme/gnome-shell-sass/_common.scss           |   4 +-
 data/theme/gnome-shell-sass/widgets/_panel.scss    | 128 ++++++++++-----------
 .../gnome-shell-sass/widgets/_search-results.scss  |  64 +++++------
 4 files changed, 99 insertions(+), 99 deletions(-)
---
diff --git a/data/theme/gnome-shell-sass/_colors.scss b/data/theme/gnome-shell-sass/_colors.scss
index 57d130c0c4..0783e69031 100644
--- a/data/theme/gnome-shell-sass/_colors.scss
+++ b/data/theme/gnome-shell-sass/_colors.scss
@@ -32,7 +32,7 @@ $shadow_color: if($variant == 'light', rgba(0,0,0,0.1), rgba(0,0,0,0.2));
 //insensitive state derived colors
 $insensitive_fg_color: mix($fg_color, $bg_color, 50%);
 $insensitive_bg_color: mix($bg_color, $base_color, 60%);
-$insensitive_borders_color: $borders_color;
+$insensitive_borders_color: mix($borders_color, $base_color, 60%);
 
 //colors for the backdrop state, derived from the main colors.
 $backdrop_base_color: if($variant =='light', darken($base_color,1%), lighten($base_color,1%));
diff --git a/data/theme/gnome-shell-sass/_common.scss b/data/theme/gnome-shell-sass/_common.scss
index 7ed554ac6a..12c887abdd 100644
--- a/data/theme/gnome-shell-sass/_common.scss
+++ b/data/theme/gnome-shell-sass/_common.scss
@@ -65,6 +65,7 @@ stage {
 }
 
 /* WIDGETS */
+@import 'widgets/panel';
 @import 'widgets/app-grid';
 @import 'widgets/app-switcher';
 @import 'widgets/buttons';
@@ -86,7 +87,6 @@ stage {
 @import 'widgets/network-dialog';
 @import 'widgets/osd';
 @import 'widgets/overview';
-@import 'widgets/panel';
 @import 'widgets/popovers';
 @import 'widgets/screen-shield';
 @import 'widgets/scrollbars';
@@ -209,7 +209,7 @@ stage {
        border-radius: $base_border_radius;
        border-width: 1px;
        min-height: 22px;
-       padding: $base_padding * 0.25 $base_padding * 2;
+       padding: $base_padding * 0.5 $base_padding * 4;
 
        @include button(normal);
        &:focus { @include button(focus);}
diff --git a/data/theme/gnome-shell-sass/widgets/_panel.scss b/data/theme/gnome-shell-sass/widgets/_panel.scss
index e5f6b96598..cdf88c1a19 100644
--- a/data/theme/gnome-shell-sass/widgets/_panel.scss
+++ b/data/theme/gnome-shell-sass/widgets/_panel.scss
@@ -19,86 +19,86 @@ $panel_height: 1.86em;
   &.lock-screen {
     background-color: transparent;
   }
+}
+
+// spacing between activities, app menu and such
+#panelLeft, #panelCenter {
+  spacing: $base_spacing;
+}
 
-  // spacing between activities, app menu and such
-  #panelLeft, #panelCenter {
-    spacing: $base_spacing;
+// the rounded outset corners
+.panel-corner {
+  -panel_corner_radius: $panel_corner_radius;
+  -panel-corner-background-color: $panel_bg_color;
+  -panel-corner-border-width: 2px;
+  -panel-corner-border-color: transparent;
+
+  &:active, &:overview, &:focus {
+    -panel-corner-border-color: lighten($selected_bg_color,5%);
   }
 
-  // the rounded outset corners
-  .panel-corner {
-    -panel_corner_radius: $panel_corner_radius;
-    -panel-corner-background-color: $panel_bg_color;
-    -panel-corner-border-width: 2px;
+  &.lock-screen, &.login-screen, &.unlock-screen {
+    -panel_corner_radius: 0;
+    -panel-corner-background-color: transparent;
     -panel-corner-border-color: transparent;
+  }
+}
 
-    &:active, &:overview, &:focus {
-      -panel-corner-border-color: lighten($selected_bg_color,5%);
-    }
+// panel menus
+.panel-button {
+  font-weight: bold;
+  color: $panel_fg_color;
+  -natural-hpadding: $base_padding * 2;
+  -minimum-hpadding: $base_padding;
 
-    &.lock-screen, &.login-screen, &.unlock-screen {
-      -panel_corner_radius: 0;
-      -panel-corner-background-color: transparent;
-      -panel-corner-border-color: transparent;
-    }
+  &:hover {
+    color: lighten($panel_fg_color, 20%);
   }
 
-  // panel menus
-  .panel-button {
-    font-weight: bold;
-    color: $panel_fg_color;
-    -natural-hpadding: $base_padding * 2;
-    -minimum-hpadding: $base_padding;
-
-    &:hover {
-      color: lighten($panel_fg_color, 20%);
-    }
-
-    &:active, &:overview, &:focus, &:checked {
-      background-color: $panel_bg_color; // Trick due to St limitations. It needs a background to draw a 
box-shadow
-      box-shadow: inset 0 -2px 0 0 lighten($selected_bg_color,5%);
-
-      color: lighten($panel_fg_color, 20%);
-    }
-
-    // status area icons
-    .system-status-icon {
-      icon-size: $base_icon_size;
-      padding: $base_padding - 1px;
-    }
-
-    // app menu icon
-    .app-menu-icon {
-      margin-left: $base_margin;
-      margin-right: $base_margin;
-      -st-icon-style: symbolic;
-      // dimensions of the icon are hardcoded
-    }
-
-    // lock & login screen styles
-    .unlock-screen &,
-    .login-screen &,
-    .lock-screen & {
-      color: lighten($fg_color, 10%);
-      &:focus, &:hover, &:active { color: lighten($fg_color, 10%); }
-    }
+  &:active, &:overview, &:focus, &:checked {
+    background-color: $panel_bg_color; // Trick due to St limitations. It needs a background to draw a 
box-shadow
+    box-shadow: inset 0 -2px 0 0 lighten($selected_bg_color,5%);
+
+    color: lighten($panel_fg_color, 20%);
+  }
+
+  // status area icons
+  .system-status-icon {
+    icon-size: $base_icon_size;
+    padding: $base_padding - 1px;
   }
 
-  .panel-status-indicators-box,
-  .panel-status-menu-box {
-    spacing: 2px;
+  // app menu icon
+  .app-menu-icon {
+    margin-left: $base_margin;
+    margin-right: $base_margin;
+    -st-icon-style: symbolic;
+    // dimensions of the icon are hardcoded
   }
 
-  // spacing between power icon and (optional) percentage label
-  .power-status.panel-status-indicators-box {
-    spacing: 0;
+  // lock & login screen styles
+  .unlock-screen &,
+  .login-screen &,
+  .lock-screen & {
+    color: lighten($fg_color, 10%);
+    &:focus, &:hover, &:active { color: lighten($fg_color, 10%); }
   }
+}
 
-  // indicator for active
-  .screencast-indicator,
-  .remote-access-indicator { color: $warning_color; }
+.panel-status-indicators-box,
+.panel-status-menu-box {
+  spacing: 2px;
 }
 
+// spacing between power icon and (optional) percentage label
+.power-status.panel-status-indicators-box {
+  spacing: 0;
+}
+
+// indicator for active
+.screencast-indicator,
+.remote-access-indicator { color: $warning_color; }
+
 // App Menu
 #appMenu {
   spacing: $base_spacing;
diff --git a/data/theme/gnome-shell-sass/widgets/_search-results.scss 
b/data/theme/gnome-shell-sass/widgets/_search-results.scss
index 91baff497f..dd3f28cc1a 100644
--- a/data/theme/gnome-shell-sass/widgets/_search-results.scss
+++ b/data/theme/gnome-shell-sass/widgets/_search-results.scss
@@ -120,41 +120,41 @@ $overview_search_container_width: 1024px;
 // search results list
 .list-search-results {
        spacing: $base_spacing;
+}
 
-       // search result listitem
-       .list-search-result {
-               @extend %icon_tile;
-               spacing: 0;
-               padding: $base_padding;
-               color: $osd_fg_color;
+// search result listitem
+.list-search-result {
+       @extend %icon_tile;
+       spacing: 0;
+       padding: $base_padding;
+       color: $osd_fg_color;
 
-               &:focus,
-               &:selected,
-               &:hover {
-                       background-color: transparentize($osd_fg_color,.9);
-                       transition-duration: 200ms;
-               }
-               &:active,
-               &:checked {
-                       background-color: transparentize(darken($osd_bg_color,10%),.1);
-               }
+       &:focus,
+       &:selected,
+       &:hover {
+               background-color: transparentize($osd_fg_color,.9);
+               transition-duration: 200ms;
+       }
+       &:active,
+       &:checked {
+               background-color: transparentize(darken($osd_bg_color,10%),.1);
+       }
 
-               // content
-               .list-search-result-content {
-                       spacing: 0;
-               }
+       // content
+       .list-search-result-content {
+               spacing: 0;
+       }
 
-               // list item title
-               .list-search-result-title {
-                       color: $osd_fg_color;
-                       spacing: $base_spacing * 2;
-                       padding-right: $base_padding;
-                       // font-weight: bold;
-               }
+       // list item title
+       .list-search-result-title {
+               color: $osd_fg_color;
+               spacing: $base_spacing * 2;
+               padding-right: $base_padding;
+               // font-weight: bold;
+       }
 
-               // list item description
-               .list-search-result-description {
-                       color: darken($osd_fg_color, 30%);
-               }
+       // list item description
+       .list-search-result-description {
+               color: darken($osd_fg_color, 30%);
        }
-}
+}
\ No newline at end of file