diff --git a/data/gnome-shell-theme.gresource.xml b/data/gnome-shell-theme.gresource.xml index 24b3be8db..8a4948e41 100644 --- a/data/gnome-shell-theme.gresource.xml +++ b/data/gnome-shell-theme.gresource.xml @@ -9,7 +9,8 @@ checkbox-off-focused.svg checkbox-off-light.svg checkbox-off.svg - gnome-shell.css + gnome-shell-dark.css + gnome-shell-light.css gnome-shell-high-contrast.css gnome-shell-start.svg pad-osd.css diff --git a/data/theme/gnome-shell.scss b/data/theme/gnome-shell-dark.scss similarity index 100% rename from data/theme/gnome-shell.scss rename to data/theme/gnome-shell-dark.scss diff --git a/data/theme/gnome-shell-light.scss b/data/theme/gnome-shell-light.scss new file mode 100644 index 000000000..ae6fce7dd --- /dev/null +++ b/data/theme/gnome-shell-light.scss @@ -0,0 +1,6 @@ +$variant: 'light'; + +@import "gnome-shell-sass/_colors"; //use gtk colors +@import "gnome-shell-sass/_drawing"; +@import "gnome-shell-sass/_common"; +@import "gnome-shell-sass/_widgets"; diff --git a/data/theme/meson.build b/data/theme/meson.build index b7cd5487b..0d28efd03 100644 --- a/data/theme/meson.build +++ b/data/theme/meson.build @@ -1,6 +1,7 @@ theme_sources = files([ 'gnome-shell-high-contrast.scss', - 'gnome-shell.scss', + 'gnome-shell-dark.scss', + 'gnome-shell-light.scss', 'gnome-shell-sass/_colors.scss', 'gnome-shell-sass/_common.scss', 'gnome-shell-sass/_drawing.scss', @@ -43,7 +44,8 @@ theme_sources = files([ stylesheets = [ 'gnome-shell-high-contrast.css', - 'gnome-shell.css' + 'gnome-shell-dark.css', + 'gnome-shell-light.css', ] foreach stylesheet: stylesheets diff --git a/js/ui/sessionMode.js b/js/ui/sessionMode.js index 8c8b6e4fc..83786a5c7 100644 --- a/js/ui/sessionMode.js +++ b/js/ui/sessionMode.js @@ -22,7 +22,7 @@ if (Config.HAVE_NETWORKMANAGER) const _modes = { 'restrictive': { parentMode: null, - stylesheetName: 'gnome-shell.css', + stylesheetName: 'gnome-shell-dark.css', themeResourceName: 'gnome-shell-theme.gresource', hasOverview: false, showCalendarEvents: false, diff --git a/meson/generate-stylesheets.py b/meson/generate-stylesheets.py index bd6b641b8..10e65b756 100644 --- a/meson/generate-stylesheets.py +++ b/meson/generate-stylesheets.py @@ -6,7 +6,8 @@ import subprocess stylesheets = [ 'data/theme/gnome-shell-high-contrast.css', - 'data/theme/gnome-shell.css' + 'data/theme/gnome-shell-dark.css', + 'data/theme/gnome-shell-light.css' ] sourceroot = os.environ.get('MESON_SOURCE_ROOT')