Merge branch 'develop' into matthew/status

This commit is contained in:
Matthew Hodgson 2017-10-26 01:46:06 +01:00
commit 225c7ee621
37 changed files with 9612 additions and 131 deletions

View file

@ -28,7 +28,10 @@ $warning-color: #ff0064;
$mention-user-pill-bg-color: #ff0064;
$other-user-pill-bg-color: rgba(0, 0, 0, 0.1);
// groups
$group-alert-color: #774f7e;
$group-my-groups-placeholder-bg: #f7f7f7;
$group-my-groups-placeholder-fg: #888;
$preview-bar-bg-color: #f7f7f7;