summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorConstance Okoghenun <cokoghenun@gitlab.com>2018-06-25 12:48:48 +0100
committerConstance Okoghenun <cokoghenun@gitlab.com>2018-06-25 12:48:48 +0100
commit3219b202222e91f129d69ec9b71f6e5ecc3dc0e4 (patch)
tree7633e0158f5d22134f331c5c9c4e4ef0da5c5581
parent5468557a5f211c2a03f81ecf11d4c7567a4d9158 (diff)
downloadgitlab-ce-3219b202222e91f129d69ec9b71f6e5ecc3dc0e4.tar.gz
Updated stlying of title and date range of milestone list
-rw-r--r--app/assets/stylesheets/pages/milestone.scss2
-rw-r--r--app/views/shared/_milestone_expired.html.haml2
-rw-r--r--app/views/shared/milestones/_milestone.html.haml2
3 files changed, 2 insertions, 4 deletions
diff --git a/app/assets/stylesheets/pages/milestone.scss b/app/assets/stylesheets/pages/milestone.scss
index 022c334ef49..f103c84e339 100644
--- a/app/assets/stylesheets/pages/milestone.scss
+++ b/app/assets/stylesheets/pages/milestone.scss
@@ -255,8 +255,6 @@
.milestone-range {
color: $gl-text-color-tertiary;
- margin: $gl-bar-padding 0 $gl-padding-4;
- font-size: $tooltip-font-size;
}
@include media-breakpoint-down(xs) {
diff --git a/app/views/shared/_milestone_expired.html.haml b/app/views/shared/_milestone_expired.html.haml
index 738622a4993..e58f346b5b5 100644
--- a/app/views/shared/_milestone_expired.html.haml
+++ b/app/views/shared/_milestone_expired.html.haml
@@ -1,5 +1,5 @@
- if milestone.due_date || milestone.start_date
- .milestone-range
+ .milestone-range.append-bottom-5
= milestone_date_range(milestone)
- if milestone.expired? and not milestone.closed?
.status-box.status-box-expired Expired
diff --git a/app/views/shared/milestones/_milestone.html.haml b/app/views/shared/milestones/_milestone.html.haml
index 4661126c904..297b88d2342 100644
--- a/app/views/shared/milestones/_milestone.html.haml
+++ b/app/views/shared/milestones/_milestone.html.haml
@@ -5,7 +5,7 @@
%li{ class: "milestone milestone-#{milestone.closed? ? 'closed' : 'open'}", id: custom_dom_id }
.row
.col-sm-6
- %div
+ .append-bottom-5
%strong= link_to truncate(milestone.title, length: 100), milestone_path
- if @group
= " - #{milestone_type}"