diff --git a/gnome-shell/upstream/theme/gnome-shell-sass/widgets/_dialogs.scss b/gnome-shell/upstream/theme/gnome-shell-sass/widgets/_dialogs.scss
index c08eb91ba5..59f77d3c4d 100644
--- a/gnome-shell/upstream/theme/gnome-shell-sass/widgets/_dialogs.scss
+++ b/gnome-shell/upstream/theme/gnome-shell-sass/widgets/_dialogs.scss
@@ -1,24 +1,49 @@
/* Modal Dialogs */
-.headline {
- @extend %title_4;
-}
-
+// style for all dialogs
.modal-dialog {
background-color: $bg_color;
border-radius: $alert_radius;
- box-shadow: inset 0 0 0 1px $outer_borders_color;
padding: $base_padding * 4;
+ spacing: $base_padding * 3;
+ box-shadow: 0 12px 8px 12px rgba(0,0,0,0.03);
.modal-dialog-content-box {
- spacing: $base_margin * 8;
- margin-top: $base_margin * 2;
- margin-bottom: $base_margin * 4;
+ padding-top: $base_padding * 2;
+ spacing: $base_padding * 3;
max-width: 28em;
}
- .modal-dialog-linked-button {
- @extend %dialog_button;
+ .modal-dialog-button-box {
+ padding-top: $base_padding;
+ .modal-dialog-button {
+ @extend %dialog_button;
+ }
+ }
+}
+
+// lists in dialogs
+.dialog-list {
+ spacing: $base_padding * 3;
+
+ .dialog-list-title {
+ @extend %heading;
+ text-align: center;
+ }
+
+ .dialog-list-scrollview { max-height: 200px; }
+ .dialog-list-box {
+ spacing: 1em;
+
+ .dialog-list-item {
+ spacing: 1em;
+
+ .dialog-list-item-title { font-weight: bold; }
+ .dialog-list-item-description {
+ @extend %caption;
+ color: darken($fg_color,5%);
+ }
+ }
}
}
@@ -26,9 +51,14 @@
.end-session-dialog {
width: 24em;
+ // special style for session warnings
.end-session-dialog-battery-warning,
.dialog-list-title {
color: $warning_color;
+ background-color: transparentize($warning_color, 0.9);
+ padding: $base_padding * 1.5;
+ border-radius: $base_border_radius;
+ margin: $base_margin 0;
}
}
@@ -40,125 +70,106 @@
text-align: center;
@extend %title_2;
- &.lightweight { @extend %title_4;}
+ &.lightweight {
+ @extend %title_4;
+ }
}
- .message-dialog-description { text-align: center; }
-}
-
-/* Dialog List */
-.dialog-list {
- spacing: $base_padding * 3;
-
- .dialog-list-title {
+ .message-dialog-description {
text-align: center;
- @extend %heading;
- }
-
- .dialog-list-scrollview { max-height: 200px; }
- .dialog-list-box {
- spacing: 1em;
-
- .dialog-list-item {
- spacing: 1em;
-
- .dialog-list-item-title { font-weight: bold; }
- .dialog-list-item-description {
- color: darken($fg_color,5%);
- @extend %caption;
- }
- }
}
}
/* Run Dialog */
.run-dialog {
- .modal-dialog-content-box {
- margin-top: $base_padding * 4;
- margin-bottom: $base_padding * 2;
+ width: 24em;
+
+ // run dialog needs to override bottom padding
+ // to account for inexplicable extra padding
+ padding-bottom: $base_padding;
+
+ .run-dialog-entry {
+ padding: $base_padding * 2 $base_padding * 1.5;
}
- .run-dialog-entry { width: 20em; }
.run-dialog-description {
@extend %caption;
- text-align: center;
color: darken($fg_color, 20%);
}
}
/* Password or Authentication Dialog */
-
.prompt-dialog {
width: 28em;
- .modal-dialog-content-box {
- margin-bottom: $base_margin * 6;
+ .prompt-dialog-password-grid {
+ spacing-rows: $base_margin * 2;
+ spacing-columns: $base_margin;
+
+ .prompt-dialog-password-entry {
+ width: auto;
+ // 4px (spacing) + 16px (spinner-width)
+ &:ltr { margin-left: $base_margin+$base_icon_size; }
+ &:rtl { margin-right: $base_margin+$base_icon_size; }
+ }
}
-}
-.prompt-dialog-password-grid {
- spacing-rows: $base_margin * 2;
- spacing-columns: $base_margin;
+ .prompt-dialog-password-layout {
+ spacing: $base_margin * 2;
+ }
.prompt-dialog-password-entry {
- width: auto;
-
- // 4px (spacing) + 16px (spinner-width)
- &:ltr { margin-left: $base_margin+$base_icon_size; }
- &:rtl { margin-right: $base_margin+$base_icon_size; }
+ width: 20em;
+ padding: $base_padding * 2 $base_padding * 1.5;
}
-}
-
-.prompt-dialog-password-layout {
- spacing: $base_margin * 2;
-}
-
-.prompt-dialog-password-entry {
- width: 20em;
-}
-.prompt-dialog-error-label,
-.prompt-dialog-info-label,
-.prompt-dialog-null-label {
- text-align: center;
- @extend %caption;
-}
+ .prompt-dialog-error-label,
+ .prompt-dialog-info-label,
+ .prompt-dialog-null-label {
+ @extend %caption;
+ text-align: center;
+ }
-.prompt-dialog-error-label {
- color: $warning_color;
+ .prompt-dialog-error-label {
+ color: $warning_color;
+ }
}
-
/* Polkit Dialog */
-
.polkit-dialog-user-layout {
text-align: center;
spacing: $base_margin * 2;
margin-bottom: $base_padding;
- .polkit-dialog-user-root-label { color: $warning_color; }
+ .polkit-dialog-user-label,
+ .polkit-dialog-user-root-label {
+ @extend %title_4;
+ }
+
+ .polkit-dialog-user-root-label {
+ color: $warning_color;
+ }
}
/* Audio selection dialog */
.audio-device-selection-dialog {
- .modal-dialog-content-box { margin-bottom: $base_margin * 7; }
- .audio-selection-box { spacing: $base_margin * 5; }
-}
+ min-width: 24em;
-.audio-selection-device {
- border-radius: $base_border_radius * 2;
- &:hover,&:focus { background-color: $hover_bg_color; }
- &:active {
- background-color: -st-accent-color;
- color: -st-accent-fg-color;
- }
-}
+ .audio-selection-box {
+ spacing: $base_padding * 2;
-.audio-selection-device-box {
- padding: $base_margin * 5;
- spacing: $base_margin * 5;
-}
+ // styled similar to switcher-popup
+ .audio-selection-device {
+ @include tile_button($fg:$osd_fg_color, $bg:$osd_bg_color);
-.audio-selection-device-icon {
- icon-size: $base_icon_size * 4;
+ .audio-selection-device-box {
+ padding: $base_padding * 2;
+ spacing: $base_padding * 2;
+ }
+
+ .audio-selection-device-icon {
+ icon-size: $base_icon_size * 4;
+ }
+ }
+ }
}
/* Welcome dialog */
@@ -173,4 +184,9 @@
/* Access portal dialog */
.access-dialog {
text-align: center;
-}
\ No newline at end of file
+}
+
+// specific label style for restart message
+.restart-message {
+ @extend %title_4;
+}
diff --git a/gnome-shell/upstream/theme/gnome-shell-sass/widgets/_login-lock.scss b/gnome-shell/upstream/theme/gnome-shell-sass/widgets/_login-lock.scss
index 477bd231ae..a89af5bf38 100644
--- a/gnome-shell/upstream/theme/gnome-shell-sass/widgets/_login-lock.scss
+++ b/gnome-shell/upstream/theme/gnome-shell-sass/widgets/_login-lock.scss
@@ -31,9 +31,7 @@ $_gdm_dialog_width: 25em;
&.cancel-button,
&.switch-user-button,
- &.login-dialog-auth-menu-button,
- &.login-dialog-session-list-button,
- &.web-login-intro-button {
+ &.login-dialog-session-list-button {
@extend .icon-button;
@extend %system_button;
}
@@ -43,25 +41,6 @@ $_gdm_dialog_width: 25em;
}
}
-.login-dialog-auth-menu-button-title {
- @include fontsize($base_font_size - 1);
- color: darken($_gdm_fg,40%);
- font-weight: bold;
- padding-top: $base_padding;
- padding-bottom: $base_padding * 2;
- padding-left: $base_padding * 2;
- padding-right: $base_padding * 2;
-}
-
-.login-dialog-auth-menu-button-popup-menu-box {
- padding: $base_padding * 3;
-}
-
-.login-dialog-auth-menu-button-item {
- padding-left: $base_padding * 2;
- padding-right: $base_padding * 2;
-}
-
.login-dialog-button-box {
spacing: $base_padding * 2;
}
@@ -85,13 +64,6 @@ $_gdm_dialog_width: 25em;
}
}
-.login-dialog-menu-button-box {
- spacing: $base_padding * 2;
- padding-left: $base_padding * 2;
- padding-right: $base_padding * 2;
- padding-bottom: $base_padding * 2;
-}
-
.login-dialog-logo-bin {
margin: 3em 0;
}
@@ -213,77 +185,6 @@ $_gdm_dialog_width: 25em;
}
}
-.login-dialog-prompt-layout {
- spacing: $base_padding * 2;
- min-width: 30em;
-}
-
-.login-dialog-prompt-entry {
- @extend %system_entry;
-}
-
-.web-login-dialog-content-overlay {
- background-color: transparentize($bg_color, 0.3);
- border-radius: $modal_radius;
- margin-bottom: 3em;
-}
-
-.web-login-spinner {
- color: $osd_fg_color;
- background-color: transparentize($osd_bg_color, 0.5);
- border: 5px transparent;
- border-radius: 50px;
-}
-
-.web-login-title-label {
- @include fontsize($base_font_size);
- color: if($variant == 'dark', darken($fg_color,30%), lighten($fg_color,20%));
-}
-
-.web-login-url-label {
- @include fontsize($base_font_size);
- @extend %monospace;
- color: $fg_color;
- text-align: center;
-}
-
-.web-login-code-title-label {
- @include fontsize($base_font_size);
- @include fontsize($base_font_size);
- color: $fg_color;
-}
-
-.web-login-code-label {
- @include fontsize($base_font_size);
- color: $fg_color;
- font-weight: bold;
-}
-
-.web-login-prompt {
- padding-top: $base_padding;
- padding-bottom: $base_padding;
- padding-left: $base_padding * 4.5;
- padding-right: $base_padding * 4.5;
- spacing: 1.75em;
- border-radius: $base_border_radius * 2;
-}
-
-.web-login-intro-button-label {
- @include fontsize($base_font_size + 5);
- color: $fg_color;
- height: 3em;
- text-align: center;
- font-weight: bold;
-}
-
-.web-login-intro-button {
- @include fontsize($base_font_size);
- color: $fg_color;
- height: 3em;
- text-align: center;
- border-radius: $base_border_radius * 4;
-}
-
// Screen Shield
// a.k.a. the lockscreen, uses transparent styles
.unlock-dialog {
@@ -433,32 +334,3 @@ $_gdm_dialog_width: 25em;
}
}
}
-
-// Login Failed banner
-.auth-notification-banner {
- .message-header {
- width: 0px;
- height: 0px;
-
- .message-close-button {
- border: none;
- background-color: rgba(0, 0, 0, 0.0);
- }
- }
-}
-
-// QR Code
-.qr-code {
- @if ($variant == 'light') {
- $qrcode_bg_color: mix($fg_color, $bg_color, 8%);
- background-color: $qrcode_bg_color;
- border-color: $qrcode_bg_color;
- color: $fg_color;
- } @else {
- background-color: $_gdm_fg;
- border-color: $_gdm_fg;
- color: $_gdm_bg;
- }
- border-radius: $base_border_radius * .5;
- border-width: 1em;
-}
diff --git a/gnome-shell/upstream/theme/gnome-shell-sass/widgets/_message-list.scss b/gnome-shell/upstream/theme/gnome-shell-sass/widgets/_message-list.scss
index 60cb5bde73..d4ec1f68c5 100644
--- a/gnome-shell/upstream/theme/gnome-shell-sass/widgets/_message-list.scss
+++ b/gnome-shell/upstream/theme/gnome-shell-sass/widgets/_message-list.scss
@@ -11,10 +11,10 @@
&:rtl {margin-right: 0; margin-left: $base_margin; padding-left: $base_padding; border-left-width: 1px; }
.message-list-placeholder {
- @extend %title_2;
- color: transparentize($fg_color, .75);
+ @extend %title_3;
+ color: transparentize($fg_color, .55);
@if $contrast == 'high' {
- color: transparentize($fg_color, .5);
+ color: $fg_color;
}
// icon size and color
> StIcon {
@@ -74,9 +74,9 @@
color: $insensitive_fg_color;
padding:0 $base_padding;
- // side padding to accommodate the close button
- &:ltr { padding-right:$base_padding - 2px; };
- &:rtl { padding-left:$base_padding - 2px; };
+ // remove side padding to accommodate the close button
+ &:ltr { padding-right: 0; }
+ &:rtl { padding-left: 0; }
// header source icon
.message-source-icon {
@@ -102,8 +102,8 @@
// Add bottom padding to align the app name with the time horizontally
padding-bottom: to_em(1px);
- &:ltr { text-align: right };
- &:rtl { text-align: left };
+ &:ltr { text-align: right; }
+ &:rtl { text-align: left; }
}
}
@@ -114,13 +114,17 @@
@extend %notification_button;
border-radius: $forced_circular_radius; // make circular
color: $fg_color;
- padding: 4px;
}
+ // increase padding to expand button to make it larger
.message-expand-button {
padding: $base_padding;
- &:ltr { margin-right: $base_padding; }
- &:rtl { margin-left: $base_padding; }
+ }
+
+ // add margin to close button to balance it with the expand button
+ .message-close-button {
+ margin: $base_padding * 0.5;
+ padding: 4px;
}
}
diff --git a/gnome-shell/upstream/theme/gnome-shell-sass/widgets/_osd.scss b/gnome-shell/upstream/theme/gnome-shell-sass/widgets/_osd.scss
index 13a77bca31..16b3bbc618 100644
--- a/gnome-shell/upstream/theme/gnome-shell-sass/widgets/_osd.scss
+++ b/gnome-shell/upstream/theme/gnome-shell-sass/widgets/_osd.scss
@@ -35,7 +35,7 @@ $osd_levelbar_height:6px;
}
// Monitor number label
-.osd-monitor-label {
+.osd-monitor-label, .osd-break-countdown-label {
background-color: -st-accent-color;
color: -st-accent-fg-color;
border-radius: $modal_radius;
diff --git a/gnome-shell/upstream/theme/process-working-dark.svg b/gnome-shell/upstream/theme/process-working-dark.svg
deleted file mode 100644
index 6c7ad64a6a..0000000000
--- a/gnome-shell/upstream/theme/process-working-dark.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/gnome-shell/upstream/theme/process-working-light.svg b/gnome-shell/upstream/theme/process-working-light.svg
deleted file mode 100644
index 903edde0fd..0000000000
--- a/gnome-shell/upstream/theme/process-working-light.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file