Skip to content

Commit

Permalink
build: Use input files to generate base SCSS files
Browse files Browse the repository at this point in the history
Generate base SCSS files for each theme variant during build,
instead of having preexisting files for every possible
variant-transparency combination. This reduces duplicate code,
and makes modifications easier.
  • Loading branch information
jnsh committed Oct 26, 2021
1 parent 860860c commit a7f6090
Show file tree
Hide file tree
Showing 133 changed files with 227 additions and 838 deletions.
6 changes: 0 additions & 6 deletions common/cinnamon/3.2/sass/cinnamon-dark.scss

This file was deleted.

6 changes: 0 additions & 6 deletions common/cinnamon/3.2/sass/cinnamon.scss

This file was deleted.

6 changes: 6 additions & 0 deletions common/cinnamon/3.2/sass/cinnamon.scss.in
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
$variant: '@variant@';
$transparency: '@transparency@';

@import "@sass_path@/_colors";
@import "@sass_path@/_drawing";
@import "@sass_path@/_common";
6 changes: 0 additions & 6 deletions common/cinnamon/3.4/sass/cinnamon-dark.scss

This file was deleted.

6 changes: 0 additions & 6 deletions common/cinnamon/3.4/sass/cinnamon.scss

This file was deleted.

6 changes: 6 additions & 0 deletions common/cinnamon/3.4/sass/cinnamon.scss.in
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
$variant: '@variant@';
$transparency: '@transparency@';

@import "@sass_path@/_colors";
@import "@sass_path@/_drawing";
@import "@sass_path@/_common";
6 changes: 0 additions & 6 deletions common/cinnamon/3.6/sass/cinnamon-dark.scss

This file was deleted.

6 changes: 0 additions & 6 deletions common/cinnamon/3.6/sass/cinnamon.scss

This file was deleted.

6 changes: 6 additions & 0 deletions common/cinnamon/3.6/sass/cinnamon.scss.in
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
$variant: '@variant@';
$transparency: '@transparency@';

@import "@sass_path@/_colors";
@import "@sass_path@/_drawing";
@import "@sass_path@/_common";
6 changes: 0 additions & 6 deletions common/cinnamon/3.8/sass/cinnamon-dark.scss

This file was deleted.

6 changes: 0 additions & 6 deletions common/cinnamon/3.8/sass/cinnamon.scss

This file was deleted.

6 changes: 6 additions & 0 deletions common/cinnamon/3.8/sass/cinnamon.scss.in
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
$variant: '@variant@';
$transparency: '@transparency@';

@import "@sass_path@/_colors";
@import "@sass_path@/_drawing";
@import "@sass_path@/_common";
6 changes: 0 additions & 6 deletions common/cinnamon/4.0/sass/cinnamon-dark.scss

This file was deleted.

6 changes: 0 additions & 6 deletions common/cinnamon/4.0/sass/cinnamon.scss

This file was deleted.

6 changes: 6 additions & 0 deletions common/cinnamon/4.0/sass/cinnamon.scss.in
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
$variant: '@variant@';
$transparency: '@transparency@';

@import "@sass_path@/_colors";
@import "@sass_path@/_drawing";
@import "@sass_path@/_common";
6 changes: 0 additions & 6 deletions common/cinnamon/4.2/sass/cinnamon-dark.scss

This file was deleted.

6 changes: 0 additions & 6 deletions common/cinnamon/4.2/sass/cinnamon.scss

This file was deleted.

6 changes: 6 additions & 0 deletions common/cinnamon/4.2/sass/cinnamon.scss.in
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
$variant: '@variant@';
$transparency: '@transparency@';

@import "@sass_path@/_colors";
@import "@sass_path@/_drawing";
@import "@sass_path@/_common";
6 changes: 0 additions & 6 deletions common/cinnamon/4.6/sass/cinnamon-dark.scss

This file was deleted.

6 changes: 0 additions & 6 deletions common/cinnamon/4.6/sass/cinnamon.scss

This file was deleted.

6 changes: 6 additions & 0 deletions common/cinnamon/4.6/sass/cinnamon.scss.in
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
$variant: '@variant@';
$transparency: '@transparency@';

@import "@sass_path@/_colors";
@import "@sass_path@/_drawing";
@import "@sass_path@/_common";
14 changes: 12 additions & 2 deletions common/cinnamon/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -44,12 +44,22 @@ foreach variant : get_option('variants')
continue
endif

input_scss = (variant == 'light' ? 'cinnamon.scss' : 'cinnamon-' + variant + '.scss')
# generate base SCSS file
input_scss = configure_file(
input: meson.current_source_dir() / cinnamon_ver / 'sass' / 'cinnamon.scss.in',
output : 'cinnamon-' + variant + '.scss',
configuration : {
'variant' : variant,
'transparency' : get_option('transparency').to_string(),
'sass_path' : meson.current_source_dir() / cinnamon_ver / 'sass',
}
)

output_css = (variant == 'light' ? 'cinnamon.css' : 'cinnamon-' + variant + '.css')

cinnamon_css = custom_target(
output_css,
input : meson.current_source_dir() / cinnamon_ver / 'sass' / input_scss,
input : input_scss,
output : output_css,
command : [sassc, '@INPUT@', '@OUTPUT@'],
build_by_default : true,
Expand Down
6 changes: 0 additions & 6 deletions common/gnome-shell/3.18/sass/gnome-shell-dark.scss

This file was deleted.

1 change: 0 additions & 1 deletion common/gnome-shell/3.18/sass/gnome-shell-solid-dark.scss

This file was deleted.

1 change: 0 additions & 1 deletion common/gnome-shell/3.18/sass/gnome-shell-solid.scss

This file was deleted.

6 changes: 0 additions & 6 deletions common/gnome-shell/3.18/sass/gnome-shell.scss

This file was deleted.

6 changes: 6 additions & 0 deletions common/gnome-shell/3.18/sass/gnome-shell.scss.in
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
$variant: '@variant@';
$transparency: '@transparency@';

@import "@sass_path@/_colors";
@import "@sass_path@/_drawing";
@import "@sass_path@/_common";
6 changes: 0 additions & 6 deletions common/gnome-shell/3.24/sass/gnome-shell-dark.scss

This file was deleted.

1 change: 0 additions & 1 deletion common/gnome-shell/3.24/sass/gnome-shell-solid-dark.scss

This file was deleted.

1 change: 0 additions & 1 deletion common/gnome-shell/3.24/sass/gnome-shell-solid.scss

This file was deleted.

6 changes: 0 additions & 6 deletions common/gnome-shell/3.24/sass/gnome-shell.scss

This file was deleted.

6 changes: 6 additions & 0 deletions common/gnome-shell/3.24/sass/gnome-shell.scss.in
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
$variant: '@variant@';
$transparency: '@transparency@';

@import "@sass_path@/_colors";
@import "@sass_path@/_drawing";
@import "@sass_path@/_common";
6 changes: 0 additions & 6 deletions common/gnome-shell/3.26/sass/gnome-shell-dark.scss

This file was deleted.

1 change: 0 additions & 1 deletion common/gnome-shell/3.26/sass/gnome-shell-solid-dark.scss

This file was deleted.

1 change: 0 additions & 1 deletion common/gnome-shell/3.26/sass/gnome-shell-solid.scss

This file was deleted.

6 changes: 0 additions & 6 deletions common/gnome-shell/3.26/sass/gnome-shell.scss

This file was deleted.

6 changes: 6 additions & 0 deletions common/gnome-shell/3.26/sass/gnome-shell.scss.in
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
$variant: '@variant@';
$transparency: '@transparency@';

@import "@sass_path@/_colors";
@import "@sass_path@/_drawing";
@import "@sass_path@/_common";
6 changes: 0 additions & 6 deletions common/gnome-shell/3.28/sass/gnome-shell-dark.scss

This file was deleted.

1 change: 0 additions & 1 deletion common/gnome-shell/3.28/sass/gnome-shell-solid-dark.scss

This file was deleted.

1 change: 0 additions & 1 deletion common/gnome-shell/3.28/sass/gnome-shell-solid.scss

This file was deleted.

6 changes: 0 additions & 6 deletions common/gnome-shell/3.28/sass/gnome-shell.scss

This file was deleted.

6 changes: 6 additions & 0 deletions common/gnome-shell/3.28/sass/gnome-shell.scss.in
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
$variant: '@variant@';
$transparency: '@transparency@';

@import "@sass_path@/_colors";
@import "@sass_path@/_drawing";
@import "@sass_path@/_common";
6 changes: 0 additions & 6 deletions common/gnome-shell/3.30/sass/gnome-shell-dark.scss

This file was deleted.

1 change: 0 additions & 1 deletion common/gnome-shell/3.30/sass/gnome-shell-solid-dark.scss

This file was deleted.

1 change: 0 additions & 1 deletion common/gnome-shell/3.30/sass/gnome-shell-solid.scss

This file was deleted.

6 changes: 0 additions & 6 deletions common/gnome-shell/3.30/sass/gnome-shell.scss

This file was deleted.

6 changes: 6 additions & 0 deletions common/gnome-shell/3.30/sass/gnome-shell.scss.in
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
$variant: '@variant@';
$transparency: '@transparency@';

@import "@sass_path@/_colors";
@import "@sass_path@/_drawing";
@import "@sass_path@/_common";
6 changes: 0 additions & 6 deletions common/gnome-shell/3.32/sass/gnome-shell-dark.scss

This file was deleted.

6 changes: 0 additions & 6 deletions common/gnome-shell/3.32/sass/gnome-shell-lighter.scss

This file was deleted.

6 changes: 0 additions & 6 deletions common/gnome-shell/3.32/sass/gnome-shell-solid-dark.scss

This file was deleted.

6 changes: 0 additions & 6 deletions common/gnome-shell/3.32/sass/gnome-shell-solid-lighter.scss

This file was deleted.

6 changes: 0 additions & 6 deletions common/gnome-shell/3.32/sass/gnome-shell-solid.scss

This file was deleted.

6 changes: 0 additions & 6 deletions common/gnome-shell/3.32/sass/gnome-shell.scss

This file was deleted.

6 changes: 6 additions & 0 deletions common/gnome-shell/3.32/sass/gnome-shell.scss.in
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
$variant: '@variant@';
$transparency: '@transparency@';

@import "@sass_path@/_colors";
@import "@sass_path@/_drawing";
@import "@sass_path@/_common";
6 changes: 0 additions & 6 deletions common/gnome-shell/3.34/sass/gnome-shell-dark.scss

This file was deleted.

6 changes: 0 additions & 6 deletions common/gnome-shell/3.34/sass/gnome-shell-lighter.scss

This file was deleted.

6 changes: 0 additions & 6 deletions common/gnome-shell/3.34/sass/gnome-shell-solid-dark.scss

This file was deleted.

6 changes: 0 additions & 6 deletions common/gnome-shell/3.34/sass/gnome-shell-solid-lighter.scss

This file was deleted.

6 changes: 0 additions & 6 deletions common/gnome-shell/3.34/sass/gnome-shell-solid.scss

This file was deleted.

6 changes: 0 additions & 6 deletions common/gnome-shell/3.34/sass/gnome-shell.scss

This file was deleted.

Loading

0 comments on commit a7f6090

Please sign in to comment.