Skip to content

Commit 6903c9d

Browse files
luixxiulJanBurp
authored andcommitted
Fix read avatars overflow from the right chat panel with a maximized widget on bubble message layout (matrix-org#8470)
* Fix RR overflow on the right chat panel Signed-off-by: Suguru Hirahara <luixxiul@users.noreply.github.com> * Align with RR outside of info tile Signed-off-by: Suguru Hirahara <luixxiul@users.noreply.github.com> * Use inset-inline property Signed-off-by: Suguru Hirahara <luixxiul@users.noreply.github.com>
1 parent 910e467 commit 6903c9d

File tree

3 files changed

+24
-10
lines changed

3 files changed

+24
-10
lines changed

res/css/views/right_panel/_TimelineCard.scss

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,8 @@ limitations under the License.
9292
}
9393

9494
.mx_EventTile_msgOption {
95-
margin-right: 2px;
95+
// Override mx_EventTile_msgOption of mx_EventTile:not([data-layout="bubble"])
96+
margin-inline-end: 0;
9697
}
9798

9899
&.mx_EventTile_info {
@@ -149,11 +150,19 @@ limitations under the License.
149150
flex-basis: 48px; // 12 (padding on message list) + 36 (padding on event lines)
150151
}
151152

152-
&.mx_BaseCard {
153-
// For a chat timeline on the right panel when the widget is maximised
154-
// TODO: rename ThreadPanel
155-
&.mx_ThreadPanel {
156-
padding-right: 8px; // .mx_RightPanel padding
153+
.mx_GenericEventListSummary_unstyledList, // RR next to a message on the event list summary
154+
.mx_RoomView_MessageList { // RR next to a message on the messsge list
155+
.mx_EventTile[data-layout=bubble] {
156+
.mx_ReadReceiptGroup {
157+
// 6px: scroll bar width (magic number)
158+
inset-inline-end: calc(-1 * var(--ReadReceiptGroup_EventBubbleTile-spacing-end) + $container-gap-width + 6px);
159+
}
160+
161+
&.mx_EventTile_info {
162+
.mx_ReadReceiptGroup {
163+
inset-inline-end: -4px; // align with RR outside of info tile
164+
}
165+
}
157166
}
158167
}
159168
}

res/css/views/rooms/_EventBubbleTile.scss

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -539,8 +539,10 @@ limitations under the License.
539539

540540
.mx_ReadReceiptGroup {
541541
position: absolute;
542+
542543
// as close to right gutter without clipping as possible
543-
right: -78px;
544+
inset-inline-end: calc(-1 * var(--ReadReceiptGroup_EventBubbleTile-spacing-end));
545+
544546
// (EventTileLine.line-height - ReadReceiptGroup.height) / 2
545547
// this centers the ReadReceiptGroup if we’ve got a single line
546548
bottom: calc(($font-18px - 24px) / 2);
@@ -691,15 +693,16 @@ limitations under the License.
691693

692694
.mx_MessageActionBar {
693695
inset-inline-start: initial; // Reset .mx_EventTile[data-layout="bubble"][data-self="false"] .mx_MessageActionBar
694-
right: 48px; // align with that of right-column bubbles
696+
inset-inline-end: 48px; // align with that of right-column bubbles
695697
}
696698

697699
.mx_ReadReceiptGroup {
698-
right: -18px; // match alignment to RRs of chat bubbles
700+
// match alignment to RRs of chat bubbles
701+
inset-inline-end: calc(-1 * var(--ReadReceiptGroup_EventBubbleTile-spacing-end) + 60px);
699702
}
700703

701704
&::before {
702-
right: 0; // match alignment of the hover background to that of chat bubbles
705+
inset-inline-end: 0; // match alignment of the hover background to that of chat bubbles
703706
}
704707
}
705708
}

res/css/views/rooms/_ReadReceiptGroup.scss

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@ limitations under the License.
1515
*/
1616

1717
.mx_ReadReceiptGroup {
18+
--ReadReceiptGroup_EventBubbleTile-spacing-end: 78px;
19+
1820
position: relative;
1921
display: inline-block;
2022
// This aligns the avatar with the last line of the

0 commit comments

Comments
 (0)