From 0e3c662cb02e21b29cdf7d4902c306c1c866eb58 Mon Sep 17 00:00:00 2001 From: ItsLemmy Date: Wed, 1 Oct 2025 20:55:29 -0400 Subject: [PATCH] GTK4 + GTK3: simplified and working. + GTK3 is a symlink to GTK4 --- Assets/Matugen/templates/gtk3.css | 23 +---------------------- Assets/Matugen/templates/gtk4.css | 15 ++++++++------- 2 files changed, 9 insertions(+), 29 deletions(-) mode change 100644 => 120000 Assets/Matugen/templates/gtk3.css diff --git a/Assets/Matugen/templates/gtk3.css b/Assets/Matugen/templates/gtk3.css deleted file mode 100644 index a3676c4a..00000000 --- a/Assets/Matugen/templates/gtk3.css +++ /dev/null @@ -1,22 +0,0 @@ -/* -* GTK Colors -* Generated with Matugen -*/ - -@define-color accent_color {{colors.primary_fixed_dim.default.hex}}; -@define-color accent_fg_color {{colors.on_primary_fixed.default.hex}}; -@define-color accent_bg_color {{colors.primary_fixed_dim.default.hex}}; -@define-color window_bg_color {{colors.surface_dim.default.hex}}; -@define-color window_fg_color {{colors.on_surface.default.hex}}; -@define-color headerbar_bg_color {{colors.surface_dim.default.hex}}; -@define-color headerbar_fg_color {{colors.on_surface.default.hex}}; -@define-color popover_bg_color {{colors.surface_dim.default.hex}}; -@define-color popover_fg_color {{colors.on_surface.default.hex}}; -@define-color view_bg_color {{colors.surface.default.hex}}; -@define-color view_fg_color {{colors.on_surface.default.hex}}; -@define-color card_bg_color {{colors.surface.default.hex}}; -@define-color card_fg_color {{colors.on_surface.default.hex}}; -@define-color sidebar_bg_color @window_bg_color; -@define-color sidebar_fg_color @window_fg_color; -@define-color sidebar_border_color @window_bg_color; -@define-color sidebar_backdrop_color @window_bg_color; diff --git a/Assets/Matugen/templates/gtk3.css b/Assets/Matugen/templates/gtk3.css new file mode 120000 index 00000000..bbb0f953 --- /dev/null +++ b/Assets/Matugen/templates/gtk3.css @@ -0,0 +1 @@ +gtk4.css \ No newline at end of file diff --git a/Assets/Matugen/templates/gtk4.css b/Assets/Matugen/templates/gtk4.css index a3676c4a..e5ae1352 100644 --- a/Assets/Matugen/templates/gtk4.css +++ b/Assets/Matugen/templates/gtk4.css @@ -3,19 +3,20 @@ * Generated with Matugen */ -@define-color accent_color {{colors.primary_fixed_dim.default.hex}}; -@define-color accent_fg_color {{colors.on_primary_fixed.default.hex}}; -@define-color accent_bg_color {{colors.primary_fixed_dim.default.hex}}; -@define-color window_bg_color {{colors.surface_dim.default.hex}}; +@define-color accent_color {{colors.primary.default.hex}}; +@define-color accent_bg_color {{colors.primary.default.hex}}; +@define-color accent_fg_color {{colors.on_primary.default.hex}}; +@define-color window_bg_color {{colors.surface.default.hex}}; @define-color window_fg_color {{colors.on_surface.default.hex}}; -@define-color headerbar_bg_color {{colors.surface_dim.default.hex}}; +@define-color headerbar_bg_color {{colors.surface.default.hex}}; @define-color headerbar_fg_color {{colors.on_surface.default.hex}}; -@define-color popover_bg_color {{colors.surface_dim.default.hex}}; -@define-color popover_fg_color {{colors.on_surface.default.hex}}; +@define-color popover_bg_color {{colors.surface_variant.default.hex}}; +@define-color popover_fg_color {{colors.on_surface_variant.default.hex}}; @define-color view_bg_color {{colors.surface.default.hex}}; @define-color view_fg_color {{colors.on_surface.default.hex}}; @define-color card_bg_color {{colors.surface.default.hex}}; @define-color card_fg_color {{colors.on_surface.default.hex}}; + @define-color sidebar_bg_color @window_bg_color; @define-color sidebar_fg_color @window_fg_color; @define-color sidebar_border_color @window_bg_color;