Fork: 0
johnpearcey / gitbucket_jkp
Browse code
(refs #1237) Fix broken layout
master
1 parent 72f7b65 commit cf9a55d896b496b247763af8d82393b8750a4f37
@Naoki Takezoe Naoki Takezoe authored on 10 Jul 2016
Patch
Unified Split
Showing 3 changed files
View
2
■■■■■
 src/main/twirl/gitbucket/core/menu.scala.html
</ul>
</div>
</div>
<div class="content-wrapper">
<div class="content body">
<div class="content body clearfix">
<div class="headbar">
<div class="container">
@gitbucket.core.helper.html.information(info)
@gitbucket.core.helper.html.error(error)
View
4
■■■■■
 src/main/twirl/gitbucket/core/pulls/conversation.scala.html
case other => None
}.exists(_.action == "merge")){ merged =>
@if(!issue.closed){
<div class="check-conflict" style="display: none;">
<div class="box issue-comment-box" style="background-color: #fbeed5">
<div class="issue-comment-box" style="background-color: #fbeed5">
<div class="box-content"class="issue-content" style="border: 1px solid #c09853; padding: 10px;">
<img src="@helpers.assets/common/images/indicator.gif"/> Checking...
</div>
</div>
</div>
}
@if(hasWritePermission && issue.closed && pullreq.userName == pullreq.requestUserName && merged &&
pullreq.repositoryName == pullreq.requestRepositoryName && repository.branchList.contains(pullreq.requestBranch)){
<div class="box issue-comment-box" style="background-color: #d0eeff;">
<div class="issue-comment-box" style="background-color: #d0eeff;">
<div class="box-content"class="issue-content" style="border: 1px solid #87a8c9; padding: 10px;">
<a href="@helpers.url(repository)/pull/@issue.issueId/delete/@helpers.encodeRefName(pullreq.requestBranch)" class="btn btn-info pull-right delete-branch" data-name="@pullreq.requestBranch">Delete branch</a>
<div>
<span class="strong">Pull request successfully merged and closed</span>
View
2
■■■■■
 src/main/twirl/gitbucket/core/pulls/mergeguide.scala.html
pullreq: gitbucket.core.model.PullRequest,
originRepository: gitbucket.core.service.RepositoryService.RepositoryInfo,
forkedRepository: gitbucket.core.service.RepositoryService.RepositoryInfo)(implicit context: gitbucket.core.controller.Context)
@import gitbucket.core.view.helpers
<div class="box issue-comment-box" style="background-color: @if(status.hasProblem){ #fbeed5 }else{ #d8f5cd };">
<div class="issue-comment-box" style="background-color: @if(status.hasProblem){ #fbeed5 }else{ #d8f5cd };">
<div class="box-content issue-content" style="border: 1px solid @if(status.hasProblem){ #c09853 }else{ #95c97e };padding:0">
<div id="merge-pull-request">
@if(!status.statuses.isEmpty){
<div class="build-statuses">