[gnome-shell/wip/snwh/sass-cleanup] theme: merge some missed changed

[Sam Hewitt <snwh src gnome org>]

commit 3571ba09d1afb17b7594ed31cf7d3e4c28986bf3
Author: Sam Hewitt <sam snwh org>
Date:   Wed Dec 18 11:29:03 2019 -0500

    theme: merge some missed changed

 data/theme/gnome-shell-sass/widgets/_dialogs.scss |  5 ++++
 data/theme/gnome-shell-sass/widgets/_entries.scss |  4 +++
 data/theme/gnome-shell-sass/widgets/_panel.scss   | 31 +++++++++++------------
 3 files changed, 24 insertions(+), 16 deletions(-)
---
diff --git a/data/theme/gnome-shell-sass/widgets/_dialogs.scss 
b/data/theme/gnome-shell-sass/widgets/_dialogs.scss
index 80ec40ed4a..0c8591cf55 100644
--- a/data/theme/gnome-shell-sass/widgets/_dialogs.scss
+++ b/data/theme/gnome-shell-sass/widgets/_dialogs.scss
@@ -175,6 +175,11 @@
        padding: 8px;
 }
 
+.prompt-dialog-caps-lock-warning {
+       @extend .prompt-dialog-error-label;
+       padding-left: 6.2em;
+}
+
 
 /* Polkit Dialog */
 
diff --git a/data/theme/gnome-shell-sass/widgets/_entries.scss 
b/data/theme/gnome-shell-sass/widgets/_entries.scss
index 99881c9602..7c105580c7 100644
--- a/data/theme/gnome-shell-sass/widgets/_entries.scss
+++ b/data/theme/gnome-shell-sass/widgets/_entries.scss
@@ -16,4 +16,8 @@ StEntry {
                warning-color: $warning_color;
                padding: 0 4px;
        }
+       StIcon.peek-password {
+               icon-size: $base_icon_size;
+               padding: 0 4px;
+       }
 }
\ No newline at end of file
diff --git a/data/theme/gnome-shell-sass/widgets/_panel.scss b/data/theme/gnome-shell-sass/widgets/_panel.scss
index 5857938233..9c5a4e0555 100644
--- a/data/theme/gnome-shell-sass/widgets/_panel.scss
+++ b/data/theme/gnome-shell-sass/widgets/_panel.scss
@@ -25,22 +25,6 @@ $panel_height: 1.86em;
                spacing: $base_spacing;
        }
 
-       // App Menu
-       #appMenu {
-               spacing: $base_spacing;
-
-               .label-shadow { color: transparent; }
-
-               // app menu icon
-               .app-menu-icon {
-                       -st-icon-style: symbolic;
-                       margin-left: $base_margin;
-                       margin-right: $base_margin;
-                       // dimensions of the icon are hardcoded
-               }
-       }
-
-
        // the rounded outset corners
        .panel-corner {
                -panel_corner_radius: $panel_corner_radius;
@@ -83,6 +67,15 @@ $panel_height: 1.86em;
                        padding: $base_padding - 1px;
                }
 
+
+               // app menu icon
+               .app-menu-icon {
+                       -st-icon-style: symbolic;
+                       margin-left: $base_margin;
+                       margin-right: $base_margin;
+                       // dimensions of the icon are hardcoded
+               }
+
                // lock & login screen styles
                .unlock-screen &,
                .login-screen &,
@@ -105,4 +98,10 @@ $panel_height: 1.86em;
        // indicator for active
        .screencast-indicator,
        .remote-access-indicator { color: $warning_color; }
+}
+
+// App Menu
+#appMenu {
+       spacing: $base_spacing;
+       .label-shadow { color: transparent; }
 }
\ No newline at end of file