diff options
| author | VeraLyu <lvroyce0210@gmail.com> | 2017-04-26 00:44:02 +0800 |
|---|---|---|
| committer | Corey Hulen <corey@hulen.com> | 2017-04-25 09:44:02 -0700 |
| commit | f9502ff14bbb31aa835540c14725bbebdf0c340d (patch) | |
| tree | 46db93a54c68280f82df857618e7cdc81d24d1d9 /webapp/components | |
| parent | dc9c73a46b5cf322f558a0f06bd8da76209321a6 (diff) | |
| download | chat-f9502ff14bbb31aa835540c14725bbebdf0c340d.tar.gz chat-f9502ff14bbb31aa835540c14725bbebdf0c340d.tar.bz2 chat-f9502ff14bbb31aa835540c14725bbebdf0c340d.zip | |
PLT-5897: Respect intrinsic ratio of img in emoji picker (#5987)
Changed style of img emoji picker, also fixed preview of emoji.
Diffstat (limited to 'webapp/components')
| -rw-r--r-- | webapp/components/emoji_picker/components/emoji_picker_item.jsx | 10 | ||||
| -rw-r--r-- | webapp/components/emoji_picker/components/emoji_picker_preview.jsx | 2 |
2 files changed, 7 insertions, 5 deletions
diff --git a/webapp/components/emoji_picker/components/emoji_picker_item.jsx b/webapp/components/emoji_picker/components/emoji_picker_item.jsx index c7981c952..dee08e638 100644 --- a/webapp/components/emoji_picker/components/emoji_picker_item.jsx +++ b/webapp/components/emoji_picker/components/emoji_picker_item.jsx @@ -44,12 +44,14 @@ export default class EmojiPickerItem extends React.Component { if (this.props.category === 'recent' || this.props.category === 'custom') { item = - (<span> + (<span + onMouseOver={this.handleMouseOver} + onMouseOut={this.handleMouseOut} + onClick={this.handleClick} + className='emoji-picker__item-wrapper' + > <img className='emoji-picker__item emoticon' - onMouseOver={this.handleMouseOver} - onMouseOut={this.handleMouseOut} - onClick={this.handleClick} src={EmojiStore.getEmojiImageUrl(this.props.emoji)} /> </span>); diff --git a/webapp/components/emoji_picker/components/emoji_picker_preview.jsx b/webapp/components/emoji_picker/components/emoji_picker_preview.jsx index 24acf9668..79ec91441 100644 --- a/webapp/components/emoji_picker/components/emoji_picker_preview.jsx +++ b/webapp/components/emoji_picker/components/emoji_picker_preview.jsx @@ -44,7 +44,7 @@ export default class EmojiPickerPreview extends React.Component { <div className='emoji-picker__preview-image-box'> {previewImage} </div> - <div className='emoji-picker__preview-detail-box'> + <div className='emoji-picker__preview-image-label-box'> <span className='emoji-picker__preview-name'>{name}</span> <span className='emoji-picker__preview-aliases' |