From c483419184b3f04483dc727de93b0ef4b46af9fb Mon Sep 17 00:00:00 2001
From: Cirno the Strongest <1447794+CirnoT@users.noreply.github.com>
Date: Sat, 16 May 2020 00:54:18 +0200
Subject: [PATCH] Better styling for code review comment form (#11413)

Co-authored-by: techknowlogick <techknowlogick@gitea.io>
---
 templates/repo/diff/section_unified.tmpl | 3 +--
 web_src/js/index.js                      | 2 +-
 web_src/less/_review.less                | 8 ++++++--
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/templates/repo/diff/section_unified.tmpl b/templates/repo/diff/section_unified.tmpl
index 4c23c159a2..707822e452 100644
--- a/templates/repo/diff/section_unified.tmpl
+++ b/templates/repo/diff/section_unified.tmpl
@@ -28,8 +28,7 @@
 			{{$isNotPending := (not (eq (index $line.Comments 0).Review.Type 0))}}
 		<tr>
 			<td colspan="2" class="lines-num"></td>
-			<td class="lines-type-marker"></td>
-			<td class="add-comment-left add-comment-right">
+			<td class="add-comment-left add-comment-right" colspan="2">
 				{{if $resolved}}
 					<div class = "ui attached header">
 						<span class="ui grey text left"><b>{{$resolveDoer.Name}}</b> {{$.root.i18n.Tr "repo.issues.review.resolved_by"}}</span>
diff --git a/web_src/js/index.js b/web_src/js/index.js
index 91d16192de..4cb8cff443 100644
--- a/web_src/js/index.js
+++ b/web_src/js/index.js
@@ -1242,7 +1242,7 @@ function initPullRequestReview() {
     if (!ntr.hasClass('add-comment')) {
       ntr = $(`<tr class="add-comment">${
         isSplit ? '<td class="lines-num"></td><td class="lines-type-marker"></td><td class="add-comment-left"></td><td class="lines-num"></td><td class="lines-type-marker"></td><td class="add-comment-right"></td>' :
-          '<td class="lines-num"></td><td class="lines-num"></td><td class="lines-type-marker"></td><td class="add-comment-left add-comment-right"></td>'
+          '<td class="lines-num"></td><td class="lines-num"></td><td class="add-comment-left add-comment-right" colspan="2"></td>'
       }</tr>`);
       tr.after(ntr);
     }
diff --git a/web_src/less/_review.less b/web_src/less/_review.less
index 5d137e0c60..568952034a 100644
--- a/web_src/less/_review.less
+++ b/web_src/less/_review.less
@@ -74,9 +74,13 @@
         margin-top: 0;
     }
 
+    .comment-list {
+        padding-bottom: 10px;
+    }
+
     .footer {
         border-top: 1px solid #f1f1f1;
-        margin-top: 10px;
+        padding: 10px 0 10px 0;
 
         .markdown-info {
             display: inline-block;
@@ -101,7 +105,7 @@
     }
 
     form.comment-form-reply {
-        margin: 0 0 0 4em;
+        margin: 0 0 0 1em;
     }
 }