From 977b2239293e930f2bdf9e280b54a809baddef15 Mon Sep 17 00:00:00 2001 From: David Baker Date: Tue, 12 Jan 2016 14:20:05 +0000 Subject: [PATCH] Hopefully working CSS that doesn't cause the messages to jump about when a read marker disappears. --- config.json | 2 +- src/skins/vector/css/matrix-react-sdk/structures/RoomView.css | 4 +--- .../vector/css/matrix-react-sdk/views/rooms/EventTile.css | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/config.json b/config.json index 923d23ab2c..9834209ae7 100644 --- a/config.json +++ b/config.json @@ -1,4 +1,4 @@ { - "default_hs_url": "https://matrix.org", + "default_hs_url": "http://localhost:8008", "default_is_url": "https://vector.im" } diff --git a/src/skins/vector/css/matrix-react-sdk/structures/RoomView.css b/src/skins/vector/css/matrix-react-sdk/structures/RoomView.css index 488f0f1521..b4cd2c0c30 100644 --- a/src/skins/vector/css/matrix-react-sdk/structures/RoomView.css +++ b/src/skins/vector/css/matrix-react-sdk/structures/RoomView.css @@ -168,15 +168,13 @@ li.mx_RoomView_myReadMarker_container { height: 0px; margin: 0px; padding: 0px; - margin-bottom: -8px; border: 0px; } hr.mx_RoomView_myReadMarker { border-top: solid 1px #76cfa6; border-bottom: solid 1px #76cfa6; - margin-top: -1px; - margin-bottom: -1px; + margin-top: 0px; } .mx_RoomView_statusArea { diff --git a/src/skins/vector/css/matrix-react-sdk/views/rooms/EventTile.css b/src/skins/vector/css/matrix-react-sdk/views/rooms/EventTile.css index 440fd4ad5e..8ea76364b3 100644 --- a/src/skins/vector/css/matrix-react-sdk/views/rooms/EventTile.css +++ b/src/skins/vector/css/matrix-react-sdk/views/rooms/EventTile.css @@ -135,8 +135,8 @@ limitations under the License. z-index: 1; position: relative; width: 90px; + height: 1px; /* Hack to stop the height of this pushing the messages apart. Replaces marigin-top: -6px. This interacts better with a read marker being in between. Content overflows. */ margin-right: 10px; - margin-top: -6px; } .mx_EventTile .mx_MessageTimestamp {