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

This commit is contained in:
Weblate 2017-07-24 21:13:38 +00:00
commit 77582e0a17
2 changed files with 2 additions and 2 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.1); $other-user-pill-bg-color: rgba(0, 0, 0, 0.05);
$preview-bar-bg-color: #f7f7f7; $preview-bar-bg-color: #f7f7f7;

View file

@ -20,7 +20,7 @@ $focus-brightness: 200%;
// red warning colour // red warning colour
$warning-color: #ff0064; $warning-color: #ff0064;
$other-user-pill-bg-color: rgba(255, 255, 255, 0.15); $other-user-pill-bg-color: rgba(255, 255, 255, 0.1);
$preview-bar-bg-color: #333; $preview-bar-bg-color: #333;