Merge branch 'develop' into matthew/dharma

2018-07-29 17:03:23 +01:00
parent 30bb7eeeae 148308235d
commit 9783b6100d
211 changed files with 10766 additions and 4710 deletions
@@ -289,6 +289,10 @@ textarea {
    vertical-align: middle;
 }

+.mx_emojione_selected {
+    background-color: $accent-color;
+}
+
 ::-moz-selection {
    background-color: $accent-color;
    color: $selection-fg-color;