Merge pull request #9243 from RocketChat/move-emojipicker-css-to-theme-package

[FIX] Move emojipicker css to theme package
pull/9258/head
Rodrigo Nascimento 8 years ago
parent 727571d0be
commit 45606e590d
No known key found for this signature in database
GPG Key ID: CFCE33B7B01AC335
  1. 27
      packages/rocketchat-emoji/client/emoji.css
  2. 3
      packages/rocketchat-emoji/package.js
  3. 28
      packages/rocketchat-theme/client/imports/components/emojiPicker.css
  4. 1
      packages/rocketchat-theme/client/main.css

@ -1,27 +0,0 @@
.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;
}

@ -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');

@ -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;
}

@ -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';

Loading…
Cancel
Save