1 files changed, 24 insertions, 17 deletions

diff --git a/app/views/projects/issues/_issue.html.haml b/app/views/projects/issues/_issue.html.haml
index d7657ee7e40..f9cf4910df3 100644
--- a/app/views/projects/issues/_issue.html.haml
+++ b/app/views/projects/issues/_issue.html.haml
@@ -6,35 +6,42 @@
   .issue-title
     %span.issue-title-text
       = link_to_gfm issue.title, issue_path(issue), class: "row_title"
-    .issue-labels
-      - issue.labels.each do |label|
-        = link_to_label(label, project: issue.project)
-    .pull-right.light
+    %ul.controls.light
       - if issue.closed?
-        %span
+        %li
           CLOSED
+
       - if issue.assignee
-        = link_to_member(@project, issue.assignee, name: false)
+        %li
+          = link_to_member(@project, issue.assignee, name: false, title: "Assigned to :name")
+
       - note_count = issue.notes.user.count
       - if note_count > 0
-         
-        %span
-          %i.fa.fa-comments
-          = note_count
+        %li
+          = link_to issue_path(issue) + "#notes" do
+            = icon('comments')
+            = note_count
       - else
-         
-        %span.issue-no-comments
-          %i.fa.fa-comments
-          = 0
+        %li
+          = link_to issue_path(issue) + "#notes", class: "issue-no-comments" do
+            = icon('comments')
+            = note_count
 
   .issue-info
-    = "#{issue.to_reference} opened #{time_ago_with_tooltip(issue.created_at, placement: 'bottom')} by #{link_to_member(@project, issue.author, avatar: false)}".html_safe
+    #{issue.to_reference} ·
+    opened #{time_ago_with_tooltip(issue.created_at, placement: 'bottom')}
+    by #{link_to_member(@project, issue.author, avatar: false)}
     - if issue.milestone
        
-      %span
-        %i.fa.fa-clock-o
+      = link_to namespace_project_issues_path(issue.project.namespace, issue.project, milestone_title: issue.milestone.title) do
+        = icon('clock-o')
         = issue.milestone.title
+    - if issue.labels.any?
+       
+      - issue.labels.each do |label|
+        = link_to_label(label, project: issue.project)
     - if issue.tasks?
+       
       %span.task-status
         = issue.task_status