lightdm-gtk-greeter: Simplify theming

Also: add workaround for visible panel separators, which are used like regular menuitems in the greeter
tanderson-google · Mar 11, 2018 · 9376aaf · 9376aaf
1 parent b9b9eca
commit 9376aaf
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 17 deletions.
diff --git a/gtk-3.0/_lightdm-gtk-greeter.scss b/gtk-3.0/_lightdm-gtk-greeter.scss
@@ -6,22 +6,23 @@ $variant: 'light';
     /*********
      * panel *
      *********/
-    #panel_window {
-        background-color: shade($panel_bg_color, 0.35);
+    #panel_window menubar {
         color: $panel_fg_color;
         font-weight: bold;
         text-shadow: 0 1px transparentize (black, 0.5);
         -gtk-icon-shadow: 0 1px transparentize (black, 0.5);
         box-shadow: inset 0 -1px transparentize (black, 0.5);
-        menubar {
-            background-color: shade($panel_bg_color, 0.35);
-            text-shadow: 0 1px transparentize (black, 0.5);
-            -gtk-icon-shadow: 0 1px transparentize (black, 0.5);
-            menu menuitem {
-                font-weight: normal;
-                text-shadow: none;
-            }
+        background-color: shade($panel_bg_color, 0.35);
+        text-shadow: 0 1px transparentize (black, 0.5);
+        -gtk-icon-shadow: 0 1px transparentize (black, 0.5);
+        menu {
+          background-color: $menu_color;
+          menuitem {
+            font-weight: normal;
+            text-shadow: none;
+          }
         }
+        separator { background: transparent; }
     }
     /****************
      * login window *

diff --git a/gtk-3.0/gtk-contained.css b/gtk-3.0/gtk-contained.css
@@ -4550,20 +4550,22 @@ XfdesktopIconView.view {
   /****************
    * login window *
    ****************/ }
-  .lightdm-gtk-greeter #panel_window {
-    background-color: shade(#686868, 0.35);
+  .lightdm-gtk-greeter #panel_window menubar {
     color: #fcfcfc;
     font-weight: bold;
     text-shadow: 0 1px transparentize black, 0.5;
     -gtk-icon-shadow: 0 1px transparentize black, 0.5;
-    box-shadow: inset 0 -1px transparentize black, 0.5; }
-    .lightdm-gtk-greeter #panel_window menubar {
-      background-color: shade(#686868, 0.35);
-      text-shadow: 0 1px transparentize black, 0.5;
-      -gtk-icon-shadow: 0 1px transparentize black, 0.5; }
+    box-shadow: inset 0 -1px transparentize black, 0.5;
+    background-color: shade(#686868, 0.35);
+    text-shadow: 0 1px transparentize black, 0.5;
+    -gtk-icon-shadow: 0 1px transparentize black, 0.5; }
+    .lightdm-gtk-greeter #panel_window menubar menu {
+      background-color: #fcfcfc; }
       .lightdm-gtk-greeter #panel_window menubar menu menuitem {
         font-weight: normal;
         text-shadow: none; }
+    .lightdm-gtk-greeter #panel_window menubar separator {
+      background: transparent; }
   .lightdm-gtk-greeter #login_window,
   .lightdm-gtk-greeter #shutdown_dialog,
   .lightdm-gtk-greeter #restart_dialog {