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

Fix header button size

Browse Source
This commit is contained in:
takezoe
2014-05-11 02:23:51 +09:00
parent ff2e55e82c
commit 93fa8484c5
12 changed files with 24 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/twirl/helper/dropdown.scala.html
View File

@@ -1,6 +1,6 @@
@(value: String = "", prefix: String = "", mini: Boolean = true, style: String = "", right: Boolean = false)(body: Html)
<div class="btn-group"@if(style.nonEmpty){ style="@style"}>
<button class="btn dropdown-toggle@if(mini){ btn-mini}" data-toggle="dropdown">
<button class="btn dropdown-toggle@if(mini){ btn-mini} else { btn-small}" data-toggle="dropdown">
@if(value.isEmpty){
<i class="icon-cog"></i>
} else {

4
src/main/twirl/issues/listparts.scala.html
View File

@@ -26,8 +26,8 @@
@helper.html.paginator(page, (if(condition.state == "open") openCount else closedCount), service.IssuesService.IssueLimit, 7, condition.toURL)
</div>
<div class="btn-group">
<a class="btn@if(condition.state == "open"){ active}" href="@condition.copy(state = "open").toURL">@openCount Open</a>
<a class="btn@if(condition.state == "closed"){ active}" href="@condition.copy(state = "closed").toURL">@closedCount Closed</a>
<a class="btn btn-small@if(condition.state == "open"){ active}" href="@condition.copy(state = "open").toURL">@openCount Open</a>
<a class="btn btn-small@if(condition.state == "closed"){ active}" href="@condition.copy(state = "closed").toURL">@closedCount Closed</a>
</div>
@helper.html.dropdown(
value = (condition.sort, condition.direction) match {

2
src/main/twirl/issues/tab.scala.html
View File

@@ -7,7 +7,7 @@
@if(loginAccount.isDefined){
<li class="pull-right">
<div class="btn-group">
<a class="btn btn-success" href="@url(repository)/issues/new">New Issue</a>
<a class="btn btn-small btn-success" href="@url(repository)/issues/new">New Issue</a>
</div>
</li>
}

2
src/main/twirl/menu.scala.html
View File

@@ -27,7 +27,7 @@
@if(repository.commitCount > 0){
<div class="pull-right">
<div class="input-prepend">
<a href="@path/@repository.owner/@repository.name/fork" class="btn" style="margin-bottom: 10px;">Fork</a>
<a href="@path/@repository.owner/@repository.name/fork" class="btn btn-small" style="margin-bottom: 10px;">Fork</a>
<span class="add-on count"><a href="@url(repository)/network/members">@repository.forkedCount</a></span>
</div>
</div>

4
src/main/twirl/pulls/listparts.scala.html
View File

@@ -17,8 +17,8 @@
}
}
<div class="btn-group">
<a class="btn@if(condition.state == "open"){ active}" href="@condition.copy(state = "open").toURL">@openCount Open</a>
<a class="btn@if(condition.state == "closed"){ active}" href="@condition.copy(state = "closed").toURL">@closedCount Closed</a>
<a class="btn btn-small@if(condition.state == "open"){ active}" href="@condition.copy(state = "open").toURL">@openCount Open</a>
<a class="btn btn-small@if(condition.state == "closed"){ active}" href="@condition.copy(state = "closed").toURL">@closedCount Closed</a>
</div>
@helper.html.dropdown(
value = (condition.sort, condition.direction) match {

7
src/main/twirl/wiki/compare.scala.html
View File

@@ -11,7 +11,6 @@
@html.main(s"Compare Revisions - ${repository.owner}/${repository.name}", Some(repository)){
@helper.html.information(info)
@html.menu("wiki", repository){
@tab("history", repository)
<ul class="nav nav-tabs fill-width pull-left">
<li>
<h1 class="wiki-title"><span class="muted">Compare Revisions</span></h1>
@@ -19,10 +18,10 @@
<li class="pull-right">
<div class="btn-group">
@if(pageName.isDefined){
<a class="btn" href="@url(repository)/wiki/@urlEncode(pageName)">View Page</a>
<a class="btn" href="@url(repository)/wiki/@urlEncode(pageName)/_history">Back to Page History</a>
<a class="btn btn-small" href="@url(repository)/wiki/@urlEncode(pageName)">View Page</a>
<a class="btn btn-small" href="@url(repository)/wiki/@urlEncode(pageName)/_history">Back to Page History</a>
} else {
<a class="btn" href="@url(repository)/wiki/_history">Back to Wiki History</a>
<a class="btn btn-small" href="@url(repository)/wiki/_history">Back to Wiki History</a>
}
</div>
</li>

7
src/main/twirl/wiki/edit.scala.html
View File

@@ -5,7 +5,6 @@
@import view.helpers._
@html.main(s"${if(pageName.isEmpty) "New Page" else pageName} - ${repository.owner}/${repository.name}", Some(repository)){
@html.menu("wiki", repository){
@tab("", repository)
<ul class="nav nav-tabs fill-width pull-left">
<li>
<h1 class="wiki-title"><span class="muted">Editing</span> @if(pageName.isEmpty){New Page} else {@pageName}</h1>
@@ -13,9 +12,9 @@
<li class="pull-right">
<div class="btn-group">
@if(page.isDefined){
<a class="btn" href="@url(repository)/wiki/@urlEncode(pageName)">View Page</a>
<a class="btn" href="@url(repository)/wiki/@urlEncode(pageName)/_delete" id="delete">Delete Page</a>
<a class="btn" href="@url(repository)/wiki/@urlEncode(pageName)/_history">Page History</a>
<a class="btn btn-small" href="@url(repository)/wiki/@urlEncode(pageName)">View Page</a>
<a class="btn btn-small" href="@url(repository)/wiki/@urlEncode(pageName)/_delete" id="delete">Delete Page</a>
<a class="btn btn-small" href="@url(repository)/wiki/@urlEncode(pageName)/_history">Page History</a>
}
</div>
</li>

7
src/main/twirl/wiki/history.scala.html
View File

@@ -5,7 +5,6 @@
@import view.helpers._
@html.main(s"History - ${repository.owner}/${repository.name}", Some(repository)){
@html.menu("wiki", repository){
@tab(if(pageName.isEmpty) "history" else "", repository)
<ul class="nav nav-tabs fill-width pull-left">
<li>
<h1 class="wiki-title">
@@ -20,12 +19,12 @@
<div class="btn-group">
@if(pageName.isEmpty){
@if(loginAccount.isDefined){
<a class="btn" href="@url(repository)/wiki/_new">New Page</a>
<a class="btn btn-small" href="@url(repository)/wiki/_new">New Page</a>
}
} else {
<a class="btn" href="@url(repository)/wiki/@urlEncode(pageName)">View Page</a>
<a class="btn btn-small" href="@url(repository)/wiki/@urlEncode(pageName)">View Page</a>
@if(loginAccount.isDefined){
<a class="btn" href="@url(repository)/wiki/@urlEncode(pageName)/_edit">Edit Page</a>
<a class="btn btn-small" href="@url(repository)/wiki/@urlEncode(pageName)/_edit">Edit Page</a>
}
}
</div>

7
src/main/twirl/wiki/page.scala.html
View File

@@ -8,7 +8,6 @@
@import view.helpers._
@html.main(s"${pageName} - ${repository.owner}/${repository.name}", Some(repository)){
@html.menu("wiki", repository){
@tab((if(pageName == "Home") "home" else ""), repository)
<ul class="nav nav-tabs fill-width pull-left">
<li>
<h1 class="wiki-title">@pageName</h1>
@@ -19,10 +18,10 @@
<li class="pull-right">
<div class="btn-group">
@if(hasWritePermission){
<a class="btn" href="@url(repository)/wiki/_new">New Page</a>
<a class="btn" href="@url(repository)/wiki/@urlEncode(pageName)/_edit">Edit Page</a>
<a class="btn btn-small" href="@url(repository)/wiki/_new">New Page</a>
<a class="btn btn-small" href="@url(repository)/wiki/@urlEncode(pageName)/_edit">Edit Page</a>
}
<a class="btn" href="@url(repository)/wiki/@urlEncode(pageName)/_history">Page History</a>
<a class="btn btn-small" href="@url(repository)/wiki/@urlEncode(pageName)/_history">Page History</a>
</div>
</li>
</ul>

3
src/main/twirl/wiki/pages.scala.html
View File

@@ -5,7 +5,6 @@
@import view.helpers._
@html.main(s"Pages - ${repository.owner}/${repository.name}", Some(repository)){
@html.menu("wiki", repository){
@tab("pages", repository)
<ul class="nav nav-tabs fill-width pull-left">
<li>
<h1 class="wiki-title"><span class="muted">Pages</span></h1>
@@ -13,7 +12,7 @@
<li class="pull-right">
<div class="btn-group">
@if(hasWritePermission){
<a class="btn" href="@url(repository)/wiki/_new">New Page</a>
<a class="btn btn-small" href="@url(repository)/wiki/_new">New Page</a>
}
</div>
</li>

38
src/main/twirl/wiki/tab.scala.html
View File

@@ -1,38 +0,0 @@
@(active: String,
repository: service.RepositoryService.RepositoryInfo)(implicit context: app.Context)
@import context._
@import service.WikiService._
@import view.helpers._
@*
<ul class="nav nav-tabs pull-left fill-width">
<li@if(active == "home" ){ class="active"}><a href="@url(repository)/wiki">Home</a></li>
<li@if(active == "pages" ){ class="active"}><a href="@url(repository)/wiki/_pages">Pages</a></li>
<li@if(active == "history"){ class="active"}><a href="@url(repository)/wiki/_history">Wiki History</a></li>
<li class="pull-right">
@helper.html.copy("repository-url-copy", httpUrl(repository)){
@if(settings.ssh && loginAccount.isDefined){
<div class="btn-group add-on" data-toggle="buttons-radio" style="padding: 0px; border-width: 0px;">
<button type="button" class="btn active" id="repository-url-http">HTTP</button><button type="button" class="btn" id="repository-url-ssh">SSH</button>
</div>
} else {
<span class="add-on">HTTP</span>
}
<input type="text" value="@httpUrl(repository)" readonly id="repository-url">
}
</li>
</ul>
@if(settings.ssh && loginAccount.isDefined){
<script>
$(function(){
$('#repository-url-http').click(function(){
$('#repository-url').val('@httpUrl(repository)');
$('#repository-url-copy').attr('data-clipboard-text', $('#repository-url').val());
});
$('#repository-url-ssh').click(function(){
$('#repository-url').val('@sshUrl(repository, settings, loginAccount.get.userName)');
$('#repository-url-copy').attr('data-clipboard-text', $('#repository-url').val());
});
});
</script>
}
*@

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

@@ -92,6 +92,10 @@ div.input-prepend span.count {
-webkit-border-radius: 0 4px 4px 0;
-moz-border-radius: 0 4px 4px 0;
border-radius: 0 4px 4px 0;
height: 16px;
font-size: 12px;
padding-top: 2px;
padding-bottom: 6px;
}
/* ======================================================================== */