diff --git a/src/main/twirl/gitbucket/core/menu.scala.html b/src/main/twirl/gitbucket/core/menu.scala.html index 3106881..1995388 100644 --- a/src/main/twirl/gitbucket/core/menu.scala.html +++ b/src/main/twirl/gitbucket/core/menu.scala.html @@ -88,9 +88,6 @@ forked from @x.parentUserName/@x.parentRepositoryName } - @x.description.map { description => -
@Html(helpers.detectAndRenderLinks(description, repository))
- } } diff --git a/src/main/twirl/gitbucket/core/repo/branches.scala.html b/src/main/twirl/gitbucket/core/repo/branches.scala.html index 65bf985..a5d7cab 100644 --- a/src/main/twirl/gitbucket/core/repo/branches.scala.html +++ b/src/main/twirl/gitbucket/core/repo/branches.scala.html @@ -7,7 +7,7 @@ - + @@ -15,7 +15,7 @@ -
All branchesAll branches
@if(isProtected){ } - @branch.name + @branch.name Updated @gitbucket.core.helper.html.datetimeago(branch.commitTime, false) by @helpers.user(branch.committerName, branch.committerEmailAddress, "muted-link") @@ -36,7 +36,7 @@ } } +
@if(repository.repository.defaultBranch != branch.name){ @branch.mergeInfo.map{ info => diff --git a/src/main/twirl/gitbucket/core/repo/files.scala.html b/src/main/twirl/gitbucket/core/repo/files.scala.html index e10c8b1..5b1e852 100644 --- a/src/main/twirl/gitbucket/core/repo/files.scala.html +++ b/src/main/twirl/gitbucket/core/repo/files.scala.html @@ -22,6 +22,13 @@ s"${(repository.name :: pathList).mkString("/")} at ${helpers.encodeRefName(branch)} - ${repository.owner}/${repository.name}" }, Some(repository)) { @gitbucket.core.html.menu("files", repository, Some(branch), info, error){ + @if(pathList.isEmpty) { + @repository.repository.description.map { description => +

+ @Html(helpers.detectAndRenderLinks(description, repository)) +

+ } + }
@@ -102,8 +109,8 @@
-
- latest commit @latestCommit.id.substring(0, 10) +
diff --git a/src/main/webapp/assets/common/css/gitbucket.css b/src/main/webapp/assets/common/css/gitbucket.css index 149e197..ee8ef84 100644 --- a/src/main/webapp/assets/common/css/gitbucket.css +++ b/src/main/webapp/assets/common/css/gitbucket.css @@ -392,8 +392,8 @@ /* Head Menu */ /****************************************************************************/ div.headbar { - padding-top: 19px; - margin-bottom: 20px; + padding-top: 4px; + margin-bottom: 8px; } /****************************************************************************/ @@ -438,10 +438,15 @@ margin-left: 40px; } -table.branches>thead>tr>th, table.branches>tbody>tr>td{ +table.branches>thead>tr>th { padding: 12px; } +table.branches>tbody>tr>td{ + padding: 12px; + line-height: 30px; +} + .branches .muted-link{ color: #777; } @@ -450,15 +455,6 @@ color: #4183c4; } -.branches .branch-name{ - color: #4183c4; - display: inline-block; - padding: 2px 6px; - font-family: Consolas, "Liberation Mono", Menlo, Courier, monospace; - background-color: rgba(209,227,237,0.5); - border-radius: 3px; -} - .branches .branch-meta{ color: #aaa; line-height: 20px;