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

Fix styles

Browse Source
This commit is contained in:
Naoki Takezoe
2017-09-12 20:48:37 +09:00
parent a11f711778
commit 5d2d36dccf
4 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -88,9 +88,6 @@
forked from <a href="@context.path/@x.parentUserName/@x.parentRepositoryName">@x.parentUserName/@x.parentRepositoryName</a> forked from <a href="@context.path/@x.parentUserName/@x.parentRepositoryName">@x.parentUserName/@x.parentRepositoryName</a>
</div> </div>
} }
@x.description.map { description =>
<div class="normal muted" style="margin-left: 36px; font-size: 80%;">@Html(helpers.detectAndRenderLinks(description, repository))</div>
}
} }
</div> </div>
</div> </div>

6
src/main/twirl/gitbucket/core/repo/branches.scala.html
View File

@@ -7,7 +7,7 @@
<table class="table table-hover branches"> <table class="table table-hover branches">
<thead> <thead>
<tr> <tr>
<th style="background: #f5f5f5;color: #666;" colspan="3">All branches</th> <th colspan="3">All branches</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
@@ -15,7 +15,7 @@
<tr> <tr>
<td class="branch-details"> <td class="branch-details">
@if(isProtected){ <span class="octicon octicon-shield" title="This branch is protected"></span> } @if(isProtected){ <span class="octicon octicon-shield" title="This branch is protected"></span> }
<a href="@helpers.url(repository)/tree/@helpers.encodeRefName(branch.name)" class="branch-name">@branch.name</a> <a href="@helpers.url(repository)/tree/@helpers.encodeRefName(branch.name)">@branch.name</a>
<span class="branch-meta"> <span class="branch-meta">
<span>Updated @gitbucket.core.helper.html.datetimeago(branch.commitTime, false) <span>Updated @gitbucket.core.helper.html.datetimeago(branch.commitTime, false)
by <span>@helpers.user(branch.committerName, branch.committerEmailAddress, "muted-link")</span> by <span>@helpers.user(branch.committerName, branch.committerEmailAddress, "muted-link")</span>
@@ -36,7 +36,7 @@
} }
} }
</td> </td>
<td> <td class="text-right">
<div class="branch-action"> <div class="branch-action">
@if(repository.repository.defaultBranch != branch.name){ @if(repository.repository.defaultBranch != branch.name){
@branch.mergeInfo.map{ info => @branch.mergeInfo.map{ info =>

11
src/main/twirl/gitbucket/core/repo/files.scala.html
View File

@@ -22,6 +22,13 @@
s"${(repository.name :: pathList).mkString("/")} at ${helpers.encodeRefName(branch)} - ${repository.owner}/${repository.name}" s"${(repository.name :: pathList).mkString("/")} at ${helpers.encodeRefName(branch)} - ${repository.owner}/${repository.name}"
}, Some(repository)) { }, Some(repository)) {
@gitbucket.core.html.menu("files", repository, Some(branch), info, error){ @gitbucket.core.html.menu("files", repository, Some(branch), info, error){
@if(pathList.isEmpty) {
@repository.repository.description.map { description =>
<p class="pc" style="margin-bottom: 10px;">
<span class="normal muted">@Html(helpers.detectAndRenderLinks(description, repository))</span>
</p>
}
}
<div class="head" style="height: 24px;"> <div class="head" style="height: 24px;">
<div class="pull-right"> <div class="pull-right">
<div class="btn-group"> <div class="btn-group">
@@ -102,8 +109,8 @@
<tr> <tr>
<th colspan="4" class="latest-commit"> <th colspan="4" class="latest-commit">
<div> <div>
<div class="pull-right align-right monospace" style="line-height: 18px;"> <div class="pull-right align-right" style="line-height: 18px;">
<a href="@helpers.url(repository)/commit/@latestCommit.id" class="commit-id"><span class="muted">latest commit</span> @latestCommit.id.substring(0, 10)</a> <a href="@helpers.url(repository)/commit/@latestCommit.id" class="commit-id"><span class="muted">latest commit</span> <span class="monospace">@latestCommit.id.substring(0, 10)</span></a>
</div> </div>
<div class="author-info"> <div class="author-info">
<div class="author"> <div class="author">

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

@@ -392,8 +392,8 @@ a.btn-danger:hover .octicon {
/* Head Menu */ /* Head Menu */
/****************************************************************************/ /****************************************************************************/
div.headbar { div.headbar {
padding-top: 19px; padding-top: 4px;
margin-bottom: 20px; margin-bottom: 8px;
} }
/****************************************************************************/ /****************************************************************************/
@@ -438,10 +438,15 @@ div.repository-content {
margin-left: 40px; margin-left: 40px;
} }
table.branches>thead>tr>th, table.branches>tbody>tr>td{ table.branches>thead>tr>th {
padding: 12px; padding: 12px;
} }
table.branches>tbody>tr>td{
padding: 12px;
line-height: 30px;
}
.branches .muted-link{ .branches .muted-link{
color: #777; color: #777;
} }
@@ -450,15 +455,6 @@ table.branches>thead>tr>th, table.branches>tbody>tr>td{
color: #4183c4; color: #4183c4;
} }
.branches .branch-name{
color: #4183c4;
display: inline-block;
padding: 2px 6px;
font-family: Consolas, "Liberation Mono", Menlo, Courier, monospace;
background-color: rgba(209,227,237,0.5);
border-radius: 3px;
}
.branches .branch-meta{ .branches .branch-meta{
color: #aaa; color: #aaa;
line-height: 20px; line-height: 20px;