mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2024-11-08 18:04:14 +01:00
Merge branch 'dev' of github.com:gogits/gogs into dev
This commit is contained in:
Unknown
commit
23e318f85a
7 changed files with 70 additions and 20 deletions
File diff suppressed because one or more lines are too long
4
public/css/bootstrap.min.css
vendored
4
public/css/bootstrap.min.css
vendored
File diff suppressed because one or more lines are too long
|
|
@ -67,6 +67,7 @@ html, body {
|
|||
color: #EEE;
|
||||
font-size: 100%;
|
||||
height: 46px;
|
||||
margin-top: 3px;
|
||||
}
|
||||
|
||||
#nav-logo {
|
||||
|
|
@ -81,10 +82,6 @@ html, body {
|
|||
text-decoration: none;
|
||||
}
|
||||
|
||||
.nav-item.navbar-right {
|
||||
margin-top: 3px;
|
||||
}
|
||||
|
||||
.nav-item.navbar-btn {
|
||||
cursor: pointer;
|
||||
margin-top: 8px;
|
||||
|
|
@ -96,6 +93,28 @@ html, body {
|
|||
margin: 0;
|
||||
}
|
||||
|
||||
#nav-search-form {
|
||||
width: 300px;
|
||||
margin-top: 0;
|
||||
}
|
||||
|
||||
#nav-search-form button {
|
||||
margin-top: 0;
|
||||
background-image: none;
|
||||
background-color: #F6F6F6;
|
||||
}
|
||||
|
||||
#nav-search-form input[type=search] {
|
||||
background-color: #F6F6F6;
|
||||
border-bottom-right-radius: 3px;
|
||||
border-top-right-radius: 3px;
|
||||
}
|
||||
|
||||
#nav-search-form input[type=search]:focus {
|
||||
background-color: #FFF;
|
||||
border-color: #D9D9D9;
|
||||
}
|
||||
|
||||
/* gogits nav item active status */
|
||||
#masthead .nav .active {
|
||||
color: #fff;
|
||||
|
|
@ -663,6 +682,10 @@ html, body {
|
|||
margin-top: -20px;
|
||||
}
|
||||
|
||||
#commits-pager {
|
||||
margin-top: 0;
|
||||
}
|
||||
|
||||
#source .source-toolbar:after {
|
||||
clear: both;
|
||||
}
|
||||
|
|
@ -880,6 +903,10 @@ html, body {
|
|||
margin-left: .5em;
|
||||
}
|
||||
|
||||
#commits-search-form {
|
||||
margin-top: 4px;
|
||||
}
|
||||
|
||||
.commit-box .avatar, .diff-head-box .avatar {
|
||||
width: 20px;
|
||||
height: 20px;
|
||||
|
|
@ -887,10 +914,6 @@ html, body {
|
|||
vertical-align: top;
|
||||
}
|
||||
|
||||
.commit-box .search {
|
||||
margin-top: 3px;
|
||||
}
|
||||
|
||||
.commit-box td {
|
||||
background-color: #FFF;
|
||||
}
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
4
public/css/todc-bootstrap.min.css
vendored
4
public/css/todc-bootstrap.min.css
vendored
File diff suppressed because one or more lines are too long
|
|
@ -1,9 +1,22 @@
|
|||
<div class="masthead navbar" id="masthead">
|
||||
<div class="container">
|
||||
<nav class="nav">
|
||||
<a id="nav-logo" class="nav-item{{if .PageIsHome}} active{{end}}" href="/"><img src="/img/favicon.png" alt="Gogs Logo" id="logo"></a>
|
||||
<a class="nav-item{{if .PageIsUserDashboard}} active{{end}}" href="/">Dashboard</a>
|
||||
<a class="nav-item{{if .PageIsHelp}} active{{end}}" href="https://github.com/gogits/gogs/wiki">Help</a>{{if .IsSigned}}
|
||||
<a id="nav-logo" class="nav-item pull-left{{if .PageIsHome}} active{{end}}" href="/"><img src="/img/favicon.png" alt="Gogs Logo" id="logo"></a>
|
||||
<a class="nav-item pull-left{{if .PageIsUserDashboard}} active{{end}}" href="/">Dashboard</a>
|
||||
<a class="nav-item pull-left{{if .PageIsHelp}} active{{end}}" href="https://github.com/gogits/gogs/wiki">Help</a>{{if .IsSigned}}
|
||||
<form class="nav-item pull-left{{if .PageIsNewRepo}} active{{end}}" id="nav-search-form">
|
||||
<div class="input-group">
|
||||
<div class="input-group-btn">
|
||||
<button type="button" class="btn btn-sm btn-default dropdown-toggle" data-toggle="dropdown">All Repositories <span class="caret"></span></button>
|
||||
<ul class="dropdown-menu">
|
||||
<li><a href="#">All Repositories</a></li>
|
||||
<li class="divider"></li>
|
||||
<li><a href="#">This Repository</a></li>
|
||||
</ul>
|
||||
</div>
|
||||
<input type="search" class="form-control input-sm" name="q" placeholder="search code, commits and issues"/>
|
||||
</div>
|
||||
</form>
|
||||
<a id="nav-out" class="nav-item navbar-right navbar-btn btn btn-danger" href="/user/logout/"><i class="fa fa-power-off fa-lg"></i></a>
|
||||
<a id="nav-avatar" class="nav-item navbar-right{{if .PageIsUserProfile}} active{{end}}" href="{{.SignedUser.HomeLink}}" data-toggle="tooltip" data-placement="bottom" title="{{.SignedUserName}}">
|
||||
<img src="{{.SignedUser.AvatarLink}}?s=28" alt="user-avatar" title="username"/>
|
||||
|
|
|
|||
|
|
@ -6,9 +6,14 @@
|
|||
<div id="commits">
|
||||
<div class="panel panel-default commit-box info-box">
|
||||
<div class="panel-heading info-head">
|
||||
<div class="search pull-right form">
|
||||
<input class="form-control search" type="search" placeholder="search commit"/>
|
||||
</div>
|
||||
<form class="search pull-right col-md-3" action="" method="post" id="commits-search-form">
|
||||
<div class="input-group">
|
||||
<input class="form-control search" type="search" placeholder="search commit" name="q"/>
|
||||
<div class="input-group-btn">
|
||||
<button type="button" class="btn btn-default">Find</button>
|
||||
</div>
|
||||
</div>
|
||||
</form>
|
||||
<h4>{{.CommitCount}} Commits</h4>
|
||||
</div>
|
||||
<table class="panel-footer table commit-list table table-striped">
|
||||
|
|
@ -35,6 +40,15 @@
|
|||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
<ul class="pagination" id="commits-pager">
|
||||
<li><a href="#">«</a></li>
|
||||
<li><a href="#">1</a></li>
|
||||
<li><a href="#">2</a></li>
|
||||
<li><a href="#">3</a></li>
|
||||
<li><a href="#">4</a></li>
|
||||
<li><a href="#">5</a></li>
|
||||
<li><a href="#">»</a></li>
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
{{template "base/footer" .}}
|
||||
|
|
|
|||
Loading…
Reference in a new issue