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

Commit afcf6ce

Browse files
authored
Include mx_RoomView_timeline_rr_enabled style rules in mx_EventTile[data-layout=group] (#8986)
1 parent 434f39f commit afcf6ce

File tree

1 file changed

+17
-19
lines changed

1 file changed

+17
-19
lines changed

res/css/views/rooms/_EventTile.scss

Lines changed: 17 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -241,6 +241,23 @@ $left-gutter: 64px;
241241
z-index: 9;
242242
}
243243

244+
.mx_RoomView_timeline_rr_enabled & {
245+
$inline-end-margin: 80px; // TODO: Use a spacing variable
246+
247+
.mx_ThreadSummary,
248+
.mx_ThreadSummary_icon,
249+
.mx_EventTile_line {
250+
margin-right: $inline-end-margin;
251+
min-height: $font-14px;
252+
}
253+
254+
.mx_ThreadSummary {
255+
max-width: min(calc(100% - $left-gutter - $inline-end-margin), 600px); // leave space on both left & right gutters
256+
}
257+
258+
// on ELS we need the margin to allow interaction with the expand/collapse button which is normally in the RR gutter
259+
}
260+
244261
&.mx_EventTile_continuation {
245262
padding-top: 0px !important;
246263
}
@@ -484,25 +501,6 @@ $left-gutter: 64px;
484501
}
485502
}
486503

487-
.mx_RoomView_timeline_rr_enabled {
488-
.mx_EventTile[data-layout=group] {
489-
490-
.mx_ThreadSummary,
491-
.mx_ThreadSummary_icon,
492-
.mx_EventTile_line {
493-
/* ideally should be 100px, but 95px gives us a max thumbnail size of 800x600, which is nice */
494-
margin-right: 80px;
495-
min-height: $font-14px;
496-
}
497-
498-
.mx_ThreadSummary {
499-
max-width: min(calc(100% - $left-gutter - 80px), 600px); // leave space on both left & right gutters
500-
}
501-
}
502-
503-
// on ELS we need the margin to allow interaction with the expand/collapse button which is normally in the RR gutter
504-
}
505-
506504
.mx_EventTile_bigEmoji {
507505
font-size: 48px;
508506
line-height: 57px;

0 commit comments

Comments
 (0)