Skip to content
This repository was archived by the owner on Sep 11, 2024. It is now read-only.

Commit b50060b

Browse files
authored
Fix MAB overlapping or overflowing in bubbles layout and threads regressions (#7569)
* Fix MAB overlapping or overflowing in bubbles layout * Fix bubbles in threads timestamps positioning regression
1 parent 1d45921 commit b50060b

File tree

2 files changed

+29
-11
lines changed

2 files changed

+29
-11
lines changed

res/css/views/rooms/_EventBubbleTile.scss

Lines changed: 23 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,10 @@ limitations under the License.
131131
left: -34px;
132132
}
133133

134+
.mx_MessageActionBar {
135+
right: -100px; // to make sure it doesn't overflow to the left or cover sender profile
136+
}
137+
134138
--backgroundColor: $eventbubble-others-bg;
135139
}
136140

@@ -194,7 +198,10 @@ limitations under the License.
194198
border-top-left-radius: var(--cornerRadius);
195199
border-top-right-radius: var(--cornerRadius);
196200

197-
> a { // timestamp wrapper anchor
201+
// the selector here is quite weird because timestamps can appear linked & unlinked and in different places
202+
// in the DOM depending on the specific rendering context
203+
> a, // timestamp wrapper anchor
204+
.mx_MessageActionBar + .mx_MessageTimestamp {
198205
position: absolute;
199206
padding: 4px 8px;
200207
bottom: 0;
@@ -223,7 +230,8 @@ limitations under the License.
223230
}
224231

225232
&.mx_EventTile_sticker {
226-
> a {
233+
> a, // timestamp wrapper anchor
234+
.mx_MessageActionBar + .mx_MessageTimestamp {
227235
// position timestamps for stickers to the right of the un-bubbled sticker
228236
right: unset;
229237
left: 100%;
@@ -338,7 +346,8 @@ limitations under the License.
338346
.mx_EventTile_reply {
339347
max-width: 90%;
340348
padding: 0;
341-
> a {
349+
> a, // timestamp wrapper anchor
350+
.mx_MessageActionBar + .mx_MessageTimestamp {
342351
display: none !important;
343352
}
344353
}
@@ -439,14 +448,17 @@ limitations under the License.
439448
margin-left: 9px;
440449
}
441450

442-
.mx_EventTile_line > a { // timestamp wrapper anchor
443-
right: auto;
444-
left: -77px;
445-
bottom: unset;
446-
align-self: center;
447-
448-
.mx_MessageTimestamp {
449-
vertical-align: middle;
451+
.mx_EventTile_line {
452+
> a, // timestamp wrapper anchor
453+
.mx_MessageActionBar + .mx_MessageTimestamp {
454+
right: auto;
455+
left: -77px;
456+
bottom: unset;
457+
align-self: center;
458+
459+
.mx_MessageTimestamp, &.mx_MessageTimestamp {
460+
vertical-align: middle;
461+
}
450462
}
451463
}
452464
}

res/css/views/rooms/_EventTile.scss

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -911,6 +911,12 @@ $left-gutter: 64px;
911911
margin: 0 -13px 0 0; // align with normal messages
912912
}
913913
}
914+
915+
&[data-self=false] {
916+
.mx_MessageActionBar {
917+
right: -60px; // smaller overlap, otherwise it'll overflow on the right
918+
}
919+
}
914920
}
915921

916922
.mx_EventTile[data-layout=group] {

0 commit comments

Comments
 (0)