}
@@ -27,6 +27,8 @@
margin-bottom: 20px;
}
+
+
div.dashboard-nav a {
line-height: 10px;
margin-left: 20px;
@@ -36,8 +38,17 @@
color: #888;
}
-div.dashboard-nav a:hover {
+
+div.dashboard-nav .octicon{
+ width: 16px;
+ height: 16px;
+ font-size: 16px;
+ color: #888;
+}
+
+div.dashboard-nav a:hover,div.dashboard-nav a:hover .octicon {
text-decoration: none;
+ color: #333;
}
div.dashboard-nav a.active {
diff --git a/src/main/twirl/gitbucket/core/helper/activities.scala.html b/src/main/twirl/gitbucket/core/helper/activities.scala.html
index 18856c2..9451bea 100644
--- a/src/main/twirl/gitbucket/core/helper/activities.scala.html
+++ b/src/main/twirl/gitbucket/core/helper/activities.scala.html
@@ -8,20 +8,20 @@
@activities.map { activity =>
@(activity.activityType match {
- case "open_issue" => detailActivity(activity, "activity-issue.png")
- case "comment_issue" => detailActivity(activity, "activity-comment.png")
- case "comment_commit" => detailActivity(activity, "activity-comment.png")
- case "close_issue" => detailActivity(activity, "activity-issue-close.png")
- case "reopen_issue" => detailActivity(activity, "activity-issue-reopen.png")
- case "open_pullreq" => detailActivity(activity, "activity-merge.png")
- case "merge_pullreq" => detailActivity(activity, "activity-merge.png")
- case "create_repository" => simpleActivity(activity, "activity-create-repository.png")
- case "create_branch" => simpleActivity(activity, "activity-branch.png")
- case "delete_branch" => simpleActivity(activity, "activity-delete.png")
- case "create_tag" => simpleActivity(activity, "activity-tag.png")
- case "delete_tag" => simpleActivity(activity, "activity-delete.png")
- case "fork" => simpleActivity(activity, "activity-fork.png")
- case "push" => customActivity(activity, "activity-commit.png"){
+ case "open_issue" => detailActivity(activity, "issue-opened")
+ case "comment_issue" => detailActivity(activity, "comment-discussion")
+ case "comment_commit" => detailActivity(activity, "comment-discussion")
+ case "close_issue" => detailActivity(activity, "issue-closed")
+ case "reopen_issue" => detailActivity(activity, "issue-reopened")
+ case "open_pullreq" => detailActivity(activity, "git-pull-request")
+ case "merge_pullreq" => detailActivity(activity, "git-merge")
+ case "create_repository" => simpleActivity(activity, "repo")
+ case "create_branch" => simpleActivity(activity, "git-branch")
+ case "delete_branch" => simpleActivity(activity, "circle-slash")
+ case "create_tag" => simpleActivity(activity, "tag")
+ case "delete_tag" => simpleActivity(activity, "circle-slash")
+ case "fork" => simpleActivity(activity, "repo-forked")
+ case "push" => customActivity(activity, "commit"){
{activity.additionalInfo.get.split("\n").reverse.take(4).zipWithIndex.map{ case (commit, i) =>
if(i == 3){
@@ -37,12 +37,12 @@
}}
}
- case "create_wiki" => customActivity(activity, "activity-wiki.png"){
+ case "create_wiki" => customActivity(activity, "book"){
}
- case "edit_wiki" => customActivity(activity, "activity-wiki.png"){
+ case "edit_wiki" => customActivity(activity, "book"){
activity.additionalInfo.get.split(":") match {
case Array(pageName, commitId) =>
@@ -61,7 +61,7 @@
}
@detailActivity(activity: gitbucket.core.model.Activity, image: String) = {
-
+
@helper.html.datetimeago(activity.activityDate)
@@ -75,7 +75,7 @@
}
@customActivity(activity: gitbucket.core.model.Activity, image: String)(additionalInfo: Any) = {
-
+
@helper.html.datetimeago(activity.activityDate)
@@ -87,7 +87,7 @@
}
@simpleActivity(activity: gitbucket.core.model.Activity, image: String) = {
-
+
}
-
+
@diff.oldPath -> @diff.newPath
}
@if(diff.changeType == ChangeType.ADD || diff.changeType == ChangeType.MODIFY){
@@ -68,9 +68,9 @@
}
@if(diff.changeType == ChangeType.ADD){
-
+
}else{
-
+
}
@diff.newPath
@@ -83,7 +83,7 @@
}
-
+
@diff.oldPath
}
diff --git a/src/main/twirl/gitbucket/core/helper/repositoryicon.scala.html b/src/main/twirl/gitbucket/core/helper/repositoryicon.scala.html
index 88462a5..a3f9cbd 100644
--- a/src/main/twirl/gitbucket/core/helper/repositoryicon.scala.html
+++ b/src/main/twirl/gitbucket/core/helper/repositoryicon.scala.html
@@ -3,11 +3,11 @@
@import context._
@import gitbucket.core.view.helpers._
@if(repository.repository.isPrivate){
-
{)
+
} else {
@if(repository.repository.originUserName.isDefined){
-
{)
+
} else {
-
{)
+
}
}
diff --git a/src/main/twirl/gitbucket/core/issues/create.scala.html b/src/main/twirl/gitbucket/core/issues/create.scala.html
index b0ab404..5fbd652 100644
--- a/src/main/twirl/gitbucket/core/issues/create.scala.html
+++ b/src/main/twirl/gitbucket/core/issues/create.scala.html
@@ -41,7 +41,7 @@
@milestone.dueDate.map { dueDate =>
@if(isPast(dueDate)){
-
Due by @date(dueDate)
+
Due by @date(dueDate)
} else {
Due by @date(dueDate)
}
diff --git a/src/main/twirl/gitbucket/core/issues/issueinfo.scala.html b/src/main/twirl/gitbucket/core/issues/issueinfo.scala.html
index 84aee5e..2c5063a 100644
--- a/src/main/twirl/gitbucket/core/issues/issueinfo.scala.html
+++ b/src/main/twirl/gitbucket/core/issues/issueinfo.scala.html
@@ -42,7 +42,7 @@
@milestone.dueDate.map { dueDate =>
@if(isPast(dueDate)){
-
Due by @date(dueDate)
+
Due by @date(dueDate)
} else {
Due by @date(dueDate)
}
diff --git a/src/main/twirl/gitbucket/core/issues/labels/label.scala.html b/src/main/twirl/gitbucket/core/issues/labels/label.scala.html
index b7cee42..891f31a 100644
--- a/src/main/twirl/gitbucket/core/issues/labels/label.scala.html
+++ b/src/main/twirl/gitbucket/core/issues/labels/label.scala.html
@@ -11,7 +11,7 @@
-
+
@label.labelName
diff --git a/src/main/twirl/gitbucket/core/issues/listparts.scala.html b/src/main/twirl/gitbucket/core/issues/listparts.scala.html
index 5cf3fc7..1ea3e34 100644
--- a/src/main/twirl/gitbucket/core/issues/listparts.scala.html
+++ b/src/main/twirl/gitbucket/core/issues/listparts.scala.html
@@ -16,8 +16,7 @@
@if(condition.nonEmpty){
@@ -28,11 +27,11 @@
-
+
@openCount Open
-
+
@closedCount Closed
@@ -176,7 +175,7 @@
@if(hasWritePermission){
}
-
 )
+
@if(repository.isEmpty){
@issue.repositoryName ・
}
@@ -195,18 +194,19 @@
}
@if(commentCount > 0){
} else {
}
#@issue.issueId opened @helper.html.datetimeago(issue.registeredDate) by @user(issue.openedUserName, styleClass="username")
@milestone.map { milestone =>
-
@milestone
+
+@milestone
}
@@ -216,4 +216,3 @@
@helper.html.paginator(page, (if(condition.state == "open") openCount else closedCount), gitbucket.core.service.IssuesService.IssueLimit, 10, condition.toURL)
-
diff --git a/src/main/twirl/gitbucket/core/issues/milestones/list.scala.html b/src/main/twirl/gitbucket/core/issues/milestones/list.scala.html
index 7ba0250..11d5332 100644
--- a/src/main/twirl/gitbucket/core/issues/milestones/list.scala.html
+++ b/src/main/twirl/gitbucket/core/issues/milestones/list.scala.html
@@ -13,11 +13,11 @@
-
+
@milestones.count(_._1.closedDate.isEmpty) Open
-
+
@milestones.count(_._1.closedDate.isDefined) Closed
@@ -38,7 +38,7 @@
} else {
@milestone.dueDate.map { dueDate =>
@if(isPast(dueDate)){
- Due by @date(dueDate)
+ Due by @date(dueDate)
} else {
Due by @date(dueDate)
}
diff --git a/src/main/twirl/gitbucket/core/main.scala.html b/src/main/twirl/gitbucket/core/main.scala.html
index ac9e6e6..b9938de 100644
--- a/src/main/twirl/gitbucket/core/main.scala.html
+++ b/src/main/twirl/gitbucket/core/main.scala.html
@@ -13,6 +13,7 @@
+
@@ -60,16 +61,16 @@
}
@if(loginAccount.isDefined){
-
+
-
+
@if(loginAccount.get.isAdmin){
-
+
}
-
+
} else {
Sign in
}
diff --git a/src/main/twirl/gitbucket/core/menu.scala.html b/src/main/twirl/gitbucket/core/menu.scala.html
index fa38262..8f088bc 100644
--- a/src/main/twirl/gitbucket/core/menu.scala.html
+++ b/src/main/twirl/gitbucket/core/menu.scala.html
@@ -9,16 +9,11 @@
@import context._
@import gitbucket.core.view.helpers._
-@sidemenu(path: String, name: String, label: String, count: Int = 0) = {
+@sidemenu(path: String, name: String, icon: String, label: String, count: Int = 0) = {
- @if(active == name){
-
- } else {
-
-
- }
+
@if(expand){ @label}
@if(expand && count > 0){
@count
@@ -76,12 +71,12 @@
@@ -99,10 +94,10 @@
}
@id.map { id =>
}
}
@@ -117,22 +112,19 @@
|
|
|
@@ -145,44 +137,21 @@
|