status-im
/
status-desktop
mirror of https://github.com/status-im/status-desktop.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix: fix reply colors in dark mode

This commit is contained in:
Jonathan Rainville 2020-09-22 10:30:49 -04:00 committed by Iuri Matias
parent 06a4353dd1
commit a35130ff68
4 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ui/app/AppLayouts/Chat/ChatColumn/MessageComponents/ChatReply.qml
View File

@ -5,17 +5,18 @@ import "../../../../../imports"
Rectangle {
property alias textField: lblReplyMessage
property bool longReply: false
property color elementsColor: isCurrentUser ? Style.current.chatReplyCurrentUser : Style.current.secondaryText
id: chatReply
color: Style.current.lightBlue
visible: responseTo != "" && replyMessageIndex > -1
// childrenRect.height shows a binding loop for soem reason, so we use heights instead
height: this.visible ? lblReplyAuthor.height + ((repliedMessageType === Constants.imageType ? imgReplyImage.height : lblReplyMessage.height) + 5 + 8) : 0
color: Style.current.transparent
StyledTextEdit {
id: lblReplyAuthor
text: "↳" + repliedMessageAuthor
color: Style.current.darkGrey
color: chatReply.elementsColor
readOnly: true
selectByMouse: true
wrapMode: Text.Wrap
@ -41,7 +42,7 @@ Rectangle {
anchors.topMargin: 5
text: Emoji.parse(Utils.linkifyAndXSS(repliedMessageContent), "26x26");
textFormat: Text.RichText
color: Style.current.darkGrey
color: chatReply.elementsColor
readOnly: true
selectByMouse: true
wrapMode: Text.Wrap
@ -56,6 +57,6 @@ Rectangle {
anchors.left: lblReplyMessage.left
anchors.right: lblReplyMessage.right
anchors.rightMargin: chatTextItem.chatHorizontalPadding
color: Style.current.darkGrey
color: chatReply.elementsColor
}
}

2
ui/app/AppLayouts/Chat/ChatColumn/MessageComponents/NormalMessage.qml
View File

@ -96,8 +96,6 @@ Item {
anchors.leftMargin: Style.current.padding
anchors.right: parent.right
anchors.rightMargin: chatBox.chatHorizontalPadding
color: isCurrentUser ? Style.current.blue : Style.current.lightBlue
}
ChatText {

1
ui/imports/Themes/DarkTheme.qml
View File

@ -46,6 +46,7 @@ Theme {
property color primaryMenuItemTextHover: almostBlack
property color backgroundTertiary: tenPercentBlue
property color pillButtonTextColor: almostBlack
property color chatReplyCurrentUser: darkerGrey
property color buttonForegroundColor: blue
property color buttonBackgroundColor: secondaryBackground

2
ui/imports/Themes/LightTheme.qml
View File

@ -12,6 +12,7 @@ Theme {
property color darkAccentBlue: "#2946C4"
property color transparent: "#00000000"
property color darkGrey: "#939BA1"
property color lighterDarkGrey: "#b3bec6"
property color lightBlueText: "#8f9fec"
property color darkBlue: "#3c55c9"
property color darkBlueBtn: "#5a70dd"
@ -44,6 +45,7 @@ Theme {
property color primaryMenuItemTextHover: white
property color backgroundTertiary: tenPercentBlue
property color pillButtonTextColor: white
property color chatReplyCurrentUser: lighterDarkGrey
property color buttonForegroundColor: blue
property color buttonBackgroundColor: secondaryBackground