Merge pull request #9186 from RocketChat/fix-emoji-size-on-last-message

[FIX] Emoji size on last message preview
RocketChat · Dec 20, 2017 · 00facda · 00facda
1 parent d62ea9d
commit 00facda
Show file tree

Hide file tree

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

diff --git a/packages/rocketchat-theme/client/imports/components/sidebar/sidebar-item.css b/packages/rocketchat-theme/client/imports/components/sidebar/sidebar-item.css
@@ -212,8 +212,18 @@
 		font-size: 12px;
 		line-height: normal;
 
-		& > p, & code, & pre {
+		& .emojione {
+			width: 13px !important;
+			min-width: 13px;
+			height: 13px !important;
+			min-height: 13px;
+		}
+
+		& > p,
+		& code,
+		& pre {
 			display: inline;
+
 			white-space: unset;
 		}