about summary refs log tree commit diff
path: root/app/javascript/flavours/glitch
diff options
context:
space:
mode:
authorbeatrix <beatrix.bitrot@gmail.com>2018-04-26 11:33:36 -0400
committerGitHub <noreply@github.com>2018-04-26 11:33:36 -0400
commit1e9fe95e132361110431e8002a6b6ef5360c99a5 (patch)
tree72337e0c0e28af86eb43f224fc7a61a6a05bccda /app/javascript/flavours/glitch
parent33691f4920c7ff01c57bdeb38ec352990bd8d53f (diff)
parent105ffaef8fb83c0246ef829a1023cb01778ca03c (diff)
Merge pull request #439 from ThibG/glitch-soc/fixes/emoji-shortcode-inline
[Glitch] Do not set emoji as inline-block
Diffstat (limited to 'app/javascript/flavours/glitch')
-rw-r--r--app/javascript/flavours/glitch/styles/components/emoji.scss1
1 files changed, 0 insertions, 1 deletions
diff --git a/app/javascript/flavours/glitch/styles/components/emoji.scss b/app/javascript/flavours/glitch/styles/components/emoji.scss
index c91964810..dd386d698 100644
--- a/app/javascript/flavours/glitch/styles/components/emoji.scss
+++ b/app/javascript/flavours/glitch/styles/components/emoji.scss
@@ -1,5 +1,4 @@
 .emojione {
-  display: inline-block;
   font-size: inherit;
   vertical-align: middle;
   object-fit: contain;