Skip to content

Fix bug where annotation remove icon is incorrect color #1157

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-robot merged 1 commit into from
Jan 31, 2019
Merged

Fix bug where annotation remove icon is incorrect color #1157

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions frontend/public/components/utils/_name-value-editor.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,6 @@ $drag-row-margin: 8px;
}

.pairs-list__action-icon {
color: $color-pf-black-900;
margin-left: $drag-row-margin;
width: auto;
}
Expand All @@ -74,7 +73,6 @@ $drag-row-margin: 8px;
}

.pairs-list__span-btns {
color: $color-pf-black-900;
margin-left: -$drag-row-margin;
white-space: pre;
}
8 changes: 4 additions & 4 deletions frontend/public/components/utils/name-value-editor.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -317,7 +317,7 @@ const PairElement = DragSource(DRAGGABLE_TYPE.ENV_ROW, pairSource, collectSource
<div className={classNames('row', isDragging ? 'pairs-list__row-dragging' : 'pairs-list__row')} ref={node => this.node = node}>
{allowSorting && !readOnly &&
<div className="col-xs-1 pairs-list__action">
{connectDragSource(<button type="button" className="btn btn-link pairs-list__action-icon" tabIndex="-1">
{connectDragSource(<button type="button" className="btn btn-link btn-link--inherit-color pairs-list__action-icon" tabIndex="-1">
<i className="pficon pficon-drag-drop pairs-list__action-icon--reorder" />
</button>)}
</div>
Expand All @@ -338,7 +338,7 @@ const PairElement = DragSource(DRAGGABLE_TYPE.ENV_ROW, pairSource, collectSource
{
!readOnly &&
<div className="col-xs-1">
<button type="button" className={classNames('btn', 'btn-link', {'pairs-list__span-btns': allowSorting})} onClick={this._onRemove}>
<button type="button" className={classNames('btn', 'btn-link', 'btn-link--inherit-color', {'pairs-list__span-btns': allowSorting})} onClick={this._onRemove}>
{deleteButton}
</button>
</div>
Expand Down Expand Up @@ -401,7 +401,7 @@ const EnvFromPairElement = DragSource(DRAGGABLE_TYPE.ENV_FROM_ROW, pairSource, c
<div className={classNames('row', isDragging ? 'pairs-list__row-dragging' : 'pairs-list__row')} ref={node => this.node = node}>
{ !readOnly &&
<div className="col-xs-1 pairs-list__action">
{connectDragSource(<button type="button" className="btn btn-link pairs-list__action-icon" tabIndex="-1">
{connectDragSource(<button type="button" className="btn btn-link btn-link--inherit-color pairs-list__action-icon" tabIndex="-1">
<i className="pficon pficon-drag-drop pairs-list__action-icon--reorder" />
</button>)}
</div>
Expand All @@ -415,7 +415,7 @@ const EnvFromPairElement = DragSource(DRAGGABLE_TYPE.ENV_FROM_ROW, pairSource, c
{
readOnly ? null :
<div className="col-xs-1">
<button type="button" className="btn btn-link pairs-list__span-btns" onClick={this._onRemove}>
<button type="button" className="btn btn-link btn-link--inherit-color pairs-list__span-btns" onClick={this._onRemove}>
{deleteButton}
</button>
</div>
Expand Down
4 changes: 4 additions & 0 deletions frontend/public/style/_overrides.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,6 +155,10 @@ tags-input .autocomplete .suggestion-item em {
margin-left: 3px;
}

.btn-link--inherit-color {
color: inherit;
}

.breadcrumb {
margin-bottom: 0;
padding-bottom: 12px;
Expand Down