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: add hover color for active emoji and fix corner

This commit is contained in:
Jonathan Rainville 2021-02-02 11:54:29 -05:00 committed by Iuri Matias
parent 55920a4f9d
commit 51a379efda
4 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ui/app/AppLayouts/Chat/ChatColumn/MessageComponents/EmojiReactions.qml
View File

@ -70,8 +70,9 @@ Item {
width: emojiImage.width + emojiCount.width + (root.imageMargin * 2) + + 8 width: emojiImage.width + emojiCount.width + (root.imageMargin * 2) + + 8
height: 20 height: 20
radius: 10 radius: 10
color: modelData.currentUserReacted ? Style.current.secondaryBackground : color: modelData.currentUserReacted ?
(isHovered ? Style.current.emojiReactionBackgroundHovered : Style.current.emojiReactionBackground) (isHovered ? Style.current.emojiReactionActiveBackgroundHovered : Style.current.secondaryBackground) :
(isHovered ? Style.current.emojiReactionBackgroundHovered : Style.current.emojiReactionBackground)
StatusToolTip { StatusToolTip {
visible: mouseArea.containsMouse visible: mouseArea.containsMouse
@ -82,8 +83,8 @@ Item {
// Rounded corner to cover one corner // Rounded corner to cover one corner
Rectangle { Rectangle {
color: parent.color color: parent.color
width: 8 width: 10
height: 8 height: 10
anchors.top: parent.top anchors.top: parent.top
anchors.left: !isCurrentUser || appSettings.compactMode ? parent.left : undefined anchors.left: !isCurrentUser || appSettings.compactMode ? parent.left : undefined
anchors.leftMargin: 0 anchors.leftMargin: 0
@ -111,8 +112,8 @@ Item {
Rectangle { Rectangle {
color: parent.color color: parent.color
width: 8 width: 10
height: 8 height: 10
anchors.top: parent.top anchors.top: parent.top
anchors.left: !isCurrentUser || appSettings.compactMode ? parent.left : undefined anchors.left: !isCurrentUser || appSettings.compactMode ? parent.left : undefined
anchors.leftMargin: 0 anchors.leftMargin: 0

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

@ -53,6 +53,7 @@ Theme {
property color primarySelectionColor: "#b4c8ff" property color primarySelectionColor: "#b4c8ff"
property color emojiReactionBackground: "#2d2823" property color emojiReactionBackground: "#2d2823"
property color emojiReactionBackgroundHovered: "#3a3632" property color emojiReactionBackgroundHovered: "#3a3632"
property color emojiReactionActiveBackgroundHovered: "#cbd5f1"
property color mentionColor: "#47B6D1" property color mentionColor: "#47B6D1"
property color mentionBgColor: Qt.rgba(71, 182, 209, 0.1) property color mentionBgColor: Qt.rgba(71, 182, 209, 0.1)
property color mentionMessageColor: "#E5F8FD" property color mentionMessageColor: "#E5F8FD"

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

@ -52,6 +52,7 @@ Theme {
property color primarySelectionColor: "#b4c8ff" property color primarySelectionColor: "#b4c8ff"
property color emojiReactionBackground: "#e2e6e9" property color emojiReactionBackground: "#e2e6e9"
property color emojiReactionBackgroundHovered: "#d7dadd" property color emojiReactionBackgroundHovered: "#d7dadd"
property color emojiReactionActiveBackgroundHovered: "#cbd5f1"
property color mentionColor: "#0DA4C9" property color mentionColor: "#0DA4C9"
property color mentionBgColor: "#D4F3FA" property color mentionBgColor: "#D4F3FA"
property color mentionMessageColor: "#E5F8FD" property color mentionMessageColor: "#E5F8FD"

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

@ -41,6 +41,7 @@ QtObject {
property color primarySelectioncolor property color primarySelectioncolor
property color emojiReactionBackground property color emojiReactionBackground
property color emojiReactionBackgroundHovered property color emojiReactionBackgroundHovered
property color emojiReactionActiveBackgroundHovered
property color mentionColor property color mentionColor
property color mentionBgColor property color mentionBgColor
property color mentionMessageColor property color mentionMessageColor