Commit dcac37d9 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Restyle MR form page

parent 8587e3a3
...@@ -158,9 +158,3 @@ ...@@ -158,9 +158,3 @@
} }
} }
} }
.event-last-push .btn-create {
position: relative;
top: -3px;
right: -30px;
}
...@@ -82,10 +82,6 @@ ...@@ -82,10 +82,6 @@
} }
} }
.mr_direction_tip {
margin-top:40px
}
.label-branch { .label-branch {
@include border-radius(4px); @include border-radius(4px);
padding: 2px 4px; padding: 2px 4px;
...@@ -113,3 +109,12 @@ ...@@ -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) - if show_last_push_widget?(event)
.alert.alert-success.event-last-push .event-last-push
%span You pushed to %span You pushed to
= link_to project_commits_path(event.project, event.ref_name) do = link_to project_commits_path(event.project, event.ref_name) do
%strong= truncate(event.ref_name, length: 28) %strong= truncate(event.ref_name, length: 28)
...@@ -11,3 +11,4 @@ ...@@ -11,3 +11,4 @@
.pull-right .pull-right
= link_to new_mr_path_from_push_event(event), title: "New Merge Request", class: "btn btn-create btn-small" do = link_to new_mr_path_from_push_event(event), title: "New Merge Request", class: "btn btn-create btn-small" do
Create Merge Request Create Merge Request
%hr
...@@ -5,36 +5,36 @@ ...@@ -5,36 +5,36 @@
- @merge_request.errors.full_messages.each do |msg| - @merge_request.errors.full_messages.each do |msg|
%li= msg %li= msg
%fieldset %h3.page-title
%legend 1. Select Branches %i.icon-code-fork
Branches
.merge-request-branches
.row .row
.span5 .span5
.mr_branch_box .light-well
%h5.cgray From (Head Branch) %h5.cgray From (Head Branch)
.body = f.select(:source_branch, @repository.branch_names, { include_blank: "Select branch" }, {class: 'chosen span4'})
.padded= f.select(:source_branch, @repository.branch_names, { include_blank: "Select branch" }, {class: 'chosen span4'}) .mr_source_commit.prepend-top-10
.mr_source_commit
.span2 .span2
%center= image_tag "merge.png", class: 'mr_direction_tip' %h1.merge-request-angle
%i.icon-angle-right
.span5 .span5
.mr_branch_box .light-well
%h5.cgray To (Base Branch) %h5.cgray To (Base Branch)
.body = f.select(:target_branch, @repository.branch_names, { include_blank: "Select branch" }, {class: 'chosen span4'})
.padded= f.select(:target_branch, @repository.branch_names, { include_blank: "Select branch" }, {class: 'chosen span4'}) .mr_target_commit.prepend-top-10
.mr_target_commit
%fieldset %hr
%legend 2. Fill info
.ui-box.ui-box-show %h3.page-title
.ui-box-head %i.icon-paper-clip
Details
.merge-request-info
.clearfix .clearfix
= f.label :title do = f.label :title do
%strong= "Title *" %strong= "Title *"
.input= f.text_field :title, class: "input-xxlarge pad js-gfm-input", maxlength: 255, rows: 5, required: true .input= f.text_field :title, class: "input-xxlarge pad js-gfm-input", maxlength: 255, rows: 5, required: true
.ui-box-body
.clearfix .clearfix
.left .left
= f.label :assignee_id do = f.label :assignee_id do
...@@ -47,7 +47,6 @@ ...@@ -47,7 +47,6 @@
Milestone Milestone
.input= f.select(:milestone_id, @project.milestones.active.all.map {|p| [ p.title, p.id ] }, { include_blank: "Select milestone" }, {class: 'chosen'}) .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 .form-actions
- if @merge_request.new_record? - if @merge_request.new_record?
......
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