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

This commit is contained in:
Michael Telatynski 2021-03-25 16:37:56 +00:00
commit 5061db259a
46 changed files with 3417 additions and 665 deletions

View file

@ -179,6 +179,9 @@ $roomsublist-skeleton-ui-bg: linear-gradient(180deg, #ffffff 0%, #ffffff00 100%)
$groupFilterPanel-divider-color: $roomlist-header-color;
$voice-record-stop-border-color: #E3E8F0;
$voice-record-stop-symbol-color: $warning-color;
$roomtile-preview-color: $secondary-fg-color;
$roomtile-default-badge-bg-color: #61708b;
$roomtile-selected-bg-color: #FFF;