Merge branch 'master' of github.com:gogits/gogs

This commit is contained in:
Unknown 2014-03-11 00:54:01 -04:00
commit e9b71c88d7
3 changed files with 81 additions and 1 deletions

View file

@ -36,6 +36,12 @@ body {
cursor: pointer; cursor: pointer;
} }
.panel-default .panel-heading{
background-color: #FAFAFA;
border-bottom: 1px solid #DDD;
font-weight: bold;
}
/* gogits nav header */ /* gogits nav header */
.gogs-masthead { .gogs-masthead {
background-color: #428bca; background-color: #428bca;
@ -131,6 +137,35 @@ body {
margin-top: 50px; margin-top: 50px;
} }
#gogs-body-nav{
margin-top: 52px;
margin-bottom: -50px;
background-color: #FFF;
border-bottom: 1px solid #BBB;
height: 66px
}
#gogs-body-nav .nav{
font-size: 14px;
margin-top: 12px;
}
#gogs-body-nav .nav-pills li a{
color: #444;
}
#gogs-body-nav .nav-pills li.active a{
font-weight: bold;
border-bottom: 2px solid #d26911;
background-color: transparent;
color: #444;
}
#gogs-body-nav .nav-pills li:hover a{
background-color: transparent;
text-decoration: underline;
}
/* gogits login card */ /* gogits login card */
.gogs-card { .gogs-card {
margin: auto; margin: auto;
@ -301,3 +336,12 @@ body {
#gogs-ssh-form textarea { #gogs-ssh-form textarea {
height: 16em; height: 16em;
} }
/* #gogs-feed */
#gogs-feed-left{
padding-left: 0;
}
#gogs-feed-right .repo-panel .panel-heading .btn{
margin-top: -4px;
}

View file

@ -49,6 +49,19 @@
</div> </div>
</div> </div>
<div class="form-group">
<label class="col-md-2 control-label">License</label>
<div class="col-md-8">
<select class="form-control" name="license">
<option value="">Select a license</option>
<option value="mit">MIT</option>
<option value="gpl">GPL</option>
<option value="apache">Apache License</option>
<option value="bsd">BSD</option>go
</select>
</div>
</div>
<div class="form-group"> <div class="form-group">
<div class="col-md-8 col-md-offset-2"> <div class="col-md-8 col-md-offset-2">
<div class="checkbox"> <div class="checkbox">

View file

@ -1,6 +1,29 @@
{{template "base/head" .}} {{template "base/head" .}}
{{template "base/navbar" .}} {{template "base/navbar" .}}
<div id="gogs-body-nav">
<div class="container">
<ul class="nav nav-pills pull-right">
<li class="active"><a href="/">Feed</a></li>
<li><a href="/issues/">Issues</a></li>
<li><a href="/pulls/">Pull Requests</a></li>
<li><a href="/stars/">Stars</a></li>
</ul>
<h3>New Feed</h3>
</div>
</div>
<div id="gogs-body" class="container"> <div id="gogs-body" class="container">
<div id="gogs-feed-left" class="col-md-8">
Website is still in the progress of building...please come back later! <strong>{{.SignedUserName}}</strong> is logged! Website is still in the progress of building...please come back later! <strong>{{.SignedUserName}}</strong> is logged!
</div>
<div id="gogs-feed-right" class="col-md-4">
<div class="panel panel-default repo-panel">
<div class="panel-heading">Your Repositories
<a class="btn btn-success pull-right btn-sm" href="/repo/create/"><i class="fa fa-plus-square"></i>New Repo</a>
</div>
<div class="panel-body">
repo-list
</div>
</div>
</div>
</div> </div>
{{template "base/footer" .}} {{template "base/footer" .}}