kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Fixed alignment of milestone status and projects in milestone list

This commit is contained in:
Constance Okoghenun 2018-06-25 14:31:19 +01:00
parent 3219b20222
commit a87a5836c3
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/views/shared/_milestone_expired.html.haml
View File

@ -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?

18
app/views/shared/milestones/_milestone.html.haml
View File

@ -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)