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

Fix fork button group style

Browse Source
This commit is contained in:
Naoki Takezoe
2015-12-15 19:39:18 +09:00
parent 21363794b6
commit b229058726
2 changed files with 25 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -25,7 +25,7 @@
@helper.html.information(info) @helper.html.information(info)
@helper.html.error(error) @helper.html.error(error)
<div class="row"> <div class="row">
<div class="head col-md-11"> <div class="head">
@helper.html.repositoryicon(repository, true) @helper.html.repositoryicon(repository, true)
<a href="@url(repository.owner)">@repository.owner</a> / <a href="@url(repository)" class="strong">@repository.name</a> <a href="@url(repository.owner)">@repository.owner</a> / <a href="@url(repository)" class="strong">@repository.name</a>
@@ -36,30 +36,30 @@
</div> </div>
} }
} }
</div> @if(repository.commitCount > 0){
@if(repository.commitCount > 0){
<div class="col-md-1">
<div class="input-group pull-right"> <div class="input-group pull-right">
<span class="input-group-btn"> <span class="fork">
@if(loginAccount.isEmpty){ <span class="input-group-btn">
<a title="You must be signed in to fork a repository" href="@path/signin?redirect=@urlEncode(s"${path}/${repository.owner}/${repository.name}")" class="btn btn-sm btn-default" style="margin-bottom: 10px;">Fork</a> @if(loginAccount.isEmpty){
} else { <a title="You must be signed in to fork a repository" href="@path/signin?redirect=@urlEncode(s"${path}/${repository.owner}/${repository.name}")" class="btn btn-default">Fork</a>
@if(isNoGroup) {
<a id="fork-link" href="javascript:void(0);" class="btn btn-sm btn-default" style="margin-bottom: 10px;">Fork</a>
} else { } else {
<a href="@path/@repository.owner/@repository.name/fork" class="btn btn-sm btn-default" rel="facebox" style="margin-bottom: 10px;">Fork</a> @if(isNoGroup) {
<a id="fork-link" href="javascript:void(0);" class="btn btn-default">Fork</a>
} else {
<a href="@path/@repository.owner/@repository.name/fork" class="btn btn-default" rel="facebox">Fork</a>
}
} }
} </span>
<span class="count"><a href="@url(repository)/network/members">@repository.forkedCount</a></span>
</span> </span>
<span class="add-on count"><a href="@url(repository)/network/members">@repository.forkedCount</a></span>
</div> </div>
@if(loginAccount.isDefined && isNoGroup){ @if(loginAccount.isDefined && isNoGroup){
<form id="fork-form" method="post" action="@path/@repository.owner/@repository.name/fork" style="display: none;"> <form id="fork-form" method="post" action="@path/@repository.owner/@repository.name/fork" style="display: none;">
<input type="hidden" name="account" value="@loginAccount.get.userName"/> <input type="hidden" name="account" value="@loginAccount.get.userName"/>
</form> </form>
} }
</div> }
} </div>
</div> </div>
</div> </div>
<hr style="margin-bottom: 20px;"/> <hr style="margin-bottom: 20px;"/>

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

@@ -199,16 +199,23 @@ span.header-version {
font-size: small; font-size: small;
} }
div.input-group span.count { div.input-group>span.fork {
display: table;
margin-left: 4px;
margin-top: 1px;
}
div.input-group>span.fork>span.count {
background-color: white; background-color: white;
-webkit-border-radius: 0 4px 4px 0; -webkit-border-radius: 0 4px 4px 0;
-moz-border-radius: 0 4px 4px 0; -moz-border-radius: 0 4px 4px 0;
border-radius: 0 4px 4px 0; border-radius: 0 4px 4px 0;
border: 1px solid #d8d8d8; border: 1px solid #d8d8d8;
border-left: none;
font-size: 11px; font-size: 11px;
height: 24px; /*height: 24px;*/
padding: 3px 6px; padding: 3px 6px;
display: inline-block; display: table-cell;
} }
a.global-header-menu { a.global-header-menu {