diff options
author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2012-03-15 19:39:28 +0200 |
---|---|---|
committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2012-03-15 19:39:28 +0200 |
commit | 2e2e0522d4777b457edb207758cb18520c6930fe (patch) | |
tree | 8a9c59173e08c3c46dd0d680841b4ce8c2ec222f | |
parent | a4993f16c0239c8615b8d068c6e53415209f8cb1 (diff) | |
parent | 945702a3ea95ab0d39938da5c1c075fd980736f4 (diff) | |
download | gitlab-ce-2e2e0522d4777b457edb207758cb18520c6930fe.tar.gz |
Merge branch 'master' of github.com:gitlabhq/gitlabhq
-rw-r--r-- | app/assets/stylesheets/common.scss | 9 | ||||
-rw-r--r-- | app/views/issues/show.html.haml | 4 | ||||
-rw-r--r-- | app/views/merge_requests/show.html.haml | 4 |
3 files changed, 13 insertions, 4 deletions
diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss index 6be40104b6e..ee06ca6d250 100644 --- a/app/assets/stylesheets/common.scss +++ b/app/assets/stylesheets/common.scss @@ -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; +} diff --git a/app/views/issues/show.html.haml b/app/views/issues/show.html.haml index 7399697198d..ab0e82c6b98 100644 --- a/app/views/issues/show.html.haml +++ b/app/views/issues/show.html.haml @@ -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 diff --git a/app/views/merge_requests/show.html.haml b/app/views/merge_requests/show.html.haml index 7b9e31df70e..3db247742e0 100644 --- a/app/views/merge_requests/show.html.haml +++ b/app/views/merge_requests/show.html.haml @@ -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 |