From fc270b435cd559972cff5ece78613de2dc869433 Mon Sep 17 00:00:00 2001
From: Germain Souquet <germain@souquet.com>
Date: Wed, 14 Jul 2021 15:32:35 +0200
Subject: [PATCH] fix group layout

---
 res/css/views/rooms/_EventBubbleTile.scss |  6 +++++-
 res/css/views/rooms/_EventTile.scss       | 26 +++++++++++++++--------
 2 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/res/css/views/rooms/_EventBubbleTile.scss b/res/css/views/rooms/_EventBubbleTile.scss
index 48011951cc..c66f635ffe 100644
--- a/res/css/views/rooms/_EventBubbleTile.scss
+++ b/res/css/views/rooms/_EventBubbleTile.scss
@@ -241,7 +241,7 @@ limitations under the License.
         }
 
         .mx_EventTile {
-            margin: 0 58px;
+            margin: 0 6px;
         }
 
         .mx_EventTile_line {
@@ -258,6 +258,10 @@ limitations under the License.
         }
     }
 
+    & ~ .mx_EventListSummary[data-expanded=false] {
+        padding: 0 34px;
+    }
+
     /* events that do not require bubble layout */
     & ~ .mx_EventListSummary,
     &.mx_EventTile_bad {
diff --git a/res/css/views/rooms/_EventTile.scss b/res/css/views/rooms/_EventTile.scss
index e9d71d557c..d6ad37f6bb 100644
--- a/res/css/views/rooms/_EventTile.scss
+++ b/res/css/views/rooms/_EventTile.scss
@@ -106,15 +106,6 @@ $hover-select-border: 4px;
         border-radius: 8px;
     }
 
-    .mx_RoomView_timeline_rr_enabled,
-    // on ELS we need the margin to allow interaction with the expand/collapse button which is normally in the RR gutter
-    .mx_EventListSummary {
-        .mx_EventTile_line {
-            /* ideally should be 100px, but 95px gives us a max thumbnail size of 800x600, which is nice */
-            margin-right: 110px;
-        }
-    }
-
     .mx_EventTile_reply {
         margin-right: 10px;
     }
@@ -309,6 +300,23 @@ $hover-select-border: 4px;
         bottom: 0;
         right: 0;
     }
+
+    .mx_ReactionsRow {
+        margin: 0;
+        padding: 6px 60px;
+    }
+}
+
+.mx_RoomView_timeline_rr_enabled {
+
+    .mx_EventTile:not([data-layout=bubble]) {
+        .mx_EventTile_line {
+            /* ideally should be 100px, but 95px gives us a max thumbnail size of 800x600, which is nice */
+            margin-right: 110px;
+        }
+    }
+
+    // on ELS we need the margin to allow interaction with the expand/collapse button which is normally in the RR gutter
 }
 
 .mx_EventTile_bubbleContainer {