diff options
author | Christopher Speller <crspeller@gmail.com> | 2015-11-09 14:13:36 -0500 |
---|---|---|
committer | Christopher Speller <crspeller@gmail.com> | 2015-11-09 14:13:36 -0500 |
commit | 79cc0be0b061001ec8e197d53872c547f0c76160 (patch) | |
tree | b89919280850634ad44bd45fd15f1300a1b6e7a9 /web | |
parent | 3ad252995a419c1bb3d20be1a8a38f4c5873cda7 (diff) | |
parent | 16e877f99e995fc4130a406fd687d2b1f4a5fff4 (diff) | |
download | chat-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')
-rw-r--r-- | web/react/components/tutorial/tutorial_tip.jsx | 7 | ||||
-rw-r--r-- | web/react/components/user_settings/manage_incoming_hooks.jsx | 2 | ||||
-rw-r--r-- | web/react/components/user_settings/manage_outgoing_hooks.jsx | 3 | ||||
-rw-r--r-- | web/sass-files/sass/partials/_tutorial.scss | 8 | ||||
-rw-r--r-- | web/static/images/tutorialTip.gif | bin | 18421 -> 22502 bytes | |||
-rw-r--r-- | web/static/images/tutorialTipWhite.gif | bin | 0 -> 6704 bytes |
6 files changed, 14 insertions, 6 deletions
diff --git a/web/react/components/tutorial/tutorial_tip.jsx b/web/react/components/tutorial/tutorial_tip.jsx index 3094b2f4c..75d73e920 100644 --- a/web/react/components/tutorial/tutorial_tip.jsx +++ b/web/react/components/tutorial/tutorial_tip.jsx @@ -69,11 +69,16 @@ export default class TutorialTip extends React.Component { } } + var tipColor = ''; + if (this.props.overlayClass === 'tip-overlay--header') { + tipColor = 'White'; + } + return ( <div className={'tip-div ' + this.props.overlayClass}> <img className='tip-button' - src='/static/images/tutorialTip.gif' + src={'/static/images/tutorialTip' + tipColor + '.gif'} width='35' onClick={this.toggle} ref='target' 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> diff --git a/web/sass-files/sass/partials/_tutorial.scss b/web/sass-files/sass/partials/_tutorial.scss index 08d491fd9..a6e16fe37 100644 --- a/web/sass-files/sass/partials/_tutorial.scss +++ b/web/sass-files/sass/partials/_tutorial.scss @@ -127,7 +127,11 @@ right:0px; &.tip-overlay--header { - top: 20px; + top: 21px; + right: 2px; + .tip-button { + @include opacity(0.8); + } } &.tip-overlay--sidebar { @@ -154,7 +158,7 @@ margin-bottom: 50px; text-align: left; display: inline-block; - padding-bottom: 30px; + padding-bottom: 30px; } .btn-primary { position: absolute; diff --git a/web/static/images/tutorialTip.gif b/web/static/images/tutorialTip.gif Binary files differindex f185ff4b9..c925f0222 100644 --- a/web/static/images/tutorialTip.gif +++ b/web/static/images/tutorialTip.gif diff --git a/web/static/images/tutorialTipWhite.gif b/web/static/images/tutorialTipWhite.gif Binary files differnew file mode 100644 index 000000000..ecf8e97be --- /dev/null +++ b/web/static/images/tutorialTipWhite.gif |