diff --git a/src/main/twirl/gitbucket/core/menu.scala.html b/src/main/twirl/gitbucket/core/menu.scala.html index 2f80d31..587d333 100644 --- a/src/main/twirl/gitbucket/core/menu.scala.html +++ b/src/main/twirl/gitbucket/core/menu.scala.html @@ -24,37 +24,41 @@
@helper.html.information(info) @helper.html.error(error) - @if(repository.commitCount > 0){ -
-
- @if(loginAccount.isEmpty){ - Fork - } else { - @if(isNoGroup) { - Fork - } else { - Fork - } +
+
+ @helper.html.repositoryicon(repository, true) + @repository.owner / @repository.name + + @defining(repository.repository){ x => + @if(repository.repository.originRepositoryName.isDefined){ + } - @repository.forkedCount -
- @if(loginAccount.isDefined && isNoGroup){ - }
- } -
- @helper.html.repositoryicon(repository, true) - @repository.owner / @repository.name - - @defining(repository.repository){ x => - @if(repository.repository.originRepositoryName.isDefined){ -
- forked from @x.parentUserName/@x.parentRepositoryName + @if(repository.commitCount > 0){ +
+
+ + @if(loginAccount.isEmpty){ + Fork + } else { + @if(isNoGroup) { + Fork + } else { + Fork + } + } + + @repository.forkedCount
- } + @if(loginAccount.isDefined && isNoGroup){ + + } +
}
diff --git a/src/main/webapp/assets/common/css/gitbucket.css b/src/main/webapp/assets/common/css/gitbucket.css index fba2d24..8ef6bc6 100644 --- a/src/main/webapp/assets/common/css/gitbucket.css +++ b/src/main/webapp/assets/common/css/gitbucket.css @@ -153,15 +153,16 @@ font-size: small; } -div.input-prepend span.count { +div.input-group span.count { background-color: white; -webkit-border-radius: 0 4px 4px 0; -moz-border-radius: 0 4px 4px 0; border-radius: 0 4px 4px 0; - height: 16px; - font-size: 12px; - padding-top: 2px; - padding-bottom: 6px; + border: 1px solid #d8d8d8; + font-size: 11px; + height: 24px; + padding: 3px 6px; + display: inline-block; } a.global-header-menu {