Skip to content

Commit 0a8e2f6

Browse files
3v1n03v1n0
committed
New upstream snapshot for GNOME Shell
1 parent 43299d4 commit 0a8e2f6

File tree

6 files changed

+61
-139
lines changed

6 files changed

+61
-139
lines changed

‎gnome-shell/upstream/theme/gnome-shell-sass/_colors.scss‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,3 +68,10 @@ $active_fg_color: if($variant=='light', darken($fg_color, 11%), lighten($fg_colo
6868

6969
// accent colors
7070
$accent_borders_color: if($variant== 'light', st-darken(-st-accent-color, 20%), st-lighten(-st-accent-color, 30%));
71+
72+
//
73+
// Special Case Colors
74+
//
75+
76+
// increase contrast on insensitive_fg_color since card elements have a lighter background
77+
$card_insensitive_fg_color: if($variant =='light', darken($insensitive_fg_color, 5%), lighten($insensitive_fg_color, 9%));

‎gnome-shell/upstream/theme/gnome-shell-sass/_high-contrast-colors.scss‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,12 @@ $active_fg_color: lighten($fg_color, 22%);
6767
// accent colors
6868
$accent_borders_color: st-lighten(-st-accent-color, 30%);
6969

70+
//
71+
// Special Case Colors
72+
//
73+
74+
$card_insensitive_fg_color: $fg_color;
75+
7076
//
7177
// High Contrast specific definitions
7278
//

‎gnome-shell/upstream/theme/gnome-shell-sass/widgets/_calendar.scss‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@
164164
// event title
165165
.events-title {
166166
@extend %heading;
167-
color: $insensitive_fg_color;
167+
color: $card_insensitive_fg_color;
168168
padding-bottom: $base_padding;
169169
}
170170

@@ -184,12 +184,12 @@
184184
.event-time {
185185
@extend %numeric;
186186
@extend %caption;
187-
color: $insensitive_fg_color;
187+
color: $card_insensitive_fg_color;
188188
}
189189
}
190190

191191
.event-placeholder {
192-
color: $insensitive_fg_color;
192+
color: $card_insensitive_fg_color;
193193
font-style: italic;
194194
}
195195
}
@@ -202,7 +202,7 @@
202202
// title
203203
.world-clocks-header {
204204
@extend %heading;
205-
color: $insensitive_fg_color;
205+
color: $card_insensitive_fg_color;
206206

207207
// change style when no world clocks are configured
208208
&.no-world-clocks {
@@ -232,7 +232,7 @@
232232
.world-clocks-timezone {
233233
@extend %numeric;
234234
@extend %caption;
235-
color: $insensitive_fg_color;
235+
color: $card_insensitive_fg_color;
236236
}
237237
}
238238
}
@@ -249,7 +249,7 @@
249249

250250
.weather-header {
251251
@extend %heading;
252-
color: $insensitive_fg_color;
252+
color: $card_insensitive_fg_color;
253253

254254
// change style when no location is configured
255255
&.no-location {

‎gnome-shell/upstream/theme/gnome-shell-sass/widgets/_dialogs.scss‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -126,10 +126,19 @@
126126
.prompt-dialog-null-label {
127127
@extend %caption;
128128
text-align: center;
129+
padding: $base_padding * 1.5;
130+
border-radius: $base_border_radius;
131+
margin: $base_margin 0;
129132
}
130133

131134
.prompt-dialog-error-label {
132135
color: $warning_color;
136+
background-color: transparentize($warning_color, 0.9);
137+
}
138+
139+
.prompt-dialog-info-label {
140+
color: $fg_color;
141+
background-color: transparentize($fg_color, 0.9);
133142
}
134143
}
135144

‎gnome-shell/upstream/theme/gnome-shell-sass/widgets/_login-lock.scss‎

Lines changed: 30 additions & 130 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,7 @@ $_gdm_dialog_width: 25em;
3737
&.a11y-button,
3838
&.cancel-button,
3939
&.switch-user-button,
40-
&.login-dialog-auth-menu-button,
41-
&.login-dialog-session-list-button,
42-
&.web-login-intro-button {
40+
&.login-dialog-session-list-button {
4341
@extend .icon-button;
4442
@extend %system_button;
4543

@@ -51,25 +49,6 @@ $_gdm_dialog_width: 25em;
5149
}
5250
}
5351

54-
.login-dialog-auth-menu-button-title {
55-
@include fontsize($base_font_size - 1);
56-
color: darken($_gdm_fg,40%);
57-
font-weight: bold;
58-
padding-top: $base_padding;
59-
padding-bottom: $base_padding * 2;
60-
padding-left: $base_padding * 2;
61-
padding-right: $base_padding * 2;
62-
}
63-
64-
.login-dialog-auth-menu-button-popup-menu-box {
65-
padding: $base_padding * 3;
66-
}
67-
68-
.login-dialog-auth-menu-button-item {
69-
padding-left: $base_padding * 2;
70-
padding-right: $base_padding * 2;
71-
}
72-
7352
.login-dialog-button-box {
7453
spacing: $base_padding * 2;
7554
}
@@ -90,16 +69,13 @@ $_gdm_dialog_width: 25em;
9069
.conflicting-session-dialog-desc-warning {
9170
text-align: center;
9271
color: $warning_color;
72+
background-color: transparentize($warning_color, 0.9);
73+
padding: $base_padding * 1.5;
74+
border-radius: $base_border_radius;
75+
margin: $base_margin 0;
9376
}
9477
}
9578

96-
.login-dialog-menu-button-box {
97-
spacing: $base_padding * 2;
98-
padding-left: $base_padding * 2;
99-
padding-right: $base_padding * 2;
100-
padding-bottom: $base_padding * 2;
101-
}
102-
10379
.login-dialog-logo-bin {
10480
margin: 3em 0;
10581
}
@@ -234,80 +210,8 @@ $_gdm_dialog_width: 25em;
234210
}
235211
}
236212

237-
.login-dialog-prompt-layout {
238-
spacing: $base_padding * 2;
239-
min-width: 30em;
240-
}
241-
242-
.login-dialog-prompt-entry {
243-
@extend %system_entry;
244-
}
245-
246-
.web-login-dialog-content-overlay {
247-
background-color: transparentize($bg_color, 0.3);
248-
border-radius: $modal_radius;
249-
margin-bottom: 3em;
250-
}
251-
252-
.web-login-spinner {
253-
color: $osd_fg_color;
254-
background-color: transparentize($osd_bg_color, 0.5);
255-
border: 5px transparent;
256-
border-radius: 50px;
257-
}
258-
259-
.web-login-title-label {
260-
@include fontsize($base_font_size);
261-
color: if($variant == 'dark', darken($fg_color,30%), lighten($fg_color,20%));
262-
}
263-
264-
.web-login-url-label {
265-
@include fontsize($base_font_size);
266-
@extend %monospace;
267-
color: $fg_color;
268-
text-align: center;
269-
}
270-
271-
.web-login-code-title-label {
272-
@include fontsize($base_font_size);
273-
@include fontsize($base_font_size);
274-
color: $fg_color;
275-
}
276-
277-
.web-login-code-label {
278-
@include fontsize($base_font_size);
279-
color: $fg_color;
280-
font-weight: bold;
281-
}
282-
283-
.web-login-prompt {
284-
padding-top: $base_padding;
285-
padding-bottom: $base_padding;
286-
padding-left: $base_padding * 4.5;
287-
padding-right: $base_padding * 4.5;
288-
spacing: 1.75em;
289-
border-radius: $base_border_radius * 2;
290-
}
291-
292-
.web-login-intro-button-label {
293-
@include fontsize($base_font_size + 5);
294-
color: $fg_color;
295-
height: 3em;
296-
text-align: center;
297-
font-weight: bold;
298-
}
299-
300-
.web-login-intro-button {
301-
@include fontsize($base_font_size);
302-
color: $fg_color;
303-
height: 3em;
304-
text-align: center;
305-
border-radius: $base_border_radius * 4;
306-
}
307-
308213
// Screen Shield
309214
// a.k.a. the lockscreen, uses transparent styles
310-
311215
.unlock-dialog {
312216
background-color: transparent;
313217

@@ -354,6 +258,31 @@ $_gdm_dialog_width: 25em;
354258
}
355259
}
356260

261+
// Parental controls
262+
.parental-controls-shield {
263+
spacing: 0.75em;
264+
265+
.parental-controls-shield-title {
266+
margin-top: 0.6em;
267+
@extend %title_4;
268+
text-align: center;
269+
}
270+
271+
.parental-controls-shield-description {
272+
text-align: center;
273+
}
274+
275+
.parental-controls-shield-button {
276+
margin-top: 0.85em;
277+
@extend %lockscreen_button;
278+
@extend %title_4;
279+
padding: $base_margin * 4 $base_margin * 11;
280+
color: $_gdm_fg;
281+
background-color: transparentize($_gdm_fg, .9);
282+
border-radius: $forced_circular_radius;
283+
}
284+
}
285+
357286
// Notifications
358287
#unlockDialogNotifications {
359288
> .vhandle, > .hhandle {
@@ -465,32 +394,3 @@ $_gdm_dialog_width: 25em;
465394
}
466395
}
467396
}
468-
469-
// Login Failed banner
470-
.auth-notification-banner {
471-
.message-header {
472-
width: 0px;
473-
height: 0px;
474-
475-
.message-close-button {
476-
border: none;
477-
background-color: rgba(0, 0, 0, 0.0);
478-
}
479-
}
480-
}
481-
482-
// QR Code
483-
.qr-code {
484-
@if ($variant == 'light') {
485-
$qrcode_bg_color: mix($fg_color, $bg_color, 8%);
486-
background-color: $qrcode_bg_color;
487-
border-color: $qrcode_bg_color;
488-
color: $fg_color;
489-
} @else {
490-
background-color: $_gdm_fg;
491-
border-color: $_gdm_fg;
492-
color: $_gdm_bg;
493-
}
494-
border-radius: $base_border_radius * .5;
495-
border-width: 1em;
496-
}

‎gnome-shell/upstream/theme/gnome-shell-sass/widgets/_message-list.scss‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@
9999
// message header
100100
.message-header {
101101
spacing: $base_padding;
102-
color: $insensitive_fg_color;
102+
color: $card_insensitive_fg_color;
103103
padding:0 $base_padding;
104104

105105
// remove side padding to accommodate the close button
@@ -126,7 +126,7 @@
126126
// Time label
127127
.event-time {
128128
@extend %caption;
129-
color: $insensitive_fg_color;
129+
color: $card_insensitive_fg_color;
130130
// Add bottom padding to align the app name with the time horizontally
131131
padding-bottom: to_em(1px);
132132

@@ -152,7 +152,7 @@
152152
// add margin to close button to balance it with the expand button
153153
.message-close-button {
154154
margin: $base_padding * 0.5;
155-
padding: 4px;
155+
padding: $base_padding;
156156
}
157157
}
158158

0 commit comments

Comments
 (0)