Merge remote-tracking branch 'origin/develop' into develop

2017-10-23 13:08:14 +00:00
parent 146a75f7e7 d9fa11d03a
commit 052c00bd86
1 changed files with 3 additions and 0 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;