From 440e61d7a883bf974ee49bfc27844911293e10a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Tinkl?= Date: Thu, 7 Sep 2023 13:55:09 +0200 Subject: [PATCH] fix(StatusButton): user correct text color for primary/dark --- ui/StatusQ/src/StatusQ/Controls/StatusButton.qml | 2 +- ui/StatusQ/src/StatusQ/Core/Theme/StatusDarkTheme.qml | 1 + ui/StatusQ/src/StatusQ/Core/Theme/StatusLightTheme.qml | 1 + ui/StatusQ/src/StatusQ/Core/Theme/ThemePalette.qml | 1 + 4 files changed, 4 insertions(+), 1 deletion(-) diff --git a/ui/StatusQ/src/StatusQ/Controls/StatusButton.qml b/ui/StatusQ/src/StatusQ/Controls/StatusButton.qml index 80b84b1b94..2c49442c29 100644 --- a/ui/StatusQ/src/StatusQ/Controls/StatusButton.qml +++ b/ui/StatusQ/src/StatusQ/Controls/StatusButton.qml @@ -16,7 +16,7 @@ StatusBaseButton { disabledColor: Theme.palette.baseColor2 - textColor: type === StatusBaseButton.Type.Primary ? Theme.palette.white : + textColor: type === StatusBaseButton.Type.Primary ? Theme.palette.indirectColor4 : type === StatusBaseButton.Type.Normal ? Theme.palette.primaryColor1 : type === StatusBaseButton.Type.Warning ? Theme.palette.warningColor1 : Theme.palette.dangerColor1 diff --git a/ui/StatusQ/src/StatusQ/Core/Theme/StatusDarkTheme.qml b/ui/StatusQ/src/StatusQ/Core/Theme/StatusDarkTheme.qml index 7c556d470a..35b4b7662e 100644 --- a/ui/StatusQ/src/StatusQ/Core/Theme/StatusDarkTheme.qml +++ b/ui/StatusQ/src/StatusQ/Core/Theme/StatusDarkTheme.qml @@ -50,6 +50,7 @@ ThemePalette { indirectColor1: getColor('black') indirectColor2: getColor('black', 0.7) indirectColor3: getColor('black', 0.4) + indirectColor4: getColor('graphite3') miscColor1: getColor('blue5') miscColor2: getColor('purple') diff --git a/ui/StatusQ/src/StatusQ/Core/Theme/StatusLightTheme.qml b/ui/StatusQ/src/StatusQ/Core/Theme/StatusLightTheme.qml index 29cee88298..059782202e 100644 --- a/ui/StatusQ/src/StatusQ/Core/Theme/StatusLightTheme.qml +++ b/ui/StatusQ/src/StatusQ/Core/Theme/StatusLightTheme.qml @@ -48,6 +48,7 @@ ThemePalette { indirectColor1: getColor('white') indirectColor2: getColor('white', 0.7) indirectColor3: getColor('white', 0.4) + indirectColor4: getColor('white') miscColor1: getColor('blue2') miscColor2: getColor('purple') diff --git a/ui/StatusQ/src/StatusQ/Core/Theme/ThemePalette.qml b/ui/StatusQ/src/StatusQ/Core/Theme/ThemePalette.qml index f218bb236a..fc383b0111 100644 --- a/ui/StatusQ/src/StatusQ/Core/Theme/ThemePalette.qml +++ b/ui/StatusQ/src/StatusQ/Core/Theme/ThemePalette.qml @@ -159,6 +159,7 @@ QtObject { property color indirectColor1 property color indirectColor2 property color indirectColor3 + property color indirectColor4 property color miscColor1 property color miscColor2