Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17021

Conflicts: res/css/structures/_SpaceRoomView.scss src/components/structures/SpaceRoomView.tsx
2021-04-29 09:52:21 +01:00
parent 1802adb4d2 d203e8f129
commit a4f02937cb
61 changed files with 1604 additions and 705 deletions
@@ -84,6 +84,15 @@ $SpaceRoomViewInnerWidth: 428px;
            max-width: $SpaceRoomViewInnerWidth;
        }

+        .mx_AddExistingToSpace {
+            max-width: $SpaceRoomViewInnerWidth;
+
+            .mx_AddExistingToSpace_content {
+                height: calc(100vh - 360px);
+                max-height: 400px;
+            }
+        }
+
        .mx_SpaceRoomView_buttons {
            display: block;
            margin-top: 44px;