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

pull/7178/head
Weblate 2018-08-13 15:01:20 +00:00
commit 970c3dc6de
1 changed files with 1 additions and 0 deletions

View File

@ -77,6 +77,7 @@ $focus-brightness: 125%;
// red warning colour // red warning colour
$warning-color: #F69E98; $warning-color: #F69E98;
$warning-bg-color: #DF2A8B; $warning-bg-color: #DF2A8B;
$info-bg-color: #2A9EDF;
$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.1);