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.
Этот коммит содержится в:
Asaad Mahmood
2017-08-04 22:55:26 +05:00
коммит произвёл Saturnino Abril
родитель 5a8c1c18e5
Коммит fcede31bed
4 изменённых файлов: 38 добавлений и 36 удалений

Просмотреть файл

@@ -29,7 +29,7 @@ class UserSuggestion extends Suggestion {
render() { render() {
const {item, isSelection} = this.props; const {item, isSelection} = this.props;
let className = 'jirabots__name'; let className = 'suggestion-list__item mentions__name';
if (isSelection) { if (isSelection) {
className += ' suggestion--selected'; className += ' suggestion--selected';
} }
@@ -218,7 +218,7 @@ export default class JIRASettings extends AdminSettings {
onChange={this.handleSecretChange} onChange={this.handleSecretChange}
disabled={!this.state.enabled} disabled={!this.state.enabled}
/> />
<div className='banner'> <div className='banner banner--url'>
<div className='banner__content'> <div className='banner__content'>
<p> <p>
<FormattedMessage <FormattedMessage
@@ -229,8 +229,8 @@ export default class JIRASettings extends AdminSettings {
}} }}
/> />
</p> </p>
<p> <div className='banner__url'>
<code <span
dangerouslySetInnerHTML={{ dangerouslySetInnerHTML={{
__html: encodeURI(this.state.siteURL) + __html: encodeURI(this.state.siteURL) +
'/plugins/jira/webhook?secret=' + '/plugins/jira/webhook?secret=' +
@@ -242,7 +242,7 @@ export default class JIRASettings extends AdminSettings {
'</b>' '</b>'
}} }}
/> />
</p> </div>
</div> </div>
</div> </div>
</SettingsGroup> </SettingsGroup>

Просмотреть файл

@@ -5,34 +5,19 @@
.jirabots__dropdown { .jirabots__dropdown {
position: relative; position: relative;
}
.jirabots__dropdown::before { &:before {
position: absolute; border-color: #999 transparent transparent;
top: 13px; border-style: solid;
right: 8px; border-width: 5px 5px 2.5px;
content: " "; content: '';
pointer-events: none; height: 0;
pointer-events: none;
width: 0; position: absolute;
height: 0; right: 11px;
top: 15px;
border-left: 8px solid transparent; width: 0;
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;
} }
.jirabot__image { .jirabot__image {

Просмотреть файл

@@ -4,19 +4,26 @@
@extend %popover-box-shadow; @extend %popover-box-shadow;
width: 100%; width: 100%;
z-index: 100; z-index: 100;
.suggestion-list__item {
&:hover {
background: alpha-color($black, .1);
}
}
} }
.suggestion-list--top { .suggestion-list--top {
position: absolute;
bottom: 100%; bottom: 100%;
position: absolute;
} }
.suggestion-list--bottom { .suggestion-list--bottom {
position: relative;
height: 0; height: 0;
position: relative;
} }
.suggestion-list__content { .suggestion-list__content {
-webkit-overflow-scrolling: touch;
background-color: $white; background-color: $white;
border: $border-gray; border: $border-gray;
max-height: 292px; max-height: 292px;
@@ -24,7 +31,6 @@
overflow-y: scroll; overflow-y: scroll;
padding-bottom: 5px; padding-bottom: 5px;
width: 100%; width: 100%;
-webkit-overflow-scrolling: touch;
.command { .command {
border-bottom: 1px solid $light-gray; border-bottom: 1px solid $light-gray;

Просмотреть файл

@@ -185,6 +185,17 @@
margin: 2em 0; margin: 2em 0;
padding: .8em 1.5rem; padding: .8em 1.5rem;
&.banner--url {
padding: 1.2em;
}
.banner__url {
background: alpha-color($black, .07);
border-radius: 2px;
padding: .7em 1em;
word-break: break-all;
}
.banner__heading { .banner__heading {
font-size: 1.5em; font-size: 1.5em;
margin-bottom: 0.5em; margin-bottom: 0.5em;