diff options
| author | Asaad Mahmood <asaadmahmood@users.noreply.github.com> | 2017-02-16 19:54:30 +0500 |
|---|---|---|
| committer | Harrison Healey <harrisonmhealey@gmail.com> | 2017-02-16 09:54:30 -0500 |
| commit | c6ffb73999ff4374503ea57d1b1e6485a5bee472 (patch) | |
| tree | a9784a52220934ab9ba1744cbddbb16ca12b3439 /webapp/components/emoji | |
| parent | d60d05f2d86400faf3303e655c46c5b8d77879c4 (diff) | |
| download | chat-c6ffb73999ff4374503ea57d1b1e6485a5bee472.tar.gz chat-c6ffb73999ff4374503ea57d1b1e6485a5bee472.tar.bz2 chat-c6ffb73999ff4374503ea57d1b1e6485a5bee472.zip | |
Multiple Ui improvements (#5398)
* PLT-5475 - Adjusting tutorials on mobile
* PLT-5475 - Adjusting tutorials on mobile
* PLT-5457 - Adjusting save button
* PLT-5443 - Updating highllight on status compact
* PLT-5413 - Team sidebar not scrolling
* PLT-5358 - Maintaing aspect ratio for emojis
* PLT-5411 - Removing help text from LDAP signin
* PLT-5420 - Updating emoticon for headings
* Updating emoji size
* Updating emoji size
* Removing emoticon tag
* Updating emoticon sizes
* Updating emoji size
Diffstat (limited to 'webapp/components/emoji')
| -rw-r--r-- | webapp/components/emoji/components/add_emoji.jsx | 4 | ||||
| -rw-r--r-- | webapp/components/emoji/components/emoji_list_item.jsx | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/webapp/components/emoji/components/add_emoji.jsx b/webapp/components/emoji/components/add_emoji.jsx index e496e42a0..53c7ecccf 100644 --- a/webapp/components/emoji/components/add_emoji.jsx +++ b/webapp/components/emoji/components/add_emoji.jsx @@ -186,9 +186,9 @@ export default class AddEmoji extends React.Component { defaultMessage='This is a sentence with {image} in it.' values={{ image: ( - <img + <span className='emoticon' - src={this.state.imageUrl} + style={{backgroundImage: 'url(' + this.state.imageUrl + ')'}} /> ) }} diff --git a/webapp/components/emoji/components/emoji_list_item.jsx b/webapp/components/emoji/components/emoji_list_item.jsx index dc27f3691..f2ed82ba7 100644 --- a/webapp/components/emoji/components/emoji_list_item.jsx +++ b/webapp/components/emoji/components/emoji_list_item.jsx @@ -98,9 +98,9 @@ export default class EmojiListItem extends React.Component { {':' + emoji.name + ':'} </td> <td className='emoji-list__image'> - <img + <span className='emoticon' - src={EmojiStore.getEmojiImageUrl(emoji)} + style={{backgroundImage: 'url(' + EmojiStore.getEmojiImageUrl(emoji) + ')'}} /> </td> <td className='emoji-list__creator'> |