diff options
Diffstat (limited to 'webapp/components/admin_console')
4 files changed, 17 insertions, 6 deletions
diff --git a/webapp/components/admin_console/connection_security_dropdown_setting.jsx b/webapp/components/admin_console/connection_security_dropdown_setting.jsx index e00abf304..02b56b192 100644 --- a/webapp/components/admin_console/connection_security_dropdown_setting.jsx +++ b/webapp/components/admin_console/connection_security_dropdown_setting.jsx @@ -10,7 +10,7 @@ import {FormattedMessage} from 'react-intl'; const CONNECTION_SECURITY_HELP_TEXT = ( <div className='help-text'> <table - className='table table-bordered' + className='table table-bordered table-margin--none' cellPadding='5' > <tbody> @@ -80,6 +80,7 @@ export default class ConnectionSecurityDropdownSetting extends React.Component { handleChange={this.props.handleChange} isDisabled={this.props.isDisabled} helpText={CONNECTION_SECURITY_HELP_TEXT} + margin='small' /> ); } diff --git a/webapp/components/admin_console/dropdown_setting.jsx b/webapp/components/admin_console/dropdown_setting.jsx index d96c3cef8..fca8dd170 100644 --- a/webapp/components/admin_console/dropdown_setting.jsx +++ b/webapp/components/admin_console/dropdown_setting.jsx @@ -20,7 +20,10 @@ export default class DropdownSetting extends React.Component { } return ( - <Setting label={this.props.label}> + <Setting + label={this.props.label} + margin={this.props.margin} + > <select className='form-control' value={this.props.currentValue} @@ -43,5 +46,6 @@ DropdownSetting.propTypes = { currentValue: React.PropTypes.string.isRequired, handleChange: React.PropTypes.func.isRequired, isDisabled: React.PropTypes.bool.isRequired, - helpText: React.PropTypes.node.isRequired + helpText: React.PropTypes.node.isRequired, + margin: React.PropTypes.oneOf(['', 'small']) }; diff --git a/webapp/components/admin_console/email_settings.jsx b/webapp/components/admin_console/email_settings.jsx index 7e8ad616f..dcdf52486 100644 --- a/webapp/components/admin_console/email_settings.jsx +++ b/webapp/components/admin_console/email_settings.jsx @@ -910,7 +910,7 @@ class EmailSettings extends React.Component { isDisabled={!this.state.sendEmailNotifications} /> <div className='form-group'> - <div className='col-sm-8'> + <div className='col-sm-offset-4 col-sm-8'> <div className='help-text'> <button className='btn btn-default' diff --git a/webapp/components/admin_console/setting.jsx b/webapp/components/admin_console/setting.jsx index 3e8c59b5d..8fc5c2ad8 100644 --- a/webapp/components/admin_console/setting.jsx +++ b/webapp/components/admin_console/setting.jsx @@ -5,8 +5,13 @@ import React from 'react'; export default class Setting extends React.Component { render() { + let marginClass; + if (this.props.margin === 'small') { + marginClass = ' form-group--small'; + } + return ( - <div className='form-group'> + <div className={'form-group' + marginClass}> <label className='control-label col-sm-4' > @@ -24,5 +29,6 @@ Setting.defaultProps = { Setting.propTypes = { label: React.PropTypes.node.isRequired, - children: React.PropTypes.node.isRequired + children: React.PropTypes.node.isRequired, + margin: React.PropTypes.oneOf(['', 'small']) }; |