Commit 2e2e0522 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

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

parents a4993f16 945702a3
...@@ -926,3 +926,12 @@ p.time { ...@@ -926,3 +926,12 @@ p.time {
font-style: italic; font-style: italic;
color: #999; color: #999;
} }
.upvotes {
font-size: 14px;
font-weight: bold;
color: #468847;
text-align: right;
padding: 4px;
margin: 2px;
}
...@@ -14,9 +14,9 @@ ...@@ -14,9 +14,9 @@
= link_to edit_project_issue_path(@project, @issue), :class => "btn" do = link_to edit_project_issue_path(@project, @issue), :class => "btn" do
Edit Edit
%br
- if @issue.upvotes > 0 - if @issue.upvotes > 0
= link_to "#notes", :class => "btn success" do .upvotes#upvotes= "+#{pluralize @issue.upvotes, 'upvote'}"
+#{@issue.upvotes}
.back_link .back_link
......
...@@ -16,9 +16,9 @@ ...@@ -16,9 +16,9 @@
= link_to edit_project_merge_request_path(@project, @merge_request), :class => "btn" do = link_to edit_project_merge_request_path(@project, @merge_request), :class => "btn" do
Edit Edit
%br
- if @merge_request.upvotes > 0 - if @merge_request.upvotes > 0
= link_to "#notes", :class => "btn success" do .upvotes#upvotes= "+#{pluralize @merge_request.upvotes, 'upvote'}"
+#{@merge_request.upvotes}
.back_link .back_link
= link_to project_merge_requests_path(@project) do = link_to project_merge_requests_path(@project) do
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment