Commit 4b0ded50 authored by Fatih Acet's avatar Fatih Acet

Merge branch 'winh-card-header-last-child-border' into 'master'

Use :last-child selector for adjusting .card-header border

See merge request gitlab-org/gitlab!17480
parents 66fdff3a d0fc0723
.card-header { .card-header {
&:first-child { &:first-child {
// intended use case: card with only a header (for example empty related issues) // intended use case: card with only a header (for example empty related issues)
&.border-0, &:last-child {
&.border-bottom-0 {
@include border-radius($card-inner-border-radius); @include border-radius($card-inner-border-radius);
} }
} }
......
--- ---
title: Redo fix for related issues border radius title: Redo fix for related issues border radius
merge_request: 17172 merge_request: 17480
author: author:
type: fixed type: fixed
...@@ -217,10 +217,8 @@ export default { ...@@ -217,10 +217,8 @@ export default {
/> />
</div> </div>
<div <div
:class="{ v-if="shouldShowTokenBody"
collapsed: !shouldShowTokenBody, :class="{ 'sortable-container': canReorder }"
'sortable-container': canReorder,
}"
class="related-issues-token-body" class="related-issues-token-body"
> >
<div v-if="isFetching" class="related-issues-loading-icon qa-related-issues-loading-icon"> <div v-if="isFetching" class="related-issues-loading-icon qa-related-issues-loading-icon">
......
...@@ -19,17 +19,6 @@ $token-spacing-bottom: 0.5em; ...@@ -19,17 +19,6 @@ $token-spacing-bottom: 0.5em;
.related-issues-token-body { .related-issues-token-body {
padding: 0; padding: 0;
transition-property: max-height, padding, opacity;
transition-duration: $general-hover-transition-duration;
transition-timing-function: $general-hover-transition-curve;
&.collapsed {
overflow: hidden;
max-height: 0;
padding-top: 0;
padding-bottom: 0;
opacity: 0;
}
li .issuable-info-container { li .issuable-info-container {
padding-left: $gl-padding; padding-left: $gl-padding;
......
...@@ -58,7 +58,7 @@ describe('EpicBodyComponent', () => { ...@@ -58,7 +58,7 @@ describe('EpicBodyComponent', () => {
expect(relatedEpicsEl.querySelector('.card-title').innerText.trim()).toContain('Epics'); expect(relatedEpicsEl.querySelector('.card-title').innerText.trim()).toContain('Epics');
expect(relatedEpicsEl.querySelector('.js-related-issues-header-issue-count')).not.toBeNull(); expect(relatedEpicsEl.querySelector('.js-related-issues-header-issue-count')).not.toBeNull();
expect(relatedEpicsEl.querySelector('button.js-issue-count-badge-add-button')).not.toBeNull(); expect(relatedEpicsEl.querySelector('button.js-issue-count-badge-add-button')).not.toBeNull();
expect(relatedEpicsEl.querySelector('.related-items-list')).not.toBeNull(); expect(relatedEpicsEl.querySelector('.related-items-list')).toBeNull();
}); });
it('renders related issues list elements', () => { it('renders related issues list elements', () => {
...@@ -71,7 +71,7 @@ describe('EpicBodyComponent', () => { ...@@ -71,7 +71,7 @@ describe('EpicBodyComponent', () => {
relatedIssuesEl.querySelector('button.js-issue-count-badge-add-button'), relatedIssuesEl.querySelector('button.js-issue-count-badge-add-button'),
).not.toBeNull(); ).not.toBeNull();
expect(relatedIssuesEl.querySelector('.related-items-list')).not.toBeNull(); expect(relatedIssuesEl.querySelector('.related-items-list')).toBeNull();
}); });
}); });
}); });
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