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

2020-12-02 15:08:13 +00:00
parent d8e46c7797 2574ba1cfe
commit 3fda7e3f46
27 changed files with 1822 additions and 75 deletions
@@ -108,6 +108,9 @@ $eventtile-meta-color: $roomtopic-color;
 $header-divider-color: $header-panel-text-primary-color;
 $composer-e2e-icon-color: $header-panel-text-primary-color;

+// this probably shouldn't have it's own colour
+$voipcall-plinth-color: #21262c;
+
 // ********************

 $theme-button-bg-color: #e3e8f0;