Merge branch 'fix-zero-votes-showing-on-issue-list' into 'master'

Only show up or down votes icon on issue list if there are any Closes #13649 ![Screen_Shot_2016-02-22_at_10.20.27](/uploads/21477426856dab9731bb110032025867/Screen_Shot_2016-02-22_at_10.20.27.png) See merge request !2909

Merge branch 'fix-zero-votes-showing-on-issue-list' into 'master'
1d9863c1 · Rémy Coutable · 04d1b412 · d8069bd8 · 1d9863c1 · 1d9863c1
Commit 1d9863c1 authored Feb 22, 2016 by Rémy Coutable
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 11 deletions

issues.scss app/assets/stylesheets/pages/issues.scss +1 -1

_issue.html.haml app/views/projects/issues/_issue.html.haml +2 -10

No files found.
--- a/app/assets/stylesheets/pages/issues.scss
+++ b/app/assets/stylesheets/pages/issues.scss
@@ -24,7 +24,7 @@
      display: inline-block;
    }

-    .issue-no-comments, .issue-no-votes {
+    .issue-no-comments {
      opacity: 0.5;
    }
  }

--- a/app/views/projects/issues/_issue.html.haml
+++ b/app/views/projects/issues/_issue.html.haml
@@ -16,23 +16,15 @@
          = link_to_member(@project, issue.assignee, name: false, title: "Assigned to :name")

      - upvotes, downvotes = issue.upvotes, issue.downvotes
-      - if upvotes > 0 || downvotes > 0
+      - if upvotes > 0
        %li
          = icon('thumbs-up')
          = upvotes
-      - else
-        %li{ class: 'issue-no-votes' }
-          = icon('thumbs-up')
-          = upvotes

-      - if upvotes > 0 || downvotes > 0
+      - if downvotes > 0
        %li
          = icon('thumbs-down')
          = downvotes
-      - else
-        %li{ class: 'issue-no-votes' }
-          = icon('thumbs-down')
-          = downvotes

      - note_count = issue.notes.user.count
      - if note_count > 0