summaryrefslogtreecommitdiffstats
path: root/web/react/components/user_settings
diff options
context:
space:
mode:
authorChristopher Speller <crspeller@gmail.com>2015-11-09 14:13:36 -0500
committerChristopher Speller <crspeller@gmail.com>2015-11-09 14:13:36 -0500
commit79cc0be0b061001ec8e197d53872c547f0c76160 (patch)
treeb89919280850634ad44bd45fd15f1300a1b6e7a9 /web/react/components/user_settings
parent3ad252995a419c1bb3d20be1a8a38f4c5873cda7 (diff)
parent16e877f99e995fc4130a406fd687d2b1f4a5fff4 (diff)
downloadchat-79cc0be0b061001ec8e197d53872c547f0c76160.tar.gz
chat-79cc0be0b061001ec8e197d53872c547f0c76160.tar.bz2
chat-79cc0be0b061001ec8e197d53872c547f0c76160.zip
Merge pull request #1367 from asaadmahmoodspin/ui-improvements
Updating tutorial tip and adding div tags to webhook labels.
Diffstat (limited to 'web/react/components/user_settings')
-rw-r--r--web/react/components/user_settings/manage_incoming_hooks.jsx2
-rw-r--r--web/react/components/user_settings/manage_outgoing_hooks.jsx3
2 files changed, 2 insertions, 3 deletions
diff --git a/web/react/components/user_settings/manage_incoming_hooks.jsx b/web/react/components/user_settings/manage_incoming_hooks.jsx
index 6b8c09718..128c011ea 100644
--- a/web/react/components/user_settings/manage_incoming_hooks.jsx
+++ b/web/react/components/user_settings/manage_incoming_hooks.jsx
@@ -163,7 +163,7 @@ export default class ManageIncomingHooks extends React.Component {
return (
<div key='addIncomingHook'>
{'Create webhook URLs for use in external integrations. Please see '}<a href='http://mattermost.org/webhooks'>{'http://mattermost.org/webhooks'}</a> {' to learn more.'}
- <label className='control-label padding-top x2'>{'Add a new incoming webhook'}</label>
+ <div><label className='control-label padding-top x2'>{'Add a new incoming webhook'}</label></div>
<div className='row padding-top'>
<div className='col-sm-10 padding-bottom'>
<select
diff --git a/web/react/components/user_settings/manage_outgoing_hooks.jsx b/web/react/components/user_settings/manage_outgoing_hooks.jsx
index c00449699..7b7cf7401 100644
--- a/web/react/components/user_settings/manage_outgoing_hooks.jsx
+++ b/web/react/components/user_settings/manage_outgoing_hooks.jsx
@@ -241,8 +241,7 @@ export default class ManageOutgoingHooks extends React.Component {
return (
<div key='addOutgoingHook'>
{'Create webhooks to send new message events to an external integration. Please see '}<a href='http://mattermost.org/webhooks'>{'http://mattermost.org/webhooks'}</a> {' to learn more.'}
- <br/>
- <label className='control-label'>{'Add a new outgoing webhook'}</label>
+ <div><label className='control-label padding-top x2'>{'Add a new outgoing webhook'}</label></div>
<div className='padding-top divider-light'></div>
<div className='padding-top'>
<div>