Fix commit message textarea position

1 files changed, 32 insertions, 31 deletions

diff --git a/app/views/projects/merge_requests/widget/open/_accept.html.haml b/app/views/projects/merge_requests/widget/open/_accept.html.haml
index 0fe3af97b70..6b4395fe4dc 100644
--- a/app/views/projects/merge_requests/widget/open/_accept.html.haml
+++ b/app/views/projects/merge_requests/widget/open/_accept.html.haml
@@ -3,37 +3,38 @@
 = form_for [:merge, @project.namespace.becomes(Namespace), @project, @merge_request], remote: true, method: :post, html: { class: 'accept-mr-form js-requires-input' } do |f|
   = hidden_field_tag :authenticity_token, form_authenticity_token
   .accept-merge-holder.clearfix.js-toggle-container
-    .accept-action
-      - if @merge_request.ci_commit && @merge_request.ci_commit.active?
-        %span.btn-group
-          = link_to "#", class: "btn btn-create merge_when_build_succeeds" do
-            Merge When Build Succeeds
-          %a.btn.btn-success.dropdown-toggle{ 'data-toggle' => 'dropdown' }
-            %span.caret
-            %span.sr-only
-              Select Merge Moment
-          %ul.dropdown-menu.dropdown-menu-right{ role: 'menu' }
-            %li
-              = link_to "#", class: "merge_when_build_succeeds" do
-                = icon('check fw')
-                Merge When Build Succeeds
-            %li
-              = link_to "#", class: "accept_merge_request" do
-                = icon('warning fw')
-                Accept Merge Request Now
-      - else
-        = f.button class: "btn btn-create btn-grouped accept_merge_request #{status_class}" do
-          Accept Merge Request
-    - if @merge_request.can_remove_source_branch?(current_user)
-      .accept-control.checkbox
-        = label_tag :should_remove_source_branch, class: "remove_source_checkbox" do
-          = check_box_tag :should_remove_source_branch
-          Remove source branch
-    .accept-control.right
-      = link_to "#", class: "modify-merge-commit-link js-toggle-button" do
-        = icon('edit')
-        Modify commit message
-    .js-toggle-content.hide.prepend-top-20
+    .clearfix
+      .accept-action
+        - if @merge_request.ci_commit && @merge_request.ci_commit.active?
+          %span.btn-group
+            = link_to "#", class: "btn btn-create merge_when_build_succeeds" do
+              Merge When Build Succeeds
+            %a.btn.btn-success.dropdown-toggle{ 'data-toggle' => 'dropdown' }
+              %span.caret
+              %span.sr-only
+                Select Merge Moment
+            %ul.dropdown-menu.dropdown-menu-right{ role: 'menu' }
+              %li
+                = link_to "#", class: "merge_when_build_succeeds" do
+                  = icon('check fw')
+                  Merge When Build Succeeds
+              %li
+                = link_to "#", class: "accept_merge_request" do
+                  = icon('warning fw')
+                  Merge Immediately
+        - else
+          = f.button class: "btn btn-create btn-grouped accept_merge_request #{status_class}" do
+            Accept Merge Request
+      - if @merge_request.can_remove_source_branch?(current_user)
+        .accept-control.checkbox
+          = label_tag :should_remove_source_branch, class: "remove_source_checkbox" do
+            = check_box_tag :should_remove_source_branch
+            Remove source branch
+      .accept-control.right
+        = link_to "#", class: "modify-merge-commit-link js-toggle-button" do
+          = icon('edit')
+          Modify commit message
+    .js-toggle-content.hide.prepend-top-default
       = render 'shared/commit_message_container', params: params,
           text: @merge_request.merge_commit_message,
           rows: 14, hint: true