IntenseWebs/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2025-02-25 18:55:24 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2641 from hmhealey/plt2488

Browse Source 
PLT-2488 Re-added missing file upload overlay for center channel
This commit is contained in:
Corey Hulen
2016-04-05 07:48:07 -07:00
parent cf72de283c 5f84a2cc3d
commit d78fd58237
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
webapp/components/channel_view.jsx
View File

@@ -4,8 +4,9 @@
import React from 'react'; import React from 'react';
import ChannelHeader from 'components/channel_header.jsx'; 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 CreatePost from 'components/create_post.jsx';
import PostsViewContainer from 'components/posts_view_container.jsx';
import ChannelStore from 'stores/channel_store.jsx'; import ChannelStore from 'stores/channel_store.jsx';
@@ -47,6 +48,7 @@ export default class ChannelView extends React.Component {
id='app-content' id='app-content'
className='app__content' className='app__content'
> >
<FileUploadOverlay overlayType='center'/>
<ChannelHeader <ChannelHeader
channelId={this.state.channelId} channelId={this.state.channelId}
/> />

3
webapp/sass/layout/_post.scss
View File

@@ -190,9 +190,6 @@ body.ios {
} }
&.center-file-overlay { &.center-file-overlay {
.overlay__indent {
margin-left: 220px;
}
} }
&.right-file-overlay { &.right-file-overlay {