diff --git a/src/main/twirl/gitbucket/core/helper/branchcontrol.scala.html b/src/main/twirl/gitbucket/core/helper/branchcontrol.scala.html index f97e166..5451506 100644 --- a/src/main/twirl/gitbucket/core/helper/branchcontrol.scala.html +++ b/src/main/twirl/gitbucket/core/helper/branchcontrol.scala.html @@ -8,7 +8,7 @@ @helper.html.dropdown( value = if(branch.length == 40) branch.substring(0, 10) else branch, prefix = if(branch.length == 40) "tree" else if(repository.branchList.contains(branch)) "branch" else "tree", - mini = true + mini = false ) {
  • Switch branches
    • diff --git a/src/main/twirl/gitbucket/core/menu.scala.html b/src/main/twirl/gitbucket/core/menu.scala.html index e8777d1..f42d225 100644 --- a/src/main/twirl/gitbucket/core/menu.scala.html +++ b/src/main/twirl/gitbucket/core/menu.scala.html @@ -11,7 +11,6 @@ @sidemenu(path: String, name: String, icon: String, label: String, count: Int = 0) = {
  • -
    @if(expand){ @label} @@ -40,7 +39,7 @@ @repository.forkedCount @if(loginAccount.isDefined && isNoGroup){ -
    +
    } diff --git a/src/main/twirl/gitbucket/core/repo/files.scala.html b/src/main/twirl/gitbucket/core/repo/files.scala.html index 6b04bb7..dc74718 100644 --- a/src/main/twirl/gitbucket/core/repo/files.scala.html +++ b/src/main/twirl/gitbucket/core/repo/files.scala.html @@ -15,15 +15,15 @@ @html.menu("code", repository, Some(branch), pathList.isEmpty, groupNames.isEmpty, info, error){
    - + @if(pathList.nonEmpty){ - + }
    @branchPullRequest.map{ case (pullRequest, issue) => - #@pullRequest.issueId + #@pullRequest.issueId }.getOrElse{ - + } @helper.html.branchcontrol( branch, @@ -77,7 +77,7 @@ @if(pathList.size > 0){ - + .. @@ -85,7 +85,7 @@ } @files.map { file => - + @if(file.isDirectory){ @if(file.linkUrl.isDefined){ @@ -96,7 +96,7 @@ } - + @if(file.isDirectory){ @if(file.linkUrl.isDefined){ @@ -118,8 +118,8 @@ } - @link(file.message, repository) - [@user(file.author, file.mailAddress)] + @link(file.message, repository) + [@user(file.author, file.mailAddress)] @helper.html.datetimeago(file.time, false) diff --git a/src/main/webapp/assets/common/css/gitbucket.css b/src/main/webapp/assets/common/css/gitbucket.css index 5be5d77..9836b58 100644 --- a/src/main/webapp/assets/common/css/gitbucket.css +++ b/src/main/webapp/assets/common/css/gitbucket.css @@ -175,6 +175,12 @@ font-weight: bold; } +.shorten-text { + text-overflow: ellipsis; + white-space: nowrap; + overflow: hidden; +} + a.commit-message, a.commit-id, a.username, a.issue-comment-count { color: #333333; } @@ -373,25 +379,28 @@ ul.sidemenu a { display: block; + padding: 8px 10px; } -ul.sidemenu a:hover{ +ul.sidemenu a:hover { text-decoration: none; } ul.sidemenu li.active { border-top: 1px solid #eee; border-bottom: 1px solid #eee; - border-right: 2px solid #bb4444; + border-right: 3px solid #bb4444; border-left: 1px solid white; } -ul.sidemenu div.gradient { - width: 5px; - height: 30px; - background: linear-gradient(to right, #eee, #fff); - margin-right: 4px; - border-left: 1px solid #eee; +ul.sidemenu li.active a { + background-color: #fff; +} + +ul.sidemenu { + background-image: -webkit-linear-gradient(left, #f6f6f6 0%, #fff 8px); + background-image: linear-gradient(to right, #f6f6f6 0%, #fff 8px); + box-shadow: inset 1px 0 0 #eee; } ul.sidemenu div.margin { @@ -402,8 +411,6 @@ } ul.sidemenu li { - line-height: 30px; - height: 30px; border-left: 1px solid #eee; margin-left:0px; border-right: 2px solid white; @@ -589,13 +596,8 @@ display: block; } -a.header-link i.octicon { - opacity: 0.5; -} - a.header-link strong { color: black; - font-size: 90%; } a.header-link:hover { @@ -651,6 +653,25 @@ font-size: small; } +table.table-file-list .file-icon { + padding-right: 1px; +} + +table.table-file-list .content-name { + max-width: 180px; +} + +table.table-file-list .commit-message { + max-width: 415px; + display: inline-block; +} + +table.table-file-list .commit-author { + color: #999; + font-size: 12px; + float: right; +} + th, td, .table th, .table td { padding-top: 4px; padding-bottom: 4px;