Merge remote-tracking branch 'upstream/develop' into task/colors-2

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>

res/css/views/rooms/_Autocomplete.scss

@@ -7,13 +7,15 @@
     background: $background;
     border-bottom: none;
     border-radius: 8px 8px 0 0;
-    max-height: 50vh;
-    overflow: auto;
+    max-height: 35vh;
+    overflow: clip;
+    display: flex;
     box-shadow: 0px -16px 32px $composer-shadow-color;
 }
 
 .mx_Autocomplete_ProviderSection {
     border-bottom: 1px solid $primary-hairline-color;
+    width: 100%;
 }
 
 /* a "block" completion takes up a whole line */
@@ -59,8 +61,8 @@
 
 .mx_Autocomplete_Completion_container_pill {
     margin: 12px;
-    display: flex;
-    flex-flow: wrap;
+    height: 100%;
+    overflow-y: scroll;
 }
 
 .mx_Autocomplete_Completion_container_truncate {
@@ -68,7 +70,6 @@
     .mx_Autocomplete_Completion_subtitle,
     .mx_Autocomplete_Completion_description {
         /* Ellipsis for long names/subtitles/descriptions */
-        max-width: 150px;
         white-space: nowrap;
         overflow: hidden;
         text-overflow: ellipsis;

res/css/views/rooms/_EventBubbleTile.scss

@@ -105,6 +105,8 @@ limitations under the License.
 
         .mx_ReplyTile .mx_SenderProfile {
             display: block;
+            top: unset;
+            left: unset;
         }
 
         .mx_ReactionsRow {
@@ -188,8 +190,6 @@ limitations under the License.
         }
 
         .mx_ReplyThread {
-            margin: 0 calc(-1 * var(--gutterSize));
-
             .mx_EventTile_reply {
                 max-width: 90%;
                 padding: 0;
@@ -223,11 +223,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;
@@ -264,6 +259,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;