summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2016-06-01 11:23:57 +0100
committerPhil Hughes <me@iamphill.com>2016-06-10 10:41:58 +0100
commitffd07382b08586420628ae7ecda8a512adf091aa (patch)
treed6646e191b4e155c27acfc8ba20cd9e74fc1f320
parente0f3e44b3e67b80543b6956c7ae46035fabc696f (diff)
downloadgitlab-ce-ffd07382b08586420628ae7ecda8a512adf091aa.tar.gz
Fixed issue with bold in issuable sidebar
-rw-r--r--app/assets/javascripts/users_select.js.coffee2
-rw-r--r--app/assets/stylesheets/pages/issuable.scss1
-rw-r--r--app/views/shared/issuable/_sidebar.html.haml10
3 files changed, 7 insertions, 6 deletions
diff --git a/app/assets/javascripts/users_select.js.coffee b/app/assets/javascripts/users_select.js.coffee
index de0eae58bff..de38d9fb26e 100644
--- a/app/assets/javascripts/users_select.js.coffee
+++ b/app/assets/javascripts/users_select.js.coffee
@@ -84,7 +84,7 @@ class @UsersSelect
<% } else { %>
<span class="assign-yourself">
No assignee -
- <a href="#" class="js-assign-yourself">
+ <a href="#" class="light js-assign-yourself">
assign yourself
</a>
</span>
diff --git a/app/assets/stylesheets/pages/issuable.scss b/app/assets/stylesheets/pages/issuable.scss
index 787c387379e..8b6370caa7d 100644
--- a/app/assets/stylesheets/pages/issuable.scss
+++ b/app/assets/stylesheets/pages/issuable.scss
@@ -141,7 +141,6 @@
.assign-yourself {
margin-top: 10px;
- font-weight: normal;
display: block;
}
}
diff --git a/app/views/shared/issuable/_sidebar.html.haml b/app/views/shared/issuable/_sidebar.html.haml
index fb906de829a..a1f6defafc4 100644
--- a/app/views/shared/issuable/_sidebar.html.haml
+++ b/app/views/shared/issuable/_sidebar.html.haml
@@ -29,8 +29,10 @@
%span.assign-yourself
No assignee
- if can_edit_issuable
- %a.js-assign-yourself{ href: '#' }
- \- assign yourself
+ %span.light
+ \-
+ %a.js-assign-yourself{ href: '#' }
+ assign yourself
.selectbox.hide-collapsed
= f.hidden_field 'assignee_id', value: issuable.assignee_id, id: 'issue_assignee_id'
@@ -56,7 +58,7 @@
%span.has-tooltip{title: milestone_remaining_days(issuable.milestone), data: {container: 'body', html: 1}}
= issuable.milestone.title
- else
- .light None
+ None
.selectbox.hide-collapsed
= f.hidden_field 'milestone_id', value: issuable.milestone_id, id: nil
@@ -112,7 +114,7 @@
- issuable.labels_array.each do |label|
= link_to_label(label, type: issuable.to_ability_name)
- else
- .light None
+ None
.selectbox.hide-collapsed
- issuable.labels_array.each do |label|
= hidden_field_tag "#{issuable.to_ability_name}[label_names][]", label.id, id: nil