Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
455712f8cc
@ -1949,6 +1949,9 @@ body {
|
||||
line-height: 22px; }
|
||||
#conversejs .chatbox .chat-body .chat-message .chat-msg-content {
|
||||
line-height: 22px; }
|
||||
#conversejs .chatbox .chat-body .chat-message .chat-msg-content .emojione {
|
||||
height: 22px;
|
||||
margin-bottom: -5.5px; }
|
||||
#conversejs .chatbox .chat-content {
|
||||
padding: 0 1em 1em 1em;
|
||||
border-top-left-radius: 7px;
|
||||
|
@ -51,6 +51,10 @@
|
||||
}
|
||||
.chat-msg-content {
|
||||
line-height: $line-height;
|
||||
.emojione {
|
||||
height: $line-height;
|
||||
margin-bottom: -$line-height/4;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user