imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
 Conflicts:
	src/components/views/spaces/SpaceCreateMenu.tsx
	src/i18n/strings/en_EN.json
This commit is contained in:
Michael Telatynski 2021-08-11 20:53:22 +01:00
commit 38dbe89316
4 changed files with 12 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
res/css/views/dialogs/_CreateSpaceFromCommunityDialog.scss
View file

@ -50,6 +50,10 @@ limitations under the License.
line-height: $font-15px;
margin: 16px 0;
}
.mx_Field_textarea {
margin-bottom: 0;
}
}
.mx_JoinRuleDropdown .mx_Dropdown_menu {