Commit 46906ca9 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

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

parent 27cd6c75
......@@ -1030,6 +1030,8 @@ p.time {
}
.project_box .project_descr,
.merge_request_box .middle_area,
.issue_box .middle_area,
.commit_box .commit_message {
margin: -20px;
padding: 20px;
......
......@@ -31,22 +31,19 @@
.alert-message.success.status_info Open
= @issue.title
%hr
%div
%div.row
%div.issue_meta.span13
%cite.cgray Created by
= image_tag gravatar_icon(@issue.author_email), :width => 16, :class => "lil_av"
%strong.author= link_to_issue_author(@issue)
%cite.cgray and currently assigned to
= image_tag gravatar_icon(@issue.assignee_email), :width => 16, :class => "lil_av"
%strong.author= link_to_issue_assignee(@issue)
%div.middle_area
%cite.cgray Created by
= image_tag gravatar_icon(@issue.author_email), :width => 16, :class => "lil_av"
%strong.author= link_to_issue_author(@issue)
%cite.cgray and currently assigned to
= image_tag gravatar_icon(@issue.assignee_email), :width => 16, :class => "lil_av"
%strong.author= link_to_issue_assignee(@issue)
%div
- if @issue.description.present?
%hr
= markdown @issue.description
%div
- if @issue.description.present?
%hr
= markdown @issue.description
.issue_notes#notes= render "notes/notes", :tid => @issue.id, :tt => "issue"
......@@ -5,19 +5,14 @@
→
%span.pretty_label.branch= @merge_request.target_branch
%small
created at
= @merge_request.created_at.stamp("Aug 21, 2011")
%span.right
- if can?(current_user, :modify_merge_request, @merge_request)
- 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 edit_project_merge_request_path(@project, @merge_request), :class => "btn" do
= link_to "Show how to merge", "#", :class => "how_to_merge_link btn small padded", :title => "How To Merge"
= 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
%br
%small= link_to "Show how to merge", "#", :class => "vlink how_to_merge_link", :title => "How To Merge"
%br
- if @merge_request.upvotes > 0
.upvotes#upvotes= "+#{pluralize @merge_request.upvotes, 'upvote'}"
......@@ -27,7 +22,6 @@
= link_to project_merge_requests_path(@project) do
← To merge requests
.merge_request_box
.merge_request_status_holder
%h5
......@@ -38,9 +32,9 @@
= @merge_request.title
%div
%div.middle_area
%div
%cite.cgray Created by
%cite.cgray Created at #{@merge_request.created_at.stamp("Aug 21, 2011")} by
= image_tag gravatar_icon(@merge_request.author_email), :width => 16, :class => "lil_av"
%strong.author= link_to_merge_request_author(@merge_request)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment