From e55a09906fa9dbb15a5e8f07d23f651ef246613d Mon Sep 17 00:00:00 2001 From: Nicolas Werner Date: Tue, 5 May 2020 23:43:43 +0200 Subject: [PATCH] Misc color fixes --- resources/qml/Avatar.qml | 4 ++-- resources/qml/Reactions.qml | 10 +++++----- resources/qml/TimelineView.qml | 4 ++-- resources/styles/system.qss | 6 +++--- src/UserSettingsPage.cpp | 2 +- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/resources/qml/Avatar.qml b/resources/qml/Avatar.qml index b1007469..ed065270 100644 --- a/resources/qml/Avatar.qml +++ b/resources/qml/Avatar.qml @@ -19,7 +19,7 @@ Rectangle { verticalAlignment: Text.AlignVCenter horizontalAlignment: Text.AlignHCenter visible: img.status != Image.Ready - color: colors.brightText + color: colors.text } Image { @@ -43,5 +43,5 @@ Rectangle { } } } - color: colors.dark + color: colors.base } diff --git a/resources/qml/Reactions.qml b/resources/qml/Reactions.qml index a33d5f61..c70519a4 100644 --- a/resources/qml/Reactions.qml +++ b/resources/qml/Reactions.qml @@ -32,7 +32,7 @@ Flow { text: reaction.text font.family: settings.emoji_font_family opacity: enabled ? 1.0 : 0.3 - color: reaction.hovered ? colors.highlight : colors.buttonText + color: reaction.hovered ? colors.highlight : colors.text horizontalAlignment: Text.AlignHCenter verticalAlignment: Text.AlignVCenter elide: Text.ElideRight @@ -41,7 +41,7 @@ Flow { Rectangle { height: reactionText.implicitHeight width: 1 - color: reaction.hovered ? colors.highlight : colors.buttonText + color: reaction.hovered ? colors.highlight : colors.text } Text { @@ -49,7 +49,7 @@ Flow { text: model.counter font: reaction.font opacity: enabled ? 1.0 : 0.3 - color: reaction.hovered ? colors.highlight : colors.buttonText + color: reaction.hovered ? colors.highlight : colors.text horizontalAlignment: Text.AlignHCenter verticalAlignment: Text.AlignVCenter elide: Text.ElideRight @@ -61,8 +61,8 @@ Flow { implicitWidth: reaction.implicitWidth implicitHeight: reaction.implicitHeight opacity: enabled ? 1 : 0.3 - border.color: (reaction.hovered || model.selfReacted )? colors.highlight : colors.buttonText - color: colors.dark + border.color: (reaction.hovered || model.selfReacted )? colors.highlight : colors.text + color: colors.base border.width: 1 radius: reaction.height / 2.0 } diff --git a/resources/qml/TimelineView.qml b/resources/qml/TimelineView.qml index 28d282a1..a63ca049 100644 --- a/resources/qml/TimelineView.qml +++ b/resources/qml/TimelineView.qml @@ -211,7 +211,7 @@ Page { anchors.horizontalCenter: parent ? parent.horizontalCenter : undefined visible: section.includes(" ") text: chat.model.formatDateSeparator(modelData.timestamp) - color: colors.brightText + color: colors.text height: fontMetrics.height * 1.4 width: contentWidth * 1.2 @@ -219,7 +219,7 @@ Page { horizontalAlignment: Text.AlignHCenter background: Rectangle { radius: parent.height / 2 - color: colors.dark + color: colors.base } } Row { diff --git a/resources/styles/system.qss b/resources/styles/system.qss index dd2a90ef..01951aff 100644 --- a/resources/styles/system.qss +++ b/resources/styles/system.qss @@ -98,15 +98,15 @@ UserMentionsWidget { qproperty-highlightedTitleColor: palette(highlighted-text); qproperty-highlightedSubtitleColor: palette(highlighted-text); - qproperty-hoverTitleColor: palette(highlightedtext); - qproperty-hoverSubtitleColor: palette(highlightedtext); + qproperty-hoverTitleColor: palette(dark); + qproperty-hoverSubtitleColor: palette(dark); qproperty-btnColor: palette(dark); qproperty-btnTextColor: palette(bright-text); qproperty-timestampColor: palette(text); qproperty-highlightedTimestampColor: palette(highlighted-text); - qproperty-hoverTimestampColor: palette(highlighted-text); + qproperty-hoverTimestampColor: palette(dark); qproperty-bubbleBgColor: palette(base); qproperty-bubbleFgColor: palette(text); diff --git a/src/UserSettingsPage.cpp b/src/UserSettingsPage.cpp index 54bce52c..e19aa876 100644 --- a/src/UserSettingsPage.cpp +++ b/src/UserSettingsPage.cpp @@ -115,7 +115,7 @@ UserSettings::applyTheme() /*mid*/ QColor(110, 110, 110), /*text*/ QColor("#333"), /*bright_text*/ QColor("#333"), - /*base*/ QColor("white"), + /*base*/ QColor("#eee"), /*window*/ QColor("white")); lightActive.setColor(QPalette::Highlight, QColor("#38a3d8")); lightActive.setColor(QPalette::ToolTipBase, lightActive.base().color());