Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge pull request #556 from gitlabhq/plusone_ui

Updated upvotes view for issue and merge request show
  • Loading branch information...
commit 945702a3ea95ab0d39938da5c1c075fd980736f4 2 parents 27e3699 + cbc56a9
@randx randx authored
View
9 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;
+}
View
4 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
View
4 app/views/merge_requests/show.html.haml
@@ -18,9 +18,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
Please sign in to comment.
Something went wrong with that request. Please try again.