Nemcio/GitBucket
1
0
Fork 0
mirror of https://github.com/gitbucket/gitbucket.git synced 2025-11-12 16:35:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix branch list styles

Browse Source
This commit is contained in:
Naoki Takezoe
2015-11-27 02:40:48 +09:00
parent 12fba30ef8
commit b8bd8f5512
2 changed files with 22 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/twirl/gitbucket/core/repo/branches.scala.html
View File

@@ -34,21 +34,23 @@
urlEncode(parent) + ":" + encodeRefName(repository.repository.defaultBranch) urlEncode(parent) + ":" + encodeRefName(repository.repository.defaultBranch)
}.getOrElse { }.getOrElse {
encodeRefName(repository.repository.defaultBranch) encodeRefName(repository.repository.defaultBranch)
}}...@{encodeRefName(branch.name)}?expand=1" class="btn btn-small">New Pull Request</a> }}...@{encodeRefName(branch.name)}?expand=1" class="btn btn-default">New Pull Request</a>
} else { } else {
<a href="@url(repository)/compare/@{repository.repository.parentUserName.map { parent => <a href="@url(repository)/compare/@{repository.repository.parentUserName.map { parent =>
urlEncode(parent) + ":" + encodeRefName(repository.repository.defaultBranch) urlEncode(parent) + ":" + encodeRefName(repository.repository.defaultBranch)
}.getOrElse { }.getOrElse {
encodeRefName(repository.repository.defaultBranch) encodeRefName(repository.repository.defaultBranch)
}}...@{encodeRefName(branch.name)}" class="btn btn-small">Compare</a> }}...@{encodeRefName(branch.name)}" class="btn btn-default">Compare</a>
} }
} }
@if(hasWritePermission){ @if(hasWritePermission){
@if(prs.map(!_._2.closed).getOrElse(false)){ <span style="margin-left: 8px;">
<a class="btn disabled btn-mini" data-toggle="tooltip" title="You can’t delete this branch because it has an open pull request"><i class="octicon octicon-trashcan"></i></a> @if(prs.map(!_._2.closed).getOrElse(false)){
}else{ <a class="disabled" data-toggle="tooltip" title="You can’t delete this branch because it has an open pull request"><i class="octicon octicon-trashcan"></i></a>
<a href="@url(repository)/delete/@encodeRefName(branch.name)" class="btn @if(info.isMerged){ btn-warning }else{ btn-danger } delete-branch btn-mini" data-name="@branch.name" @if(info.isMerged){ data-toggle="tooltip" title="this branch is merged" }><i class="octicon octicon-trashcan"></i></a> } else {
} <a href="@url(repository)/delete/@encodeRefName(branch.name)" class="delete-branch" data-name="@branch.name" @if(info.isMerged){ data-toggle="tooltip" title="this branch is merged" }><i class="octicon octicon-trashcan @if(info.isMerged){warning} else {danger}"></i></a>
}
</span>
} }
} }
</div> </div>

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

@@ -69,6 +69,19 @@ blockquote p {
font-size: 15px; font-size: 15px;
} }
.table-bordered > thead > tr > th,
.table-bordered > thead > tr > td {
border-bottom-width: 1px;
}
.danger {
color: #900;
}
.warning {
color: #F28722;
}
/* ======================================================================== */ /* ======================================================================== */
/* Global Header */ /* Global Header */
/* ======================================================================== */ /* ======================================================================== */