Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add GTK 4 variant of Greybird-dark #341

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add GTK 4 variant of Greybird-dark #341

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
60 changes: 60 additions & 0 deletions dark/gtk-3.0/meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
gtk3_dir = join_paths(theme_path, 'gtk-3.0')

scss_files = files([
'_colors-public.scss',
'_colors.scss',
'_common.scss',
'_drawing.scss',
'_gnome-apps.scss',
'_lightdm-gtk-greeter.scss',
'_others.scss',
'_unity.scss',
'_xfce.scss'
])

#
# Installing
#

install_subdir('assets', install_dir: gtk3_dir)
install_subdir('apps', install_dir: gtk3_dir)
install_data('settings.ini', install_dir : gtk3_dir)

theme_deps += custom_target('Greybird-Dark',
input: 'gtk-contained.scss',
output: 'gtk.css',
command: [
sassc, sassc_opts, '@INPUT@', '@OUTPUT@'
],
depend_files: scss_files,
build_by_default: true,
install: true,
install_dir: gtk3_dir)

theme_deps += custom_target('Greybird-Dark-Dark',
input: 'gtk-contained-dark.scss',
output: 'gtk-dark.css',
command: [
sassc, sassc_opts, '@INPUT@', '@OUTPUT@'
],
depend_files: scss_files,
build_by_default: true,
install: true,
install_dir: gtk3_dir)

# we're commenting this out because of a meson bug in the version found in Leap
#gtk_dark_gresources = gnome.compile_resources('gtk', 'gtk.gresource.xml',
# source_dir: join_paths(meson.source_root(), 'light/gtk-3.0'),
# install: true,
# gresource_bundle: true,
# install_dir: gtk3_dir)

gtk_dark_gresources = custom_target('gtk-dark-gresources',
input: 'gtk.gresource.xml',
output: 'gtk.gresource',
command: [
glib_compile_resources, '@INPUT@', '--target', '@OUTPUT@', '--sourcedir', meson.current_source_dir()
],
build_by_default: true,
install: true,
install_dir: gtk3_dir)
1 change: 1 addition & 0 deletions dark/gtk-4.0/Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../light/gtk-4.0/Gemfile
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Style/FrozenStringLiteralComment: Missing magic comment # frozen_string_literal: true.
Style/StringLiterals: Prefer double-quoted strings unless you need single quotes to avoid extra backslashes for escaping.

1 change: 1 addition & 0 deletions dark/gtk-4.0/README
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../light/gtk-4.0/README
1 change: 1 addition & 0 deletions dark/gtk-4.0/_colors-public.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../light/gtk-4.0/_colors-public.scss
1 change: 1 addition & 0 deletions dark/gtk-4.0/_colors.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../light/gtk-4.0/_colors.scss
1 change: 1 addition & 0 deletions dark/gtk-4.0/_common.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../light/gtk-4.0/_common.scss
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Commas in function parameters should be followed by one space

1 change: 1 addition & 0 deletions dark/gtk-4.0/_drawing.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../light/gtk-4.0/_drawing.scss
1 change: 1 addition & 0 deletions dark/gtk-4.0/apps
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../light/gtk-4.0/apps/
1 change: 1 addition & 0 deletions dark/gtk-4.0/assets
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../light/gtk-4.0/assets/
1 change: 1 addition & 0 deletions dark/gtk-4.0/gtk-contained-dark.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../light/gtk-4.0/gtk-contained-dark.scss
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Prefer double-quoted strings

12 changes: 12 additions & 0 deletions dark/gtk-4.0/gtk-contained.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
// General guidelines:
// - very unlikely you want to edit something else than _common.scss
// - keep the number of defined colors to a minimum, use the color blending functions if
// you need a subtle shade
// - if you need to inverse a color function use the @if directive to match for dark $variant

$variant: 'dark';
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Prefer double-quoted strings


@import 'colors';
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Prefer double-quoted strings

@import 'drawing';
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Prefer double-quoted strings

@import 'common';
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Prefer double-quoted strings

@import 'colors-public';
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Prefer double-quoted strings

1 change: 1 addition & 0 deletions dark/gtk-4.0/gtk-dark.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../light/gtk-4.0/gtk-dark.scss
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Prefer double-quoted strings

1 change: 1 addition & 0 deletions dark/gtk-4.0/gtk.gresource.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../light/gtk-4.0/gtk.gresource.xml
1 change: 1 addition & 0 deletions dark/gtk-4.0/gtk.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../light/gtk-4.0/gtk.scss
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Prefer double-quoted strings

54 changes: 54 additions & 0 deletions dark/gtk-4.0/meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
gtk4_dir = join_paths(theme_path, 'gtk-4.0')

scss_files = files([
'_colors-public.scss',
'_colors.scss',
'_common.scss',
'_drawing.scss'
])

#
# Installing
#

install_subdir('assets', install_dir: gtk4_dir)
install_subdir('apps', install_dir: gtk4_dir)

theme_deps += custom_target('Greybird-Dark',
input: 'gtk-contained.scss',
output: 'gtk.css',
command: [
sassc, sassc_opts, '@INPUT@', '@OUTPUT@'
],
depend_files: scss_files,
build_by_default: true,
install: true,
install_dir: gtk4_dir)

theme_deps += custom_target('Greybird-Dark-Dark',
input: 'gtk-contained-dark.scss',
output: 'gtk-dark.css',
command: [
sassc, sassc_opts, '@INPUT@', '@OUTPUT@'
],
depend_files: scss_files,
build_by_default: true,
install: true,
install_dir: gtk4_dir)

# we're commenting this out because of a meson bug in the version found in Leap
#gtk_dark_gresources = gnome.compile_resources('gtk', 'gtk.gresource.xml',
# source_dir: join_paths(meson.source_root(), 'light/gtk-3.0'),
# install: true,
# gresource_bundle: true,
# install_dir: gtk4_dir)

gtk_dark_gresources = custom_target('gtk-dark-gresources',
input: 'gtk.gresource.xml',
output: 'gtk.gresource',
command: [
glib_compile_resources, '@INPUT@', '--target', '@OUTPUT@', '--sourcedir', meson.current_source_dir()
],
build_by_default: true,
install: true,
install_dir: gtk4_dir)
66 changes: 2 additions & 64 deletions dark/meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,72 +2,10 @@ theme_path = join_paths(get_option('datadir'), 'themes/Greybird-dark')
a11y_theme_path = join_paths(get_option('datadir'), 'themes/Greybird-dark-accessibility')
compact_theme_path = join_paths(get_option('datadir'), 'themes/Greybird-dark-compact')

#
# GTK+-3.0 Files
#

scss_files = files([
'gtk-3.0/_colors-public.scss',
'gtk-3.0/_colors.scss',
'gtk-3.0/_common.scss',
'gtk-3.0/_drawing.scss',
'gtk-3.0/_gnome-apps.scss',
'gtk-3.0/_lightdm-gtk-greeter.scss',
'gtk-3.0/_others.scss',
'gtk-3.0/_unity.scss',
'gtk-3.0/_xfce.scss'
])

#
# Installing
#

# index.theme, always install this
install_data('index.theme', install_dir : theme_path)

# gtk3 stuff, also always install this
install_subdir('gtk-3.0/assets', install_dir: theme_path / 'gtk-3.0')
install_subdir('gtk-3.0/apps', install_dir: theme_path / 'gtk-3.0')
install_data('gtk-3.0/settings.ini', install_dir : join_paths(theme_path, 'gtk-3.0'))

theme_deps += custom_target('Greybird-Dark',
input: 'gtk-3.0/gtk-contained.scss',
output: 'gtk.css',
command: [
sassc, sassc_opts, '@INPUT@', '@OUTPUT@'
],
depend_files: scss_files,
build_by_default: true,
install: true,
install_dir: join_paths(theme_path, 'gtk-3.0'))

theme_deps += custom_target('Greybird-Dark-Dark',
input: 'gtk-3.0/gtk-contained-dark.scss',
output: 'gtk-dark.css',
command: [
sassc, sassc_opts, '@INPUT@', '@OUTPUT@'
],
depend_files: scss_files,
build_by_default: true,
install: true,
install_dir: join_paths(theme_path, 'gtk-3.0'))

# we're commenting this out because of a meson bug in the version found in Leap
#gtk_dark_gresources = gnome.compile_resources('gtk', 'gtk-3.0/gtk.gresource.xml',
# source_dir: join_paths(meson.source_root(), 'light/gtk-3.0'),
# install: true,
# gresource_bundle: true,
# install_dir: join_paths(theme_path, 'gtk-3.0'))

gtk_dark_gresources = custom_target('gtk-dark-gresources',
input: 'gtk-3.0/gtk.gresource.xml',
output: 'gtk.gresource',
command: [
glib_compile_resources, '@INPUT@', '--target', '@OUTPUT@', '--sourcedir', join_paths(meson.current_source_dir(), 'gtk-3.0')
],
build_by_default: true,
install: true,
install_dir: join_paths(theme_path, 'gtk-3.0'))
subdir('gtk-3.0')
subdir('gtk-4.0')

# we don't want to install these in the flatpak
if not get_option('flatpak')
Expand Down
1 change: 0 additions & 1 deletion light/gtk-4.0/gtk-contained-dark.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,3 @@ $variant: 'dark';
@import 'drawing';
@import 'common';
@import 'colors-public';
@import 'gnome-apps';
3 changes: 0 additions & 3 deletions light/gtk-4.0/settings.ini
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion light/meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@ a11y_theme_path = join_paths(get_option('datadir'), 'themes/Greybird-accessibili
compact_theme_path = join_paths(get_option('datadir'), 'themes/Greybird-compact')
bright_theme_path = join_paths(get_option('datadir'), 'themes/Greybird-bright')

install_data('index.theme', install_dir : theme_path)

subdir('gtk-3.0')
subdir('gtk-4.0')

# we don't want to install these in the flatpak
if not get_option('flatpak')
install_data('index.theme', install_dir : theme_path)
install_data('Greybird.emerald', install_dir : theme_path)
install_subdir('gtk-2.0', install_dir : theme_path)
install_subdir('gnome-shell', install_dir : theme_path)
Expand Down