theme: Move endSessionDialog style into dialogs stylesheet

Since the style information of the end session dialog is now only a few
lines anymore, we can move it into the general stylesheet for dialogs.

https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/965
This commit is contained in:
Jonas Dreßler 2020-01-28 15:54:21 +01:00 committed by Florian Müllner
parent 3f21c21532
commit 74393c700e
4 changed files with 10 additions and 15 deletions

View File

@ -13,7 +13,6 @@
@import 'widgets/corner-ripple'; @import 'widgets/corner-ripple';
@import 'widgets/dash'; @import 'widgets/dash';
@import 'widgets/dialogs'; @import 'widgets/dialogs';
@import 'widgets/end-session-dialog';
@import 'widgets/entries'; @import 'widgets/entries';
@import 'widgets/hotplug'; @import 'widgets/hotplug';
@import 'widgets/ibus-popup'; @import 'widgets/ibus-popup';
@ -36,4 +35,4 @@
@import 'widgets/switches'; @import 'widgets/switches';
@import 'widgets/tiled-previews'; @import 'widgets/tiled-previews';
@import 'widgets/window-picker'; @import 'widgets/window-picker';
@import 'widgets/workspace-switcher'; @import 'widgets/workspace-switcher';

View File

@ -19,6 +19,15 @@
@include fontsize($base_font_size + 3); @include fontsize($base_font_size + 3);
} }
/* End Session Dialog */
.end-session-dialog {
.end-session-dialog-battery-warning,
.dialog-list-title {
color: $warning_color;
}
}
/* Message Dialog */ /* Message Dialog */
.message-dialog-content { .message-dialog-content {
spacing: 18px; spacing: 18px;

View File

@ -1,12 +0,0 @@
/* End Session Dialog */
$end_session_dialog_width: 28em;
.end-session-dialog-battery-warning {
width: $end_session_dialog_width;
color: $warning_color;
}
.end-session-dialog .dialog-list-title {
color: $warning_color;
}

View File

@ -14,7 +14,6 @@ theme_sources = files([
'gnome-shell-sass/widgets/_corner-ripple.scss', 'gnome-shell-sass/widgets/_corner-ripple.scss',
'gnome-shell-sass/widgets/_dash.scss', 'gnome-shell-sass/widgets/_dash.scss',
'gnome-shell-sass/widgets/_dialogs.scss', 'gnome-shell-sass/widgets/_dialogs.scss',
'gnome-shell-sass/widgets/_end-session-dialog.scss',
'gnome-shell-sass/widgets/_entries.scss', 'gnome-shell-sass/widgets/_entries.scss',
'gnome-shell-sass/widgets/_hotplug.scss', 'gnome-shell-sass/widgets/_hotplug.scss',
'gnome-shell-sass/widgets/_ibus-popup.scss', 'gnome-shell-sass/widgets/_ibus-popup.scss',