Merge remote-tracking branch 'origin/master'

This commit is contained in:
takezoe
2013-10-08 03:08:06 +09:00
3 changed files with 10 additions and 6 deletions

View File

@@ -75,9 +75,9 @@
</div>
@readme.map { content =>
<div class="box">
<div id="readme" class="box">
<div class="box-header">README.md</div>
<div class="box-content">@markdown(content, repository, false, false)</div>
</div>
}
}
}

View File

@@ -17,8 +17,8 @@
}
</li>
}
<li@if(active=="files" ){ class="active"}><a href="@url(repository)/tree/@id">Files</a></li>
<li@if(active=="commits" ){ class="active"}><a href="@url(repository)/commits/@id">Commits</a></li>
<li@if(active=="files" ){ class="active"}><a href="@url(repository)/tree/@encodeBranchName(id)">Files</a></li>
<li@if(active=="commits" ){ class="active"}><a href="@url(repository)/commits/@encodeBranchName(id)">Commits</a></li>
<li@if(active=="branches"){ class="active"}><a href="@url(repository)/branches">Branches@if(repository.branchList.length > 0){ <span class="badge">@repository.branchList.length</span>}</a></li>
<li@if(active=="tags" ){ class="active"}><a href="@url(repository)/tags">Tags@if(repository.tags.length > 0){ <span class="badge">@repository.tags.length</span>}</a></li>
<li class="pull-right">
@@ -28,7 +28,7 @@
</li>
<li class="pull-right" style="margin-right: 8px;">
<div class="pull-right">
<a href="@{url(repository)}/archive/@{id}.zip" class="btn"><i class="icon-download-alt"></i>ZIP</a>
<a href="@{url(repository)}/archive/@{encodeBranchName(id)}.zip" class="btn"><i class="icon-download-alt"></i>ZIP</a>
</div>
</li>
</ul>

View File

@@ -458,6 +458,10 @@ pre.blob {
padding-left: 20px;
}
#readme .box-content {
padding: 30px;
}
/****************************************************************************/
/* Issues */
/****************************************************************************/
@@ -815,4 +819,4 @@ div.markdown-body table colgroup + tbody tr:first-child td:last-child {
-webkit-border-top-right-radius: 4px;
border-top-right-radius: 4px;
-moz-border-radius-topright: 4px;
}
}