summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Greiling <mike@pixelcog.com>2017-03-27 12:10:30 -0500
committerMike Greiling <mike@pixelcog.com>2017-03-27 12:10:30 -0500
commit8dafec40cf7efb1b46bb7b4d7501cfb74da53ba4 (patch)
tree7b78429ddd015e4aeb5f6f622534c827a4763664
parentd79bdfcf646ed1285f8ca2465d6e4abb7ad99428 (diff)
downloadgitlab-ce-8dafec40cf7efb1b46bb7b4d7501cfb74da53ba4.tar.gz
use smaller font-weight in sidebar to match other sidebar content in gitlab
-rw-r--r--app/assets/stylesheets/pages/milestone.scss1
-rw-r--r--app/views/shared/milestones/_sidebar.html.haml6
2 files changed, 3 insertions, 4 deletions
diff --git a/app/assets/stylesheets/pages/milestone.scss b/app/assets/stylesheets/pages/milestone.scss
index e700637d4f5..a1c6179840a 100644
--- a/app/assets/stylesheets/pages/milestone.scss
+++ b/app/assets/stylesheets/pages/milestone.scss
@@ -74,7 +74,6 @@
.milestone-stat {
float: left;
- font-weight: bold;
margin-right: 14px;
}
diff --git a/app/views/shared/milestones/_sidebar.html.haml b/app/views/shared/milestones/_sidebar.html.haml
index 571bff67553..7c45fdf0fab 100644
--- a/app/views/shared/milestones/_sidebar.html.haml
+++ b/app/views/shared/milestones/_sidebar.html.haml
@@ -11,7 +11,7 @@
%span== #{milestone.percent_complete(current_user)}%
= milestone_progress_bar(milestone)
.title.hide-collapsed
- %strong== #{milestone.percent_complete(current_user)}%
+ %strong.bold== #{milestone.percent_complete(current_user)}%
%span.hide-collapsed
complete
.value.hide-collapsed
@@ -50,7 +50,7 @@
- if project && can?(current_user, :create_issue, project)
= link_to new_namespace_project_issue_path(project.namespace, project, issue: { milestone_id: milestone.id }), class: "pull-right", title: "New Issue" do
New issue
- .value.hide-collapsed
+ .value.hide-collapsed.bold
%span.milestone-stat
= link_to milestones_browse_issuables_path(milestone, type: :issues) do
Open:
@@ -68,7 +68,7 @@
.title.hide-collapsed
Merge requests
%span.badge= milestone.merge_requests.size
- .value.hide-collapsed
+ .value.hide-collapsed.bold
- if !project || can?(current_user, :read_merge_request, project)
%span.milestone-stat
= link_to milestones_browse_issuables_path(milestone, type: :merge_requests) do