diff options
| author | Yamagishi Kazutoshi <ykzts@desire.sh> | 2017-05-19 18:42:54 +0900 |
|---|---|---|
| committer | Eugen Rochko <eugen@zeonfederated.com> | 2017-05-19 11:42:54 +0200 |
| commit | b8b7b506a27ddc1373032078a4f1cfd47242627a (patch) | |
| tree | c43ea178901461116913d7cd710e08066f6e3c7a /app/javascript/mastodon/features/compose/components/emoji_picker_dropdown.js | |
| parent | 550863198c111d04d463b1fdfcf6d4515ceca1fe (diff) | |
| download | mastodon-b8b7b506a27ddc1373032078a4f1cfd47242627a.tar mastodon-b8b7b506a27ddc1373032078a4f1cfd47242627a.tar.gz mastodon-b8b7b506a27ddc1373032078a4f1cfd47242627a.tar.bz2 mastodon-b8b7b506a27ddc1373032078a4f1cfd47242627a.zip | |
Replace inline styles with stylesheet (#3115)
Diffstat (limited to 'app/javascript/mastodon/features/compose/components/emoji_picker_dropdown.js')
| -rw-r--r-- | app/javascript/mastodon/features/compose/components/emoji_picker_dropdown.js | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/app/javascript/mastodon/features/compose/components/emoji_picker_dropdown.js b/app/javascript/mastodon/features/compose/components/emoji_picker_dropdown.js index 9ad0ae296..50b8ef37e 100644 --- a/app/javascript/mastodon/features/compose/components/emoji_picker_dropdown.js +++ b/app/javascript/mastodon/features/compose/components/emoji_picker_dropdown.js @@ -22,20 +22,6 @@ const settings = { imagePathPNG: '/emoji/' }; -const dropdownStyle = { - position: 'absolute', - right: '5px', - top: '5px' -}; - -const dropdownTriggerStyle = { - display: 'block', - fontSize: '24px', - lineHeight: '24px', - marginLeft: '2px', - width: '24px' -} - let EmojiPicker; // load asynchronously class EmojiPickerDropdown extends React.PureComponent { @@ -118,8 +104,8 @@ class EmojiPickerDropdown extends React.PureComponent { const { active, loading } = this.state; return ( - <Dropdown ref={this.setRef} style={dropdownStyle} onShow={this.onShowDropdown} onHide={this.onHideDropdown}> - <DropdownTrigger className='emoji-button' title={intl.formatMessage(messages.emoji)} style={dropdownTriggerStyle}> + <Dropdown ref={this.setRef} className='emoji-picker__dropdown' onShow={this.onShowDropdown} onHide={this.onHideDropdown}> + <DropdownTrigger className='emoji-button' title={intl.formatMessage(messages.emoji)}> <img draggable="false" className={`emojione ${active && loading ? "pulse-loading" : ''}`} alt="🙂" src="/emoji/1f602.svg" /> |