diff --git a/src/main/twirl/gitbucket/core/account/application.scala.html b/src/main/twirl/gitbucket/core/account/application.scala.html
index f36e840..2b722ee 100644
--- a/src/main/twirl/gitbucket/core/account/application.scala.html
+++ b/src/main/twirl/gitbucket/core/account/application.scala.html
@@ -4,7 +4,7 @@
@import context._
@import gitbucket.core.view.helpers._
@html.main("Applications"){
-<div class="container">
+<div class="container body">
<div class="row">
<div class="col-md-3">
@menu("application", settings.ssh)
diff --git a/src/main/twirl/gitbucket/core/account/edit.scala.html b/src/main/twirl/gitbucket/core/account/edit.scala.html
index ba16103..a549ede 100644
--- a/src/main/twirl/gitbucket/core/account/edit.scala.html
+++ b/src/main/twirl/gitbucket/core/account/edit.scala.html
@@ -3,7 +3,7 @@
@import context._
@import gitbucket.core.view.helpers._
@html.main("Edit your profile"){
-<div class="container">
+<div class="container body">
<div class="row">
<div class="col-md-3">
@menu("profile", settings.ssh)
diff --git a/src/main/twirl/gitbucket/core/account/group.scala.html b/src/main/twirl/gitbucket/core/account/group.scala.html
index 92a840e..60b3d72 100644
--- a/src/main/twirl/gitbucket/core/account/group.scala.html
+++ b/src/main/twirl/gitbucket/core/account/group.scala.html
@@ -2,7 +2,7 @@
@import context._
@import gitbucket.core.view.helpers._
@html.main(if(account.isEmpty) "Create group" else "Edit group"){
-<div class="container">
+<div class="container body">
<form id="form" method="post" action="@if(account.isEmpty){@path/groups/new} else {@path/@account.get.userName/_editgroup}" validate="true">
<div class="row">
<div class="col-md-5">
diff --git a/src/main/twirl/gitbucket/core/account/main.scala.html b/src/main/twirl/gitbucket/core/account/main.scala.html
index dcf5a40..aa193d3 100644
--- a/src/main/twirl/gitbucket/core/account/main.scala.html
+++ b/src/main/twirl/gitbucket/core/account/main.scala.html
@@ -3,7 +3,7 @@
@import context._
@import gitbucket.core.view.helpers._
@html.main(account.userName){
- <div class="container">
+ <div class="container body">
<div class="container-fluid">
<div class="row">
<div class="col-md-4">
diff --git a/src/main/twirl/gitbucket/core/account/newrepo.scala.html b/src/main/twirl/gitbucket/core/account/newrepo.scala.html
index 9233e0a..b796053 100644
--- a/src/main/twirl/gitbucket/core/account/newrepo.scala.html
+++ b/src/main/twirl/gitbucket/core/account/newrepo.scala.html
@@ -3,7 +3,7 @@
@import context._
@import gitbucket.core.view.helpers._
@html.main("Create a New Repository"){
-<div style="width: 600px; margin: 10px auto;">
+<div class="body" style="width: 600px; margin: 10px auto;">
<h2>Create a new repository</h2>
<p class="muted">
A repository contains all the files for your project, including the revision history.
diff --git a/src/main/twirl/gitbucket/core/account/register.scala.html b/src/main/twirl/gitbucket/core/account/register.scala.html
index 07e798a..94f95ab 100644
--- a/src/main/twirl/gitbucket/core/account/register.scala.html
+++ b/src/main/twirl/gitbucket/core/account/register.scala.html
@@ -2,7 +2,7 @@
@import context._
@import gitbucket.core.view.helpers._
@html.main("Create your account"){
-<div class="container">
+<div class="container body">
<h3>Create your account</h3>
<form action="@path/register" method="POST" validate="true">
<div class="row">
diff --git a/src/main/twirl/gitbucket/core/account/ssh.scala.html b/src/main/twirl/gitbucket/core/account/ssh.scala.html
index fcf5bda..7b1f2a0 100644
--- a/src/main/twirl/gitbucket/core/account/ssh.scala.html
+++ b/src/main/twirl/gitbucket/core/account/ssh.scala.html
@@ -3,7 +3,7 @@
@import context._
@import gitbucket.core.view.helpers._
@html.main("SSH Keys"){
-<div class="container">
+<div class="container body">
<div class="row">
<div class="col-md-3">
@menu("ssh", settings.ssh)
diff --git a/src/main/twirl/gitbucket/core/admin/menu.scala.html b/src/main/twirl/gitbucket/core/admin/menu.scala.html
index df32fbd..dba5f63 100644
--- a/src/main/twirl/gitbucket/core/admin/menu.scala.html
+++ b/src/main/twirl/gitbucket/core/admin/menu.scala.html
@@ -11,7 +11,7 @@
<a href="@path/admin/system">System Settings</a>
</li>
<li@if(active=="plugins"){ class="active"}>
- <a href="@path/admin/plugins">Plugins</a>
+ <a href="@path/admin/plugins">Plugins</a>
</li>
<li>
<a href="@path/console/login.jsp">H2 Console</a>
diff --git a/src/main/twirl/gitbucket/core/dashboard/issues.scala.html b/src/main/twirl/gitbucket/core/dashboard/issues.scala.html
index af395e5..8b3e140 100644
--- a/src/main/twirl/gitbucket/core/dashboard/issues.scala.html
+++ b/src/main/twirl/gitbucket/core/dashboard/issues.scala.html
@@ -8,9 +8,11 @@
@import context._
@import gitbucket.core.view.helpers._
@html.main("Issues"){
- @dashboard.html.tab("issues")
- <div class="container">
- @issuesnavi(filter, "issues", condition)
- @issueslist(issues, page, openCount, closedCount, condition, filter, groups)
+ <div class="body">
+ @dashboard.html.tab("issues")
+ <div class="container">
+ @issuesnavi(filter, "issues", condition)
+ @issueslist(issues, page, openCount, closedCount, condition, filter, groups)
+ </div>
</div>
}
diff --git a/src/main/twirl/gitbucket/core/dashboard/pulls.scala.html b/src/main/twirl/gitbucket/core/dashboard/pulls.scala.html
index 46dba30..2336725 100644
--- a/src/main/twirl/gitbucket/core/dashboard/pulls.scala.html
+++ b/src/main/twirl/gitbucket/core/dashboard/pulls.scala.html
@@ -8,9 +8,11 @@
@import context._
@import gitbucket.core.view.helpers._
@html.main("Pull Requests"){
- @dashboard.html.tab("pulls")
- <div class="container">
- @issuesnavi(filter, "pulls", condition)
- @issueslist(issues, page, openCount, closedCount, condition, filter, groups)
+ <div class="body">
+ @dashboard.html.tab("pulls")
+ <div class="container">
+ @issuesnavi(filter, "pulls", condition)
+ @issueslist(issues, page, openCount, closedCount, condition, filter, groups)
+ </div>
</div>
}
diff --git a/src/main/twirl/gitbucket/core/index.scala.html b/src/main/twirl/gitbucket/core/index.scala.html
index 5d499dc..d3e6b38 100644
--- a/src/main/twirl/gitbucket/core/index.scala.html
+++ b/src/main/twirl/gitbucket/core/index.scala.html
@@ -4,79 +4,81 @@
@import context._
@import gitbucket.core.view.helpers._
@main("GitBucket"){
- @dashboard.html.tab()
- <div class="container">
- <div class="row">
- <div class="col-md-8">
- <div class="pull-right">
- <a href="@path/activities.atom"><img src="@assets/common/images/feed.png" alt="activities"></a>
- </div>
- @helper.html.activities(activities)
- </div>
-
- <div class="col-md-4">
- @settings.information.map { information =>
- <div class="alert alert-info" style="background-color: white; color: #555; border-color: #4183c4; font-size: small; line-height: 120%;">
- <button type="button" class="close" data-dismiss="alert">×</button>
- @Html(information)
+ <div class="body">
+ @dashboard.html.tab()
+ <div class="container">
+ <div class="row">
+ <div class="col-md-8">
+ <div class="pull-right">
+ <a href="@path/activities.atom"><img src="@assets/common/images/feed.png" alt="activities"></a>
</div>
- }
- @if(loginAccount.isEmpty){
- <div id="dashboard-signin-form">@signinform(settings)</div>
- } else {
- <div class="panel panel-default">
- <div class="panel-heading strong">
- <div class="pull-right">
- <a href="@path/new" class="btn btn-success btn-sm">New repository</a>
- </div>
- Your repositories <span class="badge">@userRepositories.size</span>
+ @helper.html.activities(activities)
+ </div>
+
+ <div class="col-md-4">
+ @settings.information.map { information =>
+ <div class="alert alert-info" style="background-color: white; color: #555; border-color: #4183c4; font-size: small; line-height: 120%;">
+ <button type="button" class="close" data-dismiss="alert">×</button>
+ @Html(information)
</div>
- <ul class="list-group list-group-flush">
- @if(userRepositories.isEmpty){
- <li class="list-group-item">No repositories</li>
- } else {
- @defining(20){ max =>
- @userRepositories.zipWithIndex.map { case (repository, i) =>
- <li class="list-group-item repo-link" style="@if(i > max - 1){display:none;}">
- @helper.html.repositoryicon(repository, false)
- @if(repository.owner == loginAccount.get.userName){
- <a href="@url(repository)"><span class="strong">@repository.name</span></a>
- } else {
- <a href="@url(repository)">@repository.owner/<span class="strong">@repository.name</span></a>
- }
- </li>
- }
- @if(userRepositories.size > max){
- <li class="list-group-item show-more">
- <a href="javascript:void(0);" id="show-more-repos">Show @{userRepositories.size - max} more repositories...</a>
- </li>
+ }
+ @if(loginAccount.isEmpty){
+ <div id="dashboard-signin-form">@signinform(settings)</div>
+ } else {
+ <div class="panel panel-default">
+ <div class="panel-heading strong">
+ <div class="pull-right">
+ <a href="@path/new" class="btn btn-success btn-sm">New repository</a>
+ </div>
+ Your repositories <span class="badge">@userRepositories.size</span>
+ </div>
+ <ul class="list-group list-group-flush">
+ @if(userRepositories.isEmpty){
+ <li class="list-group-item">No repositories</li>
+ } else {
+ @defining(20){ max =>
+ @userRepositories.zipWithIndex.map { case (repository, i) =>
+ <li class="list-group-item repo-link" style="@if(i > max - 1){display:none;}">
+ @helper.html.repositoryicon(repository, false)
+ @if(repository.owner == loginAccount.get.userName){
+ <a href="@url(repository)"><span class="strong">@repository.name</span></a>
+ } else {
+ <a href="@url(repository)">@repository.owner/<span class="strong">@repository.name</span></a>
+ }
+ </li>
+ }
+ @if(userRepositories.size > max){
+ <li class="list-group-item show-more">
+ <a href="javascript:void(0);" id="show-more-repos">Show @{userRepositories.size - max} more repositories...</a>
+ </li>
+ }
}
}
- }
- </ul>
- </div>
- }
- <div class="panel panel-default">
- <div class="panel-heading strong">Recent updated repositories</div>
- <ul class="list-group list-group-flush">
- @if(recentRepositories.isEmpty){
- <li class="list-group-item">No repositories</li>
- } else {
- @defining(20){ max =>
- @recentRepositories.zipWithIndex.map { case (repository, i) =>
- <li class="list-group-item repo-link" style="@if(i > max - 1){display:none;}">
- @helper.html.repositoryicon(repository, false)
- <a href="@url(repository)">@repository.owner/<span class="strong">@repository.name</span></a>
- </li>
- }
- @if(recentRepositories.size > max){
- <li class="list-group-item show-more">
- <a href="javascript:void(0);" id="show-more-recent-repos">Show @{recentRepositories.size - max} more repositories...</a>
- </li>
+ </ul>
+ </div>
+ }
+ <div class="panel panel-default">
+ <div class="panel-heading strong">Recent updated repositories</div>
+ <ul class="list-group list-group-flush">
+ @if(recentRepositories.isEmpty){
+ <li class="list-group-item">No repositories</li>
+ } else {
+ @defining(20){ max =>
+ @recentRepositories.zipWithIndex.map { case (repository, i) =>
+ <li class="list-group-item repo-link" style="@if(i > max - 1){display:none;}">
+ @helper.html.repositoryicon(repository, false)
+ <a href="@url(repository)">@repository.owner/<span class="strong">@repository.name</span></a>
+ </li>
+ }
+ @if(recentRepositories.size > max){
+ <li class="list-group-item show-more">
+ <a href="javascript:void(0);" id="show-more-recent-repos">Show @{recentRepositories.size - max} more repositories...</a>
+ </li>
+ }
}
}
- }
- </ul>
+ </ul>
+ </div>
</div>
</div>
</div>
diff --git a/src/main/webapp/assets/common/css/gitbucket.css b/src/main/webapp/assets/common/css/gitbucket.css
index 80573e5..f36161d 100644
--- a/src/main/webapp/assets/common/css/gitbucket.css
+++ b/src/main/webapp/assets/common/css/gitbucket.css
@@ -58,7 +58,7 @@
margin-right: 5px;
}
-.head .octicon,.head .mega-octicon{
+.head .octicon, .head .mega-octicon{
color : #BBB;
}
@@ -70,57 +70,6 @@
font-size: 15px;
}
-/*
-.nav {
- margin-bottom: 12px;
-}
-
-.table-bordered {
- border-collapse: inherit;
- border: none;
-}
-
-.table-bordered > thead > tr > th,
-.table-bordered > tbody > tr > th,
-.table-bordered > tbody > tr > td {
- border-bottom: none;
-}
-
-.table-bordered > thead > tr:first-child > th:nth-of-type(1),
-.table-bordered > tbody > tr:first-child > th:nth-of-type(1),
-.table-bordered > tbody > tr:first-child > td:nth-of-type(1) {
- border-top-left-radius: 4px;
-}
-
-.table-bordered > thead > tr:first-child > th:nth-last-of-type(1),
-.table-bordered > tbody > tr:first-child > th:nth-last-of-type(1),
-.table-bordered > tbody > tr:first-child > td:nth-last-of-type(1) {
- border-top-right-radius: 4px;
-}
-
-.table-bordered > tbody > tr:last-child > td:nth-of-type(1) {
- border-bottom-left-radius: 4px;
-}
-
-.table-bordered > tbody > tr:last-child > td:nth-last-of-type(1) {
- border-bottom-right-radius: 4px;
-}
-
-.table-bordered > tbody > tr:last-child > td {
- border-bottom: 1px solid #dddddd;
-}
-*/
-/*
-.table-bordered > thead > tr > th,
-.table-bordered > thead > tr > td {
- border-bottom-width: 1px;
-}
-*/
-/*
-.tab-content {
- margin-top: 20px;
-}
-*/
.danger {
color: #900;
}
@@ -167,43 +116,6 @@
/* ======================================================================== */
/* Global Header */
/* ======================================================================== */
-/*
-div.navbar-inner {
- border-radius: 0px;
- -webkit-border-radius: 0px;
- -moz-border-radius: 0px;
- border-top: none;
- border-left: none;
- border-right: none;
- border-bottom: 1px solid #d4d4d4;
- padding-right: 0px;
-}
-
-div.header-menu {
- line-height: 40px;
-}
-
-div.header-menu .octicon{
- color: #333;
-}
-
-div.header-menu input,
-div.header-menu a.btn {
- margin-top: 0px;
- margin-bottom: 0px;
-}
-
-/*
-div.nav-collapse a.menu {
- margin-right: 12px;
-}
-
-div.nav-collapse a.btn-last,
-div.nav-collapse a.menu-last {
- margin-right: 30px;
-}
-*/
-
.navbar-brand {
height: unset;
padding: 8px;
@@ -278,6 +190,7 @@
*/
div.body {
+ margin-top: 20px;
margin-bottom: 40px;
}
@@ -413,23 +326,6 @@
padding: 4px;
border-radius: 3px;
}
-/*
-div > div.box-content-row:nth-of-type(1) {
- border: none;
-}
-
-div.box-content-row {
- border-top: 1px solid #d8d8d8;
- padding: 4px;
-}
-*/
-/*
-div.repo-link {
- white-space: nowrap;
- overflow: hidden;
- text-overflow: ellipsis;
-}
-*/
li.repo-link, li.page-link {
padding-top: 4px;
@@ -632,18 +528,6 @@
text-decoration: none;
}
-/*
-ul.nav-stacked.side-menu li span.header {
- border-top-right-radius: 3px;
- border-top-left-radius: 3px;
- border: 1px solid #d8d8d8;
- display: block;
- padding: 8px 15px 9px;
- margin-right: 2px;
- background-color: #f5f5f5;
-}
-*/
-
ul.nav-stacked.side-menu li a:hover {
background-color: transparent;
}
@@ -746,7 +630,6 @@
padding: 0 3px;
}
-
/****************************************************************************/
/* Activity */
/****************************************************************************/
@@ -975,73 +858,6 @@
}
/****************************************************************************/
-/* nav pulls group */
-/****************************************************************************/
-
-
-/*
-.nav-pills-group:after {
- display: table;
- line-height: 0;
- content: "";
-}
-
-.nav-pills-group:after {
- clear: both;
-}
-
-.nav-pills-group > li {
- float: left;
-}
-*/
-/*
-.nav-pills > li + li {
- margin-left: 0px;
-}
-
-.nav-pills > li > a {
- padding-right: 12px;
- padding-left: 12px;
- line-height: 14px;
- color: #666;
- font-weight: bold;
- -webkit-border-radius: 0;
- -moz-border-radius: 0;
- border-radius: 0;
-}
-
-.nav-pills > li > a {
- padding-top: 10px;
- padding-bottom: 10px;
- border-left : 1px solid #e5e5e5;
- border-top : 1px solid #e5e5e5;
- border-bottom : 1px solid #e5e5e5;
-}
-
-.nav-pills > li:nth-of-type(1) > a {
- -webkit-border-radius: 4px 0 0 4px;
- -moz-border-radius: 4px 0 0 4px;
- border-radius: 4px 0 0 4px;
-}
-
-.nav-pills > li:nth-last-of-type(1) > a {
- -webkit-border-radius: 0 4px 4px 0;
- -moz-border-radius: 0 4px 4px 0;
- border-radius: 0 4px 4px 0;
- border-right : 1px solid #e5e5e5;
-}
-*/
-/*
-.nav-pills-group > .active > a,
-.nav-pills-group > .active > a:hover,
-.nav-pills-group > .active > a:focus {
- color: #ffffff;
- background-color: #0088cc;
- border-color: #0088cc;
-}
-*/
-
-/****************************************************************************/
/* Issues */
/****************************************************************************/
#search-filter-box {
@@ -1077,11 +893,11 @@
margin-top: 12px;
}
-table.table-issues td .octicon-issue-opened,table.table-issues td .octicon-git-pull-request .open {
+table.table-issues td .octicon-issue-opened, table.table-issues td .octicon-git-pull-request .open {
color: #6CC644;
}
-table.table-issues td .octicon-issue-closed,table.table-issues td .octicon-git-pull-request .closed{
+table.table-issues td .octicon-issue-closed, table.table-issues td .octicon-git-pull-request .closed{
color : #BD2C00;;
}
@@ -1153,47 +969,6 @@
color: #b00;
}
-/*
-div#milestone-progress-area {
- display: inline-block;
-}
-
-div#milestone-progress-area div.milestone-progress {
- width: 130px;
- margin-bottom: -6px;
-}
-
-div.milestone-progress {
- position: relative;
- height: 10px;
- color: white;
- margin-bottom: 4px;
- font-weight: bold;
- font-size: 12px;
- text-shadow: 0px 0px 5px #444;
- background-color: silver;
- border-radius: 4px;
- -webkit-border-radius: 4px;
- -moz-border-radius: 4px;
-}
-
-span.milestone-progress {
- position: absolute;
- height: 100%;
- background-color: green;
- border-radius: 4px;
- -webkit-border-radius: 4px;
- -moz-border-radius: 4px;
-}
-
-div.issue-header {
- padding-left: 8px;
- padding-right: 8px;
- padding-top: 12px;
- padding-bottom: 12px;
-}
-*/
-
div.issue-info {
border-top: 1px solid #e5e5e5;
border-bottom: 1px solid #e5e5e5;
@@ -1203,21 +978,6 @@
margin-right: 0px;
}
-/*
-div.issue-content {
- padding: 13px;
- background-color: #fff;
-}
-
-div.issue-content p:first-child {
- margin-top: 0;
-}
-
-div.issue-content p:last-child {
- margin-bottom: 0;
-}
-*/
-
h4#issueTitle {
font-size: large;
font-weight: bold;