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

Fix MessageTimestamp position next to redacted messages on IRC/modern layout #8591

Merged
merged 1 commit into from
May 14, 2022
Merged

Fix MessageTimestamp position next to redacted messages on IRC/modern layout #8591

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions res/css/views/messages/_ViewSourceEvent.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ limitations under the License.
font-size: $font-12px;
width: 100%;
overflow-x: auto; // Cancel overflow setting of .mx_EventTile_content
line-height: normal; // Align with avatar and E2E icon

pre,
code {
Expand Down
6 changes: 5 additions & 1 deletion res/css/views/right_panel/_ThreadPanel.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,8 +258,12 @@ limitations under the License.
}

&:not([data-layout=bubble]) {
.mx_MessageTimestamp {
top: 2px; // Align with avatar
}

.mx_EventTile_avatar {
top: 1.5px;
top: 0; // Align with hidden event content
left: calc($MessageTimestamp_width + 14px - 4px); // 14px: avatar width, 4px: align with text
z-index: 9; // position above the hover styling
}
Expand Down
5 changes: 4 additions & 1 deletion res/css/views/rooms/_EventTile.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,10 @@ $threadInfoLineHeight: calc(2 * $font-12px); // See: _commons.scss

.mx_EventTile_line {
padding: 3px 0 2px; // Align with mx_EventTile_avatar and mx_EventTile_e2eIcon

.mx_MessageTimestamp {
top: 0;
}
}
}

Expand Down Expand Up @@ -278,7 +282,6 @@ $threadInfoLineHeight: calc(2 * $font-12px); // See: _commons.scss
.mx_GenericEventListSummary:not([data-layout=bubble]) {
.mx_EventTile_line {
padding-left: $left-gutter;
line-height: normal;

.mx_RedactedBody {
line-height: 1; // remove spacing between lines
Expand Down