Skip to content

Commit

Permalink
Fix MessageTimestamp position next to redacted messages on IRC/modern…
Browse files Browse the repository at this point in the history
… layout (#8591)
  • Loading branch information
luixxiul authored May 14, 2022
1 parent e6ec01f commit f54d54b
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 2 deletions.
1 change: 1 addition & 0 deletions res/css/views/messages/_ViewSourceEvent.scss
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
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
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

0 comments on commit f54d54b

Please sign in to comment.