Update display of merge requests and issues to also show downvotes

app/assets/stylesheets/common.scss

@@ -406,13 +406,23 @@ p.time {
   }
 }
 
-.upvotes {
+.votes {
   font-size: 14px;
   font-weight: bold;
-  color: #468847;
+  padding: 4px 0;
-  text-align: right;
+  margin: 2px 0;
-  padding: 4px;
+  .upvotes {
-  margin: 2px;
+    display: inline-block;
+    color: #468847;
+    padding: 0 4px;
+    margin: 0 2px;
+  }
+  .downvotes {
+    display: inline-block;
+    color: #B94A48;
+    padding: 0 4px;
+    margin: 0 2px;
+  }
 }
 
 /* Fix for readme code (stopped it from being yellow) */

app/views/issues/_show.html.haml

@@ -36,3 +36,5 @@
 
     - if issue.upvotes > 0
       %span.badge.badge-success= "+#{issue.upvotes}"
+    - if issue.downvotes > 0
+      %span.badge.badge-important= "-#{issue.downvotes}"

app/views/issues/show.html.haml

@@ -17,8 +17,10 @@
         Edit
 
     %br
-    - if @issue.upvotes > 0
+      .votes#votes
-      .upvotes#upvotes= "+#{pluralize @issue.upvotes, 'upvote'}"
+        Votes:
+        .upvotes#upvotes= "#{@issue.upvotes} up"
+        .downvotes#downvotes= "#{@issue.downvotes} down"
 
 .back_link
   = link_to project_issues_path(@project) do

app/views/merge_requests/_merge_request.html.haml

@@ -25,3 +25,5 @@
     ago
     - if merge_request.upvotes > 0
       %span.badge.badge-success= "+#{merge_request.upvotes}"
+    - if merge_request.downvotes > 0
+      %span.badge.badge-important= "-#{merge_request.downvotes}"

app/views/merge_requests/show/_mr_title.html.haml

@@ -24,8 +24,10 @@
           Edit
 
     %br
-    - if @merge_request.upvotes > 0
+      .votes#votes
-      .upvotes#upvotes= "+#{pluralize @merge_request.upvotes, 'upvote'}"
+        Votes:
+        .upvotes#upvotes= "#{@merge_request.upvotes} up"
+        .downvotes#downvotes= "#{@merge_request.downvotes} down"
 
 
 .back_link