Download as
Browse Code »

Commit 22ec3fa14cb87fec3655d2666783d439618890c5

Authored by Dmitriy Zaporozhets
1 parent e5ff5c28
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Fix MR css for accept MR block

Showing 2 changed files with 7 additions and 6 deletions   Show diff stats
app/assets/stylesheets/sections/merge_requests.scss
  Diff comments   View file @22ec3fa
... ... @@ -47,6 +47,7 @@
47 47 }
48 48 label {
49 49 color: #444;
  50 + text-align: left
50 51 }
51 52 }
52 53  
... ...
app/views/merge_requests/show/_mr_accept.html.haml
  Diff comments   View file @22ec3fa
... ... @@ -9,19 +9,19 @@
9 9 %span
10 10 = form_for [:automerge, @project, @merge_request], remote: true, method: :get do |f|
11 11 %p
12   - You can accept this request automatically.
13   - If you still want to do it manually -
  12 + You can accept this request automatically.
  13 + If you still want to do it manually -
14 14 %strong= link_to "click here", "#", class: "how_to_merge_link vlink", title: "How To Merge"
15 15 for instructions
16 16 .accept_group
17   - = f.submit "Accept Merge Request", class: "btn small success accept_merge_request"
18   - - unless @project.root_ref? @merge_request.source_branch
  17 + = f.submit "Accept Merge Request", class: "btn success accept_merge_request"
  18 + - unless @project.root_ref? @merge_request.source_branch
19 19 .remove_branch_holder
20   - = label_tag :should_remove_source_branch, class: "checkbox" do
  20 + = label_tag :should_remove_source_branch, class: "checkbox" do
21 21 = check_box_tag :should_remove_source_branch
22 22 Remove source-branch
23 23 .clearfix
24   -
  24 +
25 25  
26 26 .automerge_widget.cannot_be_merged{style: "display:none"}
27 27 .alert.alert-info
... ...