Michael Telatynski a704eefdd5 Merge branches 'develop' and 't3chguy/nad/rampage' of github.com:matrix-org/matrix-react-sdk into t3chguy/nad/rampage ...

 Conflicts:

	src/components/views/elements/AccessibleTooltipButton.tsx

2020-07-16 15:47:12 +01:00

..

structures

Merge branches 'develop' and 't3chguy/nad/rampage' of github.com:matrix-org/matrix-react-sdk into t3chguy/nad/rampage

2020-07-16 15:47:12 +01:00

views

Merge branches 'develop' and 't3chguy/nad/rampage' of github.com:matrix-org/matrix-react-sdk into t3chguy/nad/rampage

2020-07-16 15:47:12 +01:00

_common.scss

Update text input placeholder active colour to 75% inactive

2020-07-16 15:46:06 +01:00

_components.scss

Improve Tooltip font/layout consistency

2020-07-16 15:15:00 +01:00

_font-sizes.scss

Use 10px instead

2020-06-04 16:23:28 +01:00

rethemendex.sh

Remove sort and include new scss file in components

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