From 2aebf103ed3f7379afa006e6f5392f4e072a9bd8 Mon Sep 17 00:00:00 2001
From: Germain Souquet <germain@souquet.com>
Date: Tue, 13 Apr 2021 11:20:53 +0100
Subject: [PATCH 1/3] always display message timestamp in IRC layout replies

---
 res/css/views/rooms/_EventTile.scss |  1 +
 res/css/views/rooms/_IRCLayout.scss | 15 +++++++++++++++
 2 files changed, 16 insertions(+)

diff --git a/res/css/views/rooms/_EventTile.scss b/res/css/views/rooms/_EventTile.scss
index 028d9a7556..50adaea305 100644
--- a/res/css/views/rooms/_EventTile.scss
+++ b/res/css/views/rooms/_EventTile.scss
@@ -159,6 +159,7 @@ $left-gutter: 64px;
 .mx_EventTile.focus-visible:focus-within > div > a > .mx_MessageTimestamp,
 .mx_IRCLayout .mx_EventTile_last > a > .mx_MessageTimestamp,
 .mx_IRCLayout .mx_EventTile:hover > a > .mx_MessageTimestamp,
+.mx_IRCLayout .mx_ReplyThread .mx_EventTile > a > .mx_MessageTimestamp,
 .mx_IRCLayout .mx_EventTile.mx_EventTile_actionBarFocused > a > .mx_MessageTimestamp,
 .mx_IRCLayout .mx_EventTile.focus-visible:focus-within > a > .mx_MessageTimestamp {
     visibility: visible;
diff --git a/res/css/views/rooms/_IRCLayout.scss b/res/css/views/rooms/_IRCLayout.scss
index 21baa795e6..8419ecba8d 100644
--- a/res/css/views/rooms/_IRCLayout.scss
+++ b/res/css/views/rooms/_IRCLayout.scss
@@ -136,6 +136,21 @@ $irc-line-height: $font-18px;
         }
     }
 
+    .mx_ReplyThread {
+        .mx_MessageTimestamp {
+            width: initial;
+        }
+
+        /**
+         * adding the icon back in the document flow
+         * if it's not present, there's no unwanted wasted space
+         */
+        .mx_EventTile_e2eIcon {
+            position: relative;
+            order: -1;
+        }
+    }
+
     blockquote {
         margin: 0;
     }

From e520f7462cc403712859e6cbab07aa6df7eefc8e Mon Sep 17 00:00:00 2001
From: Germain Souquet <germain@souquet.com>
Date: Tue, 13 Apr 2021 11:21:47 +0100
Subject: [PATCH 2/3] Fix emotes left spacing in replies for the IRC layout

---
 res/css/views/rooms/_IRCLayout.scss | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/res/css/views/rooms/_IRCLayout.scss b/res/css/views/rooms/_IRCLayout.scss
index 8419ecba8d..e9661d45b1 100644
--- a/res/css/views/rooms/_IRCLayout.scss
+++ b/res/css/views/rooms/_IRCLayout.scss
@@ -137,6 +137,12 @@ $irc-line-height: $font-18px;
     }
 
     .mx_ReplyThread {
+        .mx_EventTile_emote {
+            > .mx_EventTile_avatar {
+                margin-left: initial;
+            }
+        }
+
         .mx_MessageTimestamp {
             width: initial;
         }

From cd48a8f3ab7b446f93ad1845ab4b434524738d4f Mon Sep 17 00:00:00 2001
From: Germain Souquet <germain@souquet.com>
Date: Wed, 14 Apr 2021 08:15:32 +0100
Subject: [PATCH 3/3] merge .mx_ReplyThread declaration in _IRCLayout.css

---
 res/css/views/rooms/_IRCLayout.scss | 40 ++++++++++++++---------------
 1 file changed, 19 insertions(+), 21 deletions(-)

diff --git a/res/css/views/rooms/_IRCLayout.scss b/res/css/views/rooms/_IRCLayout.scss
index e9661d45b1..b6b901757c 100644
--- a/res/css/views/rooms/_IRCLayout.scss
+++ b/res/css/views/rooms/_IRCLayout.scss
@@ -136,27 +136,6 @@ $irc-line-height: $font-18px;
         }
     }
 
-    .mx_ReplyThread {
-        .mx_EventTile_emote {
-            > .mx_EventTile_avatar {
-                margin-left: initial;
-            }
-        }
-
-        .mx_MessageTimestamp {
-            width: initial;
-        }
-
-        /**
-         * adding the icon back in the document flow
-         * if it's not present, there's no unwanted wasted space
-         */
-        .mx_EventTile_e2eIcon {
-            position: relative;
-            order: -1;
-        }
-    }
-
     blockquote {
         margin: 0;
     }
@@ -237,6 +216,25 @@ $irc-line-height: $font-18px;
                 }
             }
         }
+
+        .mx_EventTile_emote {
+            > .mx_EventTile_avatar {
+                margin-left: initial;
+            }
+        }
+
+        .mx_MessageTimestamp {
+            width: initial;
+        }
+
+        /**
+         * adding the icon back in the document flow
+         * if it's not present, there's no unwanted wasted space
+         */
+        .mx_EventTile_e2eIcon {
+            position: relative;
+            order: -1;
+        }
     }
 
     .mx_ProfileResizer {