summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Greiling <mike@pixelcog.com>2017-03-24 15:03:06 -0500
committerMike Greiling <mike@pixelcog.com>2017-03-24 17:06:48 -0500
commit38c1367335ad3df29d6b82c1f8066f5b1dece69e (patch)
treed1a4655a6b593aaccbfd8280fa0287a566f5ce37
parent2bacc040d84085eaeb2c5943c6c2ed8ba54e8dee (diff)
downloadgitlab-ce-38c1367335ad3df29d6b82c1f8066f5b1dece69e.tar.gz
update styling for milestone sidebar content
-rw-r--r--app/assets/stylesheets/pages/milestone.scss16
-rw-r--r--app/views/shared/milestones/_sidebar.html.haml2
2 files changed, 17 insertions, 1 deletions
diff --git a/app/assets/stylesheets/pages/milestone.scss b/app/assets/stylesheets/pages/milestone.scss
index 37b3b3ce17f..86355c72c37 100644
--- a/app/assets/stylesheets/pages/milestone.scss
+++ b/app/assets/stylesheets/pages/milestone.scss
@@ -52,6 +52,22 @@
}
}
+.milestone-sidebar {
+ .remaining-days strong {
+ font-weight: normal;
+ }
+
+ .milestone-stat {
+ float: left;
+ font-weight: bold;
+ margin-right: 14px;
+ }
+
+ .milestone-stat:last-child {
+ margin-right: 0;
+ }
+}
+
.milestone-summary {
.milestone-stat {
white-space: nowrap;
diff --git a/app/views/shared/milestones/_sidebar.html.haml b/app/views/shared/milestones/_sidebar.html.haml
index edacae0b4ab..7116560897c 100644
--- a/app/views/shared/milestones/_sidebar.html.haml
+++ b/app/views/shared/milestones/_sidebar.html.haml
@@ -2,7 +2,7 @@
- project = local_assigns[:project]
%aside.right-sidebar.js-right-sidebar{ data: { "offset-top" => affix_offset, "spy" => "affix" }, class: sidebar_gutter_collapsed_class, 'aria-live' => 'polite' }
- .issuable-sidebar
+ .issuable-sidebar.milestone-sidebar
.block.issuable-sidebar-header
%a.gutter-toggle.pull-right.js-sidebar-toggle{ role: "button", href: "#", "aria-label" => "Toggle sidebar" }
= sidebar_gutter_toggle_icon