deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

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

Browse source
This commit is contained in:
Dmitriy Zaporozhets 2012-03-15 19:39:28 +02:00
parent a4993f16c0 945702a3ea
commit 2e2e0522d4
3 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
app/assets/stylesheets/common.scss
View file

@ -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;
}

4
app/views/issues/show.html.haml
View file

@ -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

4
app/views/merge_requests/show.html.haml
View file

@ -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