Merge branch 'master' of github.com:gitlabhq/gitlabhq

app/assets/stylesheets/common.scss

@@ -926,3 +926,12 @@ p.time {
   font-style: italic;
   color: #999;
 }
+
+.upvotes {
+  font-size: 14px;
+  font-weight: bold;
+  color: #468847;
+  text-align: right;
+  padding: 4px;
+  margin: 2px;
+}

app/views/issues/show.html.haml

@@ -14,9 +14,9 @@
       = link_to edit_project_issue_path(@project, @issue), :class => "btn" do 
         Edit
 
+    %br
     - if @issue.upvotes > 0
-      = link_to "#notes", :class => "btn success" do
-        +#{@issue.upvotes}
+      .upvotes#upvotes= "+#{pluralize @issue.upvotes, 'upvote'}"
       
 
 .back_link

app/views/merge_requests/show.html.haml

@@ -16,9 +16,9 @@
         = link_to edit_project_merge_request_path(@project, @merge_request), :class => "btn" do 
           Edit
 
+    %br
     - if @merge_request.upvotes > 0
-      = link_to "#notes", :class => "btn success" do
-        +#{@merge_request.upvotes}
+      .upvotes#upvotes= "+#{pluralize @merge_request.upvotes, 'upvote'}"
 
 .back_link
   = link_to project_merge_requests_path(@project) do