Download as
Browse Code »

Commit 2e2e0522d4777b457edb207758cb18520c6930fe

Authored by Dmitriy Zaporozhets
2 parents a4993f16 945702a3
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

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

Showing 3 changed files with 13 additions and 4 deletions   Show diff stats
app/assets/stylesheets/common.scss
  Diff comments   View file @2e2e052
... ... @@ -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 @2e2e052
... ... @@ -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 @2e2e052
... ... @@ -16,9 +16,9 @@
16 16 = link_to edit_project_merge_request_path(@project, @merge_request), :class => "btn" do
17 17 Edit
18 18  
  19 + %br
19 20 - if @merge_request.upvotes > 0
20   - = link_to "#notes", :class => "btn success" do
21   - +#{@merge_request.upvotes}
  21 + .upvotes#upvotes= "+#{pluralize @merge_request.upvotes, 'upvote'}"
22 22  
23 23 .back_link
24 24 = link_to project_merge_requests_path(@project) do
... ...