Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
d0fc0723
Commit
d0fc0723
authored
Sep 26, 2019
by
Winnie Hellmann
Committed by
Fatih Acet
Sep 26, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use :last-child selector for adjusting .card-header border
parent
66fdff3a
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
6 additions
and
20 deletions
+6
-20
app/assets/stylesheets/framework/card.scss
app/assets/stylesheets/framework/card.scss
+1
-2
changelogs/unreleased/winh-related-issues-border.yml
changelogs/unreleased/winh-related-issues-border.yml
+1
-1
ee/app/assets/javascripts/related_issues/components/related_issues_block.vue
...cripts/related_issues/components/related_issues_block.vue
+2
-4
ee/app/assets/stylesheets/pages/issues/related_issues.scss
ee/app/assets/stylesheets/pages/issues/related_issues.scss
+0
-11
ee/spec/javascripts/epic/components/epic_body_spec.js
ee/spec/javascripts/epic/components/epic_body_spec.js
+2
-2
No files found.
app/assets/stylesheets/framework/card.scss
View file @
d0fc0723
.card-header
{
&
:first-child
{
// intended use case: card with only a header (for example empty related issues)
&
.border-0
,
&
.border-bottom-0
{
&
:last-child
{
@include
border-radius
(
$card-inner-border-radius
);
}
}
...
...
changelogs/unreleased/winh-related-issues-border.yml
View file @
d0fc0723
---
title
:
Redo fix for related issues border radius
merge_request
:
17
172
merge_request
:
17
480
author
:
type
:
fixed
ee/app/assets/javascripts/related_issues/components/related_issues_block.vue
View file @
d0fc0723
...
...
@@ -217,10 +217,8 @@ export default {
/>
</div>
<div
:class=
"
{
collapsed: !shouldShowTokenBody,
'sortable-container': canReorder,
}"
v-if=
"shouldShowTokenBody"
:class=
"
{ 'sortable-container': canReorder }"
class="related-issues-token-body"
>
<div
v-if=
"isFetching"
class=
"related-issues-loading-icon qa-related-issues-loading-icon"
>
...
...
ee/app/assets/stylesheets/pages/issues/related_issues.scss
View file @
d0fc0723
...
...
@@ -19,17 +19,6 @@ $token-spacing-bottom: 0.5em;
.related-issues-token-body
{
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
{
padding-left
:
$gl-padding
;
...
...
ee/spec/javascripts/epic/components/epic_body_spec.js
View file @
d0fc0723
...
...
@@ -58,7 +58,7 @@ describe('EpicBodyComponent', () => {
expect
(
relatedEpicsEl
.
querySelector
(
'
.card-title
'
).
innerText
.
trim
()).
toContain
(
'
Epics
'
);
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
(
'
.related-items-list
'
)).
not
.
toBeNull
();
expect
(
relatedEpicsEl
.
querySelector
(
'
.related-items-list
'
)).
toBeNull
();
});
it
(
'
renders related issues list elements
'
,
()
=>
{
...
...
@@ -71,7 +71,7 @@ describe('EpicBodyComponent', () => {
relatedIssuesEl
.
querySelector
(
'
button.js-issue-count-badge-add-button
'
),
).
not
.
toBeNull
();
expect
(
relatedIssuesEl
.
querySelector
(
'
.related-items-list
'
)).
not
.
toBeNull
();
expect
(
relatedIssuesEl
.
querySelector
(
'
.related-items-list
'
)).
toBeNull
();
});
});
});
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment