From 8c0c4750dbe79ac1515ee62485aaafd4883cc7cc Mon Sep 17 00:00:00 2001
From: Constance Okoghenun <cokoghenun@gitlab.com>
Date: Tue, 19 Jun 2018 12:09:33 +0100
Subject: [PATCH] Added styling for milestone progress

---
 app/assets/stylesheets/framework/common.scss     | 1 -
 app/assets/stylesheets/pages/milestone.scss      | 7 +++++++
 app/views/shared/milestones/_milestone.html.haml | 4 ++--
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/app/assets/stylesheets/framework/common.scss b/app/assets/stylesheets/framework/common.scss
index 326499125fc..738f3b28eb7 100644
--- a/app/assets/stylesheets/framework/common.scss
+++ b/app/assets/stylesheets/framework/common.scss
@@ -267,7 +267,6 @@ li.note {
   }
 
   .progress {
-    margin-bottom: 0;
     margin-top: 4px;
     box-shadow: none;
     background-color: $border-gray-light;
diff --git a/app/assets/stylesheets/pages/milestone.scss b/app/assets/stylesheets/pages/milestone.scss
index 0c111ae7144..fa75a7df9ac 100644
--- a/app/assets/stylesheets/pages/milestone.scss
+++ b/app/assets/stylesheets/pages/milestone.scss
@@ -23,6 +23,13 @@
     .progress {
       width: 100%;
       height: 6px;
+      margin-bottom: $gl-padding-4;
+    }
+
+    .milestone-progress {
+      a {
+        color: $gl-link-color;
+      }
     }
   }
 }
diff --git a/app/views/shared/milestones/_milestone.html.haml b/app/views/shared/milestones/_milestone.html.haml
index 4df87471947..17bb3872066 100644
--- a/app/views/shared/milestones/_milestone.html.haml
+++ b/app/views/shared/milestones/_milestone.html.haml
@@ -7,7 +7,7 @@
     .col-sm-6
       %strong= link_to truncate(milestone.title, length: 100), milestone_path
       - unless dashboard
-        = milestone_type
+        = " - #{milestone_type}"
 
       - if @project || milestone.is_a?(GlobalMilestone) || milestone.group_milestone?
         = render('shared/milestone_expired', milestone: milestone)
@@ -18,7 +18,7 @@
                 %span.badge.badge-gray
                   = dashboard ? milestone.project.full_name : milestone.project.name
 
-    .col-sm-4
+    .col-sm-4.milestone-progress
       = milestone_progress_bar(milestone)
       = link_to pluralize(milestone.total_issues_count(current_user), 'Issue'), issues_path
       &middot;
-- 
GitLab