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

Commit 9b92eca

Browse files
authored
Organize rules of GenericEventListSummary on bubble layout (#8599)
* Organize - data-expanded=false Signed-off-by: Suguru Hirahara <[email protected]> * Organize - data-expanded=true Signed-off-by: Suguru Hirahara <[email protected]> * Organize - EventTile Signed-off-by: Suguru Hirahara <[email protected]> * Dedupe mx_GenericEventListSummary[data-layout=bubble] Signed-off-by: Suguru Hirahara <[email protected]> * yarn run lint:style --fix Signed-off-by: Suguru Hirahara <[email protected]>
1 parent bb46846 commit 9b92eca

File tree

1 file changed

+28
-28
lines changed

1 file changed

+28
-28
lines changed

res/css/views/rooms/_EventBubbleTile.scss

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -606,44 +606,44 @@ limitations under the License.
606606
content: "";
607607
clear: both;
608608
}
609-
}
610609

611-
.mx_GenericEventListSummary[data-expanded=false][data-layout=bubble] {
612-
// Align with left edge of bubble tiles
613-
padding: 0 49px;
614-
}
610+
&[data-expanded=false] {
611+
// Align with left edge of bubble tiles
612+
padding: 0 49px;
615613

616-
// ideally we'd use display=contents here for the layout to all work regardless of the *ELS but
617-
// that breaks ScrollPanel's reliance upon offsetTop so we have to have a bit more finesse.
618-
.mx_GenericEventListSummary[data-expanded=true][data-layout=bubble] {
619-
display: flex;
620-
flex-direction: column;
621-
margin: 0;
614+
// increase margin between ELS and the next Event to not have our user avatar overlap the expand/collapse button
615+
+ .mx_EventTile[data-layout=bubble][data-self=true] {
616+
margin-top: 20px;
617+
}
618+
}
622619

623-
.mx_EventTile_info {
624-
padding: 2px 0;
625-
margin-right: 0;
620+
// ideally we'd use display=contents here for the layout to all work regardless of the *ELS but
621+
// that breaks ScrollPanel's reliance upon offsetTop so we have to have a bit more finesse.
622+
&[data-expanded=true] {
623+
display: flex;
624+
flex-direction: column;
625+
margin: 0;
626626

627-
.mx_MessageActionBar {
628-
inset-inline-start: initial; // Reset .mx_EventTile[data-layout="bubble"][data-self="false"] .mx_MessageActionBar
629-
right: 48px; // align with that of right-column bubbles
630-
}
627+
.mx_EventTile_info {
628+
padding: 2px 0;
629+
margin-right: 0;
631630

632-
.mx_ReadReceiptGroup {
633-
right: -18px; // match alignment to RRs of chat bubbles
634-
}
631+
.mx_MessageActionBar {
632+
inset-inline-start: initial; // Reset .mx_EventTile[data-layout="bubble"][data-self="false"] .mx_MessageActionBar
633+
right: 48px; // align with that of right-column bubbles
634+
}
635635

636-
&::before {
637-
right: 0; // match alignment of the hover background to that of chat bubbles
636+
.mx_ReadReceiptGroup {
637+
right: -18px; // match alignment to RRs of chat bubbles
638+
}
639+
640+
&::before {
641+
right: 0; // match alignment of the hover background to that of chat bubbles
642+
}
638643
}
639644
}
640645
}
641646

642-
// increase margin between ELS and the next Event to not have our user avatar overlap the expand/collapse button
643-
.mx_GenericEventListSummary[data-layout=bubble][data-expanded=false] + .mx_EventTile[data-layout=bubble][data-self=true] {
644-
margin-top: 20px;
645-
}
646-
647647
/* events that do not require bubble layout */
648648
.mx_GenericEventListSummary[data-layout=bubble],
649649
.mx_EventTile.mx_EventTile_bad[data-layout=bubble] {

0 commit comments

Comments
 (0)