colors: directly use color.

8 files changed, 12 insertions, 12 deletions

diff --git a/bar/ActiveWindow.qml b/bar/ActiveWindow.qml
index 46ac698..351f8b2 100644
--- a/bar/ActiveWindow.qml
+++ b/bar/ActiveWindow.qml
@@ -20,7 +20,7 @@ Rectangle {
     implicitHeight: rowLayout.implicitHeight + General.rectMargin * 2
     anchors.centerIn: parent
 
-    color: Colors.alt
+    color: WallustColors.color4
     // according to docs, null could happen but doesn't seem to happen in practice so..
     // hypr toplevel.activated is always true and doesn't change either so..
     opacity: activated ? 1 : 0
diff --git a/bar/Bar.qml b/bar/Bar.qml
index 95a15a5..3bb3310 100644
--- a/bar/Bar.qml
+++ b/bar/Bar.qml
@@ -43,7 +43,7 @@ Scope {
                     anchors.left: parent.left
                     width: leftRow.width + leftRow.anchors.leftMargin - leftSpacer.width
                     height: leftRow.height
-                    color: Qt.rgba(Colors.background.r, Colors.background.g, Colors.background.b, Bar.bgTransparency)
+                    color: Qt.rgba(WallustColors.background.r, WallustColors.background.g, WallustColors.background.b, Bar.bgTransparency)
                     radius: Bar.moduleRadius
                 }
 
@@ -89,7 +89,7 @@ Scope {
                     anchors.right: parent.right
                     width: rightRow.width + rightRow.anchors.rightMargin - rightSpacer.width
                     height: rightRow.height
-                    color: Qt.rgba(Colors.background.r, Colors.background.g, Colors.background.b, Bar.bgTransparency)
+                    color: Qt.rgba(WallustColors.background.r, WallustColors.background.g, WallustColors.background.b, Bar.bgTransparency)
                     radius: Bar.moduleRadius
                 }
 
diff --git a/bar/Mpris.qml b/bar/Mpris.qml
index 8d1b42f..fe1a6df 100644
--- a/bar/Mpris.qml
+++ b/bar/Mpris.qml
@@ -49,12 +49,12 @@ Item {
             value: root.progress
             background: Rectangle {
                 anchors.fill: parent
-                color: Colors.alt
+                color: WallustColors.color4
                 radius: Style.rounding.smaller - 1
             }
             contentItem: Item {
                 Rectangle {
-                    color: Colors.primary
+                    color: WallustColors.color3
                     radius: Style.rounding.smaller - 1
 
                     Behavior on width {
diff --git a/bar/Network.qml b/bar/Network.qml
index 0141cac..46e73c2 100644
--- a/bar/Network.qml
+++ b/bar/Network.qml
@@ -20,7 +20,7 @@ Item {
 
         implicitWidth: layout.implicitWidth + General.rectMargin * 2
         implicitHeight: Bar.height
-        color: Colors.alt
+        color: WallustColors.color4
         radius: Style.rounding.large
 
         RowLayout {
diff --git a/bar/Power.qml b/bar/Power.qml
index ff4f0a7..66278f0 100644
--- a/bar/Power.qml
+++ b/bar/Power.qml
@@ -21,7 +21,7 @@ Item {
         implicitWidth: layout.implicitWidth + General.rectMargin * 2
         implicitHeight: Bar.height - General.rectMargin
 
-        color: Colors.alt
+        color: WallustColors.color4
         radius: Style.rounding.large
 
         RowLayout {
diff --git a/bar/Resources.qml b/bar/Resources.qml
index af62e18..d66fed6 100644
--- a/bar/Resources.qml
+++ b/bar/Resources.qml
@@ -14,7 +14,7 @@ Item {
         implicitWidth: layout.implicitWidth + Config.General.rectMargin * 2
         implicitHeight: Config.Bar.height - Config.General.rectMargin
 
-        color: Config.Colors.alt
+        color: Config.WallustColors.color4
         radius: Config.Style.rounding.large
 
         RowLayout {
diff --git a/bar/TimeDate.qml b/bar/TimeDate.qml
index 0a0abb6..5844aab 100644
--- a/bar/TimeDate.qml
+++ b/bar/TimeDate.qml
@@ -19,7 +19,7 @@ Item {
         implicitWidth: layout.implicitWidth + General.rectMargin * 2
         implicitHeight: Bar.height
 
-        color: Colors.alt
+        color: WallustColors.color4
         radius: Style.rounding.large
 
         RowLayout {
diff --git a/bar/Workspace.qml b/bar/Workspace.qml
index 5fb5faf..977abe1 100644
--- a/bar/Workspace.qml
+++ b/bar/Workspace.qml
@@ -36,7 +36,7 @@ Item {
         implicitWidth: Bar.workspaceActiveIconSize
         implicitHeight: Bar.workspaceIconSize - Bar.workspaceHorizontalSpacing
         radius: Bar.workspaceRounding
-        color: root.activeOccupied ? Colors.alt : Colors.foreground
+        color: root.activeOccupied ? WallustColors.color4 : WallustColors.foreground
         opacity: root.activeOccupied ? Bar.workspaceActiveOpacity : Bar.workspaceEmptyOpacity / 3
         Behavior on x {
             ISpringAnimation {}
@@ -72,14 +72,14 @@ Item {
                 implicitWidth: active ? Bar.workspaceActiveIconSize : Bar.workspaceIconSize
                 implicitHeight: Bar.workspaceIconSize - Bar.workspaceHorizontalSpacing
                 radius: Bar.workspaceRounding
-                color: st.isOccupied ? Colors.alt : Colors.foreground
+                color: st.isOccupied ? WallustColors.color4 : WallustColors.foreground
                 opacity: active && st.isOccupied ? Bar.workspaceActiveOpacity : st.isOccupied ? Bar.workspaceOpacity : Bar.workspaceEmptyOpacity
 
                 Icon {
                     anchors.centerIn: parent
                     text: !st.isUrgent ? Icons.ws[index + 1] : Icons.ws['urgent']
                     font.pixelSize: !active ? Bar.workspaceIconSize / 2 : Bar.workspaceActiveIconSize / 2.5
-                    color: Colors.foreground
+                    color: WallustColors.foreground
                     opacity: !st.isOccupied ? 0 : 1
                     Behavior on font.pixelSize {
                         ISpringAnimation {}