Travis Ralston d6cf2346fe Manually conflict resolve https://github.com/matrix-org/matrix-react-sdk/pull/6240		2021-06-28 21:00:36 -06:00
..
structures	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17731	2021-06-25 14:50:24 +01:00
views	Manually conflict resolve https://github.com/matrix-org/matrix-react-sdk/pull/6240	2021-06-28 21:00:36 -06:00
_common.scss	Add CSS containement rules for shorter reflow operations	2021-06-01 11:26:32 +01:00
_components.scss	Tile styling and early behaviour	2021-06-24 13:56:11 -06: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