From 74a059b52067494c78b1cd3f6cb8d1c594362131 Mon Sep 17 00:00:00 2001
From: Suguru Hirahara <luixxiul@users.noreply.github.com>
Date: Tue, 5 Jul 2022 11:17:11 +0000
Subject: [PATCH] Move mx_EventTile_continuation out of
 mx_EventTile:not([data-layout=bubble]) (#8941)

* Move mx_EventTile_continuation out of mx_EventTile:not([data-layout=bubble])

Signed-off-by: Suguru Hirahara <luixxiul@users.noreply.github.com>

* Manage mx_EventTile_continuation declarations on one file

Signed-off-by: Suguru Hirahara <luixxiul@users.noreply.github.com>
---
 res/css/views/rooms/_EventBubbleTile.scss |  4 ----
 res/css/views/rooms/_EventTile.scss       | 22 ++++++++++++++--------
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/res/css/views/rooms/_EventBubbleTile.scss b/res/css/views/rooms/_EventBubbleTile.scss
index 52c115891a..08acc7b3b3 100644
--- a/res/css/views/rooms/_EventBubbleTile.scss
+++ b/res/css/views/rooms/_EventBubbleTile.scss
@@ -73,10 +73,6 @@ limitations under the License.
         margin-right: 0;
     }
 
-    &.mx_EventTile_continuation {
-        margin-top: 2px;
-    }
-
     &.mx_EventTile_highlight {
         &::before {
             background-color: $event-highlight-bg-color;
diff --git a/res/css/views/rooms/_EventTile.scss b/res/css/views/rooms/_EventTile.scss
index 0d927e9903..c7e5f22084 100644
--- a/res/css/views/rooms/_EventTile.scss
+++ b/res/css/views/rooms/_EventTile.scss
@@ -191,6 +191,10 @@ $left-gutter: 64px;
                 background-color: $event-highlight-bg-color;
             }
         }
+
+        &.mx_EventTile_continuation .mx_EventTile_line {
+            clear: both;
+        }
     }
 
     &[data-layout=group] {
@@ -238,6 +242,16 @@ $left-gutter: 64px;
             position: absolute;
             z-index: 9;
         }
+
+        &.mx_EventTile_continuation {
+            padding-top: 0px !important;
+        }
+    }
+
+    &[data-layout=bubble] {
+        &.mx_EventTile_continuation {
+            margin-top: 2px;
+        }
     }
 }
 
@@ -275,19 +289,11 @@ $left-gutter: 64px;
         }
     }
 
-    &.mx_EventTile_continuation {
-        padding-top: 0px !important;
-    }
-
     .mx_MessageTimestamp {
         left: 0px;
         text-align: center;
     }
 
-    &.mx_EventTile_continuation .mx_EventTile_line {
-        clear: both;
-    }
-
     /* this is used for the tile for the event which is selected via the URL.
      * TODO: ultimately we probably want some transition on here.
      */