From f6bdefe3f3937e1434b9692822e0ff6f599df758 Mon Sep 17 00:00:00 2001
From: Unknwon <u@gogs.io>
Date: Tue, 26 Jun 2018 21:16:29 +0800
Subject: public: minor fix for PR #5276

---
 templates/repo/issue/view_content.tmpl | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'templates/repo/issue')

diff --git a/templates/repo/issue/view_content.tmpl b/templates/repo/issue/view_content.tmpl
index 1d499985..8c221f51 100644
--- a/templates/repo/issue/view_content.tmpl
+++ b/templates/repo/issue/view_content.tmpl
@@ -195,12 +195,6 @@
 									<div class="ui divider"></div>
 									<form class="ui form" action="{{.Link}}/merge" method="post">
 										{{.CSRFTokenHTML}}
-										<div class="field">
-											<div class="ui top">
-												<label>{{$.i18n.Tr "repo.pulls.commit_description"}}:</label>
-												<textarea id="commit_description" class="edit_area" name="commit_description" tabindex="4"></textarea>
-											</div>
-										</div>
 										<div class="field">
 											<div class="ui radio checkbox">
 											  <input type="radio" name="merge_style" value="create_merge_commit" checked="checked">
@@ -215,6 +209,12 @@
 												</div>
 											</div>
 										{{end}}
+										<div class="commit description field">
+											<div class="ui top">
+												<p>{{$.i18n.Tr "repo.pulls.commit_description"}}:</p>
+												<textarea id="commit_description" name="commit_description" tabindex="4" rows="3"></textarea>
+											</div>
+										</div>
 										<button class="ui green button">
 											<span class="octicon octicon-git-merge"></span> {{$.i18n.Tr "repo.pulls.merge_pull_request"}}
 										</button>
-- 
cgit v1.2.3