From 19cfac8cef4a2c74a52ea4b8a798476a1487df9f Mon Sep 17 00:00:00 2001 From: Suguru Hirahara Date: Sat, 14 May 2022 13:46:33 +0900 Subject: [PATCH] Fix MessageTimestamp position next to redacted messages - Adjust its position next to hidden events content Signed-off-by: Suguru Hirahara --- res/css/views/messages/_ViewSourceEvent.scss | 1 + res/css/views/right_panel/_ThreadPanel.scss | 6 +++++- res/css/views/rooms/_EventTile.scss | 5 ++++- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/res/css/views/messages/_ViewSourceEvent.scss b/res/css/views/messages/_ViewSourceEvent.scss index 55b0b86d927..c0803eafd05 100644 --- a/res/css/views/messages/_ViewSourceEvent.scss +++ b/res/css/views/messages/_ViewSourceEvent.scss @@ -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 { diff --git a/res/css/views/right_panel/_ThreadPanel.scss b/res/css/views/right_panel/_ThreadPanel.scss index 4d7c00bff11..9ca2432221f 100644 --- a/res/css/views/right_panel/_ThreadPanel.scss +++ b/res/css/views/right_panel/_ThreadPanel.scss @@ -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 } diff --git a/res/css/views/rooms/_EventTile.scss b/res/css/views/rooms/_EventTile.scss index 99db86d53c5..ad157b4c368 100644 --- a/res/css/views/rooms/_EventTile.scss +++ b/res/css/views/rooms/_EventTile.scss @@ -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; + } } } @@ -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