Merge remote-tracking branch 'origin/master'

455712f8 · Weblate · ef318149 · 4104dec8 · 455712f8 · 455712f8
Commit 455712f8 authored Sep 02, 2017 by Weblate
Show whitespace changes
Inline Side-by-side

Showing with 7 additions and 0 deletions

css/inverse.css css/inverse.css +3 -0

sass/inverse/_chatbox.scss sass/inverse/_chatbox.scss +4 -0

No files found.
--- a/css/inverse.css
+++ b/css/inverse.css
@@ -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;

--- a/sass/inverse/_chatbox.scss
+++ b/sass/inverse/_chatbox.scss
@@ -51,6 +51,10 @@
                }
                .chat-msg-content {
                    line-height: $line-height;
+                    .emojione {
+                        height: $line-height;
+                        margin-bottom: -$line-height/4;
+                    }
                }
            }
        }