summaryrefslogtreecommitdiff
path: root/app/views
diff options
context:
space:
mode:
authorAnnabel Dunstone Gray <annabel.dunstone@gmail.com>2018-01-22 14:20:34 -0700
committerAnnabel Dunstone Gray <annabel.dunstone@gmail.com>2018-01-29 14:38:36 -0700
commitaf6aaf39f996e888ecfc536a42f25610623f6e02 (patch)
tree9cffe137933cb1b2147d0780624adfa04799dd97 /app/views
parentbb8490b018bda7327a82e8ed38d3f1d60c9b4c39 (diff)
downloadgitlab-ce-af6aaf39f996e888ecfc536a42f25610623f6e02.tar.gz
Change delete notice; update mobile styles
Diffstat (limited to 'app/views')
-rw-r--r--app/views/shared/_label_row.html.haml22
1 files changed, 11 insertions, 11 deletions
diff --git a/app/views/shared/_label_row.html.haml b/app/views/shared/_label_row.html.haml
index 34da13ca52b..bd4f191502e 100644
--- a/app/views/shared/_label_row.html.haml
+++ b/app/views/shared/_label_row.html.haml
@@ -17,14 +17,14 @@
- if defined?(@project) && @project.group.present?
%span.label-type
= label.model_name.human.titleize
- - if label.description
- %span.label-description
- = markdown_field(label, :description)
- .hidden-xs.hidden-sm
- - if show_label_issues_link
- = link_to_label(label, subject: subject) do
- Issues
- - if show_label_merge_requests_link
- &middot;
- = link_to_label(label, subject: subject, type: :merge_request) do
- Merge requests
+
+ %span.label-description
+ - if label.description.present?
+ .description-text
+ = markdown_field(label, :description)
+ .hidden-xs.hidden-sm
+ - if show_label_issues_link
+ = link_to_label(label, subject: subject) { 'Issues' }
+ - if show_label_merge_requests_link
+ &middot;
+ = link_to_label(label, subject: subject, type: :merge_request) { 'Merge requests' }