Skip to content
Snippets Groups Projects
Commit dcac37d9 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets
Browse files

Restyle MR form page

parent 8587e3a3
No related branches found
No related tags found
No related merge requests found
app/assets/images/merge.png

593 B

Loading
Loading
@@ -158,9 +158,3 @@
}
}
}
.event-last-push .btn-create {
position: relative;
top: -3px;
right: -30px;
}
Loading
Loading
@@ -82,10 +82,6 @@
}
}
 
.mr_direction_tip {
margin-top:40px
}
.label-branch {
@include border-radius(4px);
padding: 2px 4px;
Loading
Loading
@@ -113,3 +109,12 @@
}
}
}
.merge-request-angle {
text-align: center;
margin-top: 45px;
}
.merge-request-info {
padding: 15px 0;
}
- if show_last_push_widget?(event)
.alert.alert-success.event-last-push
.event-last-push
%span You pushed to
= link_to project_commits_path(event.project, event.ref_name) do
%strong= truncate(event.ref_name, length: 28)
Loading
Loading
@@ -11,3 +11,4 @@
.pull-right
= link_to new_mr_path_from_push_event(event), title: "New Merge Request", class: "btn btn-create btn-small" do
Create Merge Request
%hr
Loading
Loading
@@ -5,49 +5,48 @@
- @merge_request.errors.full_messages.each do |msg|
%li= msg
 
%fieldset
%legend 1. Select Branches
%h3.page-title
%i.icon-code-fork
Branches
.merge-request-branches
.row
.span5
.light-well
%h5.cgray From (Head Branch)
= f.select(:source_branch, @repository.branch_names, { include_blank: "Select branch" }, {class: 'chosen span4'})
.mr_source_commit.prepend-top-10
 
.row
.span5
.mr_branch_box
%h5.cgray From (Head Branch)
.body
.padded= f.select(:source_branch, @repository.branch_names, { include_blank: "Select branch" }, {class: 'chosen span4'})
.mr_source_commit
.span2
%h1.merge-request-angle
%i.icon-angle-right
.span5
.light-well
%h5.cgray To (Base Branch)
= f.select(:target_branch, @repository.branch_names, { include_blank: "Select branch" }, {class: 'chosen span4'})
.mr_target_commit.prepend-top-10
 
.span2
%center= image_tag "merge.png", class: 'mr_direction_tip'
.span5
.mr_branch_box
%h5.cgray To (Base Branch)
.body
.padded= f.select(:target_branch, @repository.branch_names, { include_blank: "Select branch" }, {class: 'chosen span4'})
.mr_target_commit
%hr
 
%fieldset
%legend 2. Fill info
%h3.page-title
%i.icon-paper-clip
Details
.merge-request-info
.clearfix
= f.label :title do
%strong= "Title *"
.input= f.text_field :title, class: "input-xxlarge pad js-gfm-input", maxlength: 255, rows: 5, required: true
.clearfix
.left
= f.label :assignee_id do
%i.icon-user
Assign to
.input= f.select(:assignee_id, @project.team.members.sort_by(&:name).map {|p| [ p.name, p.id ] }, { include_blank: "Select user" }, {class: 'chosen span3'})
.left
= f.label :milestone_id do
%i.icon-time
Milestone
.input= f.select(:milestone_id, @project.milestones.active.all.map {|p| [ p.title, p.id ] }, { include_blank: "Select milestone" }, {class: 'chosen'})
 
.ui-box.ui-box-show
.ui-box-head
.clearfix
= f.label :title do
%strong= "Title *"
.input= f.text_field :title, class: "input-xxlarge pad js-gfm-input", maxlength: 255, rows: 5, required: true
.ui-box-body
.clearfix
.left
= f.label :assignee_id do
%i.icon-user
Assign to
.input= f.select(:assignee_id, @project.team.members.sort_by(&:name).map {|p| [ p.name, p.id ] }, { include_blank: "Select user" }, {class: 'chosen span3'})
.left
= f.label :milestone_id do
%i.icon-time
Milestone
.input= f.select(:milestone_id, @project.milestones.active.all.map {|p| [ p.title, p.id ] }, { include_blank: "Select milestone" }, {class: 'chosen'})
.control-group
 
.form-actions
- if @merge_request.new_record?
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment