diff options
author | =Corey Hulen <corey@hulen.com> | 2015-09-03 13:39:22 -0700 |
---|---|---|
committer | =Corey Hulen <corey@hulen.com> | 2015-09-03 13:39:22 -0700 |
commit | 05d95d80a896d14474c7f7384d67b9edd524b922 (patch) | |
tree | 2fcc619c38175014813ffc7df34abad82e5d5b77 /web/react/components/setting_item_max.jsx | |
parent | 48ca3a4007c8b9c40a3bc3789563ed9992e9b64d (diff) | |
parent | 4f0c06114b61c92d982baac1c54ed80da93a9cc9 (diff) | |
download | chat-05d95d80a896d14474c7f7384d67b9edd524b922.tar.gz chat-05d95d80a896d14474c7f7384d67b9edd524b922.tar.bz2 chat-05d95d80a896d14474c7f7384d67b9edd524b922.zip |
Merge branch 'master' into PLT-12
Diffstat (limited to 'web/react/components/setting_item_max.jsx')
-rw-r--r-- | web/react/components/setting_item_max.jsx | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/web/react/components/setting_item_max.jsx b/web/react/components/setting_item_max.jsx index e67e458af..b1bab1d48 100644 --- a/web/react/components/setting_item_max.jsx +++ b/web/react/components/setting_item_max.jsx @@ -15,16 +15,20 @@ export default class SettingItemMax extends React.Component { var extraInfo = null; if (this.props.extraInfo) { - extraInfo = this.props.extraInfo; + extraInfo = (<div className='setting-list__hint'>{this.props.extraInfo}</div>); } var submit = ''; if (this.props.submit) { - submit = (<a - className='btn btn-sm btn-primary' - href='#' - onClick={this.props.submit}> - Submit</a>); + submit = ( + <a + className='btn btn-sm btn-primary' + href='#' + onClick={this.props.submit} + > + Submit + </a> + ); } var inputs = this.props.inputs; @@ -46,7 +50,8 @@ export default class SettingItemMax extends React.Component { <a className='btn btn-sm theme' href='#' - onClick={this.props.updateSection} > + onClick={this.props.updateSection} + > Cancel </a> </li> |