imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Display redacted body on ThreadView in the same way as normal messages (#9016)

Browse source
This commit is contained in:
Suguru Hirahara 2023-03-08 11:23:41 +00:00 • committed by GitHub
parent 6fa00a20b0
commit f60f7a19af
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 238 additions and 61 deletions
Download patch file Download diff file Expand all files Collapse all files

93
res/css/views/rooms/_EventTile.pcss
View file

@ -1039,19 +1039,6 @@ $left-gutter: 64px;
display: none;
}
.mx_EventTile_line {
padding-block: var(--BaseCard_EventTile_line-padding-block);
}
.mx_EventTile_line,
.mx_ReactionsRow {
padding-inline-start: 0; /* Cancel inherited padding value for event message and reactions row */
}
.mx_ReactionsRow {
padding-inline-end: 0;
}
/* handling for hidden events (e.g reactions) in the thread view */
&.mx_EventTile_info {
.mx_EventTile_avatar {
@ -1078,8 +1065,6 @@ $left-gutter: 64px;
.mx_EventTile_content,
.mx_RedactedBody {
width: auto;
/* 14px: avatar width, 6px: 20px - 14px */
margin-inline-start: calc(var(--ThreadView_group_spacing-start) + 14px + 6px);
font-size: $line-height;
}
}
@ -1096,12 +1081,29 @@ $left-gutter: 64px;
.mx_MessageTimestamp {
top: 2px; /* Align with avatar */
}
&.mx_EventTile_selected .mx_EventTile_line,
.mx_EventTile_line {
.mx_EventTile_content,
.mx_RedactedBody {
/* 14px: avatar width, 6px: 20px - 14px */
margin-inline-start: calc(14px + 6px);
}
}
}
&[data-layout="bubble"] {
.mx_EventTile_avatar {
inset-inline-start: 0;
}
&.mx_EventTile_selected .mx_EventTile_line,
.mx_EventTile_line {
.mx_EventTile_content,
.mx_RedactedBody {
margin-inline-start: calc(var(--ThreadView_group_spacing-start) + 14px + 6px);
}
}
}
}
@ -1109,59 +1111,38 @@ $left-gutter: 64px;
&[data-layout="group"] {
padding-block-start: $spacing-16;
.mx_EventTile_line,
.mx_ReactionsRow {
margin-inline-end: var(--ThreadView_group_spacing-end);
}
.mx_EventTile_line {
padding-block: var(--BaseCard_EventTile_line-padding-block);
/* Add padding to align message text with summary text */
/* See: .mx_EventTile[data-layout="group"] .mx_EventTile_line */
padding-inline-start: var(--ThreadView_group_spacing-start);
.mx_EventTile_content {
&.mx_EditMessageComposer {
padding-inline-start: 0; /* align start of first letter with that of the event body */
}
}
}
.mx_ReactionsRow {
/* Align with message text and summary text */
margin-inline-start: var(--ThreadView_group_spacing-start);
}
&.mx_EventTile_continuation {
padding-block-start: 0; /* Cancel padding-block-start */
}
}
&[data-layout="group"] {
width: 100%;
.mx_EventTile_content,
.mx_HiddenBody,
.mx_RedactedBody,
.mx_UnknownBody,
.mx_MPollBody,
.mx_MLocationBody,
.mx_ReplyChain_wrapper,
.mx_ReactionsRow {
margin-inline-start: var(--ThreadView_group_spacing-start);
margin-inline-end: var(--ThreadView_group_spacing-end);
.mx_EventTile_content,
.mx_HiddenBody,
.mx_RedactedBody,
.mx_MImageBody {
margin: 0;
}
}
.mx_ReplyChain_wrapper {
.mx_MLocationBody,
.mx_UnknownBody {
/* Error message inside ReplyTile */
margin-inline: unset;
}
}
.mx_EventTile_mediaLine {
/* such as MImageBody */
> div,
> span {
margin-inline-start: var(--ThreadView_group_spacing-start);
margin-inline-end: var(--ThreadView_group_spacing-end);
}
/* such as MAudioBody and MFileBody */
> span {
display: block; /* Apply the margin declarations to span element */
}
}
.mx_EventTile_senderDetails {
display: flex;
align-items: center;