From 1c3099d4406992f89885c1bdac4e9ce50d5a5adc Mon Sep 17 00:00:00 2001 From: miruka Date: Fri, 10 Jul 2020 13:27:35 -0400 Subject: [PATCH] Improve positive/middle/negativeBackground colors Make them a bit lighter, and use these background colors for presence orbs and room header device verified status instead of text colors --- src/gui/Pages/Chat/RoomHeader.qml | 4 ++-- src/themes/Glass.qpl | 12 ++++++------ src/themes/Midnight.qpl | 12 ++++++------ 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/gui/Pages/Chat/RoomHeader.qml b/src/gui/Pages/Chat/RoomHeader.qml index 1807ade1..9373a669 100644 --- a/src/gui/Pages/Chat/RoomHeader.qml +++ b/src/gui/Pages/Chat/RoomHeader.qml @@ -135,8 +135,8 @@ Rectangle { icon.color: chat.roomInfo.unverified_devices ? - theme.colors.warningText : - theme.colors.positiveText + theme.colors.middleBackground : + theme.colors.positiveBackground toolTip.text: chat.roomInfo.unverified_devices ? diff --git a/src/themes/Glass.qpl b/src/themes/Glass.qpl index cef87ffe..3a6709b2 100644 --- a/src/themes/Glass.qpl +++ b/src/themes/Glass.qpl @@ -51,13 +51,13 @@ colors: color strongAccentElement: hsluv(hue, saturation * 1.5, intensity * 72, 1) color positiveBackground: - hsluv(155, saturation * 1.5, intensity * 52, 1) + hsluv(155, saturation * 1.5, intensity * 65, 1) color middleBackground: - hsluv(60, saturation * 1.5, intensity * 52, 1) + hsluv(60, saturation * 1.5, intensity * 65, 1) color negativeBackground: - hsluv(0, saturation * 1.5, intensity * 52, 1) + hsluv(0, saturation * 1.5, intensity * 54, 1) color alertBackground: negativeBackground @@ -268,9 +268,9 @@ controls: int dimLightness: colors.dimColoredTextIntensity presence: - color online: colors.positiveText - color unavailable: colors.warningText - color offline: hsluv(0, 0, 30, 1) + color online: colors.positiveBackground + color unavailable: colors.middleBackground + color offline: hsluv(0, 0, 60, 1) color border: "black" real opacity: 1.0 real radius: 6.0 * uiScale diff --git a/src/themes/Midnight.qpl b/src/themes/Midnight.qpl index 8df8990b..7ac0d09c 100644 --- a/src/themes/Midnight.qpl +++ b/src/themes/Midnight.qpl @@ -54,13 +54,13 @@ colors: color strongAccentElement: hsluv(hue, saturation * 1.5, intensity * 72, 1) color positiveBackground: - hsluv(155, saturation * 1.5, intensity * 52, 1) + hsluv(155, saturation * 1.5, intensity * 65, 1) color middleBackground: - hsluv(60, saturation * 1.5, intensity * 52, 1) + hsluv(60, saturation * 1.5, intensity * 65, 1) color negativeBackground: - hsluv(0, saturation * 1.5, intensity * 52, 1) + hsluv(0, saturation * 1.5, intensity * 54, 1) color alertBackground: negativeBackground @@ -274,9 +274,9 @@ controls: int dimLightness: colors.dimColoredTextIntensity presence: - color online: colors.positiveText - color unavailable: colors.warningText - color offline: hsluv(0, 0, 30, 1) + color online: colors.positiveBackground + color unavailable: colors.middleBackground + color offline: hsluv(0, 0, 60, 1) color border: "black" real opacity: 1.0 real radius: 6.0 * uiScale