Merge pull request #9776 from RocketChat/fix-emoji-big

[FIX] Emoji rendering on last message
RocketChat · Feb 20, 2018 · 5fcbc41 · 5fcbc41
1 parent 6f8d3fc
commit 5fcbc41
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 4 deletions.
diff --git a/packages/rocketchat-emoji-emojione/client/sprites.css b/packages/rocketchat-emoji-emojione/client/sprites.css
@@ -23,8 +23,6 @@
 }
 
 .emojione.big {
-	display: inline-block !important;
-
 	width: 44px;
 	height: 44px;
 }

diff --git a/packages/rocketchat-theme/client/imports/components/emojiPicker.css b/packages/rocketchat-theme/client/imports/components/emojiPicker.css
@@ -262,8 +262,6 @@
 }
 
 .emoji.big {
-	display: inline-block !important;
-
 	width: 44px;
 	height: 44px;
 }
diff --git a/packages/rocketchat-theme/client/imports/components/sidebar/sidebar-item.css b/packages/rocketchat-theme/client/imports/components/sidebar/sidebar-item.css
@@ -235,6 +235,8 @@
 
 		& .emojione,
 		& .emoji {
+			display: inline-block !important;
+
 			width: 13px !important;
 			min-width: 13px;
 			height: 13px !important;