diff options
author | Florian Orben <florian.orben@gmail.com> | 2015-12-04 02:54:15 +0100 |
---|---|---|
committer | Florian Orben <florian.orben@gmail.com> | 2015-12-04 02:54:15 +0100 |
commit | 024f62f1b383d8aad6ed1c9f90116467ded7bd42 (patch) | |
tree | f2c56bd77e7bc1a948d80b6b476395fc6b41769e /web/react/components | |
parent | d5d66214db6c108eb94cf2e43c0c4538cdb5d7ae (diff) | |
download | chat-024f62f1b383d8aad6ed1c9f90116467ded7bd42.tar.gz chat-024f62f1b383d8aad6ed1c9f90116467ded7bd42.tar.bz2 chat-024f62f1b383d8aad6ed1c9f90116467ded7bd42.zip |
reorder display settings; remove 'button thingy' in font options
Diffstat (limited to 'web/react/components')
-rw-r--r-- | web/react/components/user_settings/user_settings_display.jsx | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/web/react/components/user_settings/user_settings_display.jsx b/web/react/components/user_settings/user_settings_display.jsx index dc3865c68..c464258de 100644 --- a/web/react/components/user_settings/user_settings_display.jsx +++ b/web/react/components/user_settings/user_settings_display.jsx @@ -241,7 +241,7 @@ export default class UserSettingsDisplay extends React.Component { const inputs = [ <div key='userDisplayNameOptions'> <div - className='input-group theme-group dropdown' + className='dropdown' > <select className='form-control' @@ -251,9 +251,6 @@ export default class UserSettingsDisplay extends React.Component { > {options} </select> - <span className={'input-group-addon ' + Constants.FONTS[this.state.selectedFont]}> - {this.state.selectedFont} - </span> </div> <div><br/>{'Select the font displayed in the Mattermost user interface.'}</div> </div> @@ -312,12 +309,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> ); |