Merge pull request #9314 from RocketChat/custom-emoji-size-last-message

[FIX] custom emoji size on sidebar item
RocketChat · Jan 3, 2018 · 9dc9db3 · 9dc9db3
2 parents dde0c2f + 3fa222a
commit 9dc9db3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/packages/rocketchat-theme/client/imports/components/emojiPicker.css b/packages/rocketchat-theme/client/imports/components/emojiPicker.css
@@ -254,6 +254,6 @@
 }
 
 .emoji.big {
-	width: 44px !important;
-	height: 44px !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
@@ -229,7 +229,8 @@
 		font-size: 12px;
 		line-height: normal;
 
-		& .emojione {
+		& .emojione,
+		& .emoji, {
 			width: 13px !important;
 			min-width: 13px;
 			height: 13px !important;