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

UI: Fix bottom margin of branch deletion box in pull request (#3780)

Browse Source
This commit is contained in:
Naoki Takezoe
2025-06-21 17:23:23 +09:00
committed by GitHub
parent 9c2e09020a
commit b9d2efa582
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/twirl/gitbucket/core/pulls/conversation.scala.html
View File

@@ -37,8 +37,8 @@
</div> </div>
} }
@if(isManageableForkedRepository && issue.closed && merged && @if(isManageableForkedRepository && issue.closed && merged &&
forkedRepository.map(r => (r.branchList.contains(pullreq.requestBranch) && r.repository.defaultBranch != pullreq.requestBranch)).getOrElse(false)){ forkedRepository.exists(r => r.branchList.contains(pullreq.requestBranch) && r.repository.defaultBranch != pullreq.requestBranch)){
<div class="issue-comment-box" style="background-color: #d0eeff;"> <div class="issue-comment-box" style="background-color: #d0eeff; margin-bottom: 20px;">
<div class="box-content" style="border: 1px solid #87a8c9; padding: 10px;"> <div class="box-content" style="border: 1px solid #87a8c9; padding: 10px;">
<a href="@helpers.url(repository)/pull/@issue.issueId/delete_branch" class="btn btn-info pull-right delete-branch" data-name="@pullreq.requestBranch">Delete branch</a> <a href="@helpers.url(repository)/pull/@issue.issueId/delete_branch" class="btn btn-info pull-right delete-branch" data-name="@pullreq.requestBranch">Delete branch</a>
<div> <div>