diff options
| -rw-r--r-- | bar/ActiveWindow.qml | 2 | ||||
| -rw-r--r-- | bar/Bar.qml | 4 | ||||
| -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-- | components/IText.qml | 2 | ||||
| -rw-r--r-- | config/Colors.qml | 51 |
10 files changed, 13 insertions, 64 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 {} diff --git a/components/IText.qml b/components/IText.qml index 29543b0..2810f31 100644 --- a/components/IText.qml +++ b/components/IText.qml @@ -12,7 +12,7 @@ Text { // renderType: Text.NativeRendering textFormat: Text.PlainText - color: Colors.foreground + color: WallustColors.foreground font { family: Style.font.family.iosevka diff --git a/config/Colors.qml b/config/Colors.qml index fe81638..522b5ff 100644 --- a/config/Colors.qml +++ b/config/Colors.qml @@ -3,57 +3,6 @@ import Quickshell import QtQuick Singleton { - readonly property color background: WallustColors.background - readonly property color foreground: WallustColors.foreground - readonly property color surface: WallustColors.color0 - readonly property color primary: WallustColors.color3 - readonly property color alt: WallustColors.color4 - readonly property color accent: WallustColors.color1 - readonly property color success: WallustColors.color2 - readonly property color warning: WallustColors.color3 - readonly property color error: WallustColors.color1 - readonly property color info: WallustColors.color4 - readonly property color textSecondary: WallustColors.color7 - readonly property color border: WallustColors.color8 - readonly property color highlight: WallustColors.color5 - readonly property color disabled: WallustColors.color6 - readonly property color muted: WallustColors.color2 - - // actual colors - // @define-color BLACK rgba (59, 66, 82, 1); - // @define-color RED rgba (191, 97, 106, 1); - // @define-color GREEN rgba (163, 190, 140, 1); - // @define-color YELLOW rgba (235, 203, 139, 1); - // @define-color BLUE rgba (129, 161, 193, 1); - // @define-color MAGENTA rgba (180, 142, 173, 1); - // @define-color CYAN rgba (136, 192, 208, 1); - // @define-color WHITE rgba (229, 233, 240, 1); - // @define-color ALTBLACK rgba (76, 86, 106, 1); - // @define-color ALTRED rgba (191, 97, 106, 1); - // @define-color ALTGREEN rgba (163, 190, 140, 1); - // @define-color ALTYELLOW rgba (235, 203, 139, 1); - // @define-color ALTBLUE rgba (129, 161, 193, 1); - // @define-color ALTMAGENTA rgba (180, 142, 173, 1); - // @define-color ALTCYAN rgba (143, 188, 187, 1); - // @define-color ALTWHITE rgba (236, 239, 244, 1); - - // readonly property color black: Qt.rgba(59, 66, 82) - // readonly property color red: Qt.rgba(191, 97, 106) - // readonly property color green: Qt.rgba(163, 190, 140) - // readonly property color yellow: Qt.rgba(235, 203, 139) - // readonly property color blue: Qt.rgba(129, 161, 193) - // readonly property color magenta: Qt.rgba(180, 142, 173) - // readonly property color cyan: Qt.rgba(136, 192, 208) - // readonly property color white: Qt.rgba(229, 233, 240) - // readonly property color altBlack: Qt.rgba(76, 86, 106) - // readonly property color altRed: Qt.rgba(191, 97, 106) - // readonly property color altGreen: Qt.rgba(163, 190, 140) - // readonly property color altYellow: Qt.rgba(235, 203, 139) - // readonly property color altBlue: Qt.rgba(129, 161, 193) - // readonly property color altMagenta: Qt.rgba(180, 142, 173) - // readonly property color altCyan: Qt.rgba(143, 188, 187) - // readonly property color altWhite: Qt.rgba(236, 239, 244) - 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) |