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
d4d00ba8
Commit
d4d00ba8
authored
Jun 26, 2020
by
Eulyeon Ko
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Change timeline height uniformly to 32px
Add changelog entry Remove test for unused css class
parent
afca7045
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
15 additions
and
28 deletions
+15
-28
ee/app/assets/javascripts/roadmap/components/milestone_timeline.vue
...ets/javascripts/roadmap/components/milestone_timeline.vue
+0
-1
ee/app/assets/javascripts/roadmap/components/milestones_list_section.vue
...avascripts/roadmap/components/milestones_list_section.vue
+2
-6
ee/app/assets/stylesheets/pages/roadmap.scss
ee/app/assets/stylesheets/pages/roadmap.scss
+4
-10
ee/changelogs/unreleased/224637-milestones-list-has-an-incorrect-height-value-with-1-milestone.yml
...s-list-has-an-incorrect-height-value-with-1-milestone.yml
+5
-0
ee/spec/frontend/roadmap/components/milestone_timeline_spec.js
...ec/frontend/roadmap/components/milestone_timeline_spec.js
+4
-11
No files found.
ee/app/assets/javascripts/roadmap/components/milestone_timeline.vue
View file @
d4d00ba8
...
...
@@ -38,7 +38,6 @@ export default {
v-for=
"timeframeItem in timeframe"
:key=
"timeframeItem.id"
class=
"milestone-timeline-cell gl-display-table-cell gl-relative border-right border-bottom"
:class=
"
{ 'milestone-timeline-cell-empty': !milestonesExpanded }"
data-qa-selector=
"milestone_timeline_cell"
>
<current-day-indicator
:preset-type=
"presetType"
:timeframe-item=
"timeframeItem"
/>
...
...
ee/app/assets/javascripts/roadmap/components/milestones_list_section.vue
View file @
d4d00ba8
...
...
@@ -115,13 +115,9 @@ export default {
</
script
>
<
template
>
<div
:style=
"sectionContainerStyles"
class=
"milestones-list-section gl-display-table"
>
<div
:style=
"sectionContainerStyles"
class=
"milestones-list-section gl-display-table"
:class=
"
{ 'milestones-list-section-collapsed': !milestonesExpanded }"
>
<div
class=
"milestones-list-title gl-display-table-cell border-bottom gl-vertical-align-top position-sticky gl-p-3"
class=
"milestones-list-title gl-display-table-cell border-bottom gl-vertical-align-top position-sticky gl-px-3"
>
<div
class=
"gl-display-flex gl-align-items-center"
>
<span
...
...
ee/app/assets/stylesheets/pages/roadmap.scss
View file @
d4d00ba8
$header-item-height
:
60px
;
$item-height
:
50px
;
$milestones-collapsed-height
:
38px
;
$details-cell-width
:
320px
;
$timeline-cell-height
:
32px
;
$timeline-cell-width
:
180px
;
$border-style
:
1px
solid
$border-gray-normal
;
$roadmap-gradient-dark-gray
:
rgba
(
0
,
0
,
0
,
0
.15
);
...
...
@@ -409,21 +409,14 @@ html.group-epics-roadmap-html {
}
.milestones-list-section
{
&
.milestones-list-section-collapsed
{
height
:
$milestones-collapsed-height
;
}
.milestones-list-items
{
.milestone-timeline-cell
{
height
:
$timeline-cell-height
;
width
:
$timeline-cell-width
;
}
.milestone-timeline-cell-empty
{
height
:
$milestones-collapsed-height
;
}
.timeline-bar-wrapper
{
height
:
32px
;
height
:
$timeline-cell-height
;
color
:
$gray-700
;
}
...
...
@@ -546,6 +539,7 @@ html.group-epics-roadmap-html {
.milestones-list-title
{
height
:
100%
;
left
:
0
;
padding-top
:
5px
;
width
:
$details-cell-width
;
font-size
:
$code-font-size
;
background-color
:
$white
;
...
...
ee/changelogs/unreleased/224637-milestones-list-has-an-incorrect-height-value-with-1-milestone.yml
0 → 100644
View file @
d4d00ba8
---
title
:
Fix milestones list height to a correct value
merge_request
:
35394
author
:
type
:
fixed
ee/spec/frontend/roadmap/components/milestone_timeline_spec.js
View file @
d4d00ba8
...
...
@@ -30,24 +30,17 @@ describe('MilestoneTimelineComponent', () => {
});
};
const
findMilestoneTimelineCell
=
()
=>
wrapper
.
find
(
'
.milestone-timeline-cell
'
);
const
findMilestoneItem
=
()
=>
wrapper
.
find
(
MilestoneItem
);
describe
.
each
`
props | has
CellEmpty | has
MilestoneItem
${{}}
|
$
{
false
}
|
${
true
}
${{
milestonesExpanded
:
false
}
} |
${
true
}
|
${
false
}
`
(
'
with $props
'
,
({
props
,
has
CellEmpty
,
has
MilestoneItem
})
=>
{
props | hasMilestoneItem
${{}}
|
$
{
true
}
${{
milestonesExpanded
:
false
}
} |
${
false
}
`
(
'
with $props
'
,
({
props
,
hasMilestoneItem
})
=>
{
beforeEach
(()
=>
{
createWrapper
(
props
);
});
it
(
`renders timeline cell with empty class =
${
hasCellEmpty
}
`
,
()
=>
{
expect
(
findMilestoneTimelineCell
().
classes
(
'
milestone-timeline-cell-empty
'
)).
toBe
(
hasCellEmpty
,
);
});
it
(
`renders MilestoneItem component =
${
hasMilestoneItem
}
`
,
()
=>
{
expect
(
findMilestoneItem
().
exists
()).
toBe
(
hasMilestoneItem
);
});
...
...
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