From 10cec316eee59866fa9e6ac9f0d6688a4b986946 Mon Sep 17 00:00:00 2001
From: Naoki Takezoe <takezoe@gmail.com>
Date: Thu, 19 Apr 2018 19:13:32 +0900
Subject: [PATCH] Adjust layout

---
 .../gitbucket/core/helper/commitcomment.scala.html   |  2 +-
 .../gitbucket/core/helper/commitcomments.scala.html  | 12 +++++++++---
 src/main/twirl/gitbucket/core/pulls/files.scala.html |  2 +-
 .../twirl/gitbucket/core/repo/editcomment.scala.html |  2 +-
 src/main/webapp/assets/common/css/gitbucket.css      |  5 +++--
 5 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/src/main/twirl/gitbucket/core/helper/commitcomment.scala.html b/src/main/twirl/gitbucket/core/helper/commitcomment.scala.html
index b8e6176a7..00fb36a87 100644
--- a/src/main/twirl/gitbucket/core/helper/commitcomment.scala.html
+++ b/src/main/twirl/gitbucket/core/helper/commitcomment.scala.html
@@ -3,7 +3,7 @@
   repository: gitbucket.core.service.RepositoryService.RepositoryInfo,
   latestCommitId: Option[String] = None)(implicit context: gitbucket.core.controller.Context)
 @import gitbucket.core.view.helpers
-<div class="panel-body commit-comment-box @if((!latestCommitId.isDefined || latestCommitId.get == comment.commitId)){inline-comment}" id="discussion_r@comment.commentId"
+<div class="commit-comment-box @if((!latestCommitId.isDefined || latestCommitId.get == comment.commitId)){inline-comment}" id="discussion_r@comment.commentId"
   @if(comment.fileName.isDefined){filename="@comment.fileName.get"}
   @if(comment.newLine.isDefined){newline="@comment.newLine.get"}
   @if(comment.oldLine.isDefined){oldline="@comment.oldLine.get"}>
diff --git a/src/main/twirl/gitbucket/core/helper/commitcomments.scala.html b/src/main/twirl/gitbucket/core/helper/commitcomments.scala.html
index 3bcd3cab7..41e9affb8 100644
--- a/src/main/twirl/gitbucket/core/helper/commitcomments.scala.html
+++ b/src/main/twirl/gitbucket/core/helper/commitcomments.scala.html
@@ -2,11 +2,17 @@
   hasWritePermission: Boolean,
   repository: gitbucket.core.service.RepositoryService.RepositoryInfo,
   latestCommitId: Option[String] = None)(implicit context: gitbucket.core.controller.Context)
+@import gitbucket.core.view.helpers
 <div class="panel panel-default">
   <div class="panel-heading">
     <span class="monospace">@comments.fileName</span>
+    <span class="pull-right">
+      <a href="@helpers.url(repository)/commit/@comments.comments.head.commitId" class="monospace">@comments.comments.head.commitId.substring(0, 7)</a>
+    </span>
+  </div>
+  <div class="panel-body">
+    @comments.comments.map { comment =>
+      @gitbucket.core.helper.html.commitcomment(comment, hasWritePermission, repository, latestCommitId)
+    }
   </div>
-  @comments.comments.map { comment =>
-    @gitbucket.core.helper.html.commitcomment(comment, hasWritePermission, repository, latestCommitId)
-  }
 </div>
diff --git a/src/main/twirl/gitbucket/core/pulls/files.scala.html b/src/main/twirl/gitbucket/core/pulls/files.scala.html
index 1c3433190..e58cccd34 100644
--- a/src/main/twirl/gitbucket/core/pulls/files.scala.html
+++ b/src/main/twirl/gitbucket/core/pulls/files.scala.html
@@ -16,7 +16,7 @@
     isManageable,
     true
   )
-  <div id="comment-list" style="visibility: hidden;">
+  <div id="comment-list" style="display: none;">
     @gitbucket.core.issues.html.commentlist(Some(issue), comments.toList, isManageable, repository, Some(pullreq))
   </div>
 }
diff --git a/src/main/twirl/gitbucket/core/repo/editcomment.scala.html b/src/main/twirl/gitbucket/core/repo/editcomment.scala.html
index 9e3d3d0ae..9ae596513 100644
--- a/src/main/twirl/gitbucket/core/repo/editcomment.scala.html
+++ b/src/main/twirl/gitbucket/core/repo/editcomment.scala.html
@@ -14,7 +14,7 @@
   elastic            = true,
   tabIndex           = 1
 )
-<div class="pull-right">
+<div class="text-right">
   <input type="button" class="cancel-comment-@commentId btn btn-small btn-default" value="Cancel"/>
   <input type="button" class="update-comment-@commentId btn btn-small btn-success" value="Update comment"/>
 </div>
diff --git a/src/main/webapp/assets/common/css/gitbucket.css b/src/main/webapp/assets/common/css/gitbucket.css
index 8781d5459..9b196f108 100644
--- a/src/main/webapp/assets/common/css/gitbucket.css
+++ b/src/main/webapp/assets/common/css/gitbucket.css
@@ -777,12 +777,12 @@ div.issue-comment-box textarea{
   height: 100px;
   max-height: 300px;
 }
-
+/*
 div.commit-comment-box.panel-body {
   padding-top: 8px;
   padding-bottom: 0px;
 }
-
+*/
 div.commit-comment-box div.tabbable {
   margin-top: 5px;
 }
@@ -1176,6 +1176,7 @@ table.diff tbody tr.not-diff:hover td {
 .not-diff > .comment-box-container {
   white-space: normal;
   line-height: initial;
+  padding-top: 8px;
   padding-left: 10px;
   padding-right: 10px;
 }