Merge branch 'develop' into matthew/status

2017-10-26 01:46:06 +01:00 · 2017-10-26 01:46:06 +01:00 · 225c7ee621
commit 225c7ee621
parent f86b616769 c7d18ff52e
37 changed files with 9612 additions and 131 deletions
--- a/src/skins/vector/css/themes/_dark.scss
+++ b/src/skins/vector/css/themes/_dark.scss
@ -20,6 +20,9 @@ $focus-brightness: 200%;
 // red warning colour
 $warning-color: #ff0064;

+// groups
+$group-my-groups-placeholder-bg: #454545;
+
 $other-user-pill-bg-color: rgba(255, 255, 255, 0.1);

 $preview-bar-bg-color: #333;