Merge pull request #556 from gitlabhq/plusone_ui
Updated upvotes view for issue and merge request show
This commit is contained in:
commit
945702a3ea
3 changed files with 13 additions and 4 deletions
|
@ -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 @@
|
||||||
= 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
|
||||||
|
|
|
@ -18,9 +18,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
|
||||||
|
|
Loading…
Reference in a new issue