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

Fix for pull request #119 to take some part of design fix.

Browse Source
This commit is contained in:
takezoe
2013-10-05 12:58:26 +09:00
parent cc1e0030df
commit d5a14482a6
8 changed files with 27 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -7,7 +7,7 @@
<div class="span4">
<div class="block">
<div class="account-image">@avatar(account.userName, 200)</div>
<div class="block-header" style="text-align: center">@account.userName</div>
<div class="block-header">@account.userName</div>
</div>
<div class="block">
@if(account.url.isDefined){

6
src/main/twirl/index.scala.html
View File

@@ -18,7 +18,7 @@
<tr>
<th class="metal">
<div class="pull-right">
<a href="@path/new" class="btn btn-success btn-small">New repository</a>
<a href="@path/new" class="btn btn-success btn-mini">New repository</a>
</div>
Your repositories (@userRepositories.size)
</th>
@@ -30,7 +30,7 @@
} else {
@userRepositories.map { repository =>
<tr>
<td class="repo-list-item">
<td>
@if(repository.repository.isPrivate){
<i class="icon-lock"></i>
}
@@ -62,7 +62,7 @@
} else {
@recentRepositories.map { repository =>
<tr>
<td class="repo-list-item">
<td>
@if(repository.repository.isPrivate){
<i class="icon-lock"></i>
}

13
src/main/twirl/main.scala.html
View File

@@ -46,15 +46,12 @@
<span class="header-version">@version.majorVersion.@version.minorVersion</span>
}
</a>
<div class="nav-collapse collapse pull-left header-menu">
@repository.map { repository =>
<input type="text" name="query" style="width: 300px; margin-bottom: 0px;" placeholder="Search this repository"/>
<input type="hidden" name="owner" value="@repository.owner"/>
<input type="hidden" name="repository" value="@repository.name"/>
}
</div>
<div class="nav-collapse collapse pull-right header-menu">
@repository.map { repository =>
<input type="text" name="query" style="width: 300px; margin-bottom: 0px;" placeholder="Search this repository"/>
<input type="hidden" name="owner" value="@repository.owner"/>
<input type="hidden" name="repository" value="@repository.name"/>
}
@if(loginAccount.isDefined){
<a href="@url(loginAccount.get.userName)" class="username menu">@avatar(loginAccount.get.userName, 20) @loginAccount.get.userName</a>
<a href="@path/new" class="menu" data-toggle="tooltip" data-placement="bottom" title="Create a new repo"><i class="icon-plus"></i></a>

6
src/main/twirl/newrepo.scala.html
View File

@@ -32,7 +32,7 @@
<input type="radio" name="isPrivate" value="false" checked>
<span class="strong"><i class="icon-eye-open">&nbsp;</i>&nbsp;Public</span><br>
<div>
<span class="note">All users and guests can read this repository.</span>
<span>All users and guests can read this repository.</span>
</div>
</label>
</fieldset>
@@ -41,7 +41,7 @@
<input type="radio" name="isPrivate" value="true">
<span class="strong"><i class="icon-lock">&nbsp;</i>&nbsp;Private</span><br>
<div>
<span class="note">Only collaborators can read this repository.</span>
<span>Only collaborators can read this repository.</span>
</div>
</label>
</fieldset>
@@ -50,7 +50,7 @@
<input type="checkbox" name="createReadme" id="createReadme"/>
<span class="strong">Initialize this repository with a README</span>
<div>
<span class="note">This will allow you to <code>git clone</code> the repository immediately.</span>
<span>This will allow you to <code>git clone</code> the repository immediately.</span>
</div>
</label>
</fieldset>

4
src/main/twirl/settings/options.scala.html
View File

@@ -30,7 +30,7 @@
>
<span class="strong">Public</span><br>
<div>
<span class="note">All users and guests can read this repository.</span>
<span>All users and guests can read this repository.</span>
</div>
</label>
</fieldset>
@@ -42,7 +42,7 @@
>
<span class="strong">Private</span><br>
<div>
<span class="note">Only collaborators can read this repository.</span>
<span>Only collaborators can read this repository.</span>
</div>
</label>
</fieldset>

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

@@ -5,7 +5,7 @@
<th class="metal">
@if(systemSettings.allowAccountRegistration){
<div class="pull-right">
<a href="@path/register" class="btn btn-small">Create new account</a>
<a href="@path/register" class="btn btn-mini">Create new account</a>
</div>
}
Sign in

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

@@ -37,8 +37,7 @@
<td width="0%"><input type="checkbox" name="commitId" value="@commit.id"></td>
<td>@avatar(commit.committer, 20)&nbsp;<a href="@url(commit.committer)">@commit.committer</a></td>
<td width="80%">
<span class="muted">@datetime(commit.time):</span>
@commit.shortMessage
<span class="muted">@datetime(commit.time):</span>&nbsp;@commit.shortMessage
</td>
</tr>
}

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

@@ -1,11 +1,8 @@
@import url(http://fonts.googleapis.com/css?family=Rambla:400,700,400italic,700italic|Pathway+Gothic+One|Roboto:400,400italic,700italic,700);
/****************************************************************************/
/* Common */
/****************************************************************************/
body {
color: #333;
font-family: 'Roboto', sans-serif;
}
/* ======================================================================== */
@@ -44,8 +41,6 @@ div.nav-collapse a.menu-last {
.navbar .brand {
padding-top: 6px;
padding-bottom: 6px;
font-family: 'Pathway Gothic One', sans-serif;
font-size: 27px;
}
.navbar .brand img {
@@ -88,14 +83,6 @@ div.input-prepend span.add-on {
border-radius: 0 4px 4px 0;
}
.head i {
margin-top: 6px;
}
.repo-list-item i {
margin-top: 2px;
}
/*
div.input-prepend span.add-on a {
color: #333;
@@ -228,7 +215,7 @@ div.box-header-small {
div.box-content {
background-color: white;
border: 1px solid #d8d8d8;
padding: 12px;
padding: 4px;
}
th.box-header {
@@ -238,7 +225,6 @@ th.box-header {
background-image: linear-gradient(#fafafa, #e0e0e0);
background-repeat: repeat-x;
margin: 0;
height: 25px;
border-top-left-radius: 1px;
border-top-right-radius: 1px;
border: 1px solid #d8d8d8;
@@ -253,7 +239,6 @@ th.metal {
background-image: linear-gradient(#fafafa, #e8e8e8);
background-repeat: repeat-x;
margin: 0;
padding-left: 10px;
border-top-left-radius: 1px;
border-top-right-radius: 1px;
}
@@ -271,10 +256,6 @@ hr {
margin-bottom: 4px;
}
span.note {
margin-left: 20px;
}
img.avatar {
border-radius: 4px;
-webkit-border-radius: 4px;
@@ -321,12 +302,12 @@ span.highlight {
/* Create Repo */
/****************************************************************************/
.slash {
font-size: 25px;
font-size: 20px;
}
/****************************************************************************/
/* Sign-in form */
/****************************************************************************/
div.signin-form {
width: 350px;
margin: 30px auto;
@@ -398,8 +379,6 @@ div.activity-icon-small {
div.activity-content {
margin-left: 40px;
padding-top: 2px;
padding-bottom: 2px;
}
/****************************************************************************/
@@ -426,8 +405,8 @@ table.table-file-list td {
}
th, td, .table th, .table td {
padding-top: 10px;
padding-bottom: 10px;
padding-top: 4px;
padding-bottom: 4px;
}
div.commit-avatar-image {
@@ -486,7 +465,7 @@ span.issue-status {
display: block;
font-size: large;
text-align: center;
padding: 16px;
padding: 8px;
}
table.table-issues {
@@ -508,8 +487,8 @@ ul.label-list {
ul.label-list a {
padding-left: 6px;
padding-top: 7px;
padding-bottom: 7px;
padding-top: 4px;
padding-bottom: 4px;
margin-bottom: 8px;
color: #444;
}
@@ -593,7 +572,7 @@ span.milestone-percentage {
}
div.issue-header {
padding-left: 12px;
padding-left: 8px;
padding-right: 8px;
padding-top: 12px;
padding-bottom: 12px;
@@ -603,13 +582,13 @@ div.issue-info {
border-top: 1px solid #e5e5e5;
border-bottom: 1px solid #e5e5e5;
background-color: #f5f5f5;
padding: 10px;
padding: 8px;
margin-left: 0px;
margin-right: 0px;
}
div.issue-content {
padding: 12px;
padding: 8px;
background-color: #fbfbfb;
}