upstream/mattermost
1
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2026-05-28 04:35:04 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fixing css

Browse source
This commit is contained in:
=Corey Hulen 2015-09-16 23:27:25 -07:00
parent 8e848f38d5
commit 99d0db136c
4 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
web/react/components/post_body.jsx
View file

@ -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);
});
}

10
web/sass-files/sass/partials/_base.scss
View file

@ -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;
}

1
web/static/css/emojify.min.css vendored
View file

@ -1 +0,0 @@
.emoji{width:1.5em;height:1.5em;display:inline-block;margin-bottom:-.25em;background-size:contain}

1
web/templates/head.html
View file

@ -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'});