From 945fd1441cc0b3a3e1870d1c7239ad9e38b5742d Mon Sep 17 00:00:00 2001 From: Don Williams Date: Mon, 26 Jan 2026 05:20:46 -0500 Subject: Fixed colors on Modern-Combined waybars with a global theme On branch development Your branch is up to date with 'origin/development'. Changes to be committed: modified: config/waybar/style/[Extra] Modern-Combined - Transparent.css modified: config/waybar/style/[Extra] Modern-Combined.css --- .../style/[Extra] Modern-Combined - Transparent.css | 21 +++++++++++---------- config/waybar/style/[Extra] Modern-Combined.css | 21 +++++++++++---------- 2 files changed, 22 insertions(+), 20 deletions(-) diff --git a/config/waybar/style/[Extra] Modern-Combined - Transparent.css b/config/waybar/style/[Extra] Modern-Combined - Transparent.css index b357ea6c..38f2686d 100644 --- a/config/waybar/style/[Extra] Modern-Combined - Transparent.css +++ b/config/waybar/style/[Extra] Modern-Combined - Transparent.css @@ -13,21 +13,22 @@ @define-color teal-trans rgba(1, 117, 84, 0.5); @define-color cyan rgba(53, 140, 169, 1); -@define-color background-module @color1; -@define-color background-module2 @color11; +@define-color background-module @background-alt; +@define-color background-module2 @background; @define-color border-color @color12; @define-color button-color @color10; @define-color button-hover @color13; -@define-color backgroundlight @color12; -@define-color backgrounddark #FFFFFF; -@define-color workspacesbackground1 @color12; -@define-color workspacesbackground2 #FFFFFF; +/* Theme-aware base colors */ +@define-color backgroundlight @background-alt; +@define-color backgrounddark @background; +@define-color workspacesbackground1 @background-alt; +@define-color workspacesbackground2 @background; @define-color bordercolor @color11; -@define-color textcolor1 @color12; -@define-color textcolor2 #FFFFFF; -@define-color textcolor3 #FFFFFF; -@define-color iconcolor #FFFFFF; +@define-color textcolor1 @foreground; +@define-color textcolor2 @foreground; +@define-color textcolor3 @foreground; +@define-color iconcolor @foreground; @import '../../.config/waybar/wallust/colors-waybar.css'; @import "../waybar/style/catppuccin-themes/latte.css"; diff --git a/config/waybar/style/[Extra] Modern-Combined.css b/config/waybar/style/[Extra] Modern-Combined.css index ab32852b..90976bd3 100644 --- a/config/waybar/style/[Extra] Modern-Combined.css +++ b/config/waybar/style/[Extra] Modern-Combined.css @@ -13,21 +13,22 @@ @define-color teal-trans rgba(1, 117, 84, 0.5); @define-color cyan rgba(53, 140, 169, 1); -@define-color background-module @color1; -@define-color background-module2 @color11; +@define-color background-module @background-alt; +@define-color background-module2 @background; @define-color border-color @color12; @define-color button-color @color10; @define-color button-hover @color13; -@define-color backgroundlight @color12; -@define-color backgrounddark #FFFFFF; -@define-color workspacesbackground1 @color12; -@define-color workspacesbackground2 #FFFFFF; +/* Theme-aware base colors */ +@define-color backgroundlight @background-alt; +@define-color backgrounddark @background; +@define-color workspacesbackground1 @background-alt; +@define-color workspacesbackground2 @background; @define-color bordercolor @color11; -@define-color textcolor1 @color12; -@define-color textcolor2 #FFFFFF; -@define-color textcolor3 #FFFFFF; -@define-color iconcolor #FFFFFF; +@define-color textcolor1 @foreground; +@define-color textcolor2 @foreground; +@define-color textcolor3 @foreground; +@define-color iconcolor @foreground; @import '../../.config/waybar/wallust/colors-waybar.css'; @import "../waybar/style/catppuccin-themes/latte.css"; -- cgit v1.2.3