diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss index 6be40104b6ebb93e9b4ca595e5746ae9f2562ce1..ee06ca6d25056fb927094eb38adc29b23a330cad 100644 --- a/app/assets/stylesheets/common.scss +++ b/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; +} diff --git a/app/views/issues/show.html.haml b/app/views/issues/show.html.haml index 7399697198d2c67d1381db019bb4576634844664..ab0e82c6b982b5d64d5fd21d18eded9349fff0be 100644 --- a/app/views/issues/show.html.haml +++ b/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 diff --git a/app/views/merge_requests/show.html.haml b/app/views/merge_requests/show.html.haml index 77bb6120ec760fc844af1bf8e62c9cb00108bbb5..6b9ade455b2663cddc9476c30cbd253ffa565856 100644 --- a/app/views/merge_requests/show.html.haml +++ b/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