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

 Conflicts:

	src/components/structures/SpaceRoomView.tsx

	src/i18n/strings/en_EN.json

2021-05-07 11:50:49 +01:00

..

auth

Fix term_policy aligned to the center

2021-02-03 00:05:55 +05:30

avatars

Tidy up TemporaryTile now that it isn't temporary

2021-03-09 11:19:41 +00:00

beta

Design iterations based on PR feedback

2021-04-29 16:08:59 +01:00

context_menus

Fix styling of disabled options in an Iconized menu

2021-03-01 15:40:46 +00:00

dialogs

Fix rounded progress bars

2021-05-05 11:50:55 +01:00

directory

Use thinner chevron for network, adjust placement

2020-07-31 18:15:51 +01:00

elements

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

2021-05-06 13:06:50 +01:00

emojipicker

Fix Emoji Picker footer being too small if text overflows

2020-05-24 20:00:02 +01:00

groups

Condense CSS rules and use box-sizing instead of math

2019-01-28 20:26:03 -07:00

messages

Update visual style of plain files in the timeline

2021-05-04 21:13:37 -06:00

right_panel

fix mx_EncryptionInfo_spinner padding in dialogs

2021-03-08 04:41:51 +00:00

room_settings

Remove some unused components

2020-08-20 20:47:02 -06:00

rooms

Fix issue where composer styles were being applied to the timeline

2021-05-04 21:15:22 -06:00

settings

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

2021-05-06 08:05:14 +01:00

spaces

Add beta pill to space create menu

2021-04-28 12:10:03 +01:00

terms

Use variables for the rem values.

2020-03-31 15:26:23 +01:00

toasts

Add missing scss file

2020-11-09 14:36:12 +00:00

verification

Fix sas verification buttons to match figma and remove useless inDialog prop from EncryptionPanel.js

2020-04-07 19:03:12 +01:00

voice_messages

Update colours and sizing for voice messages

2021-05-04 20:45:15 -06:00

voip

Merge branch 'develop' into feed

2021-04-28 10:52:23 +02:00