Merge branch 'develop' into matthew/roomsettings2

src/skins/vector/css/matrix-react-sdk/structures/RoomView.css

@@ -164,9 +164,17 @@ limitations under the License.
     margin-bottom: 12px;
 }
 
+li.mx_RoomView_myReadMarker_container {
+    height: 0px;
+    margin: 0px;
+    padding: 0px;
+    border: 0px;
+}
+
 hr.mx_RoomView_myReadMarker {
     border-top: solid 1px #76cfa6;
-    border-bottom: none;
+    border-bottom: solid 1px #76cfa6;
+    margin-top: 0px;
 }
 
 .mx_RoomView_statusArea {

src/skins/vector/css/matrix-react-sdk/structures/login/Login.css

@@ -105,6 +105,15 @@ limitations under the License.
    color: #4a4a4a;
 }
 
+.mx_Login_forgot {
+    font-size: 13px;
+    opacity: 0.8;
+}
+
+.mx_Login_forgot:link {
+    color: #4a4a4a;
+}
+
 .mx_Login_loader {
     position: absolute;
     left: 50%;

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 {

src/skins/vector/css/matrix-react-sdk/views/rooms/RoomPreviewBar.css

@@ -0,0 +1,32 @@
+/*
+Copyright 2015, 2016 OpenMarket Ltd
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+.mx_RoomPreviewBar {
+    text-align: center;
+}
+
+.mx_RoomPreviewBar_preview_text {
+    color: #a4a4a4;
+}
+
+.mx_RoomPreviewBar_join_text {
+    color: #ff0064;
+}
+
+.mx_RoomPreviewBar_join_text a {
+    text-decoration: underline;
+    cursor: pointer;
+}