diff options
author | Joram Wilander <jwawilander@gmail.com> | 2015-11-06 11:56:25 -0500 |
---|---|---|
committer | Joram Wilander <jwawilander@gmail.com> | 2015-11-06 11:56:25 -0500 |
commit | b11f510db7f4b9d4a1c38b3c9bbbc77ed3f45e88 (patch) | |
tree | 08a3913b9f6a9cdd5072044b004a3ce89c34c85c /web | |
parent | 9f9c8cb62c6b81fe67441cdf113b9a4b4b456066 (diff) | |
parent | 84a561207f5a901ddc38b286d87f6229fd18263e (diff) | |
download | chat-b11f510db7f4b9d4a1c38b3c9bbbc77ed3f45e88.tar.gz chat-b11f510db7f4b9d4a1c38b3c9bbbc77ed3f45e88.tar.bz2 chat-b11f510db7f4b9d4a1c38b3c9bbbc77ed3f45e88.zip |
Merge pull request #1337 from florianorben/attachments_rhs
Display slack attachments in RHS comment section
Diffstat (limited to 'web')
-rw-r--r-- | web/react/components/rhs_root_post.jsx | 4 | ||||
-rw-r--r-- | web/sass-files/sass/partials/_post.scss | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/web/react/components/rhs_root_post.jsx b/web/react/components/rhs_root_post.jsx index 21e52b438..e3b023841 100644 --- a/web/react/components/rhs_root_post.jsx +++ b/web/react/components/rhs_root_post.jsx @@ -9,6 +9,7 @@ var utils = require('../utils/utils.jsx'); var FileAttachmentList = require('./file_attachment_list.jsx'); var twemoji = require('twemoji'); var Constants = require('../utils/constants.jsx'); +const PostBodyAdditionalContent = require('./post_body_additional_content.jsx'); export default class RhsRootPost extends React.Component { constructor(props) { @@ -180,6 +181,9 @@ export default class RhsRootPost extends React.Component { onClick={TextFormatting.handleClick} dangerouslySetInnerHTML={{__html: TextFormatting.formatText(post.message)}} /> + <PostBodyAdditionalContent + post={post} + /> {fileAttachment} </div> </div> diff --git a/web/sass-files/sass/partials/_post.scss b/web/sass-files/sass/partials/_post.scss index b57c51242..36f6f445e 100644 --- a/web/sass-files/sass/partials/_post.scss +++ b/web/sass-files/sass/partials/_post.scss @@ -674,7 +674,7 @@ body.ios { width: 20%; float: right; img { - height: 75px; + max-height: 75px; max-width: 100%; } } |