Merge branch 'develop' of https://github.com/vector-im/riot-web into rxl881/apps

src/skins/vector/css/matrix-react-sdk/structures/_LoginBox.scss

@@ -19,13 +19,15 @@ limitations under the License.
     width: 100%;
 }
 
-.mx_LoginBox_loginButton {
+.mx_LoginBox_loginButton,
+.mx_LoginBox_registerButton {
     margin-top: -8px;
     height: 40px;
     border: 0px;
     border-radius: 40px;
-    padding-left: 1em;
-    padding-right: 1em;
+    margin-left: 4px;
+    margin-right: 4px;
+    width: 80px;
 
     background-color: $accent-color;
     color: $primary-bg-color;

src/skins/vector/css/matrix-react-sdk/structures/_RoomView.scss

@@ -127,15 +127,6 @@ limitations under the License.
     clear: both;
 }
 
-.mx_RoomView_MessageList h2 {
-    clear: both;
-    margin-top: 32px;
-    margin-bottom: 8px;
-    margin-left: 63px;
-    padding-bottom: 6px;
-    border-bottom: 1px solid $primary-hairline-color;
-}
-
 .mx_RoomView_invitePrompt {
     order: 2;
 

src/skins/vector/css/matrix-react-sdk/structures/_UserSettings.scss

@@ -102,6 +102,13 @@ limitations under the License.
     padding-right: 1em;
 }
 
+.mx_UserSettings_passwordWarning {
+    /* To move the "Sign out" button out of the way */
+    clear: both;
+    color: $warning-color;
+    margin-bottom: 5px;
+}
+
 .mx_UserSettings_importExportButtons {
     padding-top: 10px;
     padding-left: 40px;

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

@@ -345,6 +345,11 @@ limitations under the License.
 }
 .mx_EventTile_body pre {
     position: relative;
+    border: 1px solid transparent;
+}
+.mx_EventTile:hover .mx_EventTile_body pre
+{
+    border: 1px solid $primary-hairline-color;
 }
 .mx_EventTile_body pre:hover .mx_EventTile_copyButton
 {