Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorConstance Okoghenun <cokoghenun@gitlab.com>2018-06-25 16:31:19 +0300
committerConstance Okoghenun <cokoghenun@gitlab.com>2018-06-25 16:31:19 +0300
commita87a5836c3e6acd0f5cccf631c12e240c0dfaaa5 (patch)
tree06d46c50012a987307eda23bdc039e1e6dd79810 /app/views/shared/milestones/_milestone.html.haml
parent3219b202222e91f129d69ec9b71f6e5ecc3dc0e4 (diff)
Fixed alignment of milestone status and projects in milestone list
Diffstat (limited to 'app/views/shared/milestones/_milestone.html.haml')
-rw-r--r--app/views/shared/milestones/_milestone.html.haml18
1 files changed, 11 insertions, 7 deletions
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)