diff options
| author | Constance Okoghenun <cokoghenun@gitlab.com> | 2018-06-25 14:31:19 +0100 |
|---|---|---|
| committer | Constance Okoghenun <cokoghenun@gitlab.com> | 2018-06-25 14:31:19 +0100 |
| commit | a87a5836c3e6acd0f5cccf631c12e240c0dfaaa5 (patch) | |
| tree | 06d46c50012a987307eda23bdc039e1e6dd79810 | |
| parent | 3219b202222e91f129d69ec9b71f6e5ecc3dc0e4 (diff) | |
| download | gitlab-ce-39543-milestone-page-list-redesign.tar.gz | |
Fixed alignment of milestone status and projects in milestone list39543-milestone-page-list-redesign
| -rw-r--r-- | app/views/shared/_milestone_expired.html.haml | 3 | ||||
| -rw-r--r-- | app/views/shared/milestones/_milestone.html.haml | 18 |
2 files changed, 11 insertions, 10 deletions
diff --git a/app/views/shared/_milestone_expired.html.haml b/app/views/shared/_milestone_expired.html.haml index e58f346b5b5..f49017c59b2 100644 --- a/app/views/shared/_milestone_expired.html.haml +++ b/app/views/shared/_milestone_expired.html.haml @@ -1,6 +1,3 @@ -- if milestone.due_date || milestone.start_date - .milestone-range.append-bottom-5 - = milestone_date_range(milestone) - if milestone.expired? and not milestone.closed? .status-box.status-box-expired Expired - if milestone.upcoming? diff --git a/app/views/shared/milestones/_milestone.html.haml b/app/views/shared/milestones/_milestone.html.haml index 297b88d2342..d1b87b616ed 100644 --- a/app/views/shared/milestones/_milestone.html.haml +++ b/app/views/shared/milestones/_milestone.html.haml @@ -11,13 +11,17 @@ = " - #{milestone_type}" - if @project || milestone.is_a?(GlobalMilestone) || milestone.group_milestone? - = render('shared/milestone_expired', milestone: milestone) - - if milestone.legacy_group_milestone? - .projects - - milestone.milestones.each do |milestone| - = link_to milestone_path(milestone) do - %span.label-badge.label-badge-blue - = dashboard ? milestone.project.full_name : milestone.project.name + - if milestone.due_date || milestone.start_date + .milestone-range.append-bottom-5 + = milestone_date_range(milestone) + %div + = render('shared/milestone_expired', milestone: milestone) + - if milestone.legacy_group_milestone? + .projects + - milestone.milestones.each do |milestone| + = link_to milestone_path(milestone) do + %span.label-badge.label-badge-blue.d-inline-block.append-bottom-5.append-right-5 + = dashboard ? milestone.project.full_name : milestone.project.name .col-sm-4.milestone-progress = milestone_progress_bar(milestone) |