Merge branch 'develop' into travis/message-states

This commit is contained in:
Travis Ralston 2021-03-02 10:40:49 -07:00
commit c74224a1b7
62 changed files with 3545 additions and 115 deletions

View file

@ -187,6 +187,7 @@ $roomsublist-divider-color: $primary-fg-color;
$roomsublist-skeleton-ui-bg: linear-gradient(180deg, #ffffff 0%, #ffffff00 100%);
$groupFilterPanel-divider-color: $roomlist-header-color;
$space-button-outline-color: #E3E8F0;
$roomtile-preview-color: #9e9e9e;
$roomtile-default-badge-bg-color: #61708b;