diff options
| author | Corey Hulen <corey@hulen.com> | 2016-04-05 07:48:07 -0700 |
|---|---|---|
| committer | Corey Hulen <corey@hulen.com> | 2016-04-05 07:48:07 -0700 |
| commit | d78fd58237218e213307d22af8fa58760abadcc7 (patch) | |
| tree | b08084a697805dd837291bf771a31e7c9e3be797 /webapp | |
| parent | cf72de283cb56dfb6b5903723f2ff632ea165248 (diff) | |
| parent | 5f84a2cc3de2f591c30d92302b42f1c9d658da26 (diff) | |
| download | chat-d78fd58237218e213307d22af8fa58760abadcc7.tar.gz chat-d78fd58237218e213307d22af8fa58760abadcc7.tar.bz2 chat-d78fd58237218e213307d22af8fa58760abadcc7.zip | |
Merge pull request #2641 from hmhealey/plt2488
PLT-2488 Re-added missing file upload overlay for center channel
Diffstat (limited to 'webapp')
| -rw-r--r-- | webapp/components/channel_view.jsx | 4 | ||||
| -rw-r--r-- | webapp/sass/layout/_post.scss | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/webapp/components/channel_view.jsx b/webapp/components/channel_view.jsx index 4cca5aa98..00e1b7f35 100644 --- a/webapp/components/channel_view.jsx +++ b/webapp/components/channel_view.jsx @@ -4,8 +4,9 @@ import React from 'react'; import ChannelHeader from 'components/channel_header.jsx'; -import PostsViewContainer from 'components/posts_view_container.jsx'; +import FileUploadOverlay from 'components/file_upload_overlay.jsx'; import CreatePost from 'components/create_post.jsx'; +import PostsViewContainer from 'components/posts_view_container.jsx'; import ChannelStore from 'stores/channel_store.jsx'; @@ -47,6 +48,7 @@ export default class ChannelView extends React.Component { id='app-content' className='app__content' > + <FileUploadOverlay overlayType='center'/> <ChannelHeader channelId={this.state.channelId} /> diff --git a/webapp/sass/layout/_post.scss b/webapp/sass/layout/_post.scss index 947a81318..6801379ac 100644 --- a/webapp/sass/layout/_post.scss +++ b/webapp/sass/layout/_post.scss @@ -190,9 +190,6 @@ body.ios { } &.center-file-overlay { - .overlay__indent { - margin-left: 220px; - } } &.right-file-overlay { |