Nemcio/GitBucket
1
0
Fork 0
mirror of https://github.com/gitbucket/gitbucket.git synced 2025-11-05 04:56:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

(refs #1237) Fix broken layout

Browse Source
This commit is contained in:
Naoki Takezoe
2016-07-10 22:55:34 +09:00
parent 72f7b659f4
commit cf9a55d896
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -57,7 +57,7 @@
</div> </div>
</div> </div>
<div class="content-wrapper"> <div class="content-wrapper">
<div class="content body"> <div class="content body clearfix">
<div class="headbar"> <div class="headbar">
<div class="container"> <div class="container">
@gitbucket.core.helper.html.information(info) @gitbucket.core.helper.html.information(info)

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

@@ -18,7 +18,7 @@
}.exists(_.action == "merge")){ merged => }.exists(_.action == "merge")){ merged =>
@if(!issue.closed){ @if(!issue.closed){
<div class="check-conflict" style="display: none;"> <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;"> <div class="box-content"class="issue-content" style="border: 1px solid #c09853; padding: 10px;">
<img src="@helpers.assets/common/images/indicator.gif"/> Checking... <img src="@helpers.assets/common/images/indicator.gif"/> Checking...
</div> </div>
@@ -27,7 +27,7 @@
} }
@if(hasWritePermission && issue.closed && pullreq.userName == pullreq.requestUserName && merged && @if(hasWritePermission && issue.closed && pullreq.userName == pullreq.requestUserName && merged &&
pullreq.repositoryName == pullreq.requestRepositoryName && repository.branchList.contains(pullreq.requestBranch)){ 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;"> <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> <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> <div>

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

@@ -4,7 +4,7 @@
originRepository: gitbucket.core.service.RepositoryService.RepositoryInfo, originRepository: gitbucket.core.service.RepositoryService.RepositoryInfo,
forkedRepository: gitbucket.core.service.RepositoryService.RepositoryInfo)(implicit context: gitbucket.core.controller.Context) forkedRepository: gitbucket.core.service.RepositoryService.RepositoryInfo)(implicit context: gitbucket.core.controller.Context)
@import gitbucket.core.view.helpers @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 class="box-content issue-content" style="border: 1px solid @if(status.hasProblem){ #c09853 }else{ #95c97e };padding:0">
<div id="merge-pull-request"> <div id="merge-pull-request">
@if(!status.statuses.isEmpty){ @if(!status.statuses.isEmpty){