diff options
| author | Joram Wilander <jwawilander@gmail.com> | 2015-11-05 11:12:24 -0500 |
|---|---|---|
| committer | Joram Wilander <jwawilander@gmail.com> | 2015-11-05 11:12:24 -0500 |
| commit | 0e728316397eda4aaa9e957b7f1e2b7645ee804b (patch) | |
| tree | ea74f31ad0183d3c0818316e7e6eb6a698f1d7d8 /web/react | |
| parent | b8a1bd03cc58a355bbc28e9cecabbe6ed04f9115 (diff) | |
| parent | fafc3bfae4891e72902cef0d38c4c8715dc944e8 (diff) | |
| download | chat-0e728316397eda4aaa9e957b7f1e2b7645ee804b.tar.gz chat-0e728316397eda4aaa9e957b7f1e2b7645ee804b.tar.bz2 chat-0e728316397eda4aaa9e957b7f1e2b7645ee804b.zip | |
Merge pull request #1313 from mattermost/plt-992
PLT-992 / PLT-984 Fixed center channel height magic. Fixes tutorial.
Diffstat (limited to 'web/react')
| -rw-r--r-- | web/react/components/center_panel.jsx | 4 | ||||
| -rw-r--r-- | web/react/components/create_post.jsx | 2 | ||||
| -rw-r--r-- | web/react/components/posts_view_container.jsx | 2 |
3 files changed, 2 insertions, 6 deletions
diff --git a/web/react/components/center_panel.jsx b/web/react/components/center_panel.jsx index 242c2c637..ea0eec747 100644 --- a/web/react/components/center_panel.jsx +++ b/web/react/components/center_panel.jsx @@ -61,9 +61,7 @@ export default class CenterPanel extends React.Component { <div id='channel-header'> <ChannelHeader /> </div> - <div id='post-list'> - {postsContainer} - </div> + {postsContainer} <div className='post-create__container' id='post-create' diff --git a/web/react/components/create_post.jsx b/web/react/components/create_post.jsx index 1545cdfaa..4d1874e18 100644 --- a/web/react/components/create_post.jsx +++ b/web/react/components/create_post.jsx @@ -236,8 +236,6 @@ export default class CreatePost extends React.Component { PostStore.storeCurrentDraft(draft); } resizePostHolder() { - const height = this.state.windowHeight - $(ReactDOM.findDOMNode(this.refs.topDiv)).height() - 50; - $('.post-list-holder-by-time').css('height', `${height}px`); if (this.state.windowWidth > 960) { $('#post_textbox').focus(); } diff --git a/web/react/components/posts_view_container.jsx b/web/react/components/posts_view_container.jsx index 301057990..761664602 100644 --- a/web/react/components/posts_view_container.jsx +++ b/web/react/components/posts_view_container.jsx @@ -261,7 +261,7 @@ export default class PostsViewContainer extends React.Component { } return ( - <div>{postListCtls}</div> + <div id='post-list'>{postListCtls}</div> ); } } |