Commit 2da5853a authored by Annabel Dunstone Gray's avatar Annabel Dunstone Gray

Merge branch '7600-epic-issues-list-styling-updates' into 'master'

Update Epic issue item styling to match with related issues styling

Closes #7600

See merge request gitlab-org/gitlab-ee!7784
parents a6497423 3f6a57da
...@@ -392,7 +392,6 @@ ul.related-merge-requests > li { ...@@ -392,7 +392,6 @@ ul.related-merge-requests > li {
.issue-token-title-text { .issue-token-title-text {
overflow: hidden; overflow: hidden;
max-width: 264px;
text-overflow: ellipsis; text-overflow: ellipsis;
} }
......
...@@ -28,14 +28,8 @@ export default { ...@@ -28,14 +28,8 @@ export default {
}" }"
class="flex" class="flex"
> >
<div class="block-truncated append-right-10"> <div class="block-truncated append-right-8 d-inline-flex">
<a <div class="block text-secondary append-right-default">
:href="computedPath"
class="issue-token-title-text sortable-link"
>
{{ title }}
</a>
<div class="block text-secondary">
<icon <icon
v-if="hasState" v-if="hasState"
v-tooltip v-tooltip
...@@ -47,6 +41,12 @@ export default { ...@@ -47,6 +41,12 @@ export default {
/> />
{{ displayReference }} {{ displayReference }}
</div> </div>
<a
:href="computedPath"
class="issue-token-title-text sortable-link"
>
{{ title }}
</a>
</div> </div>
<button <button
v-if="canRemove" v-if="canRemove"
...@@ -54,7 +54,7 @@ export default { ...@@ -54,7 +54,7 @@ export default {
v-tooltip v-tooltip
:disabled="removeDisabled" :disabled="removeDisabled"
type="button" type="button"
class="btn btn-default js-issue-item-remove-button flex-align-self-center flex-right class="btn btn-default js-issue-item-remove-button issue-item-remove-button flex-align-self-center flex-right
qa-remove-issue-button" qa-remove-issue-button"
title="Remove" title="Remove"
aria-label="Remove" aria-label="Remove"
......
...@@ -211,7 +211,7 @@ issue-count-badge-add-button btn btn-sm btn-default qa-add-issues-button" ...@@ -211,7 +211,7 @@ issue-count-badge-add-button btn btn-sm btn-default qa-add-issues-button"
'collapsed': !shouldShowTokenBody, 'collapsed': !shouldShowTokenBody,
'sortable-container': canReorder 'sortable-container': canReorder
}" }"
class="related-issues-token-body card-body" class="related-issues-token-body"
> >
<div <div
v-if="isFetching" v-if="isFetching"
...@@ -237,7 +237,7 @@ issue-count-badge-add-button btn btn-sm btn-default qa-add-issues-button" ...@@ -237,7 +237,7 @@ issue-count-badge-add-button btn btn-sm btn-default qa-add-issues-button"
}" }"
:data-key="issue.id" :data-key="issue.id"
:data-epic-issue-id="issue.epic_issue_id" :data-epic-issue-id="issue.epic_issue_id"
class="js-related-issues-token-list-item" class="js-related-issues-token-list-item related-issues-list-item pt-0 pb-0"
> >
<issue-item <issue-item
:id-key="issue.id" :id-key="issue.id"
......
...@@ -35,3 +35,58 @@ ...@@ -35,3 +35,58 @@
} }
} }
} }
.related-issues-list-item {
.card-body,
.issuable-info-container {
padding: $gl-padding-4 $gl-padding-4 $gl-padding-4 $gl-padding;
.block-truncated {
padding: $gl-padding-8 0;
line-height: $gl-btn-line-height;
}
@include media-breakpoint-down(md) {
padding-left: $gl-padding;
.block-truncated {
flex-direction: column-reverse;
padding: $gl-padding-4 0;
.text-secondary {
margin-top: $gl-padding-4;
}
.issue-token-title-text {
display: block;
}
}
.issue-item-remove-button {
align-self: baseline;
}
}
@include media-breakpoint-only(md) {
.block-truncated .issue-token-title-text {
white-space: nowrap;
}
.issue-item-remove-button {
align-self: center;
}
}
@include media-breakpoint-down(sm) {
padding-left: $gl-padding-8;
.block-truncated .issue-token-title-text {
white-space: normal;
}
}
}
&.is-dragging {
padding: 0;
}
}
...@@ -33,6 +33,11 @@ $token-spacing-bottom: 0.5em; ...@@ -33,6 +33,11 @@ $token-spacing-bottom: 0.5em;
li .issuable-info-container { li .issuable-info-container {
padding-left: $gl-padding; padding-left: $gl-padding;
padding-right: $gl-padding-4;
@include media-breakpoint-down(sm) {
padding-left: $gl-padding-8;
}
} }
a.issuable-main-info:hover { a.issuable-main-info:hover {
......
---
title: Update related issues list styling to be more space efficient
merge_request: 7784
author:
type: changed
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment