Merge pull request #1240 from theseyi/misc-fix

fixes issue with delete button droppping to new line in smaller resol…
This commit is contained in:
Seyi Adebajo 2018-06-28 13:35:52 -07:00 committed by GitHub
commit feaaa1a8d6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 173 additions and 162 deletions

View File

@ -43,7 +43,7 @@
}
&__identifier-column {
width: 35%;
width: 30%;
}
&__identifier-cell {
@ -112,6 +112,7 @@
&__add-field {
&#{&} {
font-weight: fw(normal, 4);
display: block;
}
}
@ -210,6 +211,11 @@
}
}
&__tag-item {
display: flex;
flex-wrap: nowrap;
}
&__tag-info {
padding: item-spacing(1);
margin-bottom: item-spacing(2);

View File

@ -1,2 +1,3 @@
@import 'ember-power-select';
@import 'ember-radio-button';
@import 'ember-tooltip';

View File

@ -0,0 +1,3 @@
.ember-tooltip {
z-index: z(dropdown);
}

View File

@ -193,6 +193,7 @@
{{#if (and isEditing (not row.isReadonly))}}
{{#each row.fieldChangeSet as |tag|}}
<div class="dataset-compliance-fields__tag-item">
{{#basic-dropdown as |tagDrop|}}
{{#tagDrop.trigger
class="dataset-compliance-fields__tag-info dataset-compliance-fields__tag-info--editable"}}
@ -386,10 +387,10 @@
</button>
</span>
{{/if}}
</div>
{{/each}}
{{#unless row.hasNoneTag}}
<br>
<button
class="nacho-button nacho-button--tertiary dataset-compliance-fields__add-field"
onclick={{action row.onAddFieldTag}}>