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

Moved read receipts to the bottom of the message #3892

Merged
merged 2 commits into from
Mar 6, 2020
Merged

Moved read receipts to the bottom of the message #3892

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ccd3234
Moved read receipts to the bottom of the EventTile.
krkc Jan 21, 2020
1975a8e
Merge branch 'develop' into move-read-receipts-to-bottom
turt2live Mar 6, 2020
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
17 changes: 1 addition & 16 deletions res/css/views/rooms/_EventTile.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -289,17 +289,11 @@ div.mx_EventTile_notSent.mx_EventTile_redacted .mx_UnknownBody {
display: inline-block;
width: 14px;
height: 14px;
top: 29px;
top: -19px;
user-select: none;
z-index: 1;
}

.mx_EventTile_continuation .mx_EventTile_readAvatars,
.mx_EventTile_info .mx_EventTile_readAvatars,
.mx_EventTile_emote .mx_EventTile_readAvatars {
top: 7px;
}

.mx_EventTile_readAvatars .mx_BaseAvatar {
position: absolute;
display: inline-block;
Expand Down Expand Up @@ -634,15 +628,6 @@ div.mx_EventTile_notSent.mx_EventTile_redacted .mx_UnknownBody {
top: 27px;
}

.mx_EventTile_continuation .mx_EventTile_readAvatars,
.mx_EventTile_emote .mx_EventTile_readAvatars {
top: 5px;
}

.mx_EventTile_info .mx_EventTile_readAvatars {
top: 4px;
}

.mx_RoomView_MessageList h2 {
margin-top: 6px;
}
Expand Down
6 changes: 3 additions & 3 deletions src/components/views/rooms/EventTile.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -880,9 +880,6 @@ export default createReactClass({
// tab-index=-1 to allow it to be focusable but do not add tab stop for it, primarily for screen readers
return (
<div className={classes} tabIndex={-1}>
<div className="mx_EventTile_msgOption">
{ readAvatars }
</div>
{ sender }
<div className="mx_EventTile_line">
<a
Expand All @@ -906,6 +903,9 @@ export default createReactClass({
{ reactionsRow }
{ actionBar }
</div>
<div className="mx_EventTile_msgOption">
{ readAvatars }
</div>
{
// The avatar goes after the event tile as it's absolutely positioned to be over the
// event tile line, so needs to be later in the DOM so it appears on top (this avoids
Expand Down