diff options
| -rw-r--r-- | bar/Mpris.qml | 4 | ||||
| -rw-r--r-- | bar/Network.qml | 2 | ||||
| -rw-r--r-- | bar/Power.qml | 2 | ||||
| -rw-r--r-- | bar/Resources.qml | 2 | ||||
| -rw-r--r-- | bar/TimeDate.qml | 2 | ||||
| -rw-r--r-- | bar/Workspace.qml | 6 | ||||
| -rw-r--r-- | config/Colors.qml | 5 |
7 files changed, 12 insertions, 11 deletions
diff --git a/bar/Mpris.qml b/bar/Mpris.qml index 506232c..93872cb 100644 --- a/bar/Mpris.qml +++ b/bar/Mpris.qml @@ -52,14 +52,14 @@ Item { value: activePlayer?.position || 0 background: IRect { anchors.fill: parent - color: Colors.background2 + color: Colors.accent radius: Style.rounding.smaller } contentItem: Item { IRect { width: pBar.visualPosition * parent.width height: parent.height - color: Qt.rgba(Colors.background1.r, Colors.background1.g, Colors.background1.b, General.accentTransparency * 1.5) + color: Qt.rgba(Colors.accentAlt.r, Colors.accentAlt.g, Colors.accentAlt.b, General.accentTransparency * 1.5) radius: Style.rounding.smaller Behavior on width { diff --git a/bar/Network.qml b/bar/Network.qml index fcd035d..7774035 100644 --- a/bar/Network.qml +++ b/bar/Network.qml @@ -30,7 +30,7 @@ Item { implicitWidth: layout.implicitWidth + General.rectMargin * 2 implicitHeight: Bar.height - color: Colors.background2 + color: Colors.accent radius: Style.rounding.large RowLayout { diff --git a/bar/Power.qml b/bar/Power.qml index cd4ab1e..73660b3 100644 --- a/bar/Power.qml +++ b/bar/Power.qml @@ -26,7 +26,7 @@ Item { implicitWidth: layout.implicitWidth + General.rectMargin * 2 implicitHeight: Bar.height - General.rectMargin - color: Colors.background2 + color: Colors.accent radius: Style.rounding.large RowLayout { diff --git a/bar/Resources.qml b/bar/Resources.qml index 641074c..c902a92 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.background2 + color: Config.Colors.accent radius: Config.Style.rounding.large RowLayout { diff --git a/bar/TimeDate.qml b/bar/TimeDate.qml index 57373b2..dee498c 100644 --- a/bar/TimeDate.qml +++ b/bar/TimeDate.qml @@ -24,7 +24,7 @@ Item { implicitWidth: layout.width + General.rectMargin * 2 implicitHeight: Bar.height - color: Colors.background2 + color: Colors.accent radius: Style.rounding.large RowLayout { diff --git a/bar/Workspace.qml b/bar/Workspace.qml index cd80db2..da5f6db 100644 --- a/bar/Workspace.qml +++ b/bar/Workspace.qml @@ -45,7 +45,7 @@ Item { source: activeRect radius: 8 cached: true - color: root.activeOccupied ? Colors.background2 : Colors.foreground1 + color: root.activeOccupied ? Colors.accent : Colors.foreground1 opacity: root.activeOccupied ? Bar.wsActiveOpacity : Bar.wsEmptyOpacity / 3 Behavior on color { @@ -68,7 +68,7 @@ Item { implicitWidth: Bar.wsActiveIconSize implicitHeight: Bar.wsIconSize - Bar.wsHorizontalSpacing radius: Bar.wsRounding - color: root.activeOccupied ? Colors.background2 : Colors.foreground1 + color: root.activeOccupied ? Colors.accent : Colors.foreground1 opacity: root.activeOccupied ? Bar.wsActiveOpacity : Bar.wsEmptyOpacity / 3 Behavior on x { ISpringAnimation {} @@ -110,7 +110,7 @@ Item { implicitWidth: active ? Bar.wsActiveIconSize : Bar.wsIconSize implicitHeight: Bar.wsIconSize - Bar.wsHorizontalSpacing radius: Bar.wsRounding - color: st.isOccupied ? Colors.background2 : Colors.foreground1 + color: st.isOccupied ? Colors.accent : Colors.foreground1 opacity: active && st.isOccupied ? Bar.wsActiveOpacity : st.isOccupied ? Bar.wsOpacity : Bar.wsEmptyOpacity Icon { diff --git a/config/Colors.qml b/config/Colors.qml index 4b5c6a9..6b510f7 100644 --- a/config/Colors.qml +++ b/config/Colors.qml @@ -2,8 +2,6 @@ pragma Singleton import Quickshell import QtQuick -import qs.config - Singleton { readonly property color background1: WallustColors.color8 // readonly property color background2: WallustColors.color0 @@ -25,6 +23,9 @@ Singleton { readonly property color foreground2: WallustColors.color15 readonly property color foreground3: WallustColors.color7 + readonly property color accent: background2 + readonly property color accentAlt: background1 + readonly property color black: Qt.rgba(59 / 255, 66 / 255, 82 / 255, 1) readonly property color red: Qt.rgba(191 / 255, 97 / 255, 106 / 255, 1) readonly property color green: Qt.rgba(163 / 255, 190 / 255, 140 / 255, 1) |