diff options
| author | Asaad Mahmood <asaad@spinpunch.com> | 2015-12-04 13:21:40 +0500 |
|---|---|---|
| committer | Asaad Mahmood <asaad@spinpunch.com> | 2015-12-04 19:19:21 +0500 |
| commit | 62ee998714bbb2bcd5759ff71ed4818c62b43806 (patch) | |
| tree | e0fdd4be98c5274ce47ea8ae8f9886b5150f8d30 /web/react/components/user_settings | |
| parent | 622fbc67402fe36bc01163a5a80643a15758e094 (diff) | |
| download | chat-62ee998714bbb2bcd5759ff71ed4818c62b43806.tar.gz chat-62ee998714bbb2bcd5759ff71ed4818c62b43806.tar.bz2 chat-62ee998714bbb2bcd5759ff71ed4818c62b43806.zip | |
Multiple UI Improvements
Diffstat (limited to 'web/react/components/user_settings')
| -rw-r--r-- | web/react/components/user_settings/user_settings_display.jsx | 22 | ||||
| -rw-r--r-- | web/react/components/user_settings/user_settings_modal.jsx | 2 |
2 files changed, 10 insertions, 14 deletions
diff --git a/web/react/components/user_settings/user_settings_display.jsx b/web/react/components/user_settings/user_settings_display.jsx index c464258de..fd1e28033 100644 --- a/web/react/components/user_settings/user_settings_display.jsx +++ b/web/react/components/user_settings/user_settings_display.jsx @@ -240,18 +240,14 @@ export default class UserSettingsDisplay extends React.Component { const inputs = [ <div key='userDisplayNameOptions'> - <div - className='dropdown' + <select + className='form-control' + type='text' + value={this.state.selectedFont} + onChange={(e) => this.handleFont(e.target.value)} > - <select - className='form-control' - type='text' - value={this.state.selectedFont} - onChange={(e) => this.handleFont(e.target.value)} - > - {options} - </select> - </div> + {options} + </select> <div><br/>{'Select the font displayed in the Mattermost user interface.'}</div> </div> ]; @@ -309,12 +305,12 @@ export default class UserSettingsDisplay extends React.Component { <div className='user-settings'> <h3 className='tab-header'>{'Display Settings'}</h3> <div className='divider-dark first'/> - {fontSection} - <div className='divider-dark'/> {clockSection} <div className='divider-dark'/> {nameFormatSection} <div className='divider-dark'/> + {fontSection} + <div className='divider-dark'/> </div> </div> ); diff --git a/web/react/components/user_settings/user_settings_modal.jsx b/web/react/components/user_settings/user_settings_modal.jsx index f9d03f56d..97c601b5e 100644 --- a/web/react/components/user_settings/user_settings_modal.jsx +++ b/web/react/components/user_settings/user_settings_modal.jsx @@ -47,7 +47,7 @@ export default class UserSettingsModal extends React.Component { } handleShow() { - $(ReactDOM.findDOMNode(this.refs.modalBody)).css('max-height', $(window).height() - 300); + $(ReactDOM.findDOMNode(this.refs.modalBody)).css('max-height', $(window).height() - 50); if ($(window).width() > 768) { $(ReactDOM.findDOMNode(this.refs.modalBody)).perfectScrollbar(); } |