diff options
| -rw-r--r-- | web/react/components/post_body.jsx | 4 | ||||
| -rw-r--r-- | web/sass-files/sass/partials/_base.scss | 10 | ||||
| -rwxr-xr-x | web/static/css/emojify.min.css | 1 | ||||
| -rw-r--r-- | web/templates/head.html | 1 |
4 files changed, 7 insertions, 9 deletions
diff --git a/web/react/components/post_body.jsx b/web/react/components/post_body.jsx index 5e460d686..3be615bb9 100644 --- a/web/react/components/post_body.jsx +++ b/web/react/components/post_body.jsx @@ -18,7 +18,7 @@ export default class PostBody extends React.Component { this.state = {links: linkData.links, message: linkData.text}; } - getTextNodesIn(nodeIn) { + getAllChildNodes(nodeIn) { var textNodes = []; function getTextNodes(node) { @@ -35,7 +35,7 @@ export default class PostBody extends React.Component { parseEmojis() { twemoji.parse(React.findDOMNode(this), {size: Constants.EMOJI_SIZE}); - this.getTextNodesIn(React.findDOMNode(this)).forEach((current) => { + this.getAllChildNodes(React.findDOMNode(this)).forEach((current) => { global.window.emojify.run(current); }); } diff --git a/web/sass-files/sass/partials/_base.scss b/web/sass-files/sass/partials/_base.scss index 85818e19b..cdc2152e9 100644 --- a/web/sass-files/sass/partials/_base.scss +++ b/web/sass-files/sass/partials/_base.scss @@ -130,9 +130,9 @@ div.theme { } .emoji { - width: 1.5em !important; - height: 1.5em !important; - display: inline-block !important; - margin-bottom: 0.25em !important; - background-size: contain !important; + width: 1.5em; + height: 1.5em; + display: inline-block; + margin-bottom: 0.25em; + background-size: contain; } diff --git a/web/static/css/emojify.min.css b/web/static/css/emojify.min.css deleted file mode 100755 index 94b45d066..000000000 --- a/web/static/css/emojify.min.css +++ /dev/null @@ -1 +0,0 @@ -.emoji{width:1.5em;height:1.5em;display:inline-block;margin-bottom:-.25em;background-size:contain}
\ No newline at end of file diff --git a/web/templates/head.html b/web/templates/head.html index 7b873bdb8..af5c86bba 100644 --- a/web/templates/head.html +++ b/web/templates/head.html @@ -40,7 +40,6 @@ <script src="/static/js/jquery-dragster/jquery.dragster.js"></script> - <link rel="stylesheet" href="/static/css/emoji/emojify.min.css" /> <script src="/static/js/emojify.min.js"></script> <script> emojify.setConfig({img_dir: '/static/images/emoji'}); |