From 92ccfe7f65acc3e425def61c5084ccc606e0ecbb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20M=C3=BCllner?= Date: Tue, 29 Aug 2023 17:54:43 +0200 Subject: [PATCH] style: Only apply neutral entry focus color on lock screen Commit a72c95de changed the focus style for all system entries to a more neutral color, as the stronger focus often clashes with the wallpaper background on the lock screen. However that is not a concern for entries that appear over the neutral system background. Worse, the neutral focus indication provides so little contrast with the background there that is not much of an indication anymore. Address this by restoring the old focus indication for the generic system_entry mix-in, but override it specifically on the lock screen to avoid the clash with the wallpaper background. Fixes a72c95de Closes https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/6945 Closes https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/6880 Part-of: --- data/theme/gnome-shell-sass/_common.scss | 2 +- data/theme/gnome-shell-sass/widgets/_login-lock.scss | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/data/theme/gnome-shell-sass/_common.scss b/data/theme/gnome-shell-sass/_common.scss index ecd39c757..5b117ea71 100644 --- a/data/theme/gnome-shell-sass/_common.scss +++ b/data/theme/gnome-shell-sass/_common.scss @@ -280,7 +280,7 @@ stage { @extend %entry_common; @include entry(normal, $c:$system_fg_color,); &:hover { @include entry(hover, $c:$system_fg_color);} - &:focus { @include entry(focus, $c:$system_fg_color, $fc:transparentize($system_fg_color, 0.5));} + &:focus { @include entry(focus, $c:$system_fg_color, $fc:$selected_bg_color);} &:insensitive { @include entry(insensitive, $c:$system_fg_color);} StLabel.hint-text { color: transparentize($system_fg_color, 0.3);} diff --git a/data/theme/gnome-shell-sass/widgets/_login-lock.scss b/data/theme/gnome-shell-sass/widgets/_login-lock.scss index 212a2d385..8677ae748 100644 --- a/data/theme/gnome-shell-sass/widgets/_login-lock.scss +++ b/data/theme/gnome-shell-sass/widgets/_login-lock.scss @@ -155,6 +155,11 @@ $_gdm_dialog_width: 23em; .unlock-dialog { background-color: transparent; + + // %system_entry style override to have neutral focus color with wallpaper background + .login-dialog-prompt-entry { + &:focus { @include entry(focus, $c:$system_fg_color, $fc:transparentize($system_fg_color, 0.5));} + } } .screen-shield-background { // just the shadow, really