Merge branch 'develop' into luke/merge-RoomTile-context-menus

Conflicts:
	src/components/views/context_menus/RoomTagContextMenu.js

src/skins/vector/css/_common.scss

@@ -187,12 +187,16 @@ textarea {
 }
 
 .mx_Dialog_cancelButton {
-    float: right;
-    margin-top: 5px;
-    margin-right: 5px;
+    position: absolute;
+    right: 11px;
+    top: 13px;
     cursor: pointer;
 }
 
+.mx_Dialog_cancelButton object {
+    pointer-events: none;
+}
+
 .mx_Dialog_content {
     margin: 24px 58px 68px 0;
     font-size: 14px;

src/skins/vector/css/_components.scss

@@ -13,6 +13,7 @@
 @import "./matrix-react-sdk/structures/login/_Login.scss";
 @import "./matrix-react-sdk/views/avatars/_BaseAvatar.scss";
 @import "./matrix-react-sdk/views/dialogs/_BugReportDialog.scss";
+@import "./matrix-react-sdk/views/dialogs/_ChatCreateOrReuseChatDialog.scss";
 @import "./matrix-react-sdk/views/dialogs/_ChatInviteDialog.scss";
 @import "./matrix-react-sdk/views/dialogs/_ConfirmUserActionDialog.scss";
 @import "./matrix-react-sdk/views/dialogs/_EncryptedEventDialog.scss";

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

@@ -90,16 +90,13 @@ limitations under the License.
        */
     overflow-x: auto;
 
-    /* XXX: Hack: apparently if you try to nest a flex-box
-     * within a non-flex-box within a flex-box, the height
-     * of the innermost element gets miscalculated if the
-     * parents are both auto.  Height has to be auto here
-     * for RoomView to correctly fit when the Toolbar is shown.
-     * Ideally we'd launch straight into the RoomView at this
-     * point, but instead we fudge it and make the middlePanel
-     * flex itself.
-     */
     display: flex;
+
+    /* To fix https://github.com/vector-im/riot-web/issues/3298 where Safari
+       needed height 100% all the way down to the HomePage. Height does not
+       have to be auto, empirically.
+    */
+    height: 100%;
 }
 
 .mx_MatrixChat .mx_RightPanel {

src/skins/vector/css/matrix-react-sdk/views/dialogs/_ChatCreateOrReuseChatDialog.scss

@@ -0,0 +1,27 @@
+/*
+Copyright 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_ChatCreateOrReuseDialog .mx_ChatCreateOrReuseDialog_tiles {
+    margin-top: 24px;
+}
+
+.mx_ChatCreateOrReuseDialog .mx_Dialog_content {
+    margin-bottom: 24px;
+}
+
+.mx_ChatCreateOrReuseDialog .mx_RoomTile_badge {
+    display: none;
+}

src/skins/vector/css/matrix-react-sdk/views/dialogs/_ConfirmUserActionDialog.scss

@@ -14,22 +14,39 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+.mx_ConfirmUserActionDialog .mx_Dialog_content {
+    min-height: 48px;
+    margin-bottom: 24px;
+}
+
 .mx_ConfirmUserActionDialog_avatar {
     float: left;
     margin-right: 20px;
+    margin-top: -2px;
 }
 
 .mx_ConfirmUserActionDialog_name {
-    font-size: 150%;
+    font-size: 18px;
 }
 
 .mx_ConfirmUserActionDialog_userId {
-    font-style: italic;
+    font-size: 13px;
 }
 
 .mx_ConfirmUserActionDialog_reasonField {
-    margin-bottom: 40px;
+    font-family: 'Open Sans', Arial, Helvetica, Sans-Serif;
+    font-size: 14px;
+    color: $primary-fg-color;
+
+    border-radius: 3px;
+    border: solid 1px $input-border-color;
+    line-height: 36px;
+    padding-left: 16px;
+    padding-right: 16px;
+    padding-top: 1px;
+    padding-bottom: 1px;
+
+    margin-bottom: 24px;
+
     width: 90%;
-    font-size: 120%;
-    height: 35px;
 }

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

@@ -130,6 +130,16 @@ limitations under the License.
     color: $event-notsent-color;
 }
 
+.mx_EventTile_redacted {
+    padding-top: 0px;
+}
+
+.mx_EventTile_redacted .mx_EventTile_line,
+.mx_EventTile_redacted:hover .mx_EventTile_line,
+.mx_EventTile_redacted.menu .mx_EventTile_line {
+    background-color: $primary-fg-color;
+}
+
 .mx_EventTile_highlight,
 .mx_EventTile_highlight .markdown-body
  {

src/skins/vector/css/vector-web/structures/_HomePage.scss

@@ -18,6 +18,8 @@ limitations under the License.
 .mx_HomePage {
     max-width: 960px;
     width: 100%;
+    height: 100%;
+    overflow-y: hidden;
     margin-left: auto;
     margin-right: auto;
 }