Merge branch 'develop' into luke/rts-welcome-pages

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

@@ -107,6 +107,16 @@ limitations under the License.
     justify-content: flex-start;
 }
 
+.mx_RoomView_empty {
+    flex: 1 1 auto;
+    font-size: 13px;
+    padding-left: 3em;
+    padding-right: 3em;
+    margin-right: 20px;
+    margin-top: 33%;
+    text-align: center;
+}
+
 .mx_RoomView_MessageList {
     width: 100%;
     list-style-type: none;

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

@@ -46,7 +46,7 @@ limitations under the License.
 }
 
 .mx_Login_logo img {
-    height: 100%
+    max-height: 100%
 }
 
 .mx_Login_support {

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

@@ -54,7 +54,7 @@ limitations under the License.
     margin-right: 8px;
     padding-left: 0.5em;
     padding-right: 0.5em;
-    width: 70px;
+    width: 85px;
     outline: none;
     cursor: pointer;
     color: $accent-color;

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

@@ -34,14 +34,15 @@ limitations under the License.
 
 .mx_RightPanel_headerButtonGroup {
     margin-top: 6px;
-    float: left;
+    display: flex;
+    width: 100%;
     background-color: $primary-bg-color;
     margin-left: 0px;
 }
 
 .mx_RightPanel_headerButton {
     cursor: pointer;
-    display: table-cell;
+    flex: 0;
     vertical-align: top;
     padding-left: 4px;
     padding-right: 5px;
@@ -69,6 +70,12 @@ limitations under the License.
     padding-bottom: 2px;
 }
 
+.mx_RightPanel_collapsebutton {
+    flex: 1;
+    text-align: right;
+    margin-top: 20px;
+}
+
 .mx_RightPanel .mx_MemberList,
 .mx_RightPanel .mx_MemberInfo,
 .mx_RightPanel_blank {

src/skins/vector/img/icons-close.svg

@@ -3,7 +3,7 @@
 <svg version="1.1" id="Layer_1" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns"
 	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="-11 13 24 24" xml:space="preserve">
 <style type="text/css">
-	.st1{fill:none;stroke:#FFFFFF;stroke-width:2;stroke-linecap:round;}
+	.st1{fill:none;stroke-width:2;stroke-linecap:round;}
 </style>
 <title>icons_create_room</title>
 <desc>Created with sketchtool.</desc>
@@ -13,8 +13,8 @@
 			<g id="Room-list_x2F_Footer" transform="translate(0.000000, 708.000000)" sketch:type="MSShapeGroup">
 				<g id="icons_create_room" transform="translate(20.000000, 18.000000)">
 					<circle id="Oval-1-Copy-7" fill="#76CFA6" cx="1" cy="25" r="12"/>
-					<path id="Line" class="st1" d="M-2.5,28.5l7.1-7.1"/>
-					<path id="Line_1_" class="st1" d="M-2.5,21.5l7.1,7.1"/>
+					<path id="Line" class="st1" stroke="#FFFFFF" d="M-2.5,28.5l7.1-7.1"/>
+					<path id="Line_1_" class="st1" stroke="#FFFFFF" d="M-2.5,21.5l7.1,7.1"/>
 				</g>
 			</g>
 		</g>