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

Fix broken thread list timestamp display #7549

Merged
merged 4 commits into from
Jan 19, 2022
Merged

Fix broken thread list timestamp display #7549

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
08c85b6
Fix broken thread list timestamp display
Jan 14, 2022
7daa5a1
Fix event line overflowing
Jan 17, 2022
8406934
Merge branch 'develop' into gsouquet/timestamp-overflow-20556
Jan 18, 2022
3bf90ce
Accomodate ellipsis for disambiguated mxid
Jan 18, 2022
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
36 changes: 33 additions & 3 deletions res/css/views/rooms/_EventTile.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -799,6 +799,10 @@ $left-gutter: 64px;
margin: var(--topOffset) 16px var(--topOffset) 0;
border-radius: 8px;

display: flex;
flex-flow: wrap;
align-items: center;

&:hover {
background-color: $system;
}
Expand Down Expand Up @@ -844,16 +848,42 @@ $left-gutter: 64px;

.mx_SenderProfile {
margin-left: var(--leftOffset) !important;
flex: 1;
margin-right: 12px;

display: inline-flex;
// not a fan of the magic number here, but I just tweaked
// the hardcoded value of the current implementation
max-width: calc(100% - 96px);
}

.mx_SenderProfile_displayName,
.mx_SenderProfile_mxid {
display: block;
overflow: hidden;
text-overflow: ellipsis;
}

.mx_SenderProfile_displayName {
flex: none;
max-width: 100%;
}

.mx_SenderProfile_mxid {
flex: 1;
}

.mx_EventTile_line {
width: 100%;
box-sizing: border-box;
padding-left: var(--leftOffset) !important;
padding-bottom: 0;
}

.mx_MessageTimestamp {
right: 0;
left: auto !important;
top: -23px;
position: initial !important;
max-width: 80px;
width: auto !important;
}
}

Expand Down
2 changes: 1 addition & 1 deletion src/components/views/rooms/EventTile.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1451,11 +1451,11 @@ export default class EventTile extends React.Component<IProps, IState> {
}, <>
{ sender }
{ avatar }
{ timestamp }
<div
className={lineClasses}
key="mx_EventTile_line"
>
{ linkedTimestamp }
{ this.renderE2EPadlock() }
<div className="mx_EventTile_body">
{ MessagePreviewStore.instance.generatePreviewForEvent(this.props.mxEvent) }
Expand Down