Commit c2419bef authored by Saturnino Abril's avatar Saturnino Abril Committed by Corey Hulen

Fix Emoji picker cut off at RHS (#6602)

parent 9b66506c
......@@ -240,20 +240,26 @@ export default class EmojiPicker extends React.Component {
// This is a custom emoji that matches the model on the server
name = selected.name;
aliases = [selected.name];
previewImage = (<img
className='emoji-picker__preview-image'
align='absmiddle'
src={EmojiStore.getEmojiImageUrl(selected)}
/>);
previewImage = (
<img
className='emoji-picker__preview-image'
align='absmiddle'
src={EmojiStore.getEmojiImageUrl(selected)}
/>
);
} else {
// This is a system emoji which only has a list of aliases
name = selected.aliases[0];
aliases = selected.aliases;
previewImage = (<span ><img
src='/static/emoji/img_trans.gif'
className={' emojisprite-preview emoji-' + selected.filename + ' '}
align='absmiddle'
/></span>);
previewImage = (
<span>
<img
src='/static/emoji/img_trans.gif'
className={' emojisprite-preview emoji-' + selected.filename + ' '}
align='absmiddle'
/>
</span>
);
}
return (
......
......@@ -103,7 +103,7 @@
}
.emoji-picker__items {
max-height: 262px;
max-height: 278px;
overflow-x: hidden;
overflow-y: auto;
padding: 0px 8px 8px 8px;
......
......@@ -148,7 +148,6 @@
.post-right__scroll {
-webkit-overflow-scrolling: touch;
@include flex(1 1 auto);
overflow: auto;
padding-top: 10px;
position: relative;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment