Nemcio/GitBucket
1
0
Fork 0
mirror of https://github.com/gitbucket/gitbucket.git synced 2025-11-10 07:25:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

Tweak CSS styles

Browse Source
This commit is contained in:
Naoki Takezoe
2016-03-27 22:53:54 +09:00
parent ba61891510
commit 969da2c63b
11 changed files with 58 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/twirl/gitbucket/core/account/application.scala.html
View File

@@ -5,8 +5,7 @@
@import gitbucket.core.view.helpers._ @import gitbucket.core.view.helpers._
@html.main("Applications"){ @html.main("Applications"){
<div class="container body"> <div class="container body">
@menu("application", settings.ssh) @menu("application", settings.ssh){
<div style="margin-left: 260px;">
<div class="panel panel-default"> <div class="panel panel-default">
<div class="panel-heading strong">Personal access tokens</div> <div class="panel-heading strong">Personal access tokens</div>
<div class="panel-body"> <div class="panel-body">
@@ -51,6 +50,6 @@
</div> </div>
</div> </div>
</form> </form>
</div> }
</div> </div>
} }

19
src/main/twirl/gitbucket/core/account/edit.scala.html
View File

@@ -4,8 +4,7 @@
@import gitbucket.core.view.helpers._ @import gitbucket.core.view.helpers._
@html.main("Edit your profile"){ @html.main("Edit your profile"){
<div class="container body"> <div class="container body">
@menu("profile", settings.ssh) @menu("profile", settings.ssh){
<div style="margin-left: 260px;">
@helper.html.information(info) @helper.html.information(info)
@if(LDAPUtil.isDummyMailAddress(account)){<div class="alert alert-danger">Please register your mail address.</div>} @if(LDAPUtil.isDummyMailAddress(account)){<div class="alert alert-danger">Please register your mail address.</div>}
<form action="@url(account.userName)/_edit" method="POST" validate="true"> <form action="@url(account.userName)/_edit" method="POST" validate="true">
@@ -46,17 +45,17 @@
</fieldset> </fieldset>
</div> </div>
</div> </div>
<div style="margin-top: 20px;">
<div class="pull-right">
<a href="@path/@account.userName/_delete" class="btn btn-danger" id="delete">Delete account</a>
</div>
<input type="submit" class="btn btn-success" value="Save"/>
@if(!LDAPUtil.isDummyMailAddress(account)){<a href="@url(account.userName)" class="btn btn-default">Cancel</a>}
</div>
</div> </div>
</div> </div>
<div>
<div class="pull-right">
<a href="@path/@account.userName/_delete" class="btn btn-danger" id="delete">Delete account</a>
</div>
<input type="submit" class="btn btn-success" value="Save"/>
@if(!LDAPUtil.isDummyMailAddress(account)){<a href="@url(account.userName)" class="btn btn-default">Cancel</a>}
</div>
</form> </form>
</div> }
</div> </div>
} }
<script> <script>

2
src/main/twirl/gitbucket/core/account/group.scala.html
View File

@@ -2,7 +2,7 @@
@import context._ @import context._
@import gitbucket.core.view.helpers._ @import gitbucket.core.view.helpers._
@html.main(if(account.isEmpty) "Create group" else "Edit group"){ @html.main(if(account.isEmpty) "Create group" else "Edit group"){
<div class="container body"> <div class="body main-center">
<form id="form" method="post" action="@if(account.isEmpty){@path/groups/new} else {@path/@account.get.userName/_editgroup}" validate="true"> <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="row">
<div class="col-md-5"> <div class="col-md-5">

7
src/main/twirl/gitbucket/core/account/menu.scala.html
View File

@@ -1,6 +1,6 @@
@(active: String, ssh: Boolean)(implicit context: gitbucket.core.controller.Context) @(active: String, ssh: Boolean)(body: Html)(implicit context: gitbucket.core.controller.Context)
@import context._ @import context._
<div style="float: left; width: 250px;"> <div class="main-sidebar">
<ul class="nav nav-pills nav-stacked"> <ul class="nav nav-pills nav-stacked">
<li@if(active=="profile"){ class="active"}> <li@if(active=="profile"){ class="active"}>
<a href="@path/@loginAccount.get.userName/_edit">Profile</a> <a href="@path/@loginAccount.get.userName/_edit">Profile</a>
@@ -15,3 +15,6 @@
</li> </li>
</ul> </ul>
</div> </div>
<div class="main-content">
@body
</div>

2
src/main/twirl/gitbucket/core/account/newrepo.scala.html
View File

@@ -3,7 +3,7 @@ isCreateRepoOptionPublic: Boolean)(implicit context: gitbucket.core.controller.C
@import context._ @import context._
@import gitbucket.core.view.helpers._ @import gitbucket.core.view.helpers._
@html.main("Create a New Repository"){ @html.main("Create a New Repository"){
<div class="body" style="width: 600px; margin: 10px auto;"> <div class="body main-center">
<h2>Create a new repository</h2> <h2>Create a new repository</h2>
<p class="muted"> <p class="muted">
A repository contains all the files for your project, including the revision history. A repository contains all the files for your project, including the revision history.

5
src/main/twirl/gitbucket/core/account/ssh.scala.html
View File

@@ -4,8 +4,7 @@
@import gitbucket.core.view.helpers._ @import gitbucket.core.view.helpers._
@html.main("SSH Keys"){ @html.main("SSH Keys"){
<div class="container body"> <div class="container body">
@menu("ssh", settings.ssh) @menu("ssh", settings.ssh){
<div style="margin-left: 260px;">
<div class="panel panel-default"> <div class="panel panel-default">
<div class="panel-heading strong">SSH Keys</div> <div class="panel-heading strong">SSH Keys</div>
<div class="panel-body"> <div class="panel-body">
@@ -39,6 +38,6 @@
</div> </div>
</div> </div>
</form> </form>
</div> }
</div> </div>
} }

4
src/main/twirl/gitbucket/core/admin/menu.scala.html
View File

@@ -1,7 +1,7 @@
@(active: String)(body: Html)(implicit context: gitbucket.core.controller.Context) @(active: String)(body: Html)(implicit context: gitbucket.core.controller.Context)
@import context._ @import context._
<div class="container body"> <div class="container body">
<div style="width: 250px; float: left;"> <div class="main-sidebar">
<ul class="nav nav-pills nav-stacked" id="system-admin-menu-container"> <ul class="nav nav-pills nav-stacked" id="system-admin-menu-container">
<li@if(active=="users"){ class="active"}> <li@if(active=="users"){ class="active"}>
<a href="@path/admin/users">User Management</a> <a href="@path/admin/users">User Management</a>
@@ -17,7 +17,7 @@
</li> </li>
</ul> </ul>
</div> </div>
<div style="margin-left: 260px;"> <div class="main-content">
@body @body
</div> </div>
</div> </div>

3
src/main/twirl/gitbucket/core/main.scala.html
View File

@@ -12,9 +12,6 @@
<link rel="icon" href="@assets/common/images/gitbucket.png" type="image/vnd.microsoft.icon" /> <link rel="icon" href="@assets/common/images/gitbucket.png" type="image/vnd.microsoft.icon" />
<meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta name="viewport" content="width=device-width, initial-scale=1.0">
<link href="@assets/vendors/bootstrap-3.3.6/css/bootstrap.min.css" rel="stylesheet"> <link href="@assets/vendors/bootstrap-3.3.6/css/bootstrap.min.css" rel="stylesheet">
@*
<link href="@assets/vendors/bootstrap-theme-github-3.1.1/css/bootstrap-responsive.css" rel="stylesheet">
*@
<link href="@assets/vendors/octicons/octicons.css" rel="stylesheet"> <link href="@assets/vendors/octicons/octicons.css" rel="stylesheet">
<link href="@assets/vendors/datepicker/css/bootstrap-datetimepicker.min.css" rel="stylesheet"> <link href="@assets/vendors/datepicker/css/bootstrap-datetimepicker.min.css" rel="stylesheet">
<link href="@assets/vendors/colorpicker/css/bootstrap-colorpicker.css" rel="stylesheet"> <link href="@assets/vendors/colorpicker/css/bootstrap-colorpicker.css" rel="stylesheet">

36
src/main/twirl/gitbucket/core/menu.scala.html
View File

@@ -59,23 +59,25 @@
</div> </div>
</div> </div>
<div class="container body"> <div class="container body">
<ul class="nav nav-pills nav-stacked" style="width: 250px; float: left;"> <div class="main-sidebar">
@menuitem("" ,"files" ,"Files") <ul class="nav nav-pills nav-stacked">
@if(repository.commitCount != 0) { @menuitem("" ,"files" ,"Files")
@menuitem("/branches" ,"branches" ,"Branches", repository.branchList.length) @if(repository.commitCount != 0) {
@menuitem("/tags" ,"tags" ,"Tags", repository.tags.length) @menuitem("/branches" ,"branches" ,"Branches", repository.branchList.length)
} @menuitem("/tags" ,"tags" ,"Tags", repository.tags.length)
@menuitem("/issues" ,"issues" ,"Issues", repository.issueCount) }
@menuitem("/pulls" ,"pulls" ,"Pull Requests", repository.pullCount) @menuitem("/issues" ,"issues" ,"Issues", repository.issueCount)
@menuitem("/issues/labels" ,"labels" ,"Labels") @menuitem("/pulls" ,"pulls" ,"Pull Requests", repository.pullCount)
@menuitem("/issues/milestones" ,"milestones" ,"Milestones") @menuitem("/issues/labels" ,"labels" ,"Labels")
@menuitem("/wiki" ,"wiki" ,"Wiki") @menuitem("/issues/milestones" ,"milestones" ,"Milestones")
@menuitem("/network/members", "fork", "Forks", repository.forkedCount) @menuitem("/wiki" ,"wiki" ,"Wiki")
@if(loginAccount.isDefined && (loginAccount.get.isAdmin || repository.managers.contains(loginAccount.get.userName))){ @menuitem("/network/members", "fork", "Forks", repository.forkedCount)
@menuitem("/settings" , "settings" , "Settings") @if(loginAccount.isDefined && (loginAccount.get.isAdmin || repository.managers.contains(loginAccount.get.userName))){
} @menuitem("/settings" , "settings" , "Settings")
</ul> }
<div style="margin-left: 260px;"> </ul>
</div>
<div class="main-content">
@body @body
</div> </div>
</div> </div>

2
src/main/twirl/gitbucket/core/repo/branches.scala.html
View File

@@ -5,7 +5,7 @@
@import gitbucket.core.view.helpers._ @import gitbucket.core.view.helpers._
@html.main(s"${repository.owner}/${repository.name}", Some(repository)) { @html.main(s"${repository.owner}/${repository.name}", Some(repository)) {
@html.menu("branches", repository){ @html.menu("branches", repository){
<table class="table table-bordered table-hover table-issues branches"> <table class="table table-bordered table-hover branches">
<thead> <thead>
<tr> <tr>
<th style="background: #f5f5f5;color: #666;">All branches</th> <th style="background: #f5f5f5;color: #666;">All branches</th>

16
src/main/webapp/assets/common/css/gitbucket.css
View File

@@ -193,6 +193,20 @@ div.container-wide {
padding-right: 10px; padding-right: 10px;
} }
div.main-sidebar {
width: 250px;
float: left;
}
div.main-content {
margin-left: 260px;
}
div.main-center {
width: 980px;
margin: 0 auto;
}
div.body { div.body {
margin-top: 20px; margin-top: 20px;
margin-bottom: 40px; margin-bottom: 40px;
@@ -244,10 +258,12 @@ div.show-more a {
color: #7aa1d3; color: #7aa1d3;
} }
/*
span.count-right { span.count-right {
float: right; float: right;
font-weight: bold; font-weight: bold;
} }
*/
.monospace { .monospace {
font-family: Consolas, 'Courier New', Courier, Monaco, monospace; font-family: Consolas, 'Courier New', Courier, Monaco, monospace;