diff --git a/templates/admin/notice.tmpl b/templates/admin/notice.tmpl
index 08f0a4f204..7a45719a8f 100644
--- a/templates/admin/notice.tmpl
+++ b/templates/admin/notice.tmpl
@@ -35,7 +35,7 @@
{{/* TODO: Make this dropdown accessible */}}
{{ctx.Locale.Tr "admin.notices.operations"}}
@@ -51,7 +51,7 @@
-
+
{{ctx.Locale.Tr "admin.notices.delete_selected"}}
diff --git a/templates/admin/queue_manage.tmpl b/templates/admin/queue_manage.tmpl
index dc0196fc6a..86618011d4 100644
--- a/templates/admin/queue_manage.tmpl
+++ b/templates/admin/queue_manage.tmpl
@@ -32,7 +32,7 @@
{{$sum}}
{{end}}
diff --git a/templates/admin/repo/unadopted.tmpl b/templates/admin/repo/unadopted.tmpl
index a95f6b5120..de85a46da3 100644
--- a/templates/admin/repo/unadopted.tmpl
+++ b/templates/admin/repo/unadopted.tmpl
@@ -40,7 +40,7 @@
{{template "base/modal_actions_confirm"}}
- {{svg "octicon-x"}} {{ctx.Locale.Tr "repo.delete_preexisting_label"}}
+ {{svg "octicon-x"}} {{ctx.Locale.Tr "repo.delete_preexisting_label"}}
@@ -95,7 +95,7 @@
-
+
{{ctx.Locale.Tr "remove"}}
@@ -139,7 +139,7 @@
{{ctx.Locale.Tr "repo.release.cancel"}}
-
+
{{ctx.Locale.Tr "repo.release.delete_release"}}
{{if .IsDraft}}
diff --git a/templates/repo/settings/lfs.tmpl b/templates/repo/settings/lfs.tmpl
index 4928b1f5fd..7c41605590 100644
--- a/templates/repo/settings/lfs.tmpl
+++ b/templates/repo/settings/lfs.tmpl
@@ -20,7 +20,7 @@
{{DateUtils.TimeSince .CreatedUnix}}
{{ctx.Locale.Tr "repo.settings.lfs_findcommits"}}
-
+
{{svg "octicon-trash"}}
diff --git a/templates/repo/settings/options.tmpl b/templates/repo/settings/options.tmpl
index c466541382..cda735b8af 100644
--- a/templates/repo/settings/options.tmpl
+++ b/templates/repo/settings/options.tmpl
@@ -59,7 +59,7 @@
{{ctx.Locale.Tr "settings.update_avatar"}}
- {{ctx.Locale.Tr "settings.delete_current_avatar"}}
+ {{ctx.Locale.Tr "settings.delete_current_avatar"}}
@@ -266,7 +266,7 @@
{{$.CsrfTokenHtml}}
- {{svg "octicon-trash" 14}}
+ {{svg "octicon-trash" 14}}
@@ -457,7 +457,7 @@
{{ctx.Locale.Tr "repo.settings.convert_desc"}}
- {{ctx.Locale.Tr "repo.settings.convert"}}
+ {{ctx.Locale.Tr "repo.settings.convert"}}
{{end}}
@@ -468,7 +468,7 @@
{{ctx.Locale.Tr "repo.settings.convert_fork_desc"}}
- {{ctx.Locale.Tr "repo.settings.convert_fork"}}
+ {{ctx.Locale.Tr "repo.settings.convert_fork"}}
{{end}}
@@ -488,10 +488,10 @@
{{else}}
- {{ctx.Locale.Tr "repo.settings.transfer.button"}}
+ {{ctx.Locale.Tr "repo.settings.transfer.button"}}
{{end}}
@@ -503,7 +503,7 @@
{{ctx.Locale.Tr "repo.settings.wiki_rename_branch_main_desc" .DefaultWikiBranchName}}
- {{ctx.Locale.Tr "repo.settings.wiki_rename_branch_main"}}
+ {{ctx.Locale.Tr "repo.settings.wiki_rename_branch_main"}}
{{end}}
@@ -513,7 +513,7 @@
{{ctx.Locale.Tr "repo.settings.wiki_delete_desc"}}
- {{ctx.Locale.Tr "repo.settings.wiki_delete"}}
+ {{ctx.Locale.Tr "repo.settings.wiki_delete"}}
{{end}}
@@ -523,7 +523,7 @@
{{ctx.Locale.Tr "repo.settings.delete_desc"}}
- {{ctx.Locale.Tr "repo.settings.delete"}}
+ {{ctx.Locale.Tr "repo.settings.delete"}}
{{if not .Repository.IsMirror}}
@@ -538,7 +538,7 @@
{{end}}
-
+
{{if .Repository.IsArchived}}
{{ctx.Locale.Tr "repo.settings.unarchive.button"}}
{{else}}
@@ -580,7 +580,7 @@
{{ctx.Locale.Tr "settings.cancel"}}
- {{ctx.Locale.Tr "repo.settings.convert_confirm"}}
+ {{ctx.Locale.Tr "repo.settings.convert_confirm"}}
@@ -611,7 +611,7 @@
{{ctx.Locale.Tr "settings.cancel"}}
- {{ctx.Locale.Tr "repo.settings.convert_fork_confirm"}}
+ {{ctx.Locale.Tr "repo.settings.convert_fork_confirm"}}
@@ -647,7 +647,7 @@
{{ctx.Locale.Tr "settings.cancel"}}
- {{ctx.Locale.Tr "repo.settings.transfer_perform"}}
+ {{ctx.Locale.Tr "repo.settings.transfer_perform"}}
@@ -681,7 +681,7 @@
{{ctx.Locale.Tr "settings.cancel"}}
- {{ctx.Locale.Tr "repo.settings.confirm_delete"}}
+ {{ctx.Locale.Tr "repo.settings.confirm_delete"}}
@@ -713,7 +713,7 @@
{{ctx.Locale.Tr "settings.cancel"}}
- {{ctx.Locale.Tr "repo.settings.confirm_wiki_delete"}}
+ {{ctx.Locale.Tr "repo.settings.confirm_wiki_delete"}}
@@ -746,7 +746,7 @@
{{ctx.Locale.Tr "settings.cancel"}}
- {{ctx.Locale.Tr "repo.settings.confirm_wiki_branch_rename"}}
+ {{ctx.Locale.Tr "repo.settings.confirm_wiki_branch_rename"}}
@@ -777,7 +777,7 @@
{{ctx.Locale.Tr "settings.cancel"}}
-
+
{{if .Repository.IsArchived}}
{{ctx.Locale.Tr "repo.settings.unarchive.button"}}
{{else}}
diff --git a/templates/repo/settings/tags.tmpl b/templates/repo/settings/tags.tmpl
index e7a7aaa845..0a4458c225 100644
--- a/templates/repo/settings/tags.tmpl
+++ b/templates/repo/settings/tags.tmpl
@@ -109,7 +109,7 @@
diff --git a/templates/repo/wiki/new.tmpl b/templates/repo/wiki/new.tmpl
index 81433db003..31187de4e2 100644
--- a/templates/repo/wiki/new.tmpl
+++ b/templates/repo/wiki/new.tmpl
@@ -40,7 +40,7 @@
{{ctx.Locale.Tr "repo.wiki.save_page"}}
- {{ctx.Locale.Tr "repo.wiki.cancel"}}
+ {{ctx.Locale.Tr "repo.wiki.cancel"}}
diff --git a/templates/repo/wiki/view.tmpl b/templates/repo/wiki/view.tmpl
index 9f77976f35..992a7891d4 100644
--- a/templates/repo/wiki/view.tmpl
+++ b/templates/repo/wiki/view.tmpl
@@ -61,7 +61,7 @@
{{end}}
diff --git a/templates/shared/actions/runner_edit.tmpl b/templates/shared/actions/runner_edit.tmpl
index d452d69f7a..eb54bc4635 100644
--- a/templates/shared/actions/runner_edit.tmpl
+++ b/templates/shared/actions/runner_edit.tmpl
@@ -40,7 +40,7 @@
{{ctx.Locale.Tr "actions.runners.update_runner"}}
-
+
{{ctx.Locale.Tr "actions.runners.delete_runner"}}
diff --git a/templates/shared/blocked_users_list.tmpl b/templates/shared/blocked_users_list.tmpl
index f445c1bb10..5a36be9cea 100644
--- a/templates/shared/blocked_users_list.tmpl
+++ b/templates/shared/blocked_users_list.tmpl
@@ -16,7 +16,7 @@
diff --git a/templates/shared/user/profile_big_avatar.tmpl b/templates/shared/user/profile_big_avatar.tmpl
index d718fa390f..06d0070850 100644
--- a/templates/shared/user/profile_big_avatar.tmpl
+++ b/templates/shared/user/profile_big_avatar.tmpl
@@ -103,7 +103,7 @@
{{if and .IsSigned (ne .SignedUserID .ContextUser.ID)}}
{{if $.IsFollowing}}
-
+
{{svg "octicon-person"}} {{ctx.Locale.Tr "user.unfollow"}}
{{else}}
@@ -114,11 +114,11 @@
{{if $.IsBlocked}}
-
+
{{svg "octicon-person"}} {{ctx.Locale.Tr "user.unblock"}}
{{else}}
-
+
{{svg "octicon-blocked"}} {{ctx.Locale.Tr "user.block"}}
{{end}}
diff --git a/templates/status/404.tmpl b/templates/status/404.tmpl
index bf6420aef3..0960bec1a3 100644
--- a/templates/status/404.tmpl
+++ b/templates/status/404.tmpl
@@ -4,7 +4,7 @@
404
{{if .NotFoundPrompt}}{{.NotFoundPrompt}}{{else}}{{ctx.Locale.Tr "error404"}}{{end}}
- {{if .NotFoundGoBackURL}}
{{ctx.Locale.Tr "go_back"}} {{end}}
+ {{if .NotFoundGoBackURL}}
{{ctx.Locale.Tr "go_back"}} {{end}}
diff --git a/templates/user/settings/account.tmpl b/templates/user/settings/account.tmpl
index 55431392c7..afc2ad94aa 100644
--- a/templates/user/settings/account.tmpl
+++ b/templates/user/settings/account.tmpl
@@ -67,7 +67,7 @@
{{if not .IsPrimary}}
-
+
{{ctx.Locale.Tr "settings.delete_email"}}
@@ -147,7 +147,7 @@
-
+
{{ctx.Locale.Tr "settings.confirm_delete_account"}}
diff --git a/templates/user/settings/applications.tmpl b/templates/user/settings/applications.tmpl
index a5912c9e0f..5df85ad475 100644
--- a/templates/user/settings/applications.tmpl
+++ b/templates/user/settings/applications.tmpl
@@ -44,7 +44,7 @@
{{svg "octicon-issue-reopened" 16 "tw-mr-1"}}
{{ctx.Locale.Tr "settings.regenerate_token"}}
-
+
{{svg "octicon-trash" 16 "tw-mr-1"}}
{{ctx.Locale.Tr "settings.delete_token"}}
diff --git a/templates/user/settings/grants_oauth2.tmpl b/templates/user/settings/grants_oauth2.tmpl
index 23ab8f5696..072ef089aa 100644
--- a/templates/user/settings/grants_oauth2.tmpl
+++ b/templates/user/settings/grants_oauth2.tmpl
@@ -18,7 +18,7 @@
-
{{ctx.Locale.Tr "settings.revoke_key"}}
diff --git a/templates/user/settings/keys_gpg.tmpl b/templates/user/settings/keys_gpg.tmpl
index 23cd86fce7..017ed34cfd 100644
--- a/templates/user/settings/keys_gpg.tmpl
+++ b/templates/user/settings/keys_gpg.tmpl
@@ -71,7 +71,7 @@
-
+
{{ctx.Locale.Tr "settings.delete_key"}}
{{if and (not .Verified) (ne $.VerifyingID .KeyID)}}
@@ -104,7 +104,7 @@
{{ctx.Locale.Tr "settings.gpg_key_verify"}}
-
+
{{ctx.Locale.Tr "settings.cancel"}}
diff --git a/templates/user/settings/keys_principal.tmpl b/templates/user/settings/keys_principal.tmpl
index 754bc374c2..a88e5291f0 100644
--- a/templates/user/settings/keys_principal.tmpl
+++ b/templates/user/settings/keys_principal.tmpl
@@ -26,7 +26,7 @@
-
+
{{ctx.Locale.Tr "settings.delete_key"}}
diff --git a/templates/user/settings/keys_ssh.tmpl b/templates/user/settings/keys_ssh.tmpl
index b8783dead0..c31bbad95f 100644
--- a/templates/user/settings/keys_ssh.tmpl
+++ b/templates/user/settings/keys_ssh.tmpl
@@ -57,7 +57,7 @@
-
+
{{ctx.Locale.Tr "settings.delete_key"}}
{{if and (not .Verified) (ne $.VerifyingFingerprint .Fingerprint)}}
@@ -99,7 +99,7 @@
{{ctx.Locale.Tr "settings.ssh_key_verify"}}
-
+
{{ctx.Locale.Tr "settings.cancel"}}
diff --git a/templates/user/settings/organization.tmpl b/templates/user/settings/organization.tmpl
index 16c27b52cd..fc1eedfd69 100644
--- a/templates/user/settings/organization.tmpl
+++ b/templates/user/settings/organization.tmpl
@@ -25,7 +25,7 @@
diff --git a/templates/user/settings/repos.tmpl b/templates/user/settings/repos.tmpl
index 09b00f0cec..8057cca8b7 100644
--- a/templates/user/settings/repos.tmpl
+++ b/templates/user/settings/repos.tmpl
@@ -51,7 +51,7 @@
{{end}}
{{if $.allowDelete}}
- {{svg "octicon-x"}} {{ctx.Locale.Tr "repo.delete_preexisting_label"}}
+ {{svg "octicon-x"}} {{ctx.Locale.Tr "repo.delete_preexisting_label"}}
-
+
{{ctx.Locale.Tr "settings.delete_key"}}
diff --git a/templates/user/settings/security/openid.tmpl b/templates/user/settings/security/openid.tmpl
index b0473c9df5..fcd9b405c7 100644
--- a/templates/user/settings/security/openid.tmpl
+++ b/templates/user/settings/security/openid.tmpl
@@ -30,7 +30,7 @@
{{end}}
-
+
{{ctx.Locale.Tr "settings.delete_key"}}
diff --git a/templates/user/settings/security/twofa.tmpl b/templates/user/settings/security/twofa.tmpl
index adebce4265..e7829de8ad 100644
--- a/templates/user/settings/security/twofa.tmpl
+++ b/templates/user/settings/security/twofa.tmpl
@@ -13,7 +13,7 @@
{{else}}
{{/* The recovery tip is there as a means of encouraging a user to enroll */}}
diff --git a/templates/user/settings/security/webauthn.tmpl b/templates/user/settings/security/webauthn.tmpl
index b04bcf4291..7a2e98c601 100644
--- a/templates/user/settings/security/webauthn.tmpl
+++ b/templates/user/settings/security/webauthn.tmpl
@@ -16,7 +16,7 @@
-
+
{{ctx.Locale.Tr "settings.delete_key"}}
diff --git a/web_src/js/components/PullRequestMergeForm.vue b/web_src/js/components/PullRequestMergeForm.vue
index 46bda3a025..f47e135699 100644
--- a/web_src/js/components/PullRequestMergeForm.vue
+++ b/web_src/js/components/PullRequestMergeForm.vue
@@ -31,7 +31,7 @@ export default {
computed: {
mergeButtonStyleClass() {
if (this.mergeForm.allOverridableChecksOk) return 'primary';
- return this.autoMergeWhenSucceed ? 'primary' : 'red';
+ return this.autoMergeWhenSucceed ? 'primary' : 'danger';
},
forceMerge() {
return this.mergeForm.canMergeNow && !this.mergeForm.allOverridableChecksOk;
@@ -138,7 +138,7 @@ export default {