diff --git a/src/main/twirl/gitbucket/core/repo/blob.scala.html b/src/main/twirl/gitbucket/core/repo/blob.scala.html index e12bdc0..b77d89d 100644 --- a/src/main/twirl/gitbucket/core/repo/blob.scala.html +++ b/src/main/twirl/gitbucket/core/repo/blob.scala.html @@ -65,11 +65,11 @@ Delete } - + @if(content.viewType == "text"){ @defining(isRenderable(pathList.reverse.head)){ isRrenderable => @if(!isBlame && isRrenderable) { -
+
@renderMarkup(pathList, content.content.get, branch, repository, false, false, true)
} else { diff --git a/src/main/twirl/gitbucket/core/repo/commits.scala.html b/src/main/twirl/gitbucket/core/repo/commits.scala.html index 01b5d2c..ce6e673 100644 --- a/src/main/twirl/gitbucket/core/repo/commits.scala.html +++ b/src/main/twirl/gitbucket/core/repo/commits.scala.html @@ -10,72 +10,73 @@ @html.main(s"${repository.owner}/${repository.name}", Some(repository)) { @html.menu("code", repository){
- @helper.html.branchcontrol( - branch, - repository, - hasWritePermission - ){ - @repository.branchList.map { x => -
  • @helper.html.checkicon(x == branch) @x
    • - } - } @if(pathList.isEmpty){ - @repository.name / Commit History + @helper.html.branchcontrol( + branch, + repository, + hasWritePermission + ){ + @repository.branchList.map { x => +
  • @helper.html.checkicon(x == branch) @x
    • + } + } } @if(pathList.nonEmpty){ History for - @repository.name / + @repository.name / @pathList.zipWithIndex.map { case (section, i) => @if(i == pathList.length - 1){ - @section + @section } else { - @section / + @section / } } }
    - @commits.map { day => - - - - - @day.map { commit => - - - - } -
    @date(day.head.commitTime)
    -
    - @commit.id.substring(0, 10)
    - Browse code -
    -
    -
    @avatar(commit, 40)
    -
    - @link(commit.summary, repository) - @if(commit.description.isDefined){ - ... - } -
    - @if(commit.description.isDefined){ - - } -
    - @user(commit.authorName, commit.authorEmailAddress, "username") - authored @helper.html.datetimeago(commit.authorTime) - @if(commit.isDifferentFromAuthor) { - - @user(commit.committerName, commit.committerEmailAddress, "username") - committed @helper.html.datetimeago(commit.authorTime) +
    + @commits.map { day => +
    + Commits on @date(day.head.commitTime) +
    +
    + @day.map { commit => +
    + +
    +
    @avatar(commit, 40)
    +
    + @link(commit.summary, repository) + @if(commit.description.isDefined){ + ... } +
    + @if(commit.description.isDefined){ + + } +
    + @user(commit.authorName, commit.authorEmailAddress, "username") + authored @helper.html.datetimeago(commit.authorTime) + @if(commit.isDifferentFromAuthor) { + + @user(commit.committerName, commit.committerEmailAddress, "username") + committed @helper.html.datetimeago(commit.authorTime) + } +
    -
    - } -
    - - + } +
    + } +
    +
    +
    } } diff --git a/src/main/twirl/gitbucket/core/repo/files.scala.html b/src/main/twirl/gitbucket/core/repo/files.scala.html index 1c93cc0..98d7c57 100644 --- a/src/main/twirl/gitbucket/core/repo/files.scala.html +++ b/src/main/twirl/gitbucket/core/repo/files.scala.html @@ -128,7 +128,7 @@ @readme.map { case(filePath, content) =>
    @filePath.reverse.head
    -
    @renderMarkup(filePath, content, branch, repository, false, false, true)
    +
    @renderMarkup(filePath, content, branch, repository, false, false, true)
    } } diff --git a/src/main/webapp/assets/common/css/gitbucket.css b/src/main/webapp/assets/common/css/gitbucket.css index 19c2631..b09a434 100644 --- a/src/main/webapp/assets/common/css/gitbucket.css +++ b/src/main/webapp/assets/common/css/gitbucket.css @@ -232,6 +232,36 @@ background: #f2f8fa; } +.commit-list { + position: relative; +} + +.commit-list::before { + position: absolute; + top: 0; + bottom: 0; + left: 6px; + z-index: -1; + display: block; + width: 2px; + content: ""; + background-color: #f3f3f3; +} + +ul.nav-pills-group .link { + color: #4078c0; +} + +div.box-commits { + background-color: white; + border: 1px solid #d8d8d8; + padding-left: 0px; + padding-right: 0px; + margin-top: 10px; + margin-bottom: 10px; + margin-left: 20px; +} + div.box-content { background-color: white; border: 1px solid #d8d8d8; @@ -239,7 +269,7 @@ border-radius: 3px; } -div.box-content-bottom > div.box-content-row:nth-of-type(1) { +div > div.box-content-row:nth-of-type(1) { border: none; } @@ -1361,6 +1391,7 @@ font: 15px Helvetica, arial, freesans, clean, sans-serif, "Segoe UI Emoji", "Segoe UI Symbol"; word-wrap: break-word; } + div.markdown-body h1 { border-bottom: 1px solid #ddd; font-size: 2.5em; diff --git a/src/main/webapp/assets/vendors/bootstrap/css/bootstrap.css b/src/main/webapp/assets/vendors/bootstrap/css/bootstrap.css index 2f56af3..f1f9747 100644 --- a/src/main/webapp/assets/vendors/bootstrap/css/bootstrap.css +++ b/src/main/webapp/assets/vendors/bootstrap/css/bootstrap.css @@ -231,13 +231,13 @@ } a { - color: #0088cc; + color: #4078c0; text-decoration: none; } a:hover, a:focus { - color: #005580; + color: #4078c0; text-decoration: underline; }