Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2017-09-02 20:00:52 +02:00
commit 455712f8cc
2 changed files with 7 additions and 0 deletions

View File

@ -1949,6 +1949,9 @@ body {
line-height: 22px; } line-height: 22px; }
#conversejs .chatbox .chat-body .chat-message .chat-msg-content { #conversejs .chatbox .chat-body .chat-message .chat-msg-content {
line-height: 22px; } line-height: 22px; }
#conversejs .chatbox .chat-body .chat-message .chat-msg-content .emojione {
height: 22px;
margin-bottom: -5.5px; }
#conversejs .chatbox .chat-content { #conversejs .chatbox .chat-content {
padding: 0 1em 1em 1em; padding: 0 1em 1em 1em;
border-top-left-radius: 7px; border-top-left-radius: 7px;

View File

@ -51,6 +51,10 @@
} }
.chat-msg-content { .chat-msg-content {
line-height: $line-height; line-height: $line-height;
.emojione {
height: $line-height;
margin-bottom: -$line-height/4;
}
} }
} }
} }