Merge remote-tracking branch 'upstream/develop' into fix/bubble-highlight/18295

res/css/views/rooms/_EventBubbleTile.scss

@@ -109,6 +109,8 @@ limitations under the License.
 
         .mx_ReplyTile .mx_SenderProfile {
             display: block;
+            top: unset;
+            left: unset;
         }
 
         .mx_ReactionsRow {
@@ -192,8 +194,6 @@ limitations under the License.
         }
 
         .mx_ReplyThread {
-            margin: 0 calc(-1 * var(--gutterSize));
-
             .mx_EventTile_reply {
                 max-width: 90%;
                 padding: 0;
@@ -227,11 +227,6 @@ limitations under the License.
         margin-left: -9px;
     }
 
-    .mx_ReplyThread {
-        border-left-width: 2px;
-        border-left-color: $eventbubble-reply-color;
-    }
-
     /* Special layout scenario for "Unable To Decrypt (UTD)" events */
     &.mx_EventTile_bad > .mx_EventTile_line {
         display: grid;
@@ -268,6 +263,7 @@ limitations under the License.
 }
 
 .mx_EventTile.mx_EventTile_bubbleContainer[data-layout=bubble],
+.mx_EventTile.mx_EventTile_leftAlignedBubble[data-layout=bubble],
 .mx_EventTile.mx_EventTile_info[data-layout=bubble],
 .mx_EventListSummary[data-layout=bubble][data-expanded=false] {
     --backgroundColor: transparent;