brl/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

style: Fix the lock-screen styles leaking

Browse Source 
- wrap the user-icon overrides in login-lock with the login class
- clean out redundant css on the user-icon

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/3203>
This commit is contained in:
Sam Hewitt 2024-02-20 10:29:58 -03:30 committed by Marge Bot
parent 8616ec00a0
commit 881ec91370
2 changed files with 33 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
data/theme/gnome-shell-sass/widgets/_login-lock.scss
View File

@ -279,16 +279,18 @@ $_gdm_dialog_width: 25em;
} }
// User Widget .login-dialog,
.user-widget { .unlock-dialog {
// User Widget
.user-widget {
// common
.user-widget-label { .user-widget-label {
color: $_gdm_fg; color: $_gdm_fg;
} }
& .user-icon { .user-icon {
border-radius: $forced_circular_radius;
StIcon {
background-color: transparentize($_gdm_fg, .87); background-color: transparentize($_gdm_fg, .87);
color: $_gdm_fg; color: $_gdm_fg;
@ -297,7 +299,6 @@ $_gdm_dialog_width: 25em;
box-shadow:inset 0 0 0 1px $hc_inset_color; box-shadow:inset 0 0 0 1px $hc_inset_color;
} }
} }
}
// layout of the user list // layout of the user list
&.horizontal { &.horizontal {
@ -305,15 +306,6 @@ $_gdm_dialog_width: 25em;
.user-widget-label { .user-widget-label {
@extend %title_3; @extend %title_3;
} }
.user-icon {
icon-size: $base_icon_size * 4;
& StIcon {
padding: $base_padding * 2;
icon-size: $base_icon_size * 2;
}
}
} }
// layout of the login prompt // layout of the login prompt
@ -331,7 +323,7 @@ $_gdm_dialog_width: 25em;
& StIcon { & StIcon {
padding: $base_padding * 4; padding: $base_padding * 4;
icon-size: $base_icon_size * 4; }
} }
} }
} }

11
data/theme/gnome-shell-sass/widgets/_misc.scss
View File

@ -7,15 +7,14 @@
// User icon // User icon
.user-icon { .user-icon {
background-size: contain; background-size: contain;
color: $osd_fg_color;
border-radius: $forced_circular_radius; border-radius: $forced_circular_radius;
icon-size: $base_icon_size * 4; // 64px icon-size: $base_icon_size * 4;
background-color: transparentize($osd_fg_color,0.95);
color: $osd_fg_color;
& StIcon { & StIcon {
background-color: transparentize($osd_fg_color,0.95); padding: $base_padding * 2;
border-radius: $forced_circular_radius;
padding: $base_padding * 2 ; // 12px
width: $base_icon_size * 2.5; height: $base_icon_size * 2.5; // 40px;
} }
&.user-avatar { &.user-avatar {