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

Use Bootstrap panel instead of custom CSS

Browse Source
This commit is contained in:
Naoki Takezoe
2015-12-10 14:32:11 +09:00
parent 9d644b4625
commit de4db0764c
7 changed files with 45 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -10,9 +10,9 @@
@menu("application", settings.ssh) @menu("application", settings.ssh)
</div> </div>
<div class="col-md-9"> <div class="col-md-9">
<div class="box"> <div class="panel panel-default">
<div class="box-header">Personal access tokens</div> <div class="panel-heading strong">Personal access tokens</div>
<div class="box-content-bottom"> <div class="panel-body">
@if(personalTokens.isEmpty && gneratedToken.isEmpty){ @if(personalTokens.isEmpty && gneratedToken.isEmpty){
No tokens. No tokens.
} else { } else {
@@ -38,9 +38,9 @@
</div> </div>
</div> </div>
<form method="POST" action="@path/@account.userName/_personalToken" validate="true"> <form method="POST" action="@path/@account.userName/_personalToken" validate="true">
<div class="box"> <div class="panel panel-default">
<div class="box-header">Generate new token</div> <div class="panel-heading strong">Generate new token</div>
<div class="box-content-bottom"> <div class="panel-body">
<fieldset> <fieldset>
<label for="note" class="strong">Token description</label> <label for="note" class="strong">Token description</label>
<div><span id="error-note" class="error"></span></div> <div><span id="error-note" class="error"></span></div>

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

@@ -12,9 +12,9 @@
@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">
<div class="box"> <div class="panel panel-default">
<div class="box-header"><span class="strong">Profile</span></div> <div class="panel-heading strong">Profile</div>
<div class="box-content-bottom"> <div class="panel-body">
<div class="row"> <div class="row">
<div class="col-md-6"> <div class="col-md-6">
@if(account.password.nonEmpty){ @if(account.password.nonEmpty){

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

@@ -9,9 +9,9 @@
@menu("ssh", settings.ssh) @menu("ssh", settings.ssh)
</div> </div>
<div class="col-md-9"> <div class="col-md-9">
<div class="box"> <div class="panel panel-default">
<div class="box-header">SSH Keys</div> <div class="panel-heading strong">SSH Keys</div>
<div class="box-content-bottom"> <div class="panel-body">
@if(sshKeys.isEmpty){ @if(sshKeys.isEmpty){
No keys No keys
} }
@@ -25,18 +25,18 @@
</div> </div>
</div> </div>
<form method="POST" action="@path/@account.userName/_ssh" validate="true"> <form method="POST" action="@path/@account.userName/_ssh" validate="true">
<div class="box"> <div class="panel panel-default">
<div class="box-header">Add an SSH Key</div> <div class="panel-heading strong">Add an SSH Key</div>
<div class="box-content-bottom"> <div class="panel-body">
<fieldset> <fieldset class="form-group">
<label for="title" class="strong">Title</label> <label for="title" class="strong">Title</label>
<div><span id="error-title" class="error"></span></div> <div><span id="error-title" class="error"></span></div>
<input type="text" name="title" id="title" style="width: 400px;"/> <input type="text" name="title" id="title" class="form-control" style="width: 400px;"/>
</fieldset> </fieldset>
<fieldset> <fieldset class="form-group">
<label for="publicKey" class="strong">Key</label> <label for="publicKey" class="strong">Key</label>
<div><span id="error-publicKey" class="error"></span></div> <div><span id="error-publicKey" class="error"></span></div>
<textarea name="publicKey" id="publicKey" style="width: 600px; height: 250px;"></textarea> <textarea name="publicKey" id="publicKey" class="form-control" style="width: 600px; height: 250px;"></textarea>
</fieldset> </fieldset>
<input type="submit" class="btn btn-success" value="Add"/> <input type="submit" class="btn btn-success" value="Add"/>
</div> </div>

6
src/main/twirl/gitbucket/core/admin/plugins/plugins.scala.html
View File

@@ -13,9 +13,9 @@
</ul> </ul>
@plugins.map {plugin => @plugins.map {plugin =>
<div class="box"> <div class="panel panel-default">
<div class="box-header">@plugin.pluginName</div> <div class="panel-heading strong">@plugin.pluginName</div>
<div class="box-content-bottom"> <div class="panel-body">
<div class="row"> <div class="row">
<label class="col-md-2">Id</label> <label class="col-md-2">Id</label>
<span class="col-md-8">@plugin.pluginId</span> <span class="col-md-8">@plugin.pluginId</span>

6
src/main/twirl/gitbucket/core/admin/system.scala.html
View File

@@ -6,9 +6,9 @@
@menu("system"){ @menu("system"){
@helper.html.information(info) @helper.html.information(info)
<form action="@path/admin/system" method="POST" validate="true" class="form-horizontal"> <form action="@path/admin/system" method="POST" validate="true" class="form-horizontal">
<div class="box"> <div class="panel panel-default">
<div class="box-header"><span class="strong">System Settings</span></div> <div class="panel-heading strong">System Settings</div>
<div class="box-content-bottom"> <div class="panel-body">
<!--====================================================================--> <!--====================================================================-->
<!-- GITBUCKET_HOME --> <!-- GITBUCKET_HOME -->
<!--====================================================================--> <!--====================================================================-->

16
src/main/twirl/gitbucket/core/wiki/page.scala.html
View File

@@ -26,20 +26,22 @@
</ul> </ul>
<div style="width: 200px; margin-top: 20px;" class="pull-right"> <div style="width: 200px; margin-top: 20px;" class="pull-right">
@defining(15){ max => @defining(15){ max =>
<div class="box-header"> <div class="panel panel-default">
<span class="strong">Pages</span> <span class="badge">@pages.length</span> <div class="panel-heading strong">
Pages <span class="badge">@pages.length</span>
</div> </div>
<div class="box-content-bottom" style="padding: 0px;"> <ul class="list-group list-group-flush">
@pages.zipWithIndex.map { case (page, i) => @pages.zipWithIndex.map { case (page, i) =>
<div class="box-content-row page-link" style="border: none; @if(i > max - 1){display:none;}"> <li class="list-group-item page-link" style="border: none; @if(i > max - 1){display:none;}">
<a href="@url(repository)/wiki/@urlEncode(page)" class="strong">@page</a> <a href="@url(repository)/wiki/@urlEncode(page)" class="strong">@page</a>
</div> </li>
} }
@if(pages.size > max){ @if(pages.size > max){
<div class="box-content-row show-more"> <li class="list-group-item show-more">
<a href="javascript:void(0);" id="show-more-pages">Show more @{pages.size - max} pages...</a> <a href="javascript:void(0);" id="show-more-pages">Show more @{pages.size - max} pages...</a>
</div> </li>
} }
</ul>
</div> </div>
} }
<div class="small"> <div class="small">

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

@@ -403,9 +403,9 @@ div.repo-link {
} }
*/ */
li.repo-link { li.repo-link, li.page-link {
padding-top: 5px; padding-top: 4px;
padding-bottom: 5px; padding-bottom: 4px;
} }
div.box-content-bottom { div.box-content-bottom {