Fix Emoji picker cut off at RHS (mattermost#6602)

Revanth47 · Jun 18, 2017 · c2419be · c2419be
1 parent 9b66506
commit c2419be
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 12 deletions.
diff --git a/components/emoji_picker/emoji_picker.jsx b/components/emoji_picker/emoji_picker.jsx
@@ -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 (

diff --git a/sass/components/_emoticons.scss b/sass/components/_emoticons.scss
@@ -103,7 +103,7 @@
 }
 
 .emoji-picker__items {
- max-height: 262px;
+ max-height: 278px;
  overflow-x: hidden;
  overflow-y: auto;
  padding: 0px 8px 8px 8px;

diff --git a/sass/layout/_post-right.scss b/sass/layout/_post-right.scss
@@ -148,7 +148,6 @@
 .post-right__scroll {
  -webkit-overflow-scrolling: touch;
  @include flex(1 1 auto);
- overflow: auto;
  padding-top: 10px;
  position: relative;