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

This commit is contained in:
Weblate 2017-07-25 08:55:42 +00:00
commit 1a09fc60f0
1 changed files with 1 additions and 1 deletions

View File

@ -20,7 +20,7 @@ $focus-brightness: 125%;
// red warning colour // red warning colour
$warning-color: #ff0064; $warning-color: #ff0064;
$mention-user-pill-bg-color: #ff0064; $mention-user-pill-bg-color: #ff0064;
$other-user-pill-bg-color: rgba(0, 0, 0, 0.05); $other-user-pill-bg-color: rgba(0, 0, 0, 0.1);
$preview-bar-bg-color: #f7f7f7; $preview-bar-bg-color: #f7f7f7;