diff options
| author | Asaad Mahmood <Unknowngi@live.com> | 2015-09-08 21:12:36 +0500 |
|---|---|---|
| committer | Asaad Mahmood <Unknowngi@live.com> | 2015-09-08 21:12:36 +0500 |
| commit | 62940fb72f8ba89b97bbbd2bdc484fd42f5e09ce (patch) | |
| tree | ae40f78bfc1655296356014421275eddac863068 /web/react | |
| parent | 5b3ee66dc3baff35104bc6e6c8f25c4474005974 (diff) | |
| download | chat-62940fb72f8ba89b97bbbd2bdc484fd42f5e09ce.tar.gz chat-62940fb72f8ba89b97bbbd2bdc484fd42f5e09ce.tar.bz2 chat-62940fb72f8ba89b97bbbd2bdc484fd42f5e09ce.zip | |
UI changes for various tickets
Diffstat (limited to 'web/react')
| -rw-r--r-- | web/react/components/setting_upload.jsx | 6 | ||||
| -rw-r--r-- | web/react/components/team_import_tab.jsx | 6 |
2 files changed, 4 insertions, 8 deletions
diff --git a/web/react/components/setting_upload.jsx b/web/react/components/setting_upload.jsx index 5979091c4..fad27b355 100644 --- a/web/react/components/setting_upload.jsx +++ b/web/react/components/setting_upload.jsx @@ -64,9 +64,9 @@ export default class SettingsUpload extends React.Component { } return ( <ul className='section-max'> - <li className='col-xs-12 section-title'>{this.props.title}</li> - <li className='col-xs-offset-3'>{this.props.helpText}</li> - <li className='col-xs-offset-3 col-xs-8'> + <li className='col-sm-12 section-title'>{this.props.title}</li> + <li className='col-sm-offset-3 col-sm-9'>{this.props.helpText}</li> + <li className='col-sm-offset-3 col-sm-9'> <ul className='setting-list'> <li className='setting-list-item'> <span className='btn btn-sm btn-primary btn-file sel-btn'> diff --git a/web/react/components/team_import_tab.jsx b/web/react/components/team_import_tab.jsx index 1ab348465..ce0e81299 100644 --- a/web/react/components/team_import_tab.jsx +++ b/web/react/components/team_import_tab.jsx @@ -34,11 +34,7 @@ export default class TeamImportTab extends React.Component { render() { var uploadHelpText = ( <div> - <br/> - Slack does not allow you to export files, images, private groups or direct messages stored in Slack. Therefore, Slack import to Mattermost only supports importing of text messages in your Slack team's public channels. - <br/><br/> - The Slack import to Mattermost is in "Preview". Slack bot posts and channels with underscores do not yet import. - <br/><br/> + <p>Slack does not allow you to export files, images, private groups or direct messages stored in Slack. Therefore, Slack import to Mattermost only supports importing of text messages in your Slack team's public channels. </p> <p>The Slack import to Mattermost is in "Preview". Slack bot posts and channels with underscores do not yet import. </p> </div> ); var uploadSection = ( |