[gnome-shell] theme: Move endSessionDialog style into dialogs stylesheet
- From: Florian Müllner <fmuellner src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-shell] theme: Move endSessionDialog style into dialogs stylesheet
- Date: Tue, 28 Jan 2020 16:02:12 +0000 (UTC)
commit 74393c700e748b9428600d41a13ee44a8c5d0b34
Author: Jonas Dreßler <verdre v0yd nl>
Date: Tue Jan 28 15:54:21 2020 +0100
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
data/theme/gnome-shell-sass/_widgets.scss | 3 +--
data/theme/gnome-shell-sass/widgets/_dialogs.scss | 9 +++++++++
data/theme/gnome-shell-sass/widgets/_end-session-dialog.scss | 12 ------------
data/theme/meson.build | 1 -
4 files changed, 10 insertions(+), 15 deletions(-)
---
diff --git a/data/theme/gnome-shell-sass/_widgets.scss b/data/theme/gnome-shell-sass/_widgets.scss
index d2552c5b9d..997fb8069e 100644
--- a/data/theme/gnome-shell-sass/_widgets.scss
+++ b/data/theme/gnome-shell-sass/_widgets.scss
@@ -13,7 +13,6 @@
@import 'widgets/corner-ripple';
@import 'widgets/dash';
@import 'widgets/dialogs';
-@import 'widgets/end-session-dialog';
@import 'widgets/entries';
@import 'widgets/hotplug';
@import 'widgets/ibus-popup';
@@ -36,4 +35,4 @@
@import 'widgets/switches';
@import 'widgets/tiled-previews';
@import 'widgets/window-picker';
-@import 'widgets/workspace-switcher';
\ No newline at end of file
+@import 'widgets/workspace-switcher';
diff --git a/data/theme/gnome-shell-sass/widgets/_dialogs.scss
b/data/theme/gnome-shell-sass/widgets/_dialogs.scss
index 5b5fe207ec..8ce964a8b8 100644
--- a/data/theme/gnome-shell-sass/widgets/_dialogs.scss
+++ b/data/theme/gnome-shell-sass/widgets/_dialogs.scss
@@ -19,6 +19,15 @@
@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-content {
spacing: 18px;
diff --git a/data/theme/meson.build b/data/theme/meson.build
index d88e31b37f..ec750ef19d 100644
--- a/data/theme/meson.build
+++ b/data/theme/meson.build
@@ -14,7 +14,6 @@ theme_sources = files([
'gnome-shell-sass/widgets/_corner-ripple.scss',
'gnome-shell-sass/widgets/_dash.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/_hotplug.scss',
'gnome-shell-sass/widgets/_ibus-popup.scss',
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]