Refactoring scss & improving some UI elements
This commit is contained in:
parent
1dd938d20c
commit
51558bd57a
14 changed files with 101 additions and 216 deletions
|
@ -9,7 +9,7 @@
|
|||
%br
|
||||
|
||||
.row
|
||||
.span6
|
||||
.span5
|
||||
.mr_branch_box
|
||||
%h5 From (Head Branch)
|
||||
.body
|
||||
|
@ -17,10 +17,11 @@
|
|||
= f.label :source_branch, "From", class: "control-label"
|
||||
.controls
|
||||
= f.select(:source_branch, @project.heads.map(&:name), { include_blank: "Select branch" }, style: "width:250px")
|
||||
.bottom_commit
|
||||
.mr_source_commit
|
||||
.mr_source_commit
|
||||
|
||||
.span6
|
||||
.span2
|
||||
%center= image_tag "merge.png", class: 'mr_direction_tip'
|
||||
.span5
|
||||
.mr_branch_box
|
||||
%h5 To (Base Branch)
|
||||
.body
|
||||
|
@ -28,8 +29,7 @@
|
|||
= f.label :target_branch, "To", class: "control-label"
|
||||
.controls
|
||||
= f.select(:target_branch, @project.heads.map(&:name), { include_blank: "Select branch" }, style: "width:250px")
|
||||
.bottom_commit
|
||||
.mr_target_commit
|
||||
.mr_target_commit
|
||||
|
||||
%h4.cdark 2. Fill info
|
||||
|
||||
|
@ -48,12 +48,12 @@
|
|||
.control-group
|
||||
|
||||
.form-actions
|
||||
= f.submit 'Save', class: "btn-primary btn"
|
||||
= f.submit 'Save', class: "btn save-btn"
|
||||
- if @merge_request.new_record?
|
||||
= link_to project_merge_requests_path(@project), class: "btn" do
|
||||
= link_to project_merge_requests_path(@project), class: "btn cancel-btn" do
|
||||
Cancel
|
||||
- else
|
||||
= link_to project_merge_request_path(@project, @merge_request), class: "btn" do
|
||||
= link_to project_merge_request_path(@project, @merge_request), class: "btn cancel-btn" do
|
||||
Cancel
|
||||
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue