diff options
author | Florian Orben <florian.orben@gmail.com> | 2015-11-06 17:11:38 +0100 |
---|---|---|
committer | Florian Orben <florian.orben@gmail.com> | 2015-11-06 17:11:38 +0100 |
commit | 84a561207f5a901ddc38b286d87f6229fd18263e (patch) | |
tree | b7d6849d7d1f1bcdeab39dbbcc6a17a30608f26b | |
parent | 0d1fe806a06df9a0fcc97694d0c9e96835bbfb0b (diff) | |
download | chat-84a561207f5a901ddc38b286d87f6229fd18263e.tar.gz chat-84a561207f5a901ddc38b286d87f6229fd18263e.tar.bz2 chat-84a561207f5a901ddc38b286d87f6229fd18263e.zip |
display slack attachments in RHS comment section
-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%; } } |