From 49849edbac3b76a8ab1e89fbd1da194a2bb3fc7b Mon Sep 17 00:00:00 2001 From: Jonathan Rainville Date: Tue, 22 Sep 2020 10:47:25 -0400 Subject: [PATCH] fix: channel description and reaction colors in dark mode --- .../ChatColumn/MessageComponents/ChannelIdentifier.qml | 7 +++++-- .../Chat/ChatColumn/MessageComponents/EmojiReactions.qml | 3 +-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/ui/app/AppLayouts/Chat/ChatColumn/MessageComponents/ChannelIdentifier.qml b/ui/app/AppLayouts/Chat/ChatColumn/MessageComponents/ChannelIdentifier.qml index 518466bffe..8b54399a11 100644 --- a/ui/app/AppLayouts/Chat/ChatColumn/MessageComponents/ChannelIdentifier.qml +++ b/ui/app/AppLayouts/Chat/ChatColumn/MessageComponents/ChannelIdentifier.qml @@ -73,13 +73,16 @@ Item { Rectangle { id: channelDescription - width: 330 - height: childrenRect.height + visible: descText.visible + width: visible ? 330 : 0 + height: visible ? childrenRect.height : 0 anchors.horizontalCenter: parent.horizontalCenter anchors.top: channelName.bottom anchors.topMargin: 16 + color: Style.current.transparent StyledText { + id: descText wrapMode: Text.Wrap text: { switch(chatsModel.activeChannel.chatType) { diff --git a/ui/app/AppLayouts/Chat/ChatColumn/MessageComponents/EmojiReactions.qml b/ui/app/AppLayouts/Chat/ChatColumn/MessageComponents/EmojiReactions.qml index ec893cfe01..5a2cd3f73d 100644 --- a/ui/app/AppLayouts/Chat/ChatColumn/MessageComponents/EmojiReactions.qml +++ b/ui/app/AppLayouts/Chat/ChatColumn/MessageComponents/EmojiReactions.qml @@ -47,8 +47,7 @@ Item { radius: 10 anchors.left: (index === 0) ? parent.left: parent.children[index-1].right anchors.leftMargin: (index === 0) ? 0 : root.imageMargin - color: modelData.currentUserReacted ? Style.current.blue : Style.current.grey - + color: modelData.currentUserReacted ? Style.current.primary : Style.current.inputBackground // Rounded corner to cover one corner Rectangle {