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

This commit is contained in:
Weblate 2017-11-06 15:49:46 +00:00
commit 3633f55e20

View File

@ -26,7 +26,8 @@
}
.mx_EventTile_highlight .mx_EventTile_content .markdown-body a.mx_UserPill_me,
.mx_EventTile_content .mx_AtRoomPill {
.mx_EventTile_content .mx_AtRoomPill,
.mx_MessageComposer_input .mx_AtRoomPill {
color: $accent-fg-color;
background-color: $mention-user-pill-bg-color;
padding-right: 5px;