From 6e3afcde53014e4d03096c9393da15631b444973 Mon Sep 17 00:00:00 2001 From: Matthew Hodgson Date: Wed, 18 Nov 2015 22:19:21 +0000 Subject: [PATCH] dodgy fudge to put the edit button alongside the read receipts. in future I think we should turn it into a chevron next to the timestamp --- src/skins/vector/css/molecules/EventTile.css | 9 ++++---- src/skins/vector/views/molecules/EventTile.js | 22 +++++++++---------- 2 files changed, 15 insertions(+), 16 deletions(-) diff --git a/src/skins/vector/css/molecules/EventTile.css b/src/skins/vector/css/molecules/EventTile.css index 7d4acadab6..1b2725b510 100644 --- a/src/skins/vector/css/molecules/EventTile.css +++ b/src/skins/vector/css/molecules/EventTile.css @@ -91,9 +91,9 @@ limitations under the License. .mx_EventTile_msgOption { float: right; text-align: right; - margin-right: 10px; z-index: 1; position: relative; + width: 100px; } .mx_MessageTimestamp { @@ -111,10 +111,9 @@ limitations under the License. } .mx_EventTile_editButton { - display: block; - visibility: hidden; - margin-left: auto; - margin-right: 0px; + position: absolute; + display: inline-block; + visibility: hidden; } .mx_EventTile:hover .mx_EventTile_editButton { diff --git a/src/skins/vector/views/molecules/EventTile.js b/src/skins/vector/views/molecules/EventTile.js index fa1604f91c..48fdc07722 100644 --- a/src/skins/vector/views/molecules/EventTile.js +++ b/src/skins/vector/views/molecules/EventTile.js @@ -172,15 +172,22 @@ module.exports = React.createClass({ if (remainder > 0) { remText = +{ remainder } + style={{ left: left }}>{ remainder }+ ; } } + var editButton = ( + + ); + return - {remText} - - {avatars} + { editButton } + { remText } + + { avatars } ; }, @@ -217,12 +224,6 @@ module.exports = React.createClass({ menu: this.state.menu, }); var timestamp = - var editButton = ( - - ); var aux = null; if (msgtype === 'm.image') aux = "sent an image"; @@ -247,7 +248,6 @@ module.exports = React.createClass({ return (
- { editButton } { timestamp } { readAvatars }