linden123/githaven-fork
1
1
Fork 0
forked from Shiloh/githaven
Code Pull Requests Activity

Merge branch 'dev' of github.com:gogits/gogs into dev

Browse Source
This commit is contained in:
Unknown 2014-06-25 00:44:59 -04:00
commit 3624b2a7f1
2 changed files with 25 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
public/css/gogs.css
View File

@ -257,6 +257,9 @@ html, body {
.card .btn { .card .btn {
cursor: pointer; cursor: pointer;
}
.card .btn-primary {
margin-right: 1.2em; margin-right: 1.2em;
} }
@ -638,7 +641,7 @@ html, body {
margin: 0 .5em; margin: 0 .5em;
} }
#dashboard-switch .btn { #dashboard-switch .btn, #repo-owner-switch .btn {
height: 40px; height: 40px;
} }
@ -647,7 +650,7 @@ html, body {
margin-right: 18px; margin-right: 18px;
} }
#dashboard-switch .dropdown-menu { #dashboard-switch .dropdown-menu,#repo-owner-switch .dropdown-menu {
padding: 0; padding: 0;
} }

21
templates/repo/create.tmpl
View File

@ -8,9 +8,28 @@
<div class="form-group"> <div class="form-group">
<label class="col-md-2 control-label">Owner<strong class="text-danger">*</strong></label> <label class="col-md-2 control-label">Owner<strong class="text-danger">*</strong></label>
<div class="col-md-8"> <div class="col-md-8">
<div class="btn-group" id="repo-owner-switch">
<button type="button" class="btn btn-default">
<img src="//1.gravatar.com/avatar/f72f7454ce9d710baa506394f68f4132?s=28" alt="user-avatar" title="username">
fuxiaohei
</button>
<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
<span class="caret"></span>
</button>
<div class="dropdown-menu clone-group-btn no-propagation">
<ul id="dashboard-switch-menu" class="list-unstyled">
<li class="checked"><a href="#"><i class="fa fa-check"></i>
<img src="//1.gravatar.com/avatar/f72f7454ce9d710baa506394f68f4132?s=28" alt="user-avatar" title="username">
gogits/gogs</a></li>
</ul>
</div>
</div>
</div>
<!--<div class="col-md-8">
<p class="form-control-static">{{.SignedUserName}}</p> <p class="form-control-static">{{.SignedUserName}}</p>
<input type="hidden" value="{{.SignedUserId}}" name="userId"/> <input type="hidden" value="{{.SignedUserId}}" name="userId"/>
</div> </div>-->
</div> </div>
<div class="form-group {{if .Err_RepoName}}has-error has-feedback{{end}}"> <div class="form-group {{if .Err_RepoName}}has-error has-feedback{{end}}">