Nemcio/GitBucket
1
0
Fork 0
mirror of https://github.com/gitbucket/gitbucket.git synced 2025-11-15 09:55:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Adjust layout

Browse Source
This commit is contained in:
Naoki Takezoe
2018-04-19 19:13:32 +09:00
parent acf5767e4f
commit 10cec316ee
5 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/twirl/gitbucket/core/helper/commitcomment.scala.html
View File

@@ -3,7 +3,7 @@
repository: gitbucket.core.service.RepositoryService.RepositoryInfo, repository: gitbucket.core.service.RepositoryService.RepositoryInfo,
latestCommitId: Option[String] = None)(implicit context: gitbucket.core.controller.Context) latestCommitId: Option[String] = None)(implicit context: gitbucket.core.controller.Context)
@import gitbucket.core.view.helpers @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.fileName.isDefined){filename="@comment.fileName.get"}
@if(comment.newLine.isDefined){newline="@comment.newLine.get"} @if(comment.newLine.isDefined){newline="@comment.newLine.get"}
@if(comment.oldLine.isDefined){oldline="@comment.oldLine.get"}> @if(comment.oldLine.isDefined){oldline="@comment.oldLine.get"}>

6
src/main/twirl/gitbucket/core/helper/commitcomments.scala.html
View File

@@ -2,11 +2,17 @@
hasWritePermission: Boolean, hasWritePermission: Boolean,
repository: gitbucket.core.service.RepositoryService.RepositoryInfo, repository: gitbucket.core.service.RepositoryService.RepositoryInfo,
latestCommitId: Option[String] = None)(implicit context: gitbucket.core.controller.Context) latestCommitId: Option[String] = None)(implicit context: gitbucket.core.controller.Context)
@import gitbucket.core.view.helpers
<div class="panel panel-default"> <div class="panel panel-default">
<div class="panel-heading"> <div class="panel-heading">
<span class="monospace">@comments.fileName</span> <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>
<div class="panel-body">
@comments.comments.map { comment => @comments.comments.map { comment =>
@gitbucket.core.helper.html.commitcomment(comment, hasWritePermission, repository, latestCommitId) @gitbucket.core.helper.html.commitcomment(comment, hasWritePermission, repository, latestCommitId)
} }
</div>
</div> </div>

2
src/main/twirl/gitbucket/core/pulls/files.scala.html
View File

@@ -16,7 +16,7 @@
isManageable, isManageable,
true 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)) @gitbucket.core.issues.html.commentlist(Some(issue), comments.toList, isManageable, repository, Some(pullreq))
</div> </div>
} }

2
src/main/twirl/gitbucket/core/repo/editcomment.scala.html
View File

@@ -14,7 +14,7 @@
elastic = true, elastic = true,
tabIndex = 1 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="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"/> <input type="button" class="update-comment-@commentId btn btn-small btn-success" value="Update comment"/>
</div> </div>

5
src/main/webapp/assets/common/css/gitbucket.css
View File

@@ -777,12 +777,12 @@ div.issue-comment-box textarea{
height: 100px; height: 100px;
max-height: 300px; max-height: 300px;
} }
/*
div.commit-comment-box.panel-body { div.commit-comment-box.panel-body {
padding-top: 8px; padding-top: 8px;
padding-bottom: 0px; padding-bottom: 0px;
} }
*/
div.commit-comment-box div.tabbable { div.commit-comment-box div.tabbable {
margin-top: 5px; margin-top: 5px;
} }
@@ -1176,6 +1176,7 @@ table.diff tbody tr.not-diff:hover td {
.not-diff > .comment-box-container { .not-diff > .comment-box-container {
white-space: normal; white-space: normal;
line-height: initial; line-height: initial;
padding-top: 8px;
padding-left: 10px; padding-left: 10px;
padding-right: 10px; padding-right: 10px;
} }