Merge pull request #9243 from RocketChat/move-emojipicker-css-to-them…

…e-package [FIX] Move emojipicker css to theme package
RocketChat · Dec 26, 2017 · 5de3446 · 5de3446
2 parents d8886d4 + 95ec4a6
commit 5de3446
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 30 deletions.
diff --git a/packages/rocketchat-emoji/client/emoji.css b/packages/rocketchat-emoji/client/emoji.css
diff --git a/packages/rocketchat-emoji/package.js b/packages/rocketchat-emoji/package.js
@@ -21,9 +21,6 @@ Package.onUse(function(api) {
 
 	api.addFiles('client/emojiPicker.html', 'client');
 	api.addFiles('client/emojiPicker.js', 'client');
-	api.addFiles('client/emojiPicker.css', 'client');
-
-	api.addFiles('client/emoji.css', 'client');
 
 	api.addFiles('client/lib/emojiRenderer.js', 'client');
 	api.addFiles('client/lib/EmojiPicker.js', 'client');

diff --git a/...s/rocketchat-emoji/client/emojiPicker.css → ...client/imports/components/emojiPicker.css b/...s/rocketchat-emoji/client/emojiPicker.css → ...client/imports/components/emojiPicker.css
@@ -229,3 +229,31 @@
 		}
 	}
 }
+
+.emoji {
+	position: relative;
+
+	display: inline-block;
+	overflow: hidden;
+
+	width: 22px;
+	height: 22px;
+	margin: 0 0.15em;
+
+	vertical-align: middle;
+	white-space: nowrap;
+	text-indent: 100%;
+
+	background-repeat: no-repeat;
+	background-position: center;
+	background-size: cover;
+
+	font-size: inherit;
+	line-height: normal;
+	image-rendering: auto;
+}
+
+.emoji.big {
+	width: 44px !important;
+	height: 44px !important;
+}
diff --git a/packages/rocketchat-theme/client/main.css b/packages/rocketchat-theme/client/main.css
@@ -34,6 +34,7 @@
 @import 'imports/components/slider.css';
 @import 'imports/components/chip.css';
 @import 'imports/components/messages.css';
+@import 'imports/components/emojiPicker.css';
 
 /* Modal */
 @import 'imports/components/modal/full-modal.css';