style: Fix the lock-screen styles leaking

- 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

View File

@ -279,16 +279,18 @@ $_gdm_dialog_width: 25em;
}
// User Widget
.user-widget {
.login-dialog,
.unlock-dialog {
.user-widget-label {
color: $_gdm_fg;
}
// User Widget
.user-widget {
& .user-icon {
border-radius: $forced_circular_radius;
StIcon {
// common
.user-widget-label {
color: $_gdm_fg;
}
.user-icon {
background-color: transparentize($_gdm_fg, .87);
color: $_gdm_fg;
@ -297,41 +299,31 @@ $_gdm_dialog_width: 25em;
box-shadow:inset 0 0 0 1px $hc_inset_color;
}
}
}
// layout of the user list
&.horizontal {
spacing: $base_padding * 3;
.user-widget-label {
@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 user list
&.horizontal {
spacing: $base_padding * 3;
.user-widget-label {
@extend %title_3;
}
}
}
// layout of the login prompt
&.vertical {
spacing: $base_padding * 4;
// layout of the login prompt
&.vertical {
spacing: $base_padding * 4;
.user-widget-label {
@extend %title_1;
text-align: center;
margin-bottom: .75em;
}
.user-widget-label {
@extend %title_1;
text-align: center;
margin-bottom: .75em;
}
.user-icon {
icon-size: $base_icon_size * 10;
.user-icon {
icon-size: $base_icon_size * 10;
& StIcon {
padding: $base_padding * 4;
icon-size: $base_icon_size * 4;
& StIcon {
padding: $base_padding * 4;
}
}
}
}

View File

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