Merge branch 'develop' into matthew/dharma

This commit is contained in:
Matthew Hodgson
2018-08-03 17:15:00 -07:00
15 changed files with 213 additions and 6983 deletions
+2
View File
@@ -27,6 +27,8 @@ $focus-brightness: 125%;
// red warning colour
$warning-color: #ff0064;
// background colour for warnings
$warning-bg-color: #DF2A8B;
$mention-user-pill-bg-color: #ff0064;
$other-user-pill-bg-color: rgba(0, 0, 0, 0.1);