Download as
Browse Code »

Commit 945702a3ea95ab0d39938da5c1c075fd980736f4

Authored by Dmitriy Zaporozhets
2 parents 27e36998 cbc56a96
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Merge pull request #556 from gitlabhq/plusone_ui 

Updated upvotes view for issue and merge request show
Showing 3 changed files with 13 additions and 4 deletions   Show diff stats
app/assets/stylesheets/common.scss
  Diff comments   View file @945702a
... ... @@ -926,3 +926,12 @@ p.time {
926 926 font-style: italic;
927 927 color: #999;
928 928 }
  929 +
  930 +.upvotes {
  931 + font-size: 14px;
  932 + font-weight: bold;
  933 + color: #468847;
  934 + text-align: right;
  935 + padding: 4px;
  936 + margin: 2px;
  937 +}
... ...
app/views/issues/show.html.haml
  Diff comments   View file @945702a
... ... @@ -14,9 +14,9 @@
14 14 = link_to edit_project_issue_path(@project, @issue), :class => "btn" do
15 15 Edit
16 16  
  17 + %br
17 18 - if @issue.upvotes > 0
18   - = link_to "#notes", :class => "btn success" do
19   - +#{@issue.upvotes}
  19 + .upvotes#upvotes= "+#{pluralize @issue.upvotes, 'upvote'}"
20 20  
21 21  
22 22 .back_link
... ...
app/views/merge_requests/show.html.haml
  Diff comments   View file @945702a
... ... @@ -18,9 +18,9 @@
18 18 = link_to edit_project_merge_request_path(@project, @merge_request), :class => "btn" do
19 19 Edit
20 20  
  21 + %br
21 22 - if @merge_request.upvotes > 0
22   - = link_to "#notes", :class => "btn success" do
23   - +#{@merge_request.upvotes}
  23 + .upvotes#upvotes= "+#{pluralize @merge_request.upvotes, 'upvote'}"
24 24  
25 25 .back_link
26 26 = link_to project_merge_requests_path(@project) do
... ...