mirror of
				https://github.com/go-gitea/gitea.git
				synced 2025-10-26 12:27:06 +00:00 
			
		
		
		
	unify layout between auth pages (#13547)
Co-authored-by: techknowlogick <techknowlogick@gitea.io>
This commit is contained in:
		| @@ -1,21 +1,20 @@ | |||||||
| {{template "base/head" .}} | {{template "base/head" .}} | ||||||
|  |  | ||||||
| <div class="user link-account"> | <div class="user link-account"> | ||||||
| 	<div class="ui middle very relaxed page grid"> | 	<div class="ui secondary pointing tabular top attached borderless menu new-menu navbar"> | ||||||
| 		<div class="column"> |  | ||||||
|  |  | ||||||
| 			<div class="ui tabular menu"> |  | ||||||
| 		<!-- TODO handle .ShowRegistrationButton once other login bugs are fixed --> | 		<!-- TODO handle .ShowRegistrationButton once other login bugs are fixed --> | ||||||
| 				<div class="item {{if not .user_exists}}active{{end}}" | 		<a class="item {{if not .user_exists}}active{{end}}" | ||||||
| 			data-tab="auth-link-signup-tab"> | 			data-tab="auth-link-signup-tab"> | ||||||
| 			{{.i18n.Tr "auth.oauth_signup_tab"}} | 			{{.i18n.Tr "auth.oauth_signup_tab"}} | ||||||
| 				</div> | 		</a> | ||||||
| 				<div class="item {{if .user_exists}}active{{end}}" | 		<a class="item {{if .user_exists}}active{{end}}" | ||||||
| 			data-tab="auth-link-signin-tab"> | 			data-tab="auth-link-signin-tab"> | ||||||
| 			{{.i18n.Tr "auth.oauth_signin_tab"}} | 			{{.i18n.Tr "auth.oauth_signin_tab"}} | ||||||
| 				</div> | 		</a> | ||||||
| 	</div> | 	</div> | ||||||
|  |  | ||||||
|  | 	<div class="ui middle very relaxed page grid"> | ||||||
|  | 		<div class="column"> | ||||||
| 			<div class="ui tab {{if not .user_exists}}active{{end}}" | 			<div class="ui tab {{if not .user_exists}}active{{end}}" | ||||||
| 				data-tab="auth-link-signup-tab"> | 				data-tab="auth-link-signup-tab"> | ||||||
| 				{{template "user/auth/signup_inner" .}} | 				{{template "user/auth/signup_inner" .}} | ||||||
|   | |||||||
| @@ -1,8 +1,10 @@ | |||||||
| {{template "base/head" .}} | {{template "base/head" .}} | ||||||
| <div class="user signin{{if .LinkAccountMode}} icon{{end}}"> | <div class="user signin{{if .LinkAccountMode}} icon{{end}}"> | ||||||
| 	{{template "user/auth/signin_navbar" .}} | 	{{template "user/auth/signin_navbar" .}} | ||||||
| 	<div class="ui container"> | 	<div class="ui middle very relaxed page grid"> | ||||||
|  | 		<div class="ui container column"> | ||||||
| 			{{template "user/auth/signin_inner" .}} | 			{{template "user/auth/signin_inner" .}} | ||||||
| 		</div> | 		</div> | ||||||
|  | 	</div> | ||||||
| </div> | </div> | ||||||
| {{template "base/footer" .}} | {{template "base/footer" .}} | ||||||
|   | |||||||
| @@ -1,3 +1,7 @@ | |||||||
| {{template "base/head" .}} | {{template "base/head" .}} | ||||||
| {{template "user/auth/signup_inner" .}} | <div class="user signin{{if .LinkAccountMode}} icon{{end}}"> | ||||||
|  | 	<div class="ui middle very relaxed page grid"> | ||||||
|  | 		{{template "user/auth/signup_inner" .}} | ||||||
|  | 	</div> | ||||||
|  | </div> | ||||||
| {{template "base/footer" .}} | {{template "base/footer" .}} | ||||||
|   | |||||||
| @@ -1,16 +1,14 @@ | |||||||
| <div class="user signup{{if .LinkAccountMode}} icon{{end}}"> | <div class="ui container column{{if .LinkAccountMode}} icon{{end}}"> | ||||||
| 	<div class="ui middle very relaxed page grid"> | 	<h4 class="ui top attached header center"> | ||||||
| 		<div class="column"> |  | ||||||
| 			<form class="ui form" action="{{.SignUpLink}}" method="post"> |  | ||||||
| 				{{.CsrfTokenHtml}} |  | ||||||
| 				<h3 class="ui top attached header"> |  | ||||||
| 		{{if .LinkAccountMode}} | 		{{if .LinkAccountMode}} | ||||||
| 			{{.i18n.Tr "auth.oauth_signup_title"}} | 			{{.i18n.Tr "auth.oauth_signup_title"}} | ||||||
| 		{{else}} | 		{{else}} | ||||||
| 			{{.i18n.Tr "sign_up"}} | 			{{.i18n.Tr "sign_up"}} | ||||||
| 		{{end}} | 		{{end}} | ||||||
| 				</h3> | 	</h4> | ||||||
| 	<div class="ui attached segment"> | 	<div class="ui attached segment"> | ||||||
|  | 		<form class="ui form" action="{{.SignUpLink}}" method="post"> | ||||||
|  | 			{{.CsrfTokenHtml}} | ||||||
| 			{{if or (not .LinkAccountMode) (and .LinkAccountMode .LinkAccountModeRegister)}} | 			{{if or (not .LinkAccountMode) (and .LinkAccountMode .LinkAccountModeRegister)}} | ||||||
| 			{{template "base/alert" .}} | 			{{template "base/alert" .}} | ||||||
| 			{{end}} | 			{{end}} | ||||||
| @@ -75,8 +73,6 @@ | |||||||
| 				</div> | 				</div> | ||||||
| 				{{end}} | 				{{end}} | ||||||
| 			{{end}} | 			{{end}} | ||||||
| 				</div> |  | ||||||
| 		</form> | 		</form> | ||||||
| 	</div> | 	</div> | ||||||
| 	</div> |  | ||||||
| </div> | </div> | ||||||
|   | |||||||
| @@ -232,6 +232,7 @@ textarea:focus, | |||||||
| .user.activate, | .user.activate, | ||||||
| .user.forgot.password, | .user.forgot.password, | ||||||
| .user.reset.password, | .user.reset.password, | ||||||
|  | .user.link-account, | ||||||
| .user.signin, | .user.signin, | ||||||
| .user.signup { | .user.signup { | ||||||
|   @input-padding: 200px; |   @input-padding: 200px; | ||||||
|   | |||||||
| @@ -49,10 +49,6 @@ | |||||||
|   } |   } | ||||||
| } | } | ||||||
|  |  | ||||||
| .signup { |  | ||||||
|   padding-top: 15px; |  | ||||||
| } |  | ||||||
|  |  | ||||||
| footer { | footer { | ||||||
|   .ui.container .left, |   .ui.container .left, | ||||||
|   .ui.container .right { |   .ui.container .right { | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user
	 Norwin
					Norwin