From 337d20f9f95daaa679f5a96f5710fa2915c83eda Mon Sep 17 00:00:00 2001
From: Jakub Steiner <jimmac@gmail.com>
Date: Mon, 5 Sep 2022 16:11:48 +0200
Subject: [PATCH] theme: Light variant tweaks

- having system grey derived form the base color means having
  classic/light theme overview light/illegible
- System grey needs a foreground too
- login/gdm entries derived from system grey fg (assumed dark bg)

Fixes https://gitlab.gnome.org/GNOME/gnome-shell-extensions/-/issues/410
---
 data/theme/gnome-shell-sass/_colors.scss      |  4 +++-
 .../widgets/_login-dialog.scss                | 24 +++++++------------
 2 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/data/theme/gnome-shell-sass/_colors.scss b/data/theme/gnome-shell-sass/_colors.scss
index c42a95543..513d46817 100644
--- a/data/theme/gnome-shell-sass/_colors.scss
+++ b/data/theme/gnome-shell-sass/_colors.scss
@@ -6,6 +6,7 @@
 $is_highcontrast: "false";
 
 $_dark_base_color: darken(desaturate(#241f31, 100%), 2%);
+$_dark_fg_color: white;
 
 $base_color: if($variant == 'light', #fff, $_dark_base_color);
 $bg_color: if($variant == 'light', #f6f5f4, lighten($base_color, 5%));
@@ -45,7 +46,8 @@ $card_bg_color: if($variant == 'light', darken($bg_color, 5%), lighten($bg_color
 $bubble_buttons_color: if($variant == 'light', darken($bg_color, 12%), lighten($bg_color, 10%));
 
 // overview background color
-$system_bg_color: $base_color;
+$system_bg_color: $_dark_base_color;
+$system_fg_color: $_dark_fg_color;
 
 //insensitive state derived colors
 $insensitive_fg_color: mix($fg_color, $bg_color, 50%);
diff --git a/data/theme/gnome-shell-sass/widgets/_login-dialog.scss b/data/theme/gnome-shell-sass/widgets/_login-dialog.scss
index 23456be58..56a0cfafa 100644
--- a/data/theme/gnome-shell-sass/widgets/_login-dialog.scss
+++ b/data/theme/gnome-shell-sass/widgets/_login-dialog.scss
@@ -169,26 +169,20 @@
   padding-top: 1em;
 }
 
-.login-dialog {
-  StEntry {
-    @if $variant=='dark' {
-      $_gdm_entry_bg: darken($system_bg_color, 3%);
-      background-color: $_gdm_entry_bg;
-      color: $fg_color;
-    }
-  }
-}
-
-// Custom styling for unlock entry
-.unlock-dialog {
+// Custom styling for login/unlock entry
+.unlock-dialog, .login-dialog {
   StEntry {
+   $_gdm_entry_fg: $system_fg_color; 
+   $_gdm_entry_bg: transparentize($system_fg_color, 0.9);
+   
     border:none !important;
     &:focus { 
-      background-color: transparentize($fg_color, 0.9);
+      color: $_gdm_entry_fg;
+      background-color: $_gdm_entry_bg;
     }
     &:insensitive { 
-      color: transparentize($fg_color, 0.5);
-      background-color: transparentize($fg_color, 0.95);
+      color: transparentize($_gdm_entry_fg, 0.5);
+      background-color: transparentize($_gdm_entry_bg, 0.95);
     }
   }