matrix/matrix-react-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-11-11 20:22:36 +03:00
Code Activity

Merge pull request #5567 from SimonBrandner/fix-read-receipts

Browse Source 
Fix read receipts?
This commit is contained in:
Travis Ralston
2021-02-24 11:21:42 -07:00
committed by GitHub
parent 83078a67c2 3f0e8e4afc
commit dee7c7b556
2 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
res/css/views/rooms/_EventTile.scss
View File

@@ -257,17 +257,13 @@ $left-gutter: 64px;
display: inline-block; display: inline-block;
width: 14px; width: 14px;
height: 14px; height: 14px;
top: 29px; // This aligns the avatar with the last line of the
// message. We want to move it one line up - 2.2rem
top: -2.2rem;
user-select: none; user-select: none;
z-index: 1; 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 { .mx_EventTile_readAvatars .mx_BaseAvatar {
position: absolute; position: absolute;
display: inline-block; display: inline-block;

6
src/components/views/rooms/EventTile.js
View File

@@ -952,9 +952,6 @@ export default class EventTile extends React.Component {
return ( return (
<div className={classes} tabIndex={-1} aria-live={ariaLive} aria-atomic="true"> <div className={classes} tabIndex={-1} aria-live={ariaLive} aria-atomic="true">
{ ircTimestamp } { ircTimestamp }
<div className="mx_EventTile_msgOption">
{ readAvatars }
</div>
{ sender } { sender }
{ ircPadlock } { ircPadlock }
<div className="mx_EventTile_line"> <div className="mx_EventTile_line">
@@ -973,6 +970,9 @@ export default class EventTile extends React.Component {
{ reactionsRow } { reactionsRow }
{ actionBar } { actionBar }
</div> </div>
<div className="mx_EventTile_msgOption">
{ readAvatars }
</div>
{ {
// The avatar goes after the event tile as it's absolutely positioned to be over the // 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 // event tile line, so needs to be later in the DOM so it appears on top (this avoids