From ef002a2e22b136c5695168ab4636b402da739099 Mon Sep 17 00:00:00 2001
From: Germain Souquet <germain@souquet.com>
Date: Wed, 21 Jul 2021 11:41:52 +0200
Subject: [PATCH 1/2] Fix replies line clamping

---
 res/css/views/rooms/_EventTile.scss | 25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/res/css/views/rooms/_EventTile.scss b/res/css/views/rooms/_EventTile.scss
index 99b74265c7..09a55aa014 100644
--- a/res/css/views/rooms/_EventTile.scss
+++ b/res/css/views/rooms/_EventTile.scss
@@ -212,19 +212,6 @@ $hover-select-border: 4px;
         text-decoration: none;
     }
 
-    /* all the overflow-y: hidden; are to trap Zalgos -
-       but they introduce an implicit overflow-x: auto.
-       so make that explicitly hidden too to avoid random
-       horizontal scrollbars occasionally appearing, like in
-       https://github.com/vector-im/vector-web/issues/1154
-        */
-    .mx_EventTile_content {
-        display: block;
-        overflow-y: hidden;
-        overflow-x: hidden;
-        margin-right: 34px;
-    }
-
     /* De-zalgoing */
     .mx_EventTile_body {
         overflow-y: hidden;
@@ -311,6 +298,18 @@ $hover-select-border: 4px;
     }
 }
 
+/* all the overflow-y: hidden; are to trap Zalgos -
+   but they introduce an implicit overflow-x: auto.
+   so make that explicitly hidden too to avoid random
+   horizontal scrollbars occasionally appearing, like in
+   https://github.com/vector-im/vector-web/issues/1154 */
+.mx_EventTile_content {
+    // display: block;
+    overflow-y: hidden;
+    overflow-x: hidden;
+    margin-right: 34px;
+}
+
 .mx_RoomView_timeline_rr_enabled {
 
     .mx_EventTile:not([data-layout=bubble]) {

From 6308dabcfe63dbcb67d318f44cbbc2c9eec0543f Mon Sep 17 00:00:00 2001
From: Germain <germain@souquet.com>
Date: Wed, 21 Jul 2021 10:43:48 +0100
Subject: [PATCH 2/2] Remove forgotten code comment

---
 res/css/views/rooms/_EventTile.scss | 1 -
 1 file changed, 1 deletion(-)

diff --git a/res/css/views/rooms/_EventTile.scss b/res/css/views/rooms/_EventTile.scss
index 09a55aa014..66f00c2f82 100644
--- a/res/css/views/rooms/_EventTile.scss
+++ b/res/css/views/rooms/_EventTile.scss
@@ -304,7 +304,6 @@ $hover-select-border: 4px;
    horizontal scrollbars occasionally appearing, like in
    https://github.com/vector-im/vector-web/issues/1154 */
 .mx_EventTile_content {
-    // display: block;
     overflow-y: hidden;
     overflow-x: hidden;
     margin-right: 34px;