summaryrefslogtreecommitdiffstats
path: root/web/react/components
diff options
context:
space:
mode:
authorChristopher Speller <crspeller@gmail.com>2015-10-07 08:43:24 -0400
committerChristopher Speller <crspeller@gmail.com>2015-10-07 08:43:24 -0400
commit4263c08c55f7bc4b18cadeaed44f9ed8126ba70e (patch)
treec25d1230ed6f75afd4b41b11ca22d9500e68debb /web/react/components
parentdfaef4bd7227391e21890c720f9668acb3a64c28 (diff)
parent698ca63d991f4246060223642116a78302a5af32 (diff)
downloadchat-4263c08c55f7bc4b18cadeaed44f9ed8126ba70e.tar.gz
chat-4263c08c55f7bc4b18cadeaed44f9ed8126ba70e.tar.bz2
chat-4263c08c55f7bc4b18cadeaed44f9ed8126ba70e.zip
Merge pull request #953 from asaadmahmoodspin/plt-522
PLT-522 - Adding option for mentionHighlightLink for themes
Diffstat (limited to 'web/react/components')
-rw-r--r--web/react/components/user_settings/user_settings_appearance.jsx14
1 files changed, 7 insertions, 7 deletions
diff --git a/web/react/components/user_settings/user_settings_appearance.jsx b/web/react/components/user_settings/user_settings_appearance.jsx
index c4a137ed8..be6cf1f42 100644
--- a/web/react/components/user_settings/user_settings_appearance.jsx
+++ b/web/react/components/user_settings/user_settings_appearance.jsx
@@ -214,14 +214,14 @@ export default class UserSettingsAppearance extends React.Component {
<div className='divider-dark first'/>
{themeUI}
<div className='divider-dark'/>
+ <br/>
+ <a
+ className='theme'
+ onClick={this.handleImportModal}
+ >
+ {'Import theme colors from Slack'}
+ </a>
</div>
- <br/>
- <a
- className='theme'
- onClick={this.handleImportModal}
- >
- {'Import theme colors from Slack'}
- </a>
</div>
);
}