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

Adjust styles

Browse Source
This commit is contained in:
Naoki Takezoe
2016-03-15 21:09:00 +09:00
parent 62004c279c
commit 5f6b577cbf
6 changed files with 22 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
src/main/twirl/gitbucket/core/dashboard/tab.scala.html
View File

@@ -1,52 +1,12 @@
@(active: String = "")(implicit context: gitbucket.core.controller.Context)
@import context._
@import gitbucket.core.view.helpers._
<div class="dashboard-nav">
<div class="container">
<a href="@path/" @if(active == ""){ class="active"}>
<i class="octicon octicon-rss"></i> News Feed
</a>
<div class="container headbar">
<ul class="nav nav-tabs">
<li @if(active == ""){ class="active"}><a href="@path/"><i class="octicon octicon-rss"></i> News Feed</a></li>
@if(loginAccount.isDefined){
<a href="@path/dashboard/pulls" @if(active == "pulls" ){ class="active"}>
<i class="octicon octicon-git-pull-request"></i> Pull Requests
</a>
<a href="@path/dashboard/issues" @if(active == "issues"){ class="active"}>
<i class="octicon octicon-issue-opened"></i> Issues
</a>
<li @if(active == "pulls" ){ class="active"}><a href="@path/dashboard/pulls"><i class="octicon octicon-git-pull-request"></i> Pull Requests</a></li>
<li @if(active == "issues"){ class="active"}><a href="@path/dashboard/issues"><i class="octicon octicon-issue-opened"></i> Issues</a></li>
}
</div>
</ul>
</div>
<style type="text/css">
div.dashboard-nav {
border-bottom: 1px solid #ddd;
text-align: right;
height: 32px;
margin-bottom: 20px;
}
div.dashboard-nav a {
line-height: 10px;
margin-left: 20px;
padding-bottom: 13px;
padding-left: 4px;
padding-right: 4px;
color: #888;
}
div.dashboard-nav .octicon{
width: 16px;
height: 16px;
font-size: 16px;
color: #888;
}
div.dashboard-nav a:hover,div.dashboard-nav a:hover .octicon {
text-decoration: none;
color: #333;
}
div.dashboard-nav a.active {
border-bottom: 2px solid #bb4444;
color: #333;
}
</style>

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

@@ -27,9 +27,6 @@
} else {
<div class="panel panel-default">
<div class="panel-heading strong">
<div class="pull-right">
<a href="@path/new" class="btn btn-success btn-sm">New repository</a>
</div>
Your repositories <span class="badge">@userRepositories.size</span>
</div>
<ul class="list-group list-group-flush">

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

@@ -26,20 +26,28 @@
<div class="head">
@if(repository.commitCount > 0){
<div class="input-group pull-right">
@*
<span class="fork">
<span class="input-group-btn">
<span class="input-group-btn">*@
@if(loginAccount.isEmpty){
<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>
<a href="@path/signin?redirect=@urlEncode(s"${path}/${repository.owner}/${repository.name}")" class="btn btn-default">
Fork <span class="badge">@repository.forkedCount</span>
</a>
} else {
@if(isNoGroup) {
<a id="fork-link" href="javascript:void(0);" class="btn btn-default">Fork</a>
<a id="fork-link" href="javascript:void(0);" class="btn btn-default">
Fork <span class="badge">@repository.forkedCount</span>
</a>
} else {
<a href="@path/@repository.owner/@repository.name/fork" class="btn btn-default" rel="facebox">Fork</a>
<a href="@path/@repository.owner/@repository.name/fork" class="btn btn-default" rel="facebox">
Fork <span class="badge">@repository.forkedCount</span>
</a>
}
}
@*
</span>
<span class="count"><a href="@url(repository)/network/members">@repository.forkedCount</a></span>
</span>
</span>*@
</div>
@if(loginAccount.isDefined && isNoGroup){
<form id="fork-form" method="post" action="@path/@repository.owner/@repository.name/fork" style="display: none;">
@@ -58,7 +66,7 @@
}
}
</div>
<ul class="headmenu">
<ul class="nav nav-tabs">
@menuitem("" , "code" , "code" , "Code")
@menuitem("/issues", "issues" , "issue-opened" , "Issues", repository.issueCount)
@menuitem("/pulls" , "pulls" , "git-pull-request" , "Pull Requests", repository.pullCount)

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

@@ -48,7 +48,7 @@
}
</div>
<div class="box-header">
@avatar(latestCommit, 20)
@avatar(latestCommit, 28)
@user(latestCommit.authorName, latestCommit.authorEmailAddress, "username strong")
<span class="muted">@helper.html.datetimeago(latestCommit.commitTime)</span>
<a href="@url(repository)/commit/@latestCommit.id" class="commit-message">@link(latestCommit.summary, repository)</a>

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

@@ -76,7 +76,7 @@
</div>
}
</div>
<div style="width: 680px;" class="pull-left">
<div style="width: 740px;" class="pull-left">
<div class="markdown-body">
@markdown(
markdown = page.content,

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

@@ -440,53 +440,10 @@ a.btn-danger:hover .octicon {
/* Head Menu */
/****************************************************************************/
div.headbar {
background-color: #fafafa;
padding-top: 19px;
border-bottom: 1px solid #eee;
margin-bottom: 20px;
}
ul.headmenu {
margin-top: 20px;
margin-left: 0px;
padding-left: 0px;
margin-bottom: -1px;
}
ul.headmenu a:hover {
text-decoration: none;
color: black;
}
ul.headmenu li {
display: inline-block;
list-style-type: none;
font-size: 13px;
}
ul.headmenu li a {
color: #666;
padding: 8px 10px;
display: block;
}
ul.headmenu li.active a {
color: black;
}
ul.headmenu li.active {
border-top: 3px solid #bb4444;
border-left: 1px solid #eee;
border-right: 1px solid #eee;
border-bottom: none;
background-color: white;
}
ul.headmenu li.active a {
background-color: #fff;
}
/****************************************************************************/
/* Create Repository */
/****************************************************************************/