From ce59ba2dc5635648542029c7bf76fe4040872920 Mon Sep 17 00:00:00 2001
From: Gabriel Engel <gabriel.engel@gmail.com>
Date: Sat, 3 Sep 2016 19:22:00 -0300
Subject: [PATCH] simplifying css
---
packages/rocketchat-emoji-emojione/sprites.css | 12 ++++++++++++
packages/rocketchat-emoji/emojiParser.js | 6 +-----
packages/rocketchat-emoji/emojiPicker.less | 2 +-
packages/rocketchat-emoji/lib/emojiRenderer.js | 8 ++++----
4 files changed, 18 insertions(+), 10 deletions(-)
diff --git a/packages/rocketchat-emoji-emojione/sprites.css b/packages/rocketchat-emoji-emojione/sprites.css
index 62c6c1498a7..3fc5fd760cd 100644
--- a/packages/rocketchat-emoji-emojione/sprites.css
+++ b/packages/rocketchat-emoji-emojione/sprites.css
@@ -1,7 +1,19 @@
.emojione {
+ image-rendering: auto;
+ font-size: inherit;
+ height: 22px;
+ width: 22px;
+ position: relative;
+ display: inline-block;
+ margin: 0 .15em;
+ line-height: normal;
+ vertical-align: middle;
background-image: url("../../packages/emojione_emojione/assets/sprites/emojione.sprites.png?v=2.2.5") !important;
background-size: 4365.625% 4365.625% !important;
background-repeat: no-repeat !important;
+ text-indent: 100%;
+ white-space: nowrap;
+ overflow: hidden;
}
.emojione-0023-20e3 {
diff --git a/packages/rocketchat-emoji/emojiParser.js b/packages/rocketchat-emoji/emojiParser.js
index f86580e02da..7d509268530 100644
--- a/packages/rocketchat-emoji/emojiParser.js
+++ b/packages/rocketchat-emoji/emojiParser.js
@@ -28,12 +28,8 @@ RocketChat.callbacks.add('renderMessage', (message) => {
for (let childNode in checkEmojiOnly[0].childNodes) {
if (checkEmojiOnly[0].childNodes.hasOwnProperty(childNode)) {
let child = $(checkEmojiOnly[0].childNodes[childNode]);
- if (child.hasClass('emoji')) {
- checkEmojiOnly[0].childNodes[childNode] = child.addClass('big');
- continue;
- }
- if (child.hasClass('emojione')) {
+ if (child.hasClass('emoji') || child.hasClass('emojione')) {
checkEmojiOnly[0].childNodes[childNode] = child.addClass('big');
continue;
}
diff --git a/packages/rocketchat-emoji/emojiPicker.less b/packages/rocketchat-emoji/emojiPicker.less
index b4778dede10..8db8c68f993 100644
--- a/packages/rocketchat-emoji/emojiPicker.less
+++ b/packages/rocketchat-emoji/emojiPicker.less
@@ -53,7 +53,7 @@
.category-link {
i {
color: @info-font-color;
- font-size: 24px;
+ font-size: 20px;
}
}
diff --git a/packages/rocketchat-emoji/lib/emojiRenderer.js b/packages/rocketchat-emoji/lib/emojiRenderer.js
index aad39e4f854..760ee075d5e 100644
--- a/packages/rocketchat-emoji/lib/emojiRenderer.js
+++ b/packages/rocketchat-emoji/lib/emojiRenderer.js
@@ -1,8 +1,8 @@
/* globals HTML, isSetNotNull, renderEmoji:true */
renderEmoji = function(emoji) {
if (isSetNotNull(() => RocketChat.emoji.list[emoji].emojiPackage)) {
- let emPackage = RocketChat.emoji.list[emoji].emojiPackage;
- return RocketChat.emoji.packages[emPackage].render(emoji);
+ let emojiPackage = RocketChat.emoji.list[emoji].emojiPackage;
+ return RocketChat.emoji.packages[emojiPackage].render(emoji);
}
};
@@ -13,8 +13,8 @@ Template.registerHelper('renderEmoji', new Template('renderEmoji', function() {
let emoji = Blaze.getData(view);
if (isSetNotNull(() => RocketChat.emoji.list[emoji].emojiPackage)) {
- let emPackage = RocketChat.emoji.list[emoji].emojiPackage;
- return new HTML.Raw(RocketChat.emoji.packages[emPackage].render(emoji));
+ let emojiPackage = RocketChat.emoji.list[emoji].emojiPackage;
+ return new HTML.Raw(RocketChat.emoji.packages[emojiPackage].render(emoji));
}
return '';
--
GitLab