Adress design issues.

- The input field was not using the  theming.
- After submitting the reply, the text and icon on the left were moving.

Signed-off-by: Camila <hello@camila.codes>

diff --git a/src/gui/tray/ActivityItemContent.qml b/src/gui/tray/ActivityItemContent.qml
index 7b49e07bdce3c07f276e17c3001660ae1839f92a..4b4f1e3ffdcd75fc1496ef9b89800a13ad7d2e46 100644 (file)
--- a/src/gui/tray/ActivityItemContent.qml
+++ b/src/gui/tray/ActivityItemContent.qml
@@ -134,7 +134,7 @@ RowLayout {
         Label {
             id: talkReplyMessageSent
             text: root.activityData.messageSent
-            height: (text === "") ? 0 : implicitHeight
+            height: implicitHeight
             width: parent.width
             elide: Text.ElideRight
             wrapMode: Text.Wrap

diff --git a/src/gui/tray/TalkReplyTextField.qml b/src/gui/tray/TalkReplyTextField.qml
index a53c88099a0c5ad59f9e3ff8942a3581dd5e4bd4..9c9d501c85a4befbc2189b70ac6df8d1e075aece 100644 (file)
--- a/src/gui/tray/TalkReplyTextField.qml
+++ b/src/gui/tray/TalkReplyTextField.qml
@@ -34,7 +34,7 @@ Item {
             id: replyMessageTextFieldBorder
             radius: 24
             border.width: 1
-            border.color: Style.ncBlue
+            border.color: parent.activeFocus ? UserModel.currentUser.accentColor : Style.menuBorder
             color: Style.backgroundColor
         }
 
@@ -48,10 +48,10 @@ Item {
             onClicked: root.sendReplyMessage()
 
             icon {
-                source: "image://svgimage-custom-color/send.svg" + "/" + Style.ncBlue
+                source: "image://svgimage-custom-color/send.svg" + "/" + Style.menuBorder
                 width: 38
                 height: 38
-                color: hovered || !sendReplyMessageButton.enabled? Style.menuBorder : Style.ncBlue
+                color: hovered || !sendReplyMessageButton.enabled? Style.menuBorder : UserModel.currentUser.accentColor
             }
 
             anchors {