diff options
author | Eugen Rochko <eugen@zeonfederated.com> | 2017-03-24 03:50:30 +0100 |
---|---|---|
committer | Eugen Rochko <eugen@zeonfederated.com> | 2017-03-24 03:55:45 +0100 |
commit | d7c6c6dbe109544911f3fca5c547b55d1e79ccc2 (patch) | |
tree | 346b25e3801e5c9d873404e68f88a44cb0ec1636 /app/assets/javascripts/components/features/compose/components/emoji_picker_dropdown.jsx | |
parent | 3e2d6ea4083c878e51eb291f2b04d004d3d0ff60 (diff) |
Fancier drag & drop indicator, emoji icon for emoji, upload progress (fix #295)
Diffstat (limited to 'app/assets/javascripts/components/features/compose/components/emoji_picker_dropdown.jsx')
-rw-r--r-- | app/assets/javascripts/components/features/compose/components/emoji_picker_dropdown.jsx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/assets/javascripts/components/features/compose/components/emoji_picker_dropdown.jsx b/app/assets/javascripts/components/features/compose/components/emoji_picker_dropdown.jsx index 3a454a5fb..37e366203 100644 --- a/app/assets/javascripts/components/features/compose/components/emoji_picker_dropdown.jsx +++ b/app/assets/javascripts/components/features/compose/components/emoji_picker_dropdown.jsx @@ -4,7 +4,7 @@ import PureRenderMixin from 'react-addons-pure-render-mixin'; import { defineMessages, injectIntl } from 'react-intl'; const messages = defineMessages({ - emoji: { id: 'emoji_button.label', defaultMessage: 'Emoji' } + emoji: { id: 'emoji_button.label', defaultMessage: 'Insert emoji' } }); const settings = { @@ -36,8 +36,8 @@ const EmojiPickerDropdown = React.createClass({ return ( <Dropdown ref={this.setRef} style={{ marginLeft: '5px' }}> - <DropdownTrigger className='icon-button' title={intl.formatMessage(messages.emoji)} style={{ fontSize: `24px`, width: `24px`, lineHeight: `24px`, display: 'block', marginLeft: '2px' }}> - <i className={`fa fa-smile-o`} style={{ verticalAlign: 'middle' }} /> + <DropdownTrigger className='icon-button emoji-button' title={intl.formatMessage(messages.emoji)} style={{ fontSize: `24px`, width: `24px`, lineHeight: `24px`, display: 'block', marginLeft: '2px' }}> + <img className="emojione" alt="🙂" src="/emoji/1f642.png" /> </DropdownTrigger> <DropdownContent> |