Merge branch 'dev' of github.com:gogits/gogs into dev
This commit is contained in:
commit
802a110e42
2 changed files with 51 additions and 10 deletions
|
@ -259,14 +259,40 @@ html, body {
|
||||||
}
|
}
|
||||||
|
|
||||||
#social-login {
|
#social-login {
|
||||||
margin-top: 30px;
|
margin-top: 40px;
|
||||||
padding-top: 20px;
|
padding-top: 40px;
|
||||||
border-top: 1px solid #ccc;
|
border-top: 1px solid #ccc;
|
||||||
|
position: relative;
|
||||||
}
|
}
|
||||||
|
|
||||||
#social-login .btn {
|
#social-login .btn {
|
||||||
float: none;
|
float: none;
|
||||||
margin: auto;
|
margin: auto 4px;
|
||||||
|
}
|
||||||
|
|
||||||
|
#social-login .btn .fa {
|
||||||
|
margin-left: 0;
|
||||||
|
margin-right: 4px;
|
||||||
|
}
|
||||||
|
|
||||||
|
#social-login .btn span {
|
||||||
|
display: inline-block;
|
||||||
|
vertical-align: top;
|
||||||
|
font-size: 16px;
|
||||||
|
margin-top: 5px;
|
||||||
|
}
|
||||||
|
|
||||||
|
#social-login h4 {
|
||||||
|
position: absolute;
|
||||||
|
top: -20px;
|
||||||
|
width: 100%;
|
||||||
|
text-align: center;
|
||||||
|
background-color: transparent;
|
||||||
|
}
|
||||||
|
|
||||||
|
#social-login h4 span {
|
||||||
|
background-color: #FFF;
|
||||||
|
padding: 0 12px;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* gogs-user-profile */
|
/* gogs-user-profile */
|
||||||
|
|
|
@ -4,13 +4,13 @@
|
||||||
<form action="/user/login" method="post" class="form-horizontal card" id="login-card">
|
<form action="/user/login" method="post" class="form-horizontal card" id="login-card">
|
||||||
{{.CsrfTokenHtml}}
|
{{.CsrfTokenHtml}}
|
||||||
<h3>Log in
|
<h3>Log in
|
||||||
{{if .OauthEnabled}}
|
<!--{{if .OauthEnabled}}
|
||||||
<small class="pull-right">social login:
|
<small class="pull-right">social login:
|
||||||
{{if .OauthGitHubEnabled}}
|
{{if .OauthGitHubEnabled}}
|
||||||
<a href="/user/login/github?next=/user/sign_up"><i class="fa fa-github-square fa-2x"></i></a>
|
<a href="/user/login/github?next=/user/sign_up"><i class="fa fa-github-square fa-2x"></i></a>
|
||||||
{{end}}
|
{{end}}
|
||||||
</small>
|
</small>
|
||||||
{{end}}
|
{{end}}-->
|
||||||
</h3>
|
</h3>
|
||||||
{{template "base/alert" .}}
|
{{template "base/alert" .}}
|
||||||
<div class="form-group {{if .Err_UserName}}has-error has-feedback{{end}}">
|
<div class="form-group {{if .Err_UserName}}has-error has-feedback{{end}}">
|
||||||
|
@ -51,12 +51,27 @@
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<!-- {{if .OauthEnabled}}
|
{{if .OauthEnabled}}
|
||||||
<div class="form-group text-center" id="social-login">
|
<div class="form-group text-center" id="social-login">
|
||||||
<h4>Log In with Social Accounts</h4>
|
<h4><span>or</span></h4>
|
||||||
{{if .OauthGitHubEnabled}}<a href="/user/login/github?next=/user/sign_up"><i class="fa fa-github-square fa-3x"></i></a>{{end}}
|
<!--<a href="/user/login/github?next=/user/sign_up" class="btn btn-default google">
|
||||||
|
<i class="fa fa-google-plus-square fa-2x"></i>
|
||||||
|
<span>Google</span>
|
||||||
|
</a>
|
||||||
|
<a href="/user/login/github?next=/user/sign_up" class="btn btn-default facebbok">
|
||||||
|
<i class="fa fa-facebook-square fa-2x"></i>
|
||||||
|
<span>Facebook</span>
|
||||||
|
</a>
|
||||||
|
<a href="/user/login/github?next=/user/sign_up" class="btn btn-default weibo">
|
||||||
|
<i class="fa fa-weibo fa-2x"></i>
|
||||||
|
<span>Weibo</span>
|
||||||
|
</a>-->
|
||||||
|
{{if .OauthGitHubEnabled}}<a href="/user/login/github?next=/user/sign_up" class="github btn btn-default">
|
||||||
|
<i class="fa fa-github-square fa-2x"></i>
|
||||||
|
<span>GitHub</span>
|
||||||
|
</a>{{end}}
|
||||||
</div>
|
</div>
|
||||||
{{end}} -->
|
{{end}}
|
||||||
</form>
|
</form>
|
||||||
</div>
|
</div>
|
||||||
{{template "base/footer" .}}
|
{{template "base/footer" .}}
|
||||||
|
|
Reference in a new issue