diff options
| author | Christopher Speller <crspeller@gmail.com> | 2015-09-09 10:55:53 -0400 |
|---|---|---|
| committer | Christopher Speller <crspeller@gmail.com> | 2015-09-09 10:55:53 -0400 |
| commit | 2c67b4db61fb896854906c096b02290935fb9c7f (patch) | |
| tree | 3b9e78b36ebf02246349e51bd4a31eb703ba246a /web/react | |
| parent | 12f3c877f1b70869398f9318c1b81bfdf5080a43 (diff) | |
| parent | 9d3f67dddb96d851f5cf448d7ba85e24c7949451 (diff) | |
| download | chat-2c67b4db61fb896854906c096b02290935fb9c7f.tar.gz chat-2c67b4db61fb896854906c096b02290935fb9c7f.tar.bz2 chat-2c67b4db61fb896854906c096b02290935fb9c7f.zip | |
Merge pull request #625 from asaadmahmoodspin/ui-changes
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 | 16 |
2 files changed, 10 insertions, 12 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..031abc36a 100644 --- a/web/react/components/team_import_tab.jsx +++ b/web/react/components/team_import_tab.jsx @@ -34,13 +34,11 @@ 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 = ( <SettingUpload title='Import from Slack' @@ -58,7 +56,7 @@ export default class TeamImportTab extends React.Component { break; case 'in-progress': messageSection = ( - <p className='confirm-import alert alert-warning'><i className='fa fa-spinner fa-pulse'></i> Importing...</p> + <p className='confirm-import alert alert-warning'><i className='fa fa-spinner fa-pulse'></i>{' Importing...'}</p> ); break; case 'done': @@ -99,18 +97,18 @@ export default class TeamImportTab extends React.Component { data-dismiss='modal' aria-label='Close' > - <span aria-hidden='true'>×</span> + <span aria-hidden='true'>{'×'}</span> </button> <h4 className='modal-title' ref='title' - ><i className='modal-back'></i>Import</h4> + ><i className='modal-back'></i>{'Import'}</h4> </div> <div ref='wrapper' className='user-settings' > - <h3 className='tab-header'>Import</h3> + <h3 className='tab-header'>{'Import'}</h3> <div className='divider-dark first'/> {uploadSection} <div className='divider-dark'/> |