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

Issues, Merge Request show page polished. Fixed +n overflow

Browse source
This commit is contained in:
Dmitriy Zaporozhets 2012-03-28 00:31:14 +03:00
parent 27cd6c758d
commit 46906ca9db
3 changed files with 19 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1030,6 +1030,8 @@ p.time {
} }
.project_box .project_descr, .project_box .project_descr,
.merge_request_box .middle_area,
.issue_box .middle_area,
.commit_box .commit_message { .commit_box .commit_message {
margin: -20px; margin: -20px;
padding: 20px; padding: 20px;

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

@ -31,10 +31,7 @@
.alert-message.success.status_info Open .alert-message.success.status_info Open
= @issue.title = @issue.title
%hr %div.middle_area
%div
%div.row
%div.issue_meta.span13
%cite.cgray Created by %cite.cgray Created by
= image_tag gravatar_icon(@issue.author_email), :width => 16, :class => "lil_av" = image_tag gravatar_icon(@issue.author_email), :width => 16, :class => "lil_av"
%strong.author= link_to_issue_author(@issue) %strong.author= link_to_issue_author(@issue)

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

@ -5,20 +5,15 @@
→ →
%span.pretty_label.branch= @merge_request.target_branch %span.pretty_label.branch= @merge_request.target_branch
%small
created at
= @merge_request.created_at.stamp("Aug 21, 2011")
%span.right %span.right
- if can?(current_user, :modify_merge_request, @merge_request) - if can?(current_user, :modify_merge_request, @merge_request)
- if @merge_request.open? - if @merge_request.open?
= link_to 'Close', project_merge_request_path(@project, @merge_request, :merge_request => {:closed => true }, :status_only => true), :method => :put, :class => "btn", :title => "Close merge request" = link_to "Show how to merge", "#", :class => "how_to_merge_link btn small padded", :title => "How To Merge"
= link_to edit_project_merge_request_path(@project, @merge_request), :class => "btn" do = link_to 'Close', project_merge_request_path(@project, @merge_request, :merge_request => {:closed => true }, :status_only => true), :method => :put, :class => "btn small padded", :title => "Close merge request"
= link_to edit_project_merge_request_path(@project, @merge_request), :class => "btn small padded" do
Edit Edit
%br %br
%small= link_to "Show how to merge", "#", :class => "vlink how_to_merge_link", :title => "How To Merge"
%br
- if @merge_request.upvotes > 0 - if @merge_request.upvotes > 0
.upvotes#upvotes= "+#{pluralize @merge_request.upvotes, 'upvote'}" .upvotes#upvotes= "+#{pluralize @merge_request.upvotes, 'upvote'}"
@ -27,7 +22,6 @@
= link_to project_merge_requests_path(@project) do = link_to project_merge_requests_path(@project) do
← To merge requests ← To merge requests
.merge_request_box .merge_request_box
.merge_request_status_holder .merge_request_status_holder
%h5 %h5
@ -38,9 +32,9 @@
= @merge_request.title = @merge_request.title
%div.middle_area
%div %div
%div %cite.cgray Created at #{@merge_request.created_at.stamp("Aug 21, 2011")} by
%cite.cgray Created by
= image_tag gravatar_icon(@merge_request.author_email), :width => 16, :class => "lil_av" = image_tag gravatar_icon(@merge_request.author_email), :width => 16, :class => "lil_av"
%strong.author= link_to_merge_request_author(@merge_request) %strong.author= link_to_merge_request_author(@merge_request)