theme: Include both dark and light variant in resource

This will allow us to switch between the variants according to
the color-scheme setting.

https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/5545

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2324>
This commit is contained in:
Florian Müllner 2022-06-03 16:15:38 +02:00
parent 4c727b4680
commit d76f309dba
6 changed files with 15 additions and 5 deletions

View File

@ -9,7 +9,8 @@
<file>checkbox-off-focused.svg</file> <file>checkbox-off-focused.svg</file>
<file>checkbox-off-light.svg</file> <file>checkbox-off-light.svg</file>
<file>checkbox-off.svg</file> <file>checkbox-off.svg</file>
<file>gnome-shell.css</file> <file>gnome-shell-dark.css</file>
<file>gnome-shell-light.css</file>
<file>gnome-shell-high-contrast.css</file> <file>gnome-shell-high-contrast.css</file>
<file>gnome-shell-start.svg</file> <file>gnome-shell-start.svg</file>
<file>pad-osd.css</file> <file>pad-osd.css</file>

View File

@ -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";

View File

@ -1,6 +1,7 @@
theme_sources = files([ theme_sources = files([
'gnome-shell-high-contrast.scss', 'gnome-shell-high-contrast.scss',
'gnome-shell.scss', 'gnome-shell-dark.scss',
'gnome-shell-light.scss',
'gnome-shell-sass/_colors.scss', 'gnome-shell-sass/_colors.scss',
'gnome-shell-sass/_common.scss', 'gnome-shell-sass/_common.scss',
'gnome-shell-sass/_drawing.scss', 'gnome-shell-sass/_drawing.scss',
@ -43,7 +44,8 @@ theme_sources = files([
stylesheets = [ stylesheets = [
'gnome-shell-high-contrast.css', 'gnome-shell-high-contrast.css',
'gnome-shell.css' 'gnome-shell-dark.css',
'gnome-shell-light.css',
] ]
foreach stylesheet: stylesheets foreach stylesheet: stylesheets

View File

@ -22,7 +22,7 @@ if (Config.HAVE_NETWORKMANAGER)
const _modes = { const _modes = {
'restrictive': { 'restrictive': {
parentMode: null, parentMode: null,
stylesheetName: 'gnome-shell.css', stylesheetName: 'gnome-shell-dark.css',
themeResourceName: 'gnome-shell-theme.gresource', themeResourceName: 'gnome-shell-theme.gresource',
hasOverview: false, hasOverview: false,
showCalendarEvents: false, showCalendarEvents: false,

View File

@ -6,7 +6,8 @@ import subprocess
stylesheets = [ stylesheets = [
'data/theme/gnome-shell-high-contrast.css', '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') sourceroot = os.environ.get('MESON_SOURCE_ROOT')