From c02d9890c57edeb3d2634beb059ed668ce5e4ab3 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Sat, 9 Jan 2016 00:09:11 +0000
Subject: [PATCH 1/4] New CSS for read markers

---
 .../css/matrix-react-sdk/structures/RoomView.css       | 10 ++++++++++
 1 file changed, 10 insertions(+)

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 db68f4418f..710d680110 100644
--- a/src/skins/vector/css/matrix-react-sdk/structures/RoomView.css
+++ b/src/skins/vector/css/matrix-react-sdk/structures/RoomView.css
@@ -164,9 +164,19 @@ limitations under the License.
     margin-bottom: 12px;
 }
 
+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: none;
+    margin-top: -1px;
+    margin-bottom: 0px;
 }
 
 .mx_RoomView_statusArea {

From 1e57aa8c783c563df65a356a2d2f90df333a379d Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Mon, 11 Jan 2016 10:52:29 +0000
Subject: [PATCH 2/4] Make read up to line 2px and position relative so we can
 shift it up a little

---
 .../vector/css/matrix-react-sdk/structures/RoomView.css     | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

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 710d680110..2d8b3f1509 100644
--- a/src/skins/vector/css/matrix-react-sdk/structures/RoomView.css
+++ b/src/skins/vector/css/matrix-react-sdk/structures/RoomView.css
@@ -173,10 +173,12 @@ li.mx_RoomView_myReadMarker_container {
 }
 
 hr.mx_RoomView_myReadMarker {
+    position: relative;
+    top: -4px;
     border-top: solid 1px #76cfa6;
-    border-bottom: none;
+    border-bottom: solid 1px #76cfa6;
     margin-top: -1px;
-    margin-bottom: 0px;
+    margin-bottom: -1px;
 }
 
 .mx_RoomView_statusArea {

From 6cd0aeb607f9bb96eb309b10af80df3fc1c33129 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Mon, 11 Jan 2016 10:56:08 +0000
Subject: [PATCH 3/4] Revert 4px offset: it ends up in the middle of the line
 above

---
 src/skins/vector/css/matrix-react-sdk/structures/RoomView.css | 2 --
 1 file changed, 2 deletions(-)

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 2d8b3f1509..488f0f1521 100644
--- a/src/skins/vector/css/matrix-react-sdk/structures/RoomView.css
+++ b/src/skins/vector/css/matrix-react-sdk/structures/RoomView.css
@@ -173,8 +173,6 @@ li.mx_RoomView_myReadMarker_container {
 }
 
 hr.mx_RoomView_myReadMarker {
-    position: relative;
-    top: -4px;
     border-top: solid 1px #76cfa6;
     border-bottom: solid 1px #76cfa6;
     margin-top: -1px;

From 977b2239293e930f2bdf9e280b54a809baddef15 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Tue, 12 Jan 2016 14:20:05 +0000
Subject: [PATCH 4/4] 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 {