matrix/matrix-react-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-08-09 08:42:50 +03:00
Code Activity

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

Browse Source 
 Conflicts:
	src/components/structures/SpaceRoomView.tsx
	src/components/views/dialogs/BetaFeedbackDialog.tsx
This commit is contained in:
Michael Telatynski
2021-07-23 18:28:21 +01:00
parent dec2c48155 869a5fb5c7
commit 1ba601ba22
114 changed files with 794 additions and 445 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
res/css/structures/_SpaceRoomView.scss
View File

@@ -234,6 +234,9 @@ $SpaceRoomViewInnerWidth: 428px;
}
.mx_SpaceRoomView_landing {
display: flex;
flex-direction: column;
> .mx_BaseAvatar_image,
> .mx_BaseAvatar > .mx_BaseAvatar_image {
border-radius: 12px;
@@ -334,6 +337,7 @@ $SpaceRoomViewInnerWidth: 428px;
.mx_SearchBox {
margin: 0 0 20px;
flex: 0;
}
.mx_SpaceFeedbackPrompt_topRight {
@@ -349,6 +353,11 @@ $SpaceRoomViewInnerWidth: 428px;
clear: both;
}
}
.mx_SpaceRoomDirectory_list {
// we don't want this container to get forced into the flexbox layout
display: contents;
}
}
.mx_SpaceRoomView_privateScope {