diff options
author | Asaad Mahmood <asaadmahmood@users.noreply.github.com> | 2017-08-04 22:55:26 +0500 |
---|---|---|
committer | Saturnino Abril <saturnino.abril@gmail.com> | 2017-08-05 01:55:26 +0800 |
commit | fcede31bed72becef25e6eb528658f0962f1979f (patch) | |
tree | f64918744300191052a56674012f001560ade696 /webapp/plugins/jira/components | |
parent | 5a8c1c18e52c4604e1b8473fb3ab57c670e9858f (diff) | |
download | chat-fcede31bed72becef25e6eb528658f0962f1979f.tar.gz chat-fcede31bed72becef25e6eb528658f0962f1979f.tar.bz2 chat-fcede31bed72becef25e6eb528658f0962f1979f.zip |
PLT-7295 - Submitting UI changes for Jira (#7097)
* PLT-7295 - Submitting UI changes for Jira
* Updating help text
* Revert "Updating help text"
This reverts commit 2885b290c6951b47da1465095ee6e83c6a750f33.
Diffstat (limited to 'webapp/plugins/jira/components')
-rw-r--r-- | webapp/plugins/jira/components/settings.jsx | 10 | ||||
-rw-r--r-- | webapp/plugins/jira/components/style.scss | 39 |
2 files changed, 17 insertions, 32 deletions
diff --git a/webapp/plugins/jira/components/settings.jsx b/webapp/plugins/jira/components/settings.jsx index 5e5b5fac6..c0f7a0a7b 100644 --- a/webapp/plugins/jira/components/settings.jsx +++ b/webapp/plugins/jira/components/settings.jsx @@ -29,7 +29,7 @@ class UserSuggestion extends Suggestion { render() { const {item, isSelection} = this.props; - let className = 'jirabots__name'; + let className = 'suggestion-list__item mentions__name'; if (isSelection) { className += ' suggestion--selected'; } @@ -218,7 +218,7 @@ export default class JIRASettings extends AdminSettings { onChange={this.handleSecretChange} disabled={!this.state.enabled} /> - <div className='banner'> + <div className='banner banner--url'> <div className='banner__content'> <p> <FormattedMessage @@ -229,8 +229,8 @@ export default class JIRASettings extends AdminSettings { }} /> </p> - <p> - <code + <div className='banner__url'> + <span dangerouslySetInnerHTML={{ __html: encodeURI(this.state.siteURL) + '/plugins/jira/webhook?secret=' + @@ -242,7 +242,7 @@ export default class JIRASettings extends AdminSettings { '</b>' }} /> - </p> + </div> </div> </div> </SettingsGroup> diff --git a/webapp/plugins/jira/components/style.scss b/webapp/plugins/jira/components/style.scss index 477328316..46dd58427 100644 --- a/webapp/plugins/jira/components/style.scss +++ b/webapp/plugins/jira/components/style.scss @@ -5,34 +5,19 @@ .jirabots__dropdown { position: relative; -} - -.jirabots__dropdown::before { - position: absolute; - top: 13px; - right: 8px; - content: " "; - pointer-events: none; - width: 0; - height: 0; - - border-left: 8px solid transparent; - border-right: 8px solid transparent; - border-top: 8px solid #e2e2e2; -} - -.jirabots__name { - @include clearfix; - cursor: pointer; - font-size: 13px; - line-height: 20px; - margin: 0; - padding: 6px 10px; - position: relative; - white-space: nowrap; - width: 100%; - z-index: 101; + &:before { + border-color: #999 transparent transparent; + border-style: solid; + border-width: 5px 5px 2.5px; + content: ''; + height: 0; + pointer-events: none; + position: absolute; + right: 11px; + top: 15px; + width: 0; + } } .jirabot__image { |