From dcac37d9e41f21485822647b922ac952bf64358a Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Wed, 17 Jul 2013 15:48:22 +0300
Subject: [PATCH] Restyle MR form page
---
app/assets/images/merge.png | Bin 593 -> 0 bytes
app/assets/stylesheets/sections/events.scss | 6 --
.../stylesheets/sections/merge_requests.scss | 13 ++-
app/views/events/_event_last_push.html.haml | 3 +-
.../projects/merge_requests/_form.html.haml | 77 +++++++++---------
5 files changed, 49 insertions(+), 50 deletions(-)
delete mode 100644 app/assets/images/merge.png
diff --git a/app/assets/images/merge.png b/app/assets/images/merge.png
deleted file mode 100644
index 4a6bb2e154d6f724080f232e5bbb9dc21f99f7fc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 593
zcmeAS@N?(olHy`uVBq!ia0y~yV2}V|4mJh`h6m-gKNuJo7>k44ofy`glX=O&z`&N|
z?e4<x9|RZdT|SwCfq}EYBeIx*fm;}a85w5H0U5wv;_2(keuqO=$dW}jq309>1LH+c
z7sn8f<7cOC?7A8t(6-+`j%Bv)7QqzhgYF-eh_OmLda`gwO6P77;MVSLVbS@*xJ^)A
zk<mJEN0zE*V(Q8w$2Hr7TT<)0RVt>JzE_>(%I>tx<Js(=&(FyGn6I;L^S`;m*MAB+
zuKIIl#{0z^86LAQJSTUwRF3zm4;O>0Q@^4ABdx`rT~jAqWH|XwyE3Cfa#hVWm7^^}
zlD8F3PSW$P6TJS@vmqdrUAXJ@ABzpFIZSb~cXm643qEgeQ%I@kuU+kX+P`q>#U)Se
z4zPW=Wx=sF+n{K<u)>Cy{{(+%zlfSFBJVWy;<pJa&R6Bfe$eZ3a6Yh3xjBC`=N_(5
zv9<>b&;5HQBFlFCfM)0R!nyg3TRczZY~q}9WpxG9N1c$HlAX&he%Y*N5X3%bLzACU
zWJB$G-&4;gGv#<+;(w!^8+ERIX9vU0YZDHwVz0KmUAu3I>|<$==+%qMRE<BZThi~X
zo*1h9y<zi#m#L8k_j~fUW&YG#xBIWj4W2KuJMw3&Wt}l!>~_;_=1Xae`>rf|`aIw{
zJ5$D*YYR_pQ@#7P^?y^zM$fLJCAYt9|IJpi(6j64{AqV4xh!UXC1Jq6&OCFY@T(p(
sP4&Ig-yaFxSGZ*Qzr@}D=ikt`$UamPaiF-9fq{X+)78&qol`;+0GkQ|YXATM
diff --git a/app/assets/stylesheets/sections/events.scss b/app/assets/stylesheets/sections/events.scss
index 4bc8de4266e..d63746fc4b7 100644
--- a/app/assets/stylesheets/sections/events.scss
+++ b/app/assets/stylesheets/sections/events.scss
@@ -158,9 +158,3 @@
}
}
}
-
-.event-last-push .btn-create {
- position: relative;
- top: -3px;
- right: -30px;
-}
diff --git a/app/assets/stylesheets/sections/merge_requests.scss b/app/assets/stylesheets/sections/merge_requests.scss
index a84ef71e743..24efdf5f78d 100644
--- a/app/assets/stylesheets/sections/merge_requests.scss
+++ b/app/assets/stylesheets/sections/merge_requests.scss
@@ -82,10 +82,6 @@
}
}
-.mr_direction_tip {
- margin-top:40px
-}
-
.label-branch {
@include border-radius(4px);
padding: 2px 4px;
@@ -113,3 +109,12 @@
}
}
}
+
+.merge-request-angle {
+ text-align: center;
+ margin-top: 45px;
+}
+
+.merge-request-info {
+ padding: 15px 0;
+}
diff --git a/app/views/events/_event_last_push.html.haml b/app/views/events/_event_last_push.html.haml
index fe79ecd5885..de5634d3c55 100644
--- a/app/views/events/_event_last_push.html.haml
+++ b/app/views/events/_event_last_push.html.haml
@@ -1,5 +1,5 @@
- 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)
@@ -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
diff --git a/app/views/projects/merge_requests/_form.html.haml b/app/views/projects/merge_requests/_form.html.haml
index b3da15608e4..9327f4689ae 100644
--- a/app/views/projects/merge_requests/_form.html.haml
+++ b/app/views/projects/merge_requests/_form.html.haml
@@ -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?
--
GitLab