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

 Conflicts:

	res/css/structures/_SpaceHierarchy.scss

	src/components/structures/SpaceHierarchy.tsx

	src/i18n/strings/en_EN.json

2021-08-12 11:41:03 +01:00

..

structures

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

2021-08-12 11:41:03 +01:00

views

Merge pull request #6543 from matrix-org/t3chguy/fix/18092

2021-08-12 11:28:14 +01:00

_common.scss

Inherit font-family

2021-06-26 20:53:14 +02:00

_components.scss

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

2021-08-12 11:41:03 +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