mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2024-09-08 00:03:28 +00:00
I think it's better if the primary actions have primary color instead of green which fits better into the overall single-color UI design. This PR currently replaces every green button with primary: <img width="141" alt="Screenshot 2023-09-16 at 14 07 59" src="https://github.com/go-gitea/gitea/assets/115237/843c1e50-4fb2-4ec6-84ba-0efb9472dcbe"> <img width="161" alt="Screenshot 2023-09-16 at 14 07 51" src="https://github.com/go-gitea/gitea/assets/115237/9442195a-a3b2-4a42-b262-8377d6f5c0d1"> Modal actions now use uncolored/primary instead of previous green/red colors. I also removed the box-shadow on all basic buttons: <img width="259" alt="Screenshot 2023-09-16 at 14 16 39" src="https://github.com/go-gitea/gitea/assets/115237/5beea529-127a-44b0-8d4c-afa7b034a490"> <img width="261" alt="Screenshot 2023-09-16 at 14 17 42" src="https://github.com/go-gitea/gitea/assets/115237/4757f7b2-4d46-49bc-a797-38bb28437b88"> The change currently includes the "Merge PR" button, for which we might want to make an exception to match the icon color there: <img width="442" alt="Screenshot 2023-09-16 at 14 33 53" src="https://github.com/go-gitea/gitea/assets/115237/993ac1a5-c94d-4895-b76c-0d872181a70b">
79 lines
3 KiB
Handlebars
79 lines
3 KiB
Handlebars
<div class="ui container column fluid{{if .LinkAccountMode}} icon{{end}}">
|
|
<h4 class="ui top attached header center">
|
|
{{if .LinkAccountMode}}
|
|
{{.locale.Tr "auth.oauth_signup_title"}}
|
|
{{else}}
|
|
{{.locale.Tr "sign_up"}}
|
|
{{end}}
|
|
</h4>
|
|
<div class="ui attached segment">
|
|
<form class="ui form" action="{{.SignUpLink}}" method="post">
|
|
{{.CsrfTokenHtml}}
|
|
{{if or (not .LinkAccountMode) (and .LinkAccountMode .LinkAccountModeRegister)}}
|
|
{{template "base/alert" .}}
|
|
{{end}}
|
|
{{if .DisableRegistration}}
|
|
<p>{{.locale.Tr "auth.disable_register_prompt"}}</p>
|
|
{{else}}
|
|
<div class="required inline field {{if and (.Err_UserName) (or (not .LinkAccountMode) (and .LinkAccountMode .LinkAccountModeRegister))}}error{{end}}">
|
|
<label for="user_name">{{.locale.Tr "username"}}</label>
|
|
<input id="user_name" type="text" name="user_name" value="{{.user_name}}" autofocus required>
|
|
</div>
|
|
<div class="required inline field {{if .Err_Email}}error{{end}}">
|
|
<label for="email">{{.locale.Tr "email"}}</label>
|
|
<input id="email" name="email" type="email" value="{{.email}}" required>
|
|
</div>
|
|
|
|
{{if not .DisablePassword}}
|
|
<div class="required inline field {{if and (.Err_Password) (or (not .LinkAccountMode) (and .LinkAccountMode .LinkAccountModeRegister))}}error{{end}}">
|
|
<label for="password">{{.locale.Tr "password"}}</label>
|
|
<input id="password" name="password" type="password" value="{{.password}}" autocomplete="new-password" required>
|
|
</div>
|
|
<div class="required inline field {{if and (.Err_Password) (or (not .LinkAccountMode) (and .LinkAccountMode .LinkAccountModeRegister))}}error{{end}}">
|
|
<label for="retype">{{.locale.Tr "re_type"}}</label>
|
|
<input id="retype" name="retype" type="password" value="{{.retype}}" autocomplete="new-password" required>
|
|
</div>
|
|
{{end}}
|
|
|
|
{{template "user/auth/captcha" .}}
|
|
|
|
<div class="inline field">
|
|
<label></label>
|
|
<button class="ui primary button">
|
|
{{if .LinkAccountMode}}
|
|
{{.locale.Tr "auth.oauth_signup_submit"}}
|
|
{{else}}
|
|
{{.locale.Tr "auth.create_new_account"}}
|
|
{{end}}
|
|
</button>
|
|
</div>
|
|
|
|
{{if not .LinkAccountMode}}
|
|
<div class="inline field">
|
|
<label></label>
|
|
<a href="{{AppSubUrl}}/user/login">{{.locale.Tr "auth.register_helper_msg"}}</a>
|
|
</div>
|
|
{{end}}
|
|
{{end}}
|
|
|
|
{{if and .OrderedOAuth2Names .OAuth2Providers}}
|
|
<div class="divider divider-text">
|
|
{{.locale.Tr "sign_in_or"}}
|
|
</div>
|
|
<div id="oauth2-login-navigator" class="gt-py-2">
|
|
<div class="gt-df gt-fc gt-jc">
|
|
<div id="oauth2-login-navigator-inner" class="gt-df gt-fc gt-fw gt-ac gt-gap-3">
|
|
{{range $key := .OrderedOAuth2Names}}
|
|
{{$provider := index $.OAuth2Providers $key}}
|
|
<a class="{{$provider.Name}} ui button gt-df gt-ac gt-jc gt-py-3 oauth-login-link" href="{{AppSubUrl}}/user/oauth2/{{$key}}">
|
|
{{$provider.IconHTML}}
|
|
{{$.locale.Tr "sign_in_with_provider" $provider.DisplayName}}
|
|
</a>
|
|
{{end}}
|
|
</div>
|
|
</div>
|
|
</div>
|
|
{{end}}
|
|
</form>
|
|
</div>
|
|
</div>
|