# HG changeset patch
# User Marcin Kuzminski <marcin@rhodecode.com>
# Date 2019-11-08 14:23:41
# Node ID e5416152602287f5e3980973b8b00c86e83276ab
# Parent  b3fe0fccb7184dd44e2216806da7d22841c6abd6

pull-request: flip the order of comments/merge status. Comments should be close to actuall comments

diff --git a/rhodecode/public/css/comments.less b/rhodecode/public/css/comments.less
--- a/rhodecode/public/css/comments.less
+++ b/rhodecode/public/css/comments.less
@@ -425,7 +425,7 @@ form.comment-form {
     }
 
     .comment-footer {
-        margin-bottom: 110px;
+        margin-bottom: 50px;
         margin-top: 10px;
     }
 }
diff --git a/rhodecode/templates/pullrequests/pullrequest_show.mako b/rhodecode/templates/pullrequests/pullrequest_show.mako
--- a/rhodecode/templates/pullrequests/pullrequest_show.mako
+++ b/rhodecode/templates/pullrequests/pullrequest_show.mako
@@ -563,16 +563,17 @@
       ${comment.generate_comments(c.comments, include_pull_request=True, is_pull_request=True)}
 
       % if not c.pull_request.is_closed():
+        ## main comment form and it status
+        ${comment.comments(h.route_path('pullrequest_comment_create', repo_name=c.repo_name,
+                                        pull_request_id=c.pull_request.pull_request_id),
+                           c.pull_request_review_status,
+                           is_pull_request=True, change_status=c.allowed_to_change_status)}
+
         ## merge status, and merge action
         <div class="pull-request-merge">
             <%include file="/pullrequests/pullrequest_merge_checks.mako"/>
         </div>
 
-        ## main comment form and it status
-        ${comment.comments(h.route_path('pullrequest_comment_create', repo_name=c.repo_name,
-                                        pull_request_id=c.pull_request.pull_request_id),
-                           c.pull_request_review_status,
-                           is_pull_request=True, change_status=c.allowed_to_change_status)}
       %endif
 
       <script type="text/javascript">