mirror of
https://codeberg.org/forgejo/forgejo
synced 2024-07-04 07:36:53 +02:00
8099238618
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">
36 lines
1.5 KiB
Handlebars
36 lines
1.5 KiB
Handlebars
<h4 class="ui top attached header">
|
|
{{.locale.Tr "settings.twofa"}}
|
|
</h4>
|
|
<div class="ui attached segment">
|
|
<p>{{.locale.Tr "settings.twofa_desc"}}</p>
|
|
{{if .TOTPEnrolled}}
|
|
<p>{{$.locale.Tr "settings.twofa_is_enrolled" | Str2html}}</p>
|
|
<form class="ui form" action="{{AppSubUrl}}/user/settings/security/two_factor/regenerate_scratch" method="post" enctype="multipart/form-data">
|
|
{{.CsrfTokenHtml}}
|
|
<p>{{.locale.Tr "settings.regenerate_scratch_token_desc"}}</p>
|
|
<button class="ui primary button">{{$.locale.Tr "settings.twofa_scratch_token_regenerate"}}</button>
|
|
</form>
|
|
<form class="ui form" action="{{AppSubUrl}}/user/settings/security/two_factor/disable" method="post" enctype="multipart/form-data" id="disable-form">
|
|
{{.CsrfTokenHtml}}
|
|
<p>{{.locale.Tr "settings.twofa_disable_note"}}</p>
|
|
<button class="ui red button delete-button" data-modal-id="disable-twofa" data-type="form" data-form="#disable-form">{{$.locale.Tr "settings.twofa_disable"}}</button>
|
|
</form>
|
|
{{else}}
|
|
<p>{{.locale.Tr "settings.twofa_not_enrolled"}}</p>
|
|
<div class="inline field">
|
|
<a class="ui primary button" href="{{AppSubUrl}}/user/settings/security/two_factor/enroll">{{$.locale.Tr "settings.twofa_enroll"}}</a>
|
|
</div>
|
|
{{end}}
|
|
|
|
<div class="ui g-modal-confirm delete modal" id="disable-twofa">
|
|
<div class="header">
|
|
{{svg "octicon-trash"}}
|
|
{{.locale.Tr "settings.twofa_disable"}}
|
|
</div>
|
|
<div class="content">
|
|
<p>{{.locale.Tr "settings.twofa_disable_desc"}}</p>
|
|
</div>
|
|
{{template "base/modal_actions_confirm" .}}
|
|
</div>
|
|
</div>
|