From f33c930c418475fbe8f02c0fbc73a86f7100e3b2 Mon Sep 17 00:00:00 2001 From: Travis Ralston Date: Thu, 5 Mar 2020 17:24:51 -0700 Subject: [PATCH] Revert "Merge pull request #3892 from krkc/move-read-receipts-to-bottom" This reverts commit 191abb5b0d9e642c69ea8a9cad44b05f59ce06f4. --- res/css/views/rooms/_EventTile.scss | 17 ++++++++++++++++- src/components/views/rooms/EventTile.js | 6 +++--- 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/res/css/views/rooms/_EventTile.scss b/res/css/views/rooms/_EventTile.scss index 09827fe3bb..d292c729dd 100644 --- a/res/css/views/rooms/_EventTile.scss +++ b/res/css/views/rooms/_EventTile.scss @@ -289,11 +289,17 @@ div.mx_EventTile_notSent.mx_EventTile_redacted .mx_UnknownBody { display: inline-block; width: 14px; height: 14px; - top: -19px; + top: 29px; 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; @@ -628,6 +634,15 @@ 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; } diff --git a/src/components/views/rooms/EventTile.js b/src/components/views/rooms/EventTile.js index cdbf725a5c..26c8a54f4e 100644 --- a/src/components/views/rooms/EventTile.js +++ b/src/components/views/rooms/EventTile.js @@ -878,6 +878,9 @@ 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 (
+
+ { readAvatars } +
{ sender }
-
- { readAvatars } -
{ // 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