diff --git a/src/main/twirl/gitbucket/core/repo/branches.scala.html b/src/main/twirl/gitbucket/core/repo/branches.scala.html index 6a5f5a6..759d6b2 100644 --- a/src/main/twirl/gitbucket/core/repo/branches.scala.html +++ b/src/main/twirl/gitbucket/core/repo/branches.scala.html @@ -13,74 +13,75 @@ @branchInfo.map { case (branch, prs, isProtected) => - -
- @branch.mergeInfo.map{ info => - @prs.map{ case (pull, issue) => - #@issue.issueId - @if(issue.closed) { - @if(info.isMerged){ - Merged - }else{ - Closed - } - } else { - Open - } - }.getOrElse{ - @if(context.loginAccount.isDefined){ - New Pull Request - } else { - Compare - } - } - @if(hasWritePermission){ - - @if(prs.map(!_._2.closed).getOrElse(false)){ - - } else { - @if(isProtected){ - - } else { - - } - } - - } - } -
-
- @if(isProtected){ } - @branch.name - - Updated @helper.html.datetimeago(branch.commitTime, false) - by @user(branch.committerName, branch.committerEmailAddress, "muted-link") - - -
-
- @if(branch.mergeInfo.isEmpty){ - Default - }else{ + + +
@branch.mergeInfo.map{ info => -
-
-
@info.ahead
-
@info.behind
+ @prs.map{ case (pull, issue) => + #@issue.issueId + @if(issue.closed) { + @if(info.isMerged){ + Merged + } else { + Closed + } + } else { + Open + } + }.getOrElse{ + @if(context.loginAccount.isDefined){ + New Pull Request + } else { + Compare + } + } + @if(hasWritePermission){ + + @if(prs.map(!_._2.closed).getOrElse(false)){ + + } else { + @if(isProtected){ + + } else { + + } + } + + } + } +
+
+ @if(isProtected){ } + @branch.name + + Updated @helper.html.datetimeago(branch.commitTime, false) + by @user(branch.committerName, branch.committerEmailAddress, "muted-link") + + +
+
+ @if(branch.mergeInfo.isEmpty){ + Default + } else { + @branch.mergeInfo.map{ info => +
+
+
@info.ahead
+
@info.behind
-
+ } } - } -
+
+ } diff --git a/src/main/webapp/assets/common/css/gitbucket.css b/src/main/webapp/assets/common/css/gitbucket.css index 2c391cf..299bc13 100644 --- a/src/main/webapp/assets/common/css/gitbucket.css +++ b/src/main/webapp/assets/common/css/gitbucket.css @@ -833,6 +833,7 @@ font-size: 120%; } +/* .label-success { background-color: #6cc644; } @@ -840,6 +841,7 @@ .label-important { background-color: #bd2c00; } +*/ ul.label-list { list-style-type: none;