diff --git a/src/main/twirl/gitbucket/core/account/main.scala.html b/src/main/twirl/gitbucket/core/account/main.scala.html index 2a3d44f..0e17090 100644 --- a/src/main/twirl/gitbucket/core/account/main.scala.html +++ b/src/main/twirl/gitbucket/core/account/main.scala.html @@ -39,14 +39,14 @@ @if(loginAccount.isDefined && loginAccount.get.userName == account.userName){
  • - Edit Your Profile + Edit Your Profile
  • } @if(loginAccount.isDefined && account.isGroupAccount && isGroupManager){
  • - Edit Group + Edit Group
  • } diff --git a/src/main/twirl/gitbucket/core/account/newrepo.scala.html b/src/main/twirl/gitbucket/core/account/newrepo.scala.html index 2fe1915..c2dec33 100644 --- a/src/main/twirl/gitbucket/core/account/newrepo.scala.html +++ b/src/main/twirl/gitbucket/core/account/newrepo.scala.html @@ -4,45 +4,56 @@ @import gitbucket.core.view.helpers._ @html.main("Create a New Repository"){
    +

    Create a new repository

    +

    + A repository contains all the files for your project, including the revision history. +

    -
    - -
    - - - -
    - / - - +
    +
    +
    Owner
    +
    +
    + + + +
    +
    +
    + / +
    +
    Repository name
    +
    + + +
    +
    -
    +
    - +
    -
    @@ -50,13 +61,13 @@
    -
    - +
    +
    diff --git a/src/main/twirl/gitbucket/core/helper/preview.scala.html b/src/main/twirl/gitbucket/core/helper/preview.scala.html index abe2949..aacd048 100644 --- a/src/main/twirl/gitbucket/core/helper/preview.scala.html +++ b/src/main/twirl/gitbucket/core/helper/preview.scala.html @@ -14,11 +14,11 @@ @import gitbucket.core._ @import gitbucket.core.view.helpers._
    -
    diff --git a/src/main/twirl/gitbucket/core/search/menu.scala.html b/src/main/twirl/gitbucket/core/search/menu.scala.html index 93c7e38..0725dfd 100644 --- a/src/main/twirl/gitbucket/core/search/menu.scala.html +++ b/src/main/twirl/gitbucket/core/search/menu.scala.html @@ -3,8 +3,8 @@ @import context._ @import gitbucket.core.view.helpers._ @html.menu("", repository){ -
    -
    +
    +
    -
    -
    - - +
    + + + @body diff --git a/src/main/twirl/gitbucket/core/wiki/compare.scala.html b/src/main/twirl/gitbucket/core/wiki/compare.scala.html index d793178..7da312b 100644 --- a/src/main/twirl/gitbucket/core/wiki/compare.scala.html +++ b/src/main/twirl/gitbucket/core/wiki/compare.scala.html @@ -17,10 +17,10 @@
  • diff --git a/src/main/twirl/gitbucket/core/wiki/edit.scala.html b/src/main/twirl/gitbucket/core/wiki/edit.scala.html index d949f17..3006696 100644 --- a/src/main/twirl/gitbucket/core/wiki/edit.scala.html +++ b/src/main/twirl/gitbucket/core/wiki/edit.scala.html @@ -12,8 +12,8 @@
  • @if(page.isDefined){ - Delete Page - Page History + Delete Page + Page History } New Page
    @@ -21,7 +21,7 @@
    - + @helper.html.preview( repository = repository, content = page.map(_.content).getOrElse(""), @@ -29,14 +29,19 @@ enableRefsLink = false, enableTaskList = false, hasWritePermission = false, - style = "width: 910px; height: 400px;", + style = "width: 900px; height: 400px;", styleClass = "monospace", placeholder = "" ) - - - - +
    + + +
    +
    + + + +
    } } diff --git a/src/main/twirl/gitbucket/core/wiki/history.scala.html b/src/main/twirl/gitbucket/core/wiki/history.scala.html index 8c4d65c..681cf50 100644 --- a/src/main/twirl/gitbucket/core/wiki/history.scala.html +++ b/src/main/twirl/gitbucket/core/wiki/history.scala.html @@ -23,7 +23,7 @@ } } else { @if(loginAccount.isDefined){ - Edit Page + Edit Page New Page } } diff --git a/src/main/twirl/gitbucket/core/wiki/page.scala.html b/src/main/twirl/gitbucket/core/wiki/page.scala.html index 99afb54..eb2c818 100644 --- a/src/main/twirl/gitbucket/core/wiki/page.scala.html +++ b/src/main/twirl/gitbucket/core/wiki/page.scala.html @@ -18,16 +18,16 @@
  • @if(hasWritePermission){ }
  • -
    +
    @defining(15){ max =>
    - Pages @pages.length + Pages @pages.length
    @pages.zipWithIndex.map { case (page, i) => @@ -54,7 +54,7 @@
    }
    -
    +
    @markdown(page.content, repository, true, false, false, false, pages)
    diff --git a/src/main/twirl/gitbucket/core/wiki/pages.scala.html b/src/main/twirl/gitbucket/core/wiki/pages.scala.html index a8b5206..53bee25 100644 --- a/src/main/twirl/gitbucket/core/wiki/pages.scala.html +++ b/src/main/twirl/gitbucket/core/wiki/pages.scala.html @@ -12,7 +12,7 @@
  • @if(hasWritePermission){ - New Page + New Page }
  • diff --git a/src/main/webapp/assets/common/css/gitbucket.css b/src/main/webapp/assets/common/css/gitbucket.css index 1ddc233..17efc73 100644 --- a/src/main/webapp/assets/common/css/gitbucket.css +++ b/src/main/webapp/assets/common/css/gitbucket.css @@ -74,11 +74,11 @@ .table-bordered > thead > tr > td { border-bottom-width: 1px; } - +/* .tab-content { margin-top: 20px; } - +*/ .danger { color: #900; } @@ -87,6 +87,10 @@ color: #F28722; } +.muted { + color: #777; +} + dl { margin: 0px; } @@ -219,6 +223,10 @@ font-weight: bold; } +.normal { + font-weight: normal; +} + .shorten-text { text-overflow: ellipsis; white-space: nowrap;