summaryrefslogtreecommitdiffstats
path: root/web/react
diff options
context:
space:
mode:
authorJoram Wilander <jwawilander@gmail.com>2015-12-04 08:16:02 -0500
committerJoram Wilander <jwawilander@gmail.com>2015-12-04 08:16:02 -0500
commitbd90802c2ca53378ed5d0190f6b0ebf3948daf5f (patch)
tree51d5952b878cb55b991124ac662d9abd14d26f87 /web/react
parent129fa3c89a5aa9838338f869f30650961fc2f6ab (diff)
parent024f62f1b383d8aad6ed1c9f90116467ded7bd42 (diff)
downloadchat-bd90802c2ca53378ed5d0190f6b0ebf3948daf5f.tar.gz
chat-bd90802c2ca53378ed5d0190f6b0ebf3948daf5f.tar.bz2
chat-bd90802c2ca53378ed5d0190f6b0ebf3948daf5f.zip
Merge pull request #1614 from florianorben/reorder-display-settings
Reorder display settings; remove 'button thingy' in font options
Diffstat (limited to 'web/react')
-rw-r--r--web/react/components/user_settings/user_settings_display.jsx9
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>
);