Skip to content
Snippets Groups Projects
Unverified Commit ce59ba2d authored by Gabriel Engel's avatar Gabriel Engel
Browse files

simplifying css

parent 1c76000f
No related branches found
No related tags found
No related merge requests found
.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 {
......
......@@ -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;
}
......
......@@ -53,7 +53,7 @@
.category-link {
i {
color: @info-font-color;
font-size: 24px;
font-size: 20px;
}
}
......
/* 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 '';
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment