Merge branch 'develop' into new-guest-access

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

@@ -175,3 +175,22 @@ limitations under the License.
     margin-top: -2px;
 }
 
+.mx_MatrixChat_useCompactLayout {
+    .mx_RoomStatusBar {
+        min-height: 40px;
+    }
+
+    .mx_RoomStatusBar_indicator {
+        margin-top: 10px;
+    }
+
+    .mx_RoomStatusBar_callBar {
+      height: 40px;
+      line-height: 40px;
+    }
+
+    .mx_RoomStatusBar_typingBar {
+      height: 40px;
+      line-height: 40px;
+    }
+}

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

@@ -260,4 +260,14 @@ hr.mx_RoomView_myReadMarker {
 
 .mx_RoomView_ongoingConfCallNotification a {
     color: $accent-fg-color ! important;
-}
+}
+
+.mx_MatrixChat_useCompactLayout {
+    .mx_RoomView_MessageList {
+        margin-bottom: 4px;
+    }
+
+    .mx_RoomView_statusAreaBox {
+        min-height: 42px;
+    }
+}

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

@@ -231,7 +231,8 @@ input.mx_UserSettings_phoneNumberField {
     display: none;
 }
 
-.mx_UserSettings_advanced_spoiler {
+.mx_UserSettings_advanced_spoiler,
+.mx_UserSettings_link {
     cursor: pointer;
     color: $accent-color;
     word-break: break-all;

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

@@ -176,8 +176,9 @@ limitations under the License.
 
 .mx_Login_type_dropdown {
     display: inline-block;
-    min-width: 125px;
+    min-width: 170px;
     align-self: flex-end;
+    flex: 1 1 auto;
 }
 
 .mx_Login_field_group {