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

 Conflicts:

	src/components/views/dialogs/CreateRoomDialog.tsx

	src/components/views/dialogs/RoomUpgradeDialog.tsx

	src/components/views/dialogs/RoomUpgradeWarningDialog.tsx

	src/components/views/settings/tabs/room/SecurityRoomSettingsTab.tsx

2021-07-21 10:46:41 +01:00

..

structures

Remove hover effect from files in the files panel

2021-07-19 10:07:16 -06:00

views

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

2021-07-21 10:46:41 +01:00

_common.scss

Add CSS containement rules for shorter reflow operations

2021-06-01 11:26:32 +01:00

_components.scss

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

2021-07-21 10:46:41 +01:00

_font-sizes.scss

Use rem to guard against font scaling breakages

2020-07-16 20:15:28 +05:30

_font-weights.scss

Iterate PR, tweak margins

2020-08-18 12:00:56 +01:00

rethemendex.sh

Remove sort and include new scss file in components

2020-04-02 13:42:59 +01:00