From b6847289ffc884063ca2d67479247b5bc4e2a9f2 Mon Sep 17 00:00:00 2001
From: bbedward <bbedward@gmail.com>
Date: Wed, 3 Dec 2025 23:14:20 -0500
Subject: [PATCH] keybinds tab: change colors

---
 quickshell/Modules/Settings/KeybindsTab.qml | 20 ++++----------------
 quickshell/Widgets/KeybindItem.qml          | 16 ++++++++--------
 2 files changed, 12 insertions(+), 24 deletions(-)

diff --git a/quickshell/Modules/Settings/KeybindsTab.qml b/quickshell/Modules/Settings/KeybindsTab.qml
index 8952b48d..002658c4 100644
--- a/quickshell/Modules/Settings/KeybindsTab.qml
+++ b/quickshell/Modules/Settings/KeybindsTab.qml
@@ -258,20 +258,8 @@ Item {
                 readonly property bool showWarning: status.included && status.overriddenBy > 0
                 readonly property bool showSetup: !status.exists
 
-                color: {
-                    if (showError || showSetup)
-                        return Theme.withAlpha(Theme.error, 0.15);
-                    if (showWarning)
-                        return Theme.withAlpha(Theme.warning ?? Theme.tertiary, 0.15);
-                    return "transparent";
-                }
-                border.color: {
-                    if (showError || showSetup)
-                        return Theme.withAlpha(Theme.error, 0.3);
-                    if (showWarning)
-                        return Theme.withAlpha(Theme.warning ?? Theme.tertiary, 0.3);
-                    return "transparent";
-                }
+                color: (showError || showWarning || showSetup) ? Theme.withAlpha(Theme.primary, 0.15) : "transparent"
+                border.color: (showError || showWarning || showSetup) ? Theme.withAlpha(Theme.primary, 0.3) : "transparent"
                 border.width: 1
                 visible: (showError || showWarning || showSetup) && !KeybindsService.loading
 
@@ -288,7 +276,7 @@ Item {
                         DankIcon {
                             name: warningBox.showWarning ? "info" : "warning"
                             size: Theme.iconSize
-                            color: warningBox.showWarning ? (Theme.warning ?? Theme.tertiary) : Theme.error
+                            color: Theme.primary
                             anchors.verticalCenter: parent.verticalCenter
                         }
 
@@ -309,7 +297,7 @@ Item {
                                 }
                                 font.pixelSize: Theme.fontSizeMedium
                                 font.weight: Font.Medium
-                                color: warningBox.showWarning ? (Theme.warning ?? Theme.tertiary) : Theme.error
+                                color: Theme.primary
                             }
 
                             StyledText {
diff --git a/quickshell/Widgets/KeybindItem.qml b/quickshell/Widgets/KeybindItem.qml
index df174b51..82bbdc65 100644
--- a/quickshell/Widgets/KeybindItem.qml
+++ b/quickshell/Widgets/KeybindItem.qml
@@ -312,14 +312,14 @@ Item {
                         DankIcon {
                             name: "warning"
                             size: 14
-                            color: Theme.warning ?? Theme.tertiary
+                            color: Theme.primary
                             visible: root.hasConfigConflict
                         }
 
                         StyledText {
                             text: I18n.tr("Overridden by config")
                             font.pixelSize: Theme.fontSizeSmall
-                            color: Theme.warning ?? Theme.tertiary
+                            color: Theme.primary
                             visible: root.hasConfigConflict
                         }
 
@@ -382,8 +382,8 @@ Item {
                     Layout.fillWidth: true
                     Layout.preferredHeight: conflictColumn.implicitHeight + Theme.spacingM * 2
                     radius: Theme.cornerRadius
-                    color: Theme.withAlpha(Theme.warning ?? Theme.tertiary, 0.15)
-                    border.color: Theme.withAlpha(Theme.warning ?? Theme.tertiary, 0.3)
+                    color: Theme.withAlpha(Theme.primary, 0.15)
+                    border.color: Theme.withAlpha(Theme.primary, 0.3)
                     border.width: 1
                     visible: root.hasConfigConflict
 
@@ -400,14 +400,14 @@ Item {
                             DankIcon {
                                 name: "warning"
                                 size: 16
-                                color: Theme.warning ?? Theme.tertiary
+                                color: Theme.primary
                             }
 
                             StyledText {
                                 text: I18n.tr("This bind is overridden by config.kdl")
                                 font.pixelSize: Theme.fontSizeSmall
                                 font.weight: Font.Medium
-                                color: Theme.warning ?? Theme.tertiary
+                                color: Theme.primary
                                 Layout.fillWidth: true
                             }
                         }
@@ -663,13 +663,13 @@ Item {
                     DankIcon {
                         name: "warning"
                         size: 16
-                        color: Theme.warning
+                        color: Theme.primary
                     }
 
                     StyledText {
                         text: I18n.tr("Conflicts with: %1").arg(root._conflicts.map(c => c.desc).join(", "))
                         font.pixelSize: Theme.fontSizeSmall
-                        color: Theme.warning
+                        color: Theme.primary
                         Layout.fillWidth: true
                         elide: Text.ElideRight
                     }