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

 Conflicts:
	package.json
	src/components/views/spaces/SpacePanel.tsx
	src/i18n/strings/en_EN.json
	src/stores/SpaceStore.tsx
	yarn.lock
This commit is contained in:
Michael Telatynski
2021-06-22 21:15:53 +01:00
167 changed files with 3202 additions and 1684 deletions
+2 -1
View File
@@ -328,7 +328,8 @@ $SpaceRoomViewInnerWidth: 428px;
font-size: $font-15px;
margin-top: 12px;
margin-bottom: 16px;
white-space: pre;
white-space: pre-wrap;
word-wrap: break-word;
}
> hr {
+2 -1
View File
@@ -134,8 +134,9 @@ limitations under the License.
.mx_Toast_buttons {
float: right;
display: flex;
gap: 5px;
.mx_FormButton {
.mx_AccessibleButton {
min-width: 96px;
box-sizing: border-box;
}