diff options
| author | Harrison Healey <harrisonmhealey@gmail.com> | 2016-11-22 12:31:37 -0500 |
|---|---|---|
| committer | enahum <nahumhbl@gmail.com> | 2016-11-22 14:31:37 -0300 |
| commit | e033dcce8e57ed6b6684227adf9b29347e4718b3 (patch) | |
| tree | d6ed4a2d9cdd71592d7ad7de32e0bba381114aba | |
| parent | a12581cb9eba725425dd7222a4986870eacda02e (diff) | |
| download | chat-e033dcce8e57ed6b6684227adf9b29347e4718b3.tar.gz chat-e033dcce8e57ed6b6684227adf9b29347e4718b3.tar.bz2 chat-e033dcce8e57ed6b6684227adf9b29347e4718b3.zip | |
PLT-4300 Switched emoji to use a background-image (#4631)
| -rw-r--r-- | webapp/sass/components/_emoticons.scss | 9 | ||||
| -rw-r--r-- | webapp/utils/emoticons.jsx | 2 |
2 files changed, 7 insertions, 4 deletions
diff --git a/webapp/sass/components/_emoticons.scss b/webapp/sass/components/_emoticons.scss index 80a800863..0e6ce6041 100644 --- a/webapp/sass/components/_emoticons.scss +++ b/webapp/sass/components/_emoticons.scss @@ -1,11 +1,14 @@ @charset 'UTF-8'; .emoticon { + background-repeat: no-repeat; + background-position: 50% 50%; background-size: contain; display: inline-block; - height: 1.5em; - margin-bottom: .25em; - width: 1.5em; + font-size: 19px; + height: 1em; + vertical-align: text-top; + width: 1em; } .emoticon-suggestion { diff --git a/webapp/utils/emoticons.jsx b/webapp/utils/emoticons.jsx index 7280ef88b..26443b120 100644 --- a/webapp/utils/emoticons.jsx +++ b/webapp/utils/emoticons.jsx @@ -38,7 +38,7 @@ export function handleEmoticons(text, tokens, emojis) { // we have an image path so we found a matching emoticon tokens.set(alias, { - value: `<img align="absmiddle" alt="${matchText}" class="emoticon" src="${path}" title="${matchText}" />`, + value: `<span alt="${matchText}" class="emoticon" title="${matchText}" style="background-image:url(${path})"></span>`, originalText: fullMatch }); |