From 2141711d9ebd890bb29ea012f02ec26ae845d72d Mon Sep 17 00:00:00 2001
From: nizune <9-nizune@users.noreply.gitlab.insrt.uk>
Date: Fri, 9 Jul 2021 21:46:35 +0200
Subject: [PATCH 1/2] Fixed username in replies

---
 external/lang                                 |  2 +-
 .../messaging/attachments/MessageReply.tsx    | 22 ++++++++++++++++---
 src/pages/settings/panes/Experiments.tsx      |  4 ++--
 3 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/external/lang b/external/lang
index de2b94c8..2054052c 160000
--- a/external/lang
+++ b/external/lang
@@ -1 +1 @@
-Subproject commit de2b94c8d8615b732cbbec3679041e73fd3c7640
+Subproject commit 2054052c791ff2396dcbde68ae257fa13a93ab6c
diff --git a/src/components/common/messaging/attachments/MessageReply.tsx b/src/components/common/messaging/attachments/MessageReply.tsx
index 435f2d54..90005b8a 100644
--- a/src/components/common/messaging/attachments/MessageReply.tsx
+++ b/src/components/common/messaging/attachments/MessageReply.tsx
@@ -29,10 +29,11 @@ export const ReplyBase = styled.div<{
 }>`
     gap: 4px;
     display: flex;
-    margin: 0 30px;
+    margin-inline-start: 30px;
+    margin-inline-end: 12px;
+    margin-bottom: 4px;
     font-size: 0.8em;
     user-select: none;
-    margin-bottom: 4px;
     align-items: center;
     color: var(--secondary-foreground);
 
@@ -42,6 +43,21 @@ export const ReplyBase = styled.div<{
         text-overflow: ellipsis;
     }
 
+    .user {
+        display: flex;
+        gap: 4px;
+        flex-shrink: 0;
+        font-weight: 600;
+        align-items: center;
+
+        /*&::before {
+            position:relative;
+            width: 50px;
+            height: 2px;
+            background: red;
+        }*/
+    }
+
     .content {
         gap: 4px;
         display: flex;
@@ -120,7 +136,7 @@ export function MessageReply({ index, channel, id }: Props) {
                     {message.author === SYSTEM_USER_ID ? (
                         <SystemMessage message={message} hideInfo />
                     ) : <>
-                        <UserShort user={user} size={16} />
+                        <div className="user"><UserShort user={user} size={16} /></div>
                         <div className="content" onClick={() => {
                             let obj = ctx.client.channels.get(channel);
                             if (obj?.channel_type === 'TextChannel') {
diff --git a/src/pages/settings/panes/Experiments.tsx b/src/pages/settings/panes/Experiments.tsx
index 973fc7ea..4ff72adb 100644
--- a/src/pages/settings/panes/Experiments.tsx
+++ b/src/pages/settings/panes/Experiments.tsx
@@ -31,9 +31,9 @@ export function Component(props: Props) {
                                 : "EXPERIMENTS_DISABLE",
                             key,
                         })
-                    }>
+                    }
+                    description={ EXPERIMENTS[key].description }>
                     { EXPERIMENTS[key].title }
-                    <p>{ EXPERIMENTS[key].description }</p>
                 </Checkbox>
             ))}
             {AVAILABLE_EXPERIMENTS.length === 0 && (

From 4eb046197739ac3d5b1ff1759d27633444831dd7 Mon Sep 17 00:00:00 2001
From: nizune <9-nizune@users.noreply.gitlab.insrt.uk>
Date: Fri, 9 Jul 2021 21:56:09 +0200
Subject: [PATCH 2/2] Updated replies

---
 .../messaging/attachments/MessageReply.tsx     | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/src/components/common/messaging/attachments/MessageReply.tsx b/src/components/common/messaging/attachments/MessageReply.tsx
index 90005b8a..57510184 100644
--- a/src/components/common/messaging/attachments/MessageReply.tsx
+++ b/src/components/common/messaging/attachments/MessageReply.tsx
@@ -50,6 +50,13 @@ export const ReplyBase = styled.div<{
         font-weight: 600;
         align-items: center;
 
+        span {
+            cursor: pointer;
+            &:hover {
+                text-decoration: underline;
+            }
+        }
+
         /*&::before {
             position:relative;
             width: 50px;
@@ -64,6 +71,17 @@ export const ReplyBase = styled.div<{
         cursor: pointer;
         align-items: center;
         flex-direction: row;
+        transition: filter 1s ease-in-out;
+        transition: transform ease-in-out .1s;
+        filter: brightness(1);
+
+        &:hover {
+            filter: brightness(2);
+        }
+
+        &:active {
+            transform: translateY(1px);
+        }
 
         > * {
             pointer-events: none;