ubuntu · Jupi007 · Jun 16, 2023 · Mar 16, 2023
diff --git a/cinnamon-shell/meson.build b/cinnamon-shell/meson.build
@@ -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

diff --git a/cinnamon-shell/src/assets/colorable-assets/checkbox/checkbox-checked-focused.svg b/cinnamon-shell/src/assets/colorable-assets/checkbox/checkbox-checked-focused.svg
diff --git a/cinnamon-shell/src/assets/colorable-assets/checkbox/checkbox-checked.svg b/cinnamon-shell/src/assets/colorable-assets/checkbox/checkbox-checked.svg
diff --git a/cinnamon-shell/src/assets/colorable-assets/checkbox/checkbox-unchecked-focused.svg b/cinnamon-shell/src/assets/colorable-assets/checkbox/checkbox-unchecked-focused.svg
diff --git a/cinnamon-shell/src/assets/colorable-assets/checkbox/checkbox-unchecked.svg b/cinnamon-shell/src/assets/colorable-assets/checkbox/checkbox-unchecked.svg
diff --git a/cinnamon-shell/src/assets/colorable-assets/checkbox/radio-checked.svg b/cinnamon-shell/src/assets/colorable-assets/checkbox/radio-checked.svg
diff --git a/cinnamon-shell/src/assets/colorable-assets/checkbox/radio-unchecked.svg b/cinnamon-shell/src/assets/colorable-assets/checkbox/radio-unchecked.svg
diff --git a/cinnamon-shell/src/assets/colorable-assets/menu/menu-hover.svg b/cinnamon-shell/src/assets/colorable-assets/menu/menu-hover.svg
diff --git a/cinnamon-shell/src/assets/colorable-assets/menu/menu.svg b/cinnamon-shell/src/assets/colorable-assets/menu/menu.svg
diff --git a/cinnamon-shell/src/assets/colorable-assets/menu/submenu.svg b/cinnamon-shell/src/assets/colorable-assets/menu/submenu.svg
diff --git a/cinnamon-shell/src/assets/colorable-assets/misc/button-box.svg b/cinnamon-shell/src/assets/colorable-assets/misc/button-box.svg
diff --git a/cinnamon-shell/src/assets/colorable-assets/misc/close-active.svg b/cinnamon-shell/src/assets/colorable-assets/misc/close-active.svg
diff --git a/cinnamon-shell/src/assets/colorable-assets/misc/close-hover.svg b/cinnamon-shell/src/assets/colorable-assets/misc/close-hover.svg
diff --git a/cinnamon-shell/src/assets/colorable-assets/misc/close.svg b/cinnamon-shell/src/assets/colorable-assets/misc/close.svg
diff --git a/cinnamon-shell/src/assets/colorable-assets/misc/message.svg b/cinnamon-shell/src/assets/colorable-assets/misc/message.svg
diff --git a/cinnamon-shell/src/assets/colorable-assets/misc/modal.svg b/cinnamon-shell/src/assets/colorable-assets/misc/modal.svg
diff --git a/cinnamon-shell/src/assets/colorable-assets/switch/switch-off.svg b/cinnamon-shell/src/assets/colorable-assets/switch/switch-off.svg
diff --git a/cinnamon-shell/src/assets/colorable-assets/switch/switch-on.svg b/cinnamon-shell/src/assets/colorable-assets/switch/switch-on.svg
diff --git a/cinnamon-shell/src/assets/common-assets/menu/menu-separator.svg b/cinnamon-shell/src/assets/common-assets/menu/menu-separator.svg
diff --git a/cinnamon-shell/src/assets/common-assets/misc/add-workspace-active.svg b/cinnamon-shell/src/assets/common-assets/misc/add-workspace-active.svg
diff --git a/cinnamon-shell/src/assets/common-assets/misc/add-workspace-hover.svg b/cinnamon-shell/src/assets/common-assets/misc/add-workspace-hover.svg
diff --git a/cinnamon-shell/src/assets/common-assets/misc/add-workspace.svg b/cinnamon-shell/src/assets/common-assets/misc/add-workspace.svg
diff --git a/cinnamon-shell/src/assets/common-assets/misc/bg.svg b/cinnamon-shell/src/assets/common-assets/misc/bg.svg
diff --git a/cinnamon-shell/src/assets/common-assets/misc/calendar-arrow-left-hover.svg b/cinnamon-shell/src/assets/common-assets/misc/calendar-arrow-left-hover.svg
diff --git a/cinnamon-shell/src/assets/common-assets/misc/calendar-arrow-left.svg b/cinnamon-shell/src/assets/common-assets/misc/calendar-arrow-left.svg
diff --git a/cinnamon-shell/src/assets/common-assets/misc/calendar-arrow-right-hover.svg b/cinnamon-shell/src/assets/common-assets/misc/calendar-arrow-right-hover.svg
diff --git a/cinnamon-shell/src/assets/common-assets/misc/calendar-arrow-right.svg b/cinnamon-shell/src/assets/common-assets/misc/calendar-arrow-right.svg
diff --git a/cinnamon-shell/src/assets/common-assets/misc/corner-ripple.svg b/cinnamon-shell/src/assets/common-assets/misc/corner-ripple.svg
diff --git a/...ult/common-assets/misc/desklet-header.svg → ...ets/common-assets/misc/desklet-header.svg b/...ult/common-assets/misc/desklet-header.svg → ...ets/common-assets/misc/desklet-header.svg
diff --git a/...rc/default/common-assets/misc/desklet.svg → ...src/assets/common-assets/misc/desklet.svg b/...rc/default/common-assets/misc/desklet.svg → ...src/assets/common-assets/misc/desklet.svg
diff --git a/...ll/src/default/common-assets/misc/osd.svg → ...ell/src/assets/common-assets/misc/osd.svg b/...ll/src/default/common-assets/misc/osd.svg → ...ell/src/assets/common-assets/misc/osd.svg
diff --git a/...ult/common-assets/misc/overview-hover.png → ...ets/common-assets/misc/overview-hover.png b/...ult/common-assets/misc/overview-hover.png → ...ets/common-assets/misc/overview-hover.png
diff --git a/...c/default/common-assets/misc/overview.png → ...rc/assets/common-assets/misc/overview.png b/...c/default/common-assets/misc/overview.png → ...rc/assets/common-assets/misc/overview.png
diff --git a/...default/common-assets/misc/trash-icon.svg → .../assets/common-assets/misc/trash-icon.svg b/...default/common-assets/misc/trash-icon.svg → .../assets/common-assets/misc/trash-icon.svg
diff --git a/cinnamon-shell/src/assets/common-assets/panel/activities-active.svg b/cinnamon-shell/src/assets/common-assets/panel/activities-active.svg
diff --git a/cinnamon-shell/src/assets/common-assets/panel/activities.svg b/cinnamon-shell/src/assets/common-assets/panel/activities.svg
diff --git a/cinnamon-shell/src/assets/common-assets/panel/window-list-active-bottom.svg b/cinnamon-shell/src/assets/common-assets/panel/window-list-active-bottom.svg
diff --git a/cinnamon-shell/src/assets/common-assets/panel/window-list-active-top.svg b/cinnamon-shell/src/assets/common-assets/panel/window-list-active-top.svg
diff --git a/cinnamon-shell/src/cinnamon-dark/_colors.scss b/cinnamon-shell/src/cinnamon-dark/_colors.scss
diff --git a/cinnamon-shell/src/cinnamon-dark/_common.scss b/cinnamon-shell/src/cinnamon-dark/_common.scss
diff --git a/cinnamon-shell/src/cinnamon-dark/_drawing.scss b/cinnamon-shell/src/cinnamon-dark/_drawing.scss
diff --git a/cinnamon-shell/src/cinnamon-dark/_palette.scss b/cinnamon-shell/src/cinnamon-dark/_palette.scss
diff --git a/cinnamon-shell/src/cinnamon-dark/_tweaks.scss b/cinnamon-shell/src/cinnamon-dark/_tweaks.scss
diff --git a/cinnamon-shell/src/cinnamon-dark/cinnamon.scss b/cinnamon-shell/src/cinnamon-dark/cinnamon.scss
diff --git a/cinnamon-shell/src/cinnamon-dark/common-assets b/cinnamon-shell/src/cinnamon-dark/common-assets
diff --git a/cinnamon-shell/src/cinnamon-dark/dark-assets/checkbox/checkbox-checked-focused.svg b/cinnamon-shell/src/cinnamon-dark/dark-assets/checkbox/checkbox-checked-focused.svg
diff --git a/cinnamon-shell/src/cinnamon-dark/dark-assets/checkbox/checkbox-checked.svg b/cinnamon-shell/src/cinnamon-dark/dark-assets/checkbox/checkbox-checked.svg
diff --git a/...mon-shell/src/cinnamon-dark/dark-assets/checkbox/checkbox-unchecked-focused.svg b/...mon-shell/src/cinnamon-dark/dark-assets/checkbox/checkbox-unchecked-focused.svg
diff --git a/cinnamon-shell/src/cinnamon-dark/dark-assets/checkbox/checkbox-unchecked.svg b/cinnamon-shell/src/cinnamon-dark/dark-assets/checkbox/checkbox-unchecked.svg
diff --git a/cinnamon-shell/src/cinnamon-dark/dark-assets/checkbox/radio-checked.svg b/cinnamon-shell/src/cinnamon-dark/dark-assets/checkbox/radio-checked.svg
diff --git a/cinnamon-shell/src/cinnamon-dark/dark-assets/checkbox/radio-unchecked.svg b/cinnamon-shell/src/cinnamon-dark/dark-assets/checkbox/radio-unchecked.svg
diff --git a/cinnamon-shell/src/cinnamon-dark/dark-assets/menu b/cinnamon-shell/src/cinnamon-dark/dark-assets/menu
diff --git a/cinnamon-shell/src/cinnamon-dark/dark-assets/misc b/cinnamon-shell/src/cinnamon-dark/dark-assets/misc
diff --git a/cinnamon-shell/src/cinnamon-dark/dark-assets/switch/switch-off.svg b/cinnamon-shell/src/cinnamon-dark/dark-assets/switch/switch-off.svg
diff --git a/cinnamon-shell/src/cinnamon-dark/dark-assets/switch/switch-on.svg b/cinnamon-shell/src/cinnamon-dark/dark-assets/switch/switch-on.svg
diff --git a/cinnamon-shell/src/cinnamon-dark/thumbnail.png b/cinnamon-shell/src/cinnamon-dark/thumbnail.png
diff --git a/cinnamon-shell/src/cinnamon-shell.scss.in b/cinnamon-shell/src/cinnamon-shell.scss.in
@@ -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";
diff --git a/cinnamon-shell/src/cinnamon/_colors.scss b/cinnamon-shell/src/cinnamon/_colors.scss
diff --git a/cinnamon-shell/src/cinnamon/_common.scss b/cinnamon-shell/src/cinnamon/_common.scss
diff --git a/cinnamon-shell/src/cinnamon/_drawing.scss b/cinnamon-shell/src/cinnamon/_drawing.scss
diff --git a/cinnamon-shell/src/cinnamon/_palette.scss b/cinnamon-shell/src/cinnamon/_palette.scss
diff --git a/cinnamon-shell/src/cinnamon/_tweaks.scss b/cinnamon-shell/src/cinnamon/_tweaks.scss
diff --git a/cinnamon-shell/src/cinnamon/cinnamon.scss b/cinnamon-shell/src/cinnamon/cinnamon.scss
diff --git a/cinnamon-shell/src/cinnamon/common-assets/menu b/cinnamon-shell/src/cinnamon/common-assets/menu
diff --git a/cinnamon-shell/src/cinnamon/common-assets/misc b/cinnamon-shell/src/cinnamon/common-assets/misc