Matrix/element-web-Github
1
0
Fork 0
mirror of https://github.com/vector-im/element-web.git synced 2024-11-16 13:14:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4727 from matrix-org/joriks/fix-read-receipt-overlap

Browse Source 
Fix read receipt overlap
This commit is contained in:
Jorik Schellekens 2020-06-08 15:08:35 +01:00 committed by GitHub
commit 4b39ccbe26
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -23,7 +23,7 @@ import { _t } from '../../../languageHandler';
import {formatDate} from '../../../DateUtils'; import {formatDate} from '../../../DateUtils';
import Velociraptor from "../../../Velociraptor"; import Velociraptor from "../../../Velociraptor";
import * as sdk from "../../../index"; import * as sdk from "../../../index";
import {toRem} from "../../../utils/units"; import {toPx} from "../../../utils/units";
let bounce = false; let bounce = false;
try { try {
@ -149,7 +149,7 @@ export default createReactClass({
// start at the old height and in the old h pos // start at the old height and in the old h pos
startStyles.push({ top: startTopOffset+"px", startStyles.push({ top: startTopOffset+"px",
left: toRem(oldInfo.left) }); left: toPx(oldInfo.left) });
const reorderTransitionOpts = { const reorderTransitionOpts = {
duration: 100, duration: 100,
@ -182,7 +182,7 @@ export default createReactClass({
} }
const style = { const style = {
left: toRem(this.props.leftOffset), left: toPx(this.props.leftOffset),
top: '0px', top: '0px',
visibility: this.props.hidden ? 'hidden' : 'visible', visibility: this.props.hidden ? 'hidden' : 'visible',
}; };