diff --git a/src/themes/Kali/sass/Makefile b/src/themes/Kali/sass/Makefile index 509f953b..82209f50 100644 --- a/src/themes/Kali/sass/Makefile +++ b/src/themes/Kali/sass/Makefile @@ -12,12 +12,12 @@ build: $(patsubst %.scss, %.css, $(wildcard *.scss)) mkdir -p $(THEMES_DIR)Kali-Light/gnome-shell/ mkdir -p $(THEMES_DIR)Kali-Dark/gnome-shell/ - cp gtk-3.css $(THEMES_DIR)Kali-Light/gtk-3.0/gtk.css - cp gtk-3-dark.css $(THEMES_DIR)Kali-Light/gtk-3.0/gtk-dark.css - cp gtk-3-dark.css $(THEMES_DIR)Kali-Dark/gtk-3.0/gtk.css - cp gtk-4.css $(THEMES_DIR)Kali-Light/gtk-4.0/gtk.css - cp gtk-4-dark.css $(THEMES_DIR)Kali-Light/gtk-4.0/gtk-dark.css - cp gtk-4-dark.css $(THEMES_DIR)Kali-Dark/gtk-4.0/gtk.css + cp gtk3.css $(THEMES_DIR)Kali-Light/gtk-3.0/gtk.css + cp gtk3-dark.css $(THEMES_DIR)Kali-Light/gtk-3.0/gtk-dark.css + cp gtk3-dark.css $(THEMES_DIR)Kali-Dark/gtk-3.0/gtk.css + cp gtk4.css $(THEMES_DIR)Kali-Light/gtk-4.0/gtk.css + cp gtk4-dark.css $(THEMES_DIR)Kali-Light/gtk-4.0/gtk-dark.css + cp gtk4-dark.css $(THEMES_DIR)Kali-Dark/gtk-4.0/gtk.css cp gnome-shell.css $(THEMES_DIR)Kali-Light/gnome-shell/gnome-shell.css cp gnome-shell-dark.css $(THEMES_DIR)Kali-Dark/gnome-shell/gnome-shell.css diff --git a/src/themes/Kali/sass/gtk-sass/_colors.scss b/src/themes/Kali/sass/common/_colors.scss similarity index 100% rename from src/themes/Kali/sass/gtk-sass/_colors.scss rename to src/themes/Kali/sass/common/_colors.scss diff --git a/src/themes/Kali/sass/gnome-shell-dark.scss b/src/themes/Kali/sass/gnome-shell-dark.scss index 2f1ae68d..e7972d82 100644 --- a/src/themes/Kali/sass/gnome-shell-dark.scss +++ b/src/themes/Kali/sass/gnome-shell-dark.scss @@ -1,8 +1,8 @@ $variant: 'dark'; -@import "gtk-sass/_colors"; //use gtk colors -@import "gnome-shell-sass/upstream/gnome-shell-sass/_drawing"; -@import "gnome-shell-sass/upstream/gnome-shell-sass/_common"; -@import "gnome-shell-sass/upstream/gnome-shell-sass/_widgets"; -@import "gnome-shell-sass/_common-tweaks"; -@import 'gnome-shell-sass/_extensions'; +@import "common/_colors"; //use gtk colors +@import "gnome-shell/upstream/gnome-shell-sass/_drawing"; +@import "gnome-shell/upstream/gnome-shell-sass/_common"; +@import "gnome-shell/upstream/gnome-shell-sass/_widgets"; +@import "gnome-shell/_common-tweaks"; +@import 'gnome-shell/_extensions'; diff --git a/src/themes/Kali/sass/gnome-shell.scss b/src/themes/Kali/sass/gnome-shell.scss index 0e9feffb..9ff9caf1 100644 --- a/src/themes/Kali/sass/gnome-shell.scss +++ b/src/themes/Kali/sass/gnome-shell.scss @@ -1,8 +1,8 @@ $variant: 'light'; -@import "gtk-sass/_colors"; //use gtk colors -@import "gnome-shell-sass/upstream/gnome-shell-sass/_drawing"; -@import "gnome-shell-sass/upstream/gnome-shell-sass/_common"; -@import "gnome-shell-sass/upstream/gnome-shell-sass/_widgets"; -@import "gnome-shell-sass/_common-tweaks"; -@import 'gnome-shell-sass/_extensions'; +@import "common/_colors"; //use gtk colors +@import "gnome-shell/upstream/gnome-shell-sass/_drawing"; +@import "gnome-shell/upstream/gnome-shell-sass/_common"; +@import "gnome-shell/upstream/gnome-shell-sass/_widgets"; +@import "gnome-shell/_common-tweaks"; +@import 'gnome-shell/_extensions'; diff --git a/src/themes/Kali/sass/gnome-shell-sass/_common-tweaks.scss b/src/themes/Kali/sass/gnome-shell/_common-tweaks.scss similarity index 100% rename from src/themes/Kali/sass/gnome-shell-sass/_common-tweaks.scss rename to src/themes/Kali/sass/gnome-shell/_common-tweaks.scss diff --git a/src/themes/Kali/sass/gnome-shell-sass/_extensions.scss b/src/themes/Kali/sass/gnome-shell/_extensions.scss similarity index 100% rename from src/themes/Kali/sass/gnome-shell-sass/_extensions.scss rename to src/themes/Kali/sass/gnome-shell/_extensions.scss diff --git a/src/themes/Kali/sass/gnome-shell-sass/extensions/workspace-indicator.scss b/src/themes/Kali/sass/gnome-shell/extensions/workspace-indicator.scss similarity index 100% rename from src/themes/Kali/sass/gnome-shell-sass/extensions/workspace-indicator.scss rename to src/themes/Kali/sass/gnome-shell/extensions/workspace-indicator.scss diff --git a/src/themes/Kali/sass/gnome-shell-sass/upstream/gnome-shell-high-contrast.scss b/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-high-contrast.scss similarity index 100% rename from src/themes/Kali/sass/gnome-shell-sass/upstream/gnome-shell-high-contrast.scss rename to src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-high-contrast.scss diff --git a/src/themes/Kali/sass/gnome-shell-sass/upstream/gnome-shell-sass/_common.scss b/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/_common.scss similarity index 100% rename from src/themes/Kali/sass/gnome-shell-sass/upstream/gnome-shell-sass/_common.scss rename to src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/_common.scss diff --git a/src/themes/Kali/sass/gnome-shell-sass/upstream/gnome-shell-sass/_drawing.scss b/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/_drawing.scss similarity index 100% rename from src/themes/Kali/sass/gnome-shell-sass/upstream/gnome-shell-sass/_drawing.scss rename to src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/_drawing.scss diff --git a/src/themes/Kali/sass/gnome-shell-sass/upstream/gnome-shell-sass/_widgets.scss b/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/_widgets.scss similarity index 100% rename from src/themes/Kali/sass/gnome-shell-sass/upstream/gnome-shell-sass/_widgets.scss rename to src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/_widgets.scss diff --git a/src/themes/Kali/sass/gnome-shell-sass/upstream/gnome-shell-sass/widgets/_a11y.scss b/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_a11y.scss similarity index 100% rename from src/themes/Kali/sass/gnome-shell-sass/upstream/gnome-shell-sass/widgets/_a11y.scss rename to src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_a11y.scss diff --git a/src/themes/Kali/sass/gnome-shell-sass/upstream/gnome-shell-sass/widgets/_app-grid.scss b/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_app-grid.scss similarity index 100% rename from src/themes/Kali/sass/gnome-shell-sass/upstream/gnome-shell-sass/widgets/_app-grid.scss rename to src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_app-grid.scss diff --git a/src/themes/Kali/sass/gnome-shell-sass/upstream/gnome-shell-sass/widgets/_base.scss b/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_base.scss similarity index 100% rename from src/themes/Kali/sass/gnome-shell-sass/upstream/gnome-shell-sass/widgets/_base.scss rename to src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_base.scss diff --git a/src/themes/Kali/sass/gnome-shell-sass/upstream/gnome-shell-sass/widgets/_buttons.scss b/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_buttons.scss similarity index 100% rename from src/themes/Kali/sass/gnome-shell-sass/upstream/gnome-shell-sass/widgets/_buttons.scss rename to src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_buttons.scss diff --git a/src/themes/Kali/sass/gnome-shell-sass/upstream/gnome-shell-sass/widgets/_calendar.scss b/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_calendar.scss similarity index 100% rename from src/themes/Kali/sass/gnome-shell-sass/upstream/gnome-shell-sass/widgets/_calendar.scss rename to src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_calendar.scss diff --git a/src/themes/Kali/sass/gnome-shell-sass/upstream/gnome-shell-sass/widgets/_check-box.scss b/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_check-box.scss similarity index 100% rename from src/themes/Kali/sass/gnome-shell-sass/upstream/gnome-shell-sass/widgets/_check-box.scss rename to src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_check-box.scss diff --git a/src/themes/Kali/sass/gnome-shell-sass/upstream/gnome-shell-sass/widgets/_corner-ripple.scss b/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_corner-ripple.scss similarity index 100% rename from src/themes/Kali/sass/gnome-shell-sass/upstream/gnome-shell-sass/widgets/_corner-ripple.scss rename to src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_corner-ripple.scss diff --git a/src/themes/Kali/sass/gnome-shell-sass/upstream/gnome-shell-sass/widgets/_dash.scss b/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_dash.scss similarity index 100% rename from src/themes/Kali/sass/gnome-shell-sass/upstream/gnome-shell-sass/widgets/_dash.scss rename to src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_dash.scss diff --git a/src/themes/Kali/sass/gnome-shell-sass/upstream/gnome-shell-sass/widgets/_dialogs.scss b/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_dialogs.scss similarity index 100% rename from src/themes/Kali/sass/gnome-shell-sass/upstream/gnome-shell-sass/widgets/_dialogs.scss rename to src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_dialogs.scss diff --git a/src/themes/Kali/sass/gnome-shell-sass/upstream/gnome-shell-sass/widgets/_entries.scss b/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_entries.scss similarity index 100% rename from src/themes/Kali/sass/gnome-shell-sass/upstream/gnome-shell-sass/widgets/_entries.scss rename to src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_entries.scss diff --git a/src/themes/Kali/sass/gnome-shell-sass/upstream/gnome-shell-sass/widgets/_hotplug.scss b/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_hotplug.scss similarity index 100% rename from src/themes/Kali/sass/gnome-shell-sass/upstream/gnome-shell-sass/widgets/_hotplug.scss rename to src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_hotplug.scss diff --git a/src/themes/Kali/sass/gnome-shell-sass/upstream/gnome-shell-sass/widgets/_ibus-popup.scss b/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_ibus-popup.scss similarity index 100% rename from src/themes/Kali/sass/gnome-shell-sass/upstream/gnome-shell-sass/widgets/_ibus-popup.scss rename to src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_ibus-popup.scss diff --git a/src/themes/Kali/sass/gnome-shell-sass/upstream/gnome-shell-sass/widgets/_keyboard.scss b/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_keyboard.scss similarity index 100% rename from src/themes/Kali/sass/gnome-shell-sass/upstream/gnome-shell-sass/widgets/_keyboard.scss rename to src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_keyboard.scss diff --git a/src/themes/Kali/sass/gnome-shell-sass/upstream/gnome-shell-sass/widgets/_login-dialog.scss b/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_login-dialog.scss similarity index 100% rename from src/themes/Kali/sass/gnome-shell-sass/upstream/gnome-shell-sass/widgets/_login-dialog.scss rename to src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_login-dialog.scss diff --git a/src/themes/Kali/sass/gnome-shell-sass/upstream/gnome-shell-sass/widgets/_looking-glass.scss b/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_looking-glass.scss similarity index 100% rename from src/themes/Kali/sass/gnome-shell-sass/upstream/gnome-shell-sass/widgets/_looking-glass.scss rename to src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_looking-glass.scss diff --git a/src/themes/Kali/sass/gnome-shell-sass/upstream/gnome-shell-sass/widgets/_message-list.scss b/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_message-list.scss similarity index 100% rename from src/themes/Kali/sass/gnome-shell-sass/upstream/gnome-shell-sass/widgets/_message-list.scss rename to src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_message-list.scss diff --git a/src/themes/Kali/sass/gnome-shell-sass/upstream/gnome-shell-sass/widgets/_misc.scss b/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_misc.scss similarity index 100% rename from src/themes/Kali/sass/gnome-shell-sass/upstream/gnome-shell-sass/widgets/_misc.scss rename to src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_misc.scss diff --git a/src/themes/Kali/sass/gnome-shell-sass/upstream/gnome-shell-sass/widgets/_network-dialog.scss b/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_network-dialog.scss similarity index 100% rename from src/themes/Kali/sass/gnome-shell-sass/upstream/gnome-shell-sass/widgets/_network-dialog.scss rename to src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_network-dialog.scss diff --git a/src/themes/Kali/sass/gnome-shell-sass/upstream/gnome-shell-sass/widgets/_notifications.scss b/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_notifications.scss similarity index 100% rename from src/themes/Kali/sass/gnome-shell-sass/upstream/gnome-shell-sass/widgets/_notifications.scss rename to src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_notifications.scss diff --git a/src/themes/Kali/sass/gnome-shell-sass/upstream/gnome-shell-sass/widgets/_osd.scss b/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_osd.scss similarity index 100% rename from src/themes/Kali/sass/gnome-shell-sass/upstream/gnome-shell-sass/widgets/_osd.scss rename to src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_osd.scss diff --git a/src/themes/Kali/sass/gnome-shell-sass/upstream/gnome-shell-sass/widgets/_overview.scss b/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_overview.scss similarity index 100% rename from src/themes/Kali/sass/gnome-shell-sass/upstream/gnome-shell-sass/widgets/_overview.scss rename to src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_overview.scss diff --git a/src/themes/Kali/sass/gnome-shell-sass/upstream/gnome-shell-sass/widgets/_panel.scss b/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_panel.scss similarity index 100% rename from src/themes/Kali/sass/gnome-shell-sass/upstream/gnome-shell-sass/widgets/_panel.scss rename to src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_panel.scss diff --git a/src/themes/Kali/sass/gnome-shell-sass/upstream/gnome-shell-sass/widgets/_popovers.scss b/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_popovers.scss similarity index 100% rename from src/themes/Kali/sass/gnome-shell-sass/upstream/gnome-shell-sass/widgets/_popovers.scss rename to src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_popovers.scss diff --git a/src/themes/Kali/sass/gnome-shell-sass/upstream/gnome-shell-sass/widgets/_screen-shield.scss b/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_screen-shield.scss similarity index 100% rename from src/themes/Kali/sass/gnome-shell-sass/upstream/gnome-shell-sass/widgets/_screen-shield.scss rename to src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_screen-shield.scss diff --git a/src/themes/Kali/sass/gnome-shell-sass/upstream/gnome-shell-sass/widgets/_scrollbars.scss b/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_scrollbars.scss similarity index 100% rename from src/themes/Kali/sass/gnome-shell-sass/upstream/gnome-shell-sass/widgets/_scrollbars.scss rename to src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_scrollbars.scss diff --git a/src/themes/Kali/sass/gnome-shell-sass/upstream/gnome-shell-sass/widgets/_search-entry.scss b/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_search-entry.scss similarity index 100% rename from src/themes/Kali/sass/gnome-shell-sass/upstream/gnome-shell-sass/widgets/_search-entry.scss rename to src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_search-entry.scss diff --git a/src/themes/Kali/sass/gnome-shell-sass/upstream/gnome-shell-sass/widgets/_search-results.scss b/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_search-results.scss similarity index 100% rename from src/themes/Kali/sass/gnome-shell-sass/upstream/gnome-shell-sass/widgets/_search-results.scss rename to src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_search-results.scss diff --git a/src/themes/Kali/sass/gnome-shell-sass/upstream/gnome-shell-sass/widgets/_slider.scss b/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_slider.scss similarity index 100% rename from src/themes/Kali/sass/gnome-shell-sass/upstream/gnome-shell-sass/widgets/_slider.scss rename to src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_slider.scss diff --git a/src/themes/Kali/sass/gnome-shell-sass/upstream/gnome-shell-sass/widgets/_switcher-popup.scss b/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_switcher-popup.scss similarity index 100% rename from src/themes/Kali/sass/gnome-shell-sass/upstream/gnome-shell-sass/widgets/_switcher-popup.scss rename to src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_switcher-popup.scss diff --git a/src/themes/Kali/sass/gnome-shell-sass/upstream/gnome-shell-sass/widgets/_switches.scss b/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_switches.scss similarity index 100% rename from src/themes/Kali/sass/gnome-shell-sass/upstream/gnome-shell-sass/widgets/_switches.scss rename to src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_switches.scss diff --git a/src/themes/Kali/sass/gnome-shell-sass/upstream/gnome-shell-sass/widgets/_tiled-previews.scss b/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_tiled-previews.scss similarity index 100% rename from src/themes/Kali/sass/gnome-shell-sass/upstream/gnome-shell-sass/widgets/_tiled-previews.scss rename to src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_tiled-previews.scss diff --git a/src/themes/Kali/sass/gnome-shell-sass/upstream/gnome-shell-sass/widgets/_window-picker.scss b/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_window-picker.scss similarity index 100% rename from src/themes/Kali/sass/gnome-shell-sass/upstream/gnome-shell-sass/widgets/_window-picker.scss rename to src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_window-picker.scss diff --git a/src/themes/Kali/sass/gnome-shell-sass/upstream/gnome-shell-sass/widgets/_workspace-switcher.scss b/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_workspace-switcher.scss similarity index 100% rename from src/themes/Kali/sass/gnome-shell-sass/upstream/gnome-shell-sass/widgets/_workspace-switcher.scss rename to src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_workspace-switcher.scss diff --git a/src/themes/Kali/sass/gnome-shell-sass/upstream/gnome-shell-sass/widgets/_workspace-thumbnails.scss b/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_workspace-thumbnails.scss similarity index 100% rename from src/themes/Kali/sass/gnome-shell-sass/upstream/gnome-shell-sass/widgets/_workspace-thumbnails.scss rename to src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_workspace-thumbnails.scss diff --git a/src/themes/Kali/sass/gnome-shell-sass/upstream/pad-osd.css b/src/themes/Kali/sass/gnome-shell/upstream/pad-osd.css similarity index 100% rename from src/themes/Kali/sass/gnome-shell-sass/upstream/pad-osd.css rename to src/themes/Kali/sass/gnome-shell/upstream/pad-osd.css diff --git a/src/themes/Kali/sass/gnome-shell-sass/upstream/sync.sh b/src/themes/Kali/sass/gnome-shell/upstream/sync.sh similarity index 100% rename from src/themes/Kali/sass/gnome-shell-sass/upstream/sync.sh rename to src/themes/Kali/sass/gnome-shell/upstream/sync.sh diff --git a/src/themes/Kali/sass/gtk-3-dark.scss b/src/themes/Kali/sass/gtk3-dark.scss similarity index 54% rename from src/themes/Kali/sass/gtk-3-dark.scss rename to src/themes/Kali/sass/gtk3-dark.scss index 4c1ece97..a812df95 100644 --- a/src/themes/Kali/sass/gtk-3-dark.scss +++ b/src/themes/Kali/sass/gtk3-dark.scss @@ -7,10 +7,10 @@ $variant: 'dark'; $high-contrast:'false'; -@import 'gtk-sass/_colors'; -@import 'gtk-sass/upstream-gtk-3/_drawing'; -@import 'gtk-sass/upstream-gtk-3/_common'; -@import 'gtk-sass/upstream-gtk-3/libhandy/Adwaita-base'; -@import 'gtk-sass/_common-tweaks'; -@import 'gtk-sass/_applications'; -@import 'gtk-sass/upstream-gtk-3/_colors-public'; +@import 'common/_colors'; +@import 'gtk3/upstream/_drawing'; +@import 'gtk3/upstream/_common'; +@import 'gtk3/upstream/libhandy/Adwaita-base'; +@import 'gtk3/_common-tweaks'; +@import 'gtk3/_applications'; +@import 'gtk3/upstream/_colors-public'; diff --git a/src/themes/Kali/sass/gtk-3.scss b/src/themes/Kali/sass/gtk3.scss similarity index 54% rename from src/themes/Kali/sass/gtk-3.scss rename to src/themes/Kali/sass/gtk3.scss index 81950f09..b755b1f6 100644 --- a/src/themes/Kali/sass/gtk-3.scss +++ b/src/themes/Kali/sass/gtk3.scss @@ -7,10 +7,10 @@ $variant: 'light'; $high-contrast:'false'; -@import 'gtk-sass/_colors'; -@import 'gtk-sass/upstream-gtk-3/_drawing'; -@import 'gtk-sass/upstream-gtk-3/_common'; -@import 'gtk-sass/upstream-gtk-3/libhandy/Adwaita-base'; -@import 'gtk-sass/_common-tweaks'; -@import 'gtk-sass/_applications'; -@import 'gtk-sass/upstream-gtk-3/_colors-public'; +@import 'common/_colors'; +@import 'gtk3/upstream/_drawing'; +@import 'gtk3/upstream/_common'; +@import 'gtk3/upstream/libhandy/Adwaita-base'; +@import 'gtk3/_common-tweaks'; +@import 'gtk3/_applications'; +@import 'gtk3/upstream/_colors-public'; diff --git a/src/themes/Kali/sass/gtk-sass/_applications.scss b/src/themes/Kali/sass/gtk3/_applications.scss similarity index 100% rename from src/themes/Kali/sass/gtk-sass/_applications.scss rename to src/themes/Kali/sass/gtk3/_applications.scss diff --git a/src/themes/Kali/sass/gtk-sass/_common-tweaks.scss b/src/themes/Kali/sass/gtk3/_common-tweaks.scss similarity index 100% rename from src/themes/Kali/sass/gtk-sass/_common-tweaks.scss rename to src/themes/Kali/sass/gtk3/_common-tweaks.scss diff --git a/src/themes/Kali/sass/gtk-sass/upstream-gtk-3/_colors-public.scss b/src/themes/Kali/sass/gtk3/upstream/_colors-public.scss similarity index 100% rename from src/themes/Kali/sass/gtk-sass/upstream-gtk-3/_colors-public.scss rename to src/themes/Kali/sass/gtk3/upstream/_colors-public.scss diff --git a/src/themes/Kali/sass/gtk-sass/upstream-gtk-3/_colors.scss b/src/themes/Kali/sass/gtk3/upstream/_colors.scss similarity index 100% rename from src/themes/Kali/sass/gtk-sass/upstream-gtk-3/_colors.scss rename to src/themes/Kali/sass/gtk3/upstream/_colors.scss diff --git a/src/themes/Kali/sass/gtk-sass/upstream-gtk-3/_common.scss b/src/themes/Kali/sass/gtk3/upstream/_common.scss similarity index 100% rename from src/themes/Kali/sass/gtk-sass/upstream-gtk-3/_common.scss rename to src/themes/Kali/sass/gtk3/upstream/_common.scss diff --git a/src/themes/Kali/sass/gtk-sass/upstream-gtk-3/_common.scss.patch b/src/themes/Kali/sass/gtk3/upstream/_common.scss.patch similarity index 100% rename from src/themes/Kali/sass/gtk-sass/upstream-gtk-3/_common.scss.patch rename to src/themes/Kali/sass/gtk3/upstream/_common.scss.patch diff --git a/src/themes/Kali/sass/gtk-sass/upstream-gtk-3/_drawing.scss b/src/themes/Kali/sass/gtk3/upstream/_drawing.scss similarity index 100% rename from src/themes/Kali/sass/gtk-sass/upstream-gtk-3/_drawing.scss rename to src/themes/Kali/sass/gtk3/upstream/_drawing.scss diff --git a/src/themes/Kali/sass/gtk-sass/upstream-gtk-3/_drawing.scss.patch b/src/themes/Kali/sass/gtk3/upstream/_drawing.scss.patch similarity index 100% rename from src/themes/Kali/sass/gtk-sass/upstream-gtk-3/_drawing.scss.patch rename to src/themes/Kali/sass/gtk3/upstream/_drawing.scss.patch diff --git a/src/themes/Kali/sass/gtk-sass/upstream-gtk-3/libhandy/_Adwaita-base.scss b/src/themes/Kali/sass/gtk3/upstream/libhandy/_Adwaita-base.scss similarity index 100% rename from src/themes/Kali/sass/gtk-sass/upstream-gtk-3/libhandy/_Adwaita-base.scss rename to src/themes/Kali/sass/gtk3/upstream/libhandy/_Adwaita-base.scss diff --git a/src/themes/Kali/sass/gtk-sass/upstream-gtk-3/libhandy/_definitions.scss b/src/themes/Kali/sass/gtk3/upstream/libhandy/_definitions.scss similarity index 100% rename from src/themes/Kali/sass/gtk-sass/upstream-gtk-3/libhandy/_definitions.scss rename to src/themes/Kali/sass/gtk3/upstream/libhandy/_definitions.scss diff --git a/src/themes/Kali/sass/gtk-sass/upstream-gtk-3/libhandy/_drawing.scss b/src/themes/Kali/sass/gtk3/upstream/libhandy/_drawing.scss similarity index 100% rename from src/themes/Kali/sass/gtk-sass/upstream-gtk-3/libhandy/_drawing.scss rename to src/themes/Kali/sass/gtk3/upstream/libhandy/_drawing.scss diff --git a/src/themes/Kali/sass/gtk-sass/upstream-gtk-3/libhandy/_fallback-base.scss b/src/themes/Kali/sass/gtk3/upstream/libhandy/_fallback-base.scss similarity index 100% rename from src/themes/Kali/sass/gtk-sass/upstream-gtk-3/libhandy/_fallback-base.scss rename to src/themes/Kali/sass/gtk3/upstream/libhandy/_fallback-base.scss diff --git a/src/themes/Kali/sass/gtk-sass/upstream-gtk-3/libhandy/_shared-base.scss b/src/themes/Kali/sass/gtk3/upstream/libhandy/_shared-base.scss similarity index 100% rename from src/themes/Kali/sass/gtk-sass/upstream-gtk-3/libhandy/_shared-base.scss rename to src/themes/Kali/sass/gtk3/upstream/libhandy/_shared-base.scss diff --git a/src/themes/Kali/sass/gtk-sass/upstream-gtk-3/libhandy/sync.sh b/src/themes/Kali/sass/gtk3/upstream/libhandy/sync.sh similarity index 100% rename from src/themes/Kali/sass/gtk-sass/upstream-gtk-3/libhandy/sync.sh rename to src/themes/Kali/sass/gtk3/upstream/libhandy/sync.sh diff --git a/src/themes/Kali/sass/gtk-sass/upstream-gtk-3/sync.sh b/src/themes/Kali/sass/gtk3/upstream/sync.sh similarity index 100% rename from src/themes/Kali/sass/gtk-sass/upstream-gtk-3/sync.sh rename to src/themes/Kali/sass/gtk3/upstream/sync.sh diff --git a/src/themes/Kali/sass/gtk-4-dark.scss b/src/themes/Kali/sass/gtk4-dark.scss similarity index 59% rename from src/themes/Kali/sass/gtk-4-dark.scss rename to src/themes/Kali/sass/gtk4-dark.scss index 27aec71a..96a082e9 100644 --- a/src/themes/Kali/sass/gtk-4-dark.scss +++ b/src/themes/Kali/sass/gtk4-dark.scss @@ -7,9 +7,9 @@ $variant: 'dark'; $high-contrast:'false'; -@import 'gtk-sass/_colors'; -@import 'gtk-sass/upstream-gtk-4/_drawing'; -@import 'gtk-sass/upstream-gtk-4/_common'; -//@import 'gtk-sass/_common-tweaks'; -@import 'gtk-sass/_applications'; -@import 'gtk-sass/upstream-gtk-4/_colors-public'; +@import 'common/_colors'; +@import 'gtk4/upstream/_drawing'; +@import 'gtk4/upstream/_common'; +//@import 'gtk4/_common-tweaks'; +//@import 'gtk4/_applications'; +@import 'gtk4/upstream/_colors-public'; diff --git a/src/themes/Kali/sass/gtk-4.scss b/src/themes/Kali/sass/gtk4.scss similarity index 59% rename from src/themes/Kali/sass/gtk-4.scss rename to src/themes/Kali/sass/gtk4.scss index 31b3f0e8..a4c0cacf 100644 --- a/src/themes/Kali/sass/gtk-4.scss +++ b/src/themes/Kali/sass/gtk4.scss @@ -7,9 +7,9 @@ $variant: 'light'; $high-contrast:'false'; -@import 'gtk-sass/_colors'; -@import 'gtk-sass/upstream-gtk-4/_drawing'; -@import 'gtk-sass/upstream-gtk-4/_common'; -//@import 'gtk-sass/_common-tweaks'; -@import 'gtk-sass/_applications'; -@import 'gtk-sass/upstream-gtk-4/_colors-public'; +@import 'common/_colors'; +@import 'gtk4/upstream/_drawing'; +@import 'gtk4/upstream/_common'; +//@import 'gtk4/_common-tweaks'; +//@import 'gtk4/_applications'; +@import 'gtk4/upstream/_colors-public'; diff --git a/src/themes/Kali/sass/gtk-sass/upstream-gtk-4/_colors-public.scss b/src/themes/Kali/sass/gtk4/upstream/_colors-public.scss similarity index 100% rename from src/themes/Kali/sass/gtk-sass/upstream-gtk-4/_colors-public.scss rename to src/themes/Kali/sass/gtk4/upstream/_colors-public.scss diff --git a/src/themes/Kali/sass/gtk-sass/upstream-gtk-4/_colors.scss b/src/themes/Kali/sass/gtk4/upstream/_colors.scss similarity index 100% rename from src/themes/Kali/sass/gtk-sass/upstream-gtk-4/_colors.scss rename to src/themes/Kali/sass/gtk4/upstream/_colors.scss diff --git a/src/themes/Kali/sass/gtk-sass/upstream-gtk-4/_common.scss b/src/themes/Kali/sass/gtk4/upstream/_common.scss similarity index 100% rename from src/themes/Kali/sass/gtk-sass/upstream-gtk-4/_common.scss rename to src/themes/Kali/sass/gtk4/upstream/_common.scss diff --git a/src/themes/Kali/sass/gtk-sass/upstream-gtk-4/_drawing.scss b/src/themes/Kali/sass/gtk4/upstream/_drawing.scss similarity index 100% rename from src/themes/Kali/sass/gtk-sass/upstream-gtk-4/_drawing.scss rename to src/themes/Kali/sass/gtk4/upstream/_drawing.scss diff --git a/src/themes/Kali/sass/gtk-sass/upstream-gtk-4/sync.sh b/src/themes/Kali/sass/gtk4/upstream/sync.sh similarity index 100% rename from src/themes/Kali/sass/gtk-sass/upstream-gtk-4/sync.sh rename to src/themes/Kali/sass/gtk4/upstream/sync.sh