Skip to content

Commit

Permalink
Prepare cinnamon theme variants; closes #3754
Browse files Browse the repository at this point in the history
- set cinnamon component option to true
- add colorable assets file
- Update the meson build script to create variants
- Follow the way gnome-shell variants are created
- Not using directories cinnamon, cinnamon-dark, dark and
  default. Can be cleaned up later.
  • Loading branch information
hsbasu committed Mar 16, 2023
2 parents 5f5fe75 + eab4689 commit efd36dc
Show file tree
Hide file tree
Showing 149 changed files with 2,892 additions and 3,626 deletions.
4 changes: 3 additions & 1 deletion cinnamon-shell/meson.build
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
cinnamonshell_default_theme_dir = join_paths(get_option('datadir'), 'themes')
cinnamonshell_alt_themes_dir = cinnamonshell_default_theme_dir
flavours = []
foreach flavour: ['default', 'dark', 'cinnamon', 'cinnamon-dark']
foreach flavour: ['default', 'dark']
if not get_option(flavour)
message('skip flavour ' + flavour)
continue
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 9 additions & 0 deletions cinnamon-shell/src/assets/colorable-assets/menu/menu.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 5 additions & 0 deletions cinnamon-shell/src/assets/colorable-assets/menu/submenu.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 7 additions & 0 deletions cinnamon-shell/src/assets/colorable-assets/misc/close.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions cinnamon-shell/src/assets/colorable-assets/misc/message.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
14 changes: 14 additions & 0 deletions cinnamon-shell/src/assets/colorable-assets/misc/modal.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 9 additions & 0 deletions cinnamon-shell/src/assets/common-assets/misc/bg.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
11 changes: 11 additions & 0 deletions cinnamon-shell/src/assets/common-assets/misc/corner-ripple.svg
7 changes: 7 additions & 0 deletions cinnamon-shell/src/assets/common-assets/panel/activities.svg
1 change: 0 additions & 1 deletion cinnamon-shell/src/cinnamon-dark/_colors.scss

This file was deleted.

1 change: 0 additions & 1 deletion cinnamon-shell/src/cinnamon-dark/_common.scss

This file was deleted.

1 change: 0 additions & 1 deletion cinnamon-shell/src/cinnamon-dark/_drawing.scss

This file was deleted.

1 change: 0 additions & 1 deletion cinnamon-shell/src/cinnamon-dark/_palette.scss

This file was deleted.

1 change: 0 additions & 1 deletion cinnamon-shell/src/cinnamon-dark/_tweaks.scss

This file was deleted.

1 change: 0 additions & 1 deletion cinnamon-shell/src/cinnamon-dark/cinnamon.scss

This file was deleted.

1 change: 0 additions & 1 deletion cinnamon-shell/src/cinnamon-dark/common-assets

This file was deleted.

Diff not rendered.
Diff not rendered.
Diff not rendered.

This file was deleted.

Diff not rendered.

This file was deleted.

1 change: 0 additions & 1 deletion cinnamon-shell/src/cinnamon-dark/dark-assets/menu

This file was deleted.

1 change: 0 additions & 1 deletion cinnamon-shell/src/cinnamon-dark/dark-assets/misc

This file was deleted.

This file was deleted.

59 changes: 0 additions & 59 deletions cinnamon-shell/src/cinnamon-dark/dark-assets/switch/switch-on.svg
Diff not rendered.
Binary file removed cinnamon-shell/src/cinnamon-dark/thumbnail.png
Diff not rendered.
11 changes: 11 additions & 0 deletions cinnamon-shell/src/cinnamon-shell.scss.in
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
$variant: if(@DarkVariant@, 'dark', 'light');
$yaru_variant: '@YaruVariant@';

@import 'sass-utils';

@debug 'Generating Cinnamon Shell ' + $yaru_variant + ' theme (' + $variant +' variant'+')';

@import "@VariantDir@/_@Colors@";
@import "@VariantDir@/_drawing";
@import "@VariantDir@/_common";
@import "@VariantDir@/_tweaks";
1 change: 0 additions & 1 deletion cinnamon-shell/src/cinnamon/_colors.scss

This file was deleted.

1 change: 0 additions & 1 deletion cinnamon-shell/src/cinnamon/_common.scss

This file was deleted.

1 change: 0 additions & 1 deletion cinnamon-shell/src/cinnamon/_drawing.scss

This file was deleted.

42 changes: 0 additions & 42 deletions cinnamon-shell/src/cinnamon/_palette.scss

This file was deleted.

1 change: 0 additions & 1 deletion cinnamon-shell/src/cinnamon/_tweaks.scss

This file was deleted.

1 change: 0 additions & 1 deletion cinnamon-shell/src/cinnamon/cinnamon.scss

This file was deleted.

1 change: 0 additions & 1 deletion cinnamon-shell/src/cinnamon/common-assets/menu

This file was deleted.

1 change: 0 additions & 1 deletion cinnamon-shell/src/cinnamon/common-assets/misc

This file was deleted.

Loading

0 comments on commit efd36dc

Please sign in to comment.