From 35d0145a332cc958b8176b49f694f9dcb3c29645 Mon Sep 17 00:00:00 2001
From: HesterG <hestergong@gmail.com>
Date: Thu, 13 Apr 2023 10:58:43 +0800
Subject: [PATCH 01/26] fix project column delete

---
 templates/base/delete_modal_actions.tmpl | 2 +-
 templates/projects/view.tmpl             | 8 ++++----
 templates/repo/projects/view.tmpl        | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/templates/base/delete_modal_actions.tmpl b/templates/base/delete_modal_actions.tmpl
index 29bf5f92fd53f..8348cfad7917f 100644
--- a/templates/base/delete_modal_actions.tmpl
+++ b/templates/base/delete_modal_actions.tmpl
@@ -3,7 +3,7 @@
 		{{svg "octicon-x"}}
 		{{.locale.Tr "modal.no"}}
 	</button>
-	<button class="ui green basic inverted ok button">
+	<button class="ui green basic inverted ok button{{if .ExtClass}} {{.ExtClass}}{{end}}" {{if .DataUrl}}data-url="{{.DataUrl}}"{{end}}>
 		{{svg "octicon-check"}}
 		{{.locale.Tr "modal.yes"}}
 	</button>
diff --git a/templates/projects/view.tmpl b/templates/projects/view.tmpl
index 41bbb83f7b1de..cb0ef42208948 100644
--- a/templates/projects/view.tmpl
+++ b/templates/projects/view.tmpl
@@ -144,8 +144,8 @@
 										</label>
 									</div>
 									<div class="text right actions">
-										<button class="ui cancel button">{{$.locale.Tr "settings.cancel"}}</button>
-										<button class="ui primary button set-default-project-board" data-url="{{$.Link}}/{{.ID}}/default">{{$.locale.Tr "repo.projects.column.set_default"}}</button>
+										<button class="ui red basic inverted cancel button">{{$.locale.Tr "settings.cancel"}}</button>
+										<button class="ui green basic inverted ok button set-default-project-board" data-url="{{$.Link}}/{{.ID}}/default">{{$.locale.Tr "repo.projects.column.set_default"}}</button>
 									</div>
 								</div>
 
@@ -159,8 +159,8 @@
 										</label>
 									</div>
 									<div class="text right actions">{{/* TODO: convert to base/delete_modal_actions.tmpl */}}
-										<button class="ui cancel button">{{$.locale.Tr "settings.cancel"}}</button>
-										<button class="ui red button delete-project-board" data-url="{{$.Link}}/{{.ID}}">{{$.locale.Tr "repo.projects.column.delete"}}</button>
+										{{$DataUrl := printf "%s/%d" $.Link .ID}}
+										{{template "base/delete_modal_actions" (dict "." $ "ExtClass" "delete-project-board" "DataUrl" $DataUrl)}}
 									</div>
 								</div>
 							</div>
diff --git a/templates/repo/projects/view.tmpl b/templates/repo/projects/view.tmpl
index acbd0241d4a58..2b1e0c018b7ca 100644
--- a/templates/repo/projects/view.tmpl
+++ b/templates/repo/projects/view.tmpl
@@ -163,8 +163,8 @@
 										</label>
 									</div>
 									<div class="text right actions">{{/* TODO: Convert to base/delete_modal_actions.tmpl? */}}
-										<button class="ui cancel button">{{$.locale.Tr "settings.cancel"}}</button>
-										<button class="ui red button delete-project-board" data-url="{{$.RepoLink}}/projects/{{$.Project.ID}}/{{.ID}}">{{$.locale.Tr "repo.projects.column.delete"}}</button>
+										{{$DataUrl := printf "%s/projects/%d/%d" $.RepoLink $.Project.ID .ID}}
+										{{template "base/delete_modal_actions" (dict "." $ "ExtClass" "delete-project-board" "DataUrl" $DataUrl)}}
 									</div>
 								</div>
 							</div>

From 11e133f2ada3702a75a3a9047a4f52b29baa74a4 Mon Sep 17 00:00:00 2001
From: HesterG <hestergong@gmail.com>
Date: Thu, 13 Apr 2023 11:13:43 +0800
Subject: [PATCH 02/26] set default template

---
 templates/projects/view.tmpl      | 4 ++--
 templates/repo/projects/view.tmpl | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/templates/projects/view.tmpl b/templates/projects/view.tmpl
index cb0ef42208948..657d9015ab645 100644
--- a/templates/projects/view.tmpl
+++ b/templates/projects/view.tmpl
@@ -144,8 +144,8 @@
 										</label>
 									</div>
 									<div class="text right actions">
-										<button class="ui red basic inverted cancel button">{{$.locale.Tr "settings.cancel"}}</button>
-										<button class="ui green basic inverted ok button set-default-project-board" data-url="{{$.Link}}/{{.ID}}/default">{{$.locale.Tr "repo.projects.column.set_default"}}</button>
+										{{$DataUrl := printf "%s/%d/default" $.Link .ID}}
+										{{template "base/delete_modal_actions" (dict "." $ "ExtClass" "set-default-project-board" "DataUrl" $DataUrl)}}
 									</div>
 								</div>
 
diff --git a/templates/repo/projects/view.tmpl b/templates/repo/projects/view.tmpl
index 2b1e0c018b7ca..918b8df1bc5a4 100644
--- a/templates/repo/projects/view.tmpl
+++ b/templates/repo/projects/view.tmpl
@@ -148,8 +148,8 @@
 										</label>
 									</div>
 									<div class="text right actions">
-										<button class="ui cancel button">{{$.locale.Tr "settings.cancel"}}</button>
-										<button class="ui primary button set-default-project-board" data-url="{{$.RepoLink}}/projects/{{$.Project.ID}}/{{.ID}}/default">{{$.locale.Tr "repo.projects.column.set_default"}}</button>
+										{{$DataUrl := printf "%s/projects/%d/%d/default" $.RepoLink $.Project.ID .ID}}
+										{{template "base/delete_modal_actions" (dict "." $ "ExtClass" "set-default-project-board" "DataUrl" $DataUrl)}}
 									</div>
 								</div>
 

From 31162d8d8cfca5b282c14b4088c4b95ebfcc722a Mon Sep 17 00:00:00 2001
From: HesterG <hestergong@gmail.com>
Date: Thu, 13 Apr 2023 11:41:00 +0800
Subject: [PATCH 03/26] remove todo

---
 templates/projects/view.tmpl      | 2 +-
 templates/repo/projects/view.tmpl | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/templates/projects/view.tmpl b/templates/projects/view.tmpl
index 657d9015ab645..128988d08467c 100644
--- a/templates/projects/view.tmpl
+++ b/templates/projects/view.tmpl
@@ -158,7 +158,7 @@
 											{{$.locale.Tr "repo.projects.column.deletion_desc"}}
 										</label>
 									</div>
-									<div class="text right actions">{{/* TODO: convert to base/delete_modal_actions.tmpl */}}
+									<div class="text right actions">
 										{{$DataUrl := printf "%s/%d" $.Link .ID}}
 										{{template "base/delete_modal_actions" (dict "." $ "ExtClass" "delete-project-board" "DataUrl" $DataUrl)}}
 									</div>
diff --git a/templates/repo/projects/view.tmpl b/templates/repo/projects/view.tmpl
index 918b8df1bc5a4..4f38c18418a57 100644
--- a/templates/repo/projects/view.tmpl
+++ b/templates/repo/projects/view.tmpl
@@ -162,7 +162,7 @@
 											{{$.locale.Tr "repo.projects.column.deletion_desc"}}
 										</label>
 									</div>
-									<div class="text right actions">{{/* TODO: Convert to base/delete_modal_actions.tmpl? */}}
+									<div class="text right actions">
 										{{$DataUrl := printf "%s/projects/%d/%d" $.RepoLink $.Project.ID .ID}}
 										{{template "base/delete_modal_actions" (dict "." $ "ExtClass" "delete-project-board" "DataUrl" $DataUrl)}}
 									</div>

From 66700ffaeb12a6c6247c2fc1a4f7fa2862eeb273 Mon Sep 17 00:00:00 2001
From: HesterG <hestergong@gmail.com>
Date: Thu, 13 Apr 2023 11:51:43 +0800
Subject: [PATCH 04/26] rename variable

---
 templates/base/delete_modal_actions.tmpl | 2 +-
 templates/projects/view.tmpl             | 4 ++--
 templates/repo/projects/view.tmpl        | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/templates/base/delete_modal_actions.tmpl b/templates/base/delete_modal_actions.tmpl
index 8348cfad7917f..8ad4cf65e4834 100644
--- a/templates/base/delete_modal_actions.tmpl
+++ b/templates/base/delete_modal_actions.tmpl
@@ -3,7 +3,7 @@
 		{{svg "octicon-x"}}
 		{{.locale.Tr "modal.no"}}
 	</button>
-	<button class="ui green basic inverted ok button{{if .ExtClass}} {{.ExtClass}}{{end}}" {{if .DataUrl}}data-url="{{.DataUrl}}"{{end}}>
+	<button class="ui green basic inverted ok button{{if .ExtendedClasses}} {{.ExtendedClasses}}{{end}}" {{if .DataUrl}}data-url="{{.DataUrl}}"{{end}}>
 		{{svg "octicon-check"}}
 		{{.locale.Tr "modal.yes"}}
 	</button>
diff --git a/templates/projects/view.tmpl b/templates/projects/view.tmpl
index 128988d08467c..11e3312d9bcf4 100644
--- a/templates/projects/view.tmpl
+++ b/templates/projects/view.tmpl
@@ -145,7 +145,7 @@
 									</div>
 									<div class="text right actions">
 										{{$DataUrl := printf "%s/%d/default" $.Link .ID}}
-										{{template "base/delete_modal_actions" (dict "." $ "ExtClass" "set-default-project-board" "DataUrl" $DataUrl)}}
+										{{template "base/delete_modal_actions" (dict "." $ "ExtendedClasses" "set-default-project-board" "DataUrl" $DataUrl)}}
 									</div>
 								</div>
 
@@ -160,7 +160,7 @@
 									</div>
 									<div class="text right actions">
 										{{$DataUrl := printf "%s/%d" $.Link .ID}}
-										{{template "base/delete_modal_actions" (dict "." $ "ExtClass" "delete-project-board" "DataUrl" $DataUrl)}}
+										{{template "base/delete_modal_actions" (dict "." $ "ExtendedClasses" "delete-project-board" "DataUrl" $DataUrl)}}
 									</div>
 								</div>
 							</div>
diff --git a/templates/repo/projects/view.tmpl b/templates/repo/projects/view.tmpl
index 4f38c18418a57..9dbf2d49c04c2 100644
--- a/templates/repo/projects/view.tmpl
+++ b/templates/repo/projects/view.tmpl
@@ -149,7 +149,7 @@
 									</div>
 									<div class="text right actions">
 										{{$DataUrl := printf "%s/projects/%d/%d/default" $.RepoLink $.Project.ID .ID}}
-										{{template "base/delete_modal_actions" (dict "." $ "ExtClass" "set-default-project-board" "DataUrl" $DataUrl)}}
+										{{template "base/delete_modal_actions" (dict "." $ "ExtendedClasses" "set-default-project-board" "DataUrl" $DataUrl)}}
 									</div>
 								</div>
 
@@ -164,7 +164,7 @@
 									</div>
 									<div class="text right actions">
 										{{$DataUrl := printf "%s/projects/%d/%d" $.RepoLink $.Project.ID .ID}}
-										{{template "base/delete_modal_actions" (dict "." $ "ExtClass" "delete-project-board" "DataUrl" $DataUrl)}}
+										{{template "base/delete_modal_actions" (dict "." $ "ExtendedClasses" "delete-project-board" "DataUrl" $DataUrl)}}
 									</div>
 								</div>
 							</div>

From 9037ed079f1239a4a7774aaf5c1842511453bca7 Mon Sep 17 00:00:00 2001
From: HesterG <hestergong@gmail.com>
Date: Thu, 13 Apr 2023 13:22:36 +0800
Subject: [PATCH 05/26] add variable

---
 templates/base/delete_modal_actions.tmpl | 4 ++--
 templates/projects/view.tmpl             | 2 +-
 templates/repo/projects/view.tmpl        | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/templates/base/delete_modal_actions.tmpl b/templates/base/delete_modal_actions.tmpl
index 8ad4cf65e4834..c45d3a98040a2 100644
--- a/templates/base/delete_modal_actions.tmpl
+++ b/templates/base/delete_modal_actions.tmpl
@@ -1,10 +1,10 @@
 <div class="actions">
 	<button class="ui red basic inverted cancel button">
 		{{svg "octicon-x"}}
-		{{.locale.Tr "modal.no"}}
+		{{if .ModalNoTranslationKey}}{{.locale.Tr .ModalNoTranslationKey}}{{else}}{{.locale.Tr "modal.no"}}{{end}}
 	</button>
 	<button class="ui green basic inverted ok button{{if .ExtendedClasses}} {{.ExtendedClasses}}{{end}}" {{if .DataUrl}}data-url="{{.DataUrl}}"{{end}}>
 		{{svg "octicon-check"}}
-		{{.locale.Tr "modal.yes"}}
+		{{if .ModalYesTranslationKey}}{{.locale.Tr .ModalYesTranslationKey}}{{else}}{{.locale.Tr "modal.yes"}}{{end}}
 	</button>
 </div>
diff --git a/templates/projects/view.tmpl b/templates/projects/view.tmpl
index 11e3312d9bcf4..ffe5f6164b2c7 100644
--- a/templates/projects/view.tmpl
+++ b/templates/projects/view.tmpl
@@ -145,7 +145,7 @@
 									</div>
 									<div class="text right actions">
 										{{$DataUrl := printf "%s/%d/default" $.Link .ID}}
-										{{template "base/delete_modal_actions" (dict "." $ "ExtendedClasses" "set-default-project-board" "DataUrl" $DataUrl)}}
+										{{template "base/delete_modal_actions" (dict "." $ "ExtendedClasses" "set-default-project-board" "DataUrl" $DataUrl "ModalNoTranslationKey" "settings.cancel" "ModalYesTranslationKey" "repo.projects.column.set_default")}}
 									</div>
 								</div>
 
diff --git a/templates/repo/projects/view.tmpl b/templates/repo/projects/view.tmpl
index 9dbf2d49c04c2..40206ea7449fb 100644
--- a/templates/repo/projects/view.tmpl
+++ b/templates/repo/projects/view.tmpl
@@ -149,7 +149,7 @@
 									</div>
 									<div class="text right actions">
 										{{$DataUrl := printf "%s/projects/%d/%d/default" $.RepoLink $.Project.ID .ID}}
-										{{template "base/delete_modal_actions" (dict "." $ "ExtendedClasses" "set-default-project-board" "DataUrl" $DataUrl)}}
+										{{template "base/delete_modal_actions" (dict "." $ "ExtendedClasses" "set-default-project-board" "DataUrl" $DataUrl "ModalNoTranslationKey" "settings.cancel" "ModalYesTranslationKey" "repo.projects.column.set_default")}}
 									</div>
 								</div>
 

From 50d6b5a6083ce6da17b7709752bad3098957dabb Mon Sep 17 00:00:00 2001
From: HesterG <hestergong@gmail.com>
Date: Thu, 13 Apr 2023 15:20:33 +0800
Subject: [PATCH 06/26] revert set/unset col for now and test texts

---
 templates/base/delete_modal_actions.tmpl | 4 ++--
 templates/projects/view.tmpl             | 8 +++++---
 templates/repo/projects/view.tmpl        | 4 ++--
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/templates/base/delete_modal_actions.tmpl b/templates/base/delete_modal_actions.tmpl
index c45d3a98040a2..60bb27122c21e 100644
--- a/templates/base/delete_modal_actions.tmpl
+++ b/templates/base/delete_modal_actions.tmpl
@@ -1,10 +1,10 @@
 <div class="actions">
 	<button class="ui red basic inverted cancel button">
 		{{svg "octicon-x"}}
-		{{if .ModalNoTranslationKey}}{{.locale.Tr .ModalNoTranslationKey}}{{else}}{{.locale.Tr "modal.no"}}{{end}}
+		{{if .ModalNoText}}{{.ModalNoText}}{{else}}{{.locale.Tr "modal.no"}}{{end}}
 	</button>
 	<button class="ui green basic inverted ok button{{if .ExtendedClasses}} {{.ExtendedClasses}}{{end}}" {{if .DataUrl}}data-url="{{.DataUrl}}"{{end}}>
 		{{svg "octicon-check"}}
-		{{if .ModalYesTranslationKey}}{{.locale.Tr .ModalYesTranslationKey}}{{else}}{{.locale.Tr "modal.yes"}}{{end}}
+		{{if .ModalYesText}}{{.ModalYesText}}{{else}}{{.locale.Tr "modal.yes"}}{{end}}
 	</button>
 </div>
diff --git a/templates/projects/view.tmpl b/templates/projects/view.tmpl
index ffe5f6164b2c7..02b7c9258c6e5 100644
--- a/templates/projects/view.tmpl
+++ b/templates/projects/view.tmpl
@@ -144,8 +144,8 @@
 										</label>
 									</div>
 									<div class="text right actions">
-										{{$DataUrl := printf "%s/%d/default" $.Link .ID}}
-										{{template "base/delete_modal_actions" (dict "." $ "ExtendedClasses" "set-default-project-board" "DataUrl" $DataUrl "ModalNoTranslationKey" "settings.cancel" "ModalYesTranslationKey" "repo.projects.column.set_default")}}
+										<button class="ui cancel button">{{$.locale.Tr "settings.cancel"}}</button>
+										<button class="ui primary button set-default-project-board" data-url="{{$.Link}}/{{.ID}}/default">{{$.locale.Tr "repo.projects.column.set_default"}}</button>
 									</div>
 								</div>
 
@@ -160,7 +160,9 @@
 									</div>
 									<div class="text right actions">
 										{{$DataUrl := printf "%s/%d" $.Link .ID}}
-										{{template "base/delete_modal_actions" (dict "." $ "ExtendedClasses" "delete-project-board" "DataUrl" $DataUrl)}}
+										{{$ModalNoText := $.locale.Tr "settings.cancel"}}
+										{{$ModalYesText := $.locale.Tr "repo.projects.column.delete"}}
+										{{template "base/delete_modal_actions" (dict "." $ "ExtendedClasses" "delete-project-board" "DataUrl" $DataUrl "ModalNoText" $ModalNoText "ModalYesText" $ModalYesText)}}
 									</div>
 								</div>
 							</div>
diff --git a/templates/repo/projects/view.tmpl b/templates/repo/projects/view.tmpl
index 40206ea7449fb..aee714dea7b9a 100644
--- a/templates/repo/projects/view.tmpl
+++ b/templates/repo/projects/view.tmpl
@@ -148,8 +148,8 @@
 										</label>
 									</div>
 									<div class="text right actions">
-										{{$DataUrl := printf "%s/projects/%d/%d/default" $.RepoLink $.Project.ID .ID}}
-										{{template "base/delete_modal_actions" (dict "." $ "ExtendedClasses" "set-default-project-board" "DataUrl" $DataUrl "ModalNoTranslationKey" "settings.cancel" "ModalYesTranslationKey" "repo.projects.column.set_default")}}
+										<button class="ui cancel button">{{$.locale.Tr "settings.cancel"}}</button>
+										<button class="ui primary button set-default-project-board" data-url="{{$.RepoLink}}/projects/{{$.Project.ID}}/{{.ID}}/default">{{$.locale.Tr "repo.projects.column.set_default"}}</button>
 									</div>
 								</div>
 

From 6ac0e0063025cddff439a34496fc84596205afb0 Mon Sep 17 00:00:00 2001
From: HesterG <hestergong@gmail.com>
Date: Fri, 14 Apr 2023 14:51:20 +0800
Subject: [PATCH 07/26] refactor and respect original button texts for project
 deletion

---
 templates/admin/auth/edit.tmpl                              | 2 +-
 templates/admin/emails/list.tmpl                            | 2 +-
 templates/admin/monitor.tmpl                                | 2 +-
 templates/admin/packages/list.tmpl                          | 2 +-
 templates/admin/queue.tmpl                                  | 2 +-
 templates/admin/repo/list.tmpl                              | 2 +-
 templates/admin/stacktrace.tmpl                             | 2 +-
 templates/admin/user/edit.tmpl                              | 2 +-
 .../{delete_modal_actions.tmpl => page_dimmer_buttons.tmpl} | 0
 templates/org/member/members.tmpl                           | 4 ++--
 templates/org/settings/delete.tmpl                          | 2 +-
 templates/org/team/members.tmpl                             | 2 +-
 templates/org/team/new.tmpl                                 | 2 +-
 templates/org/team/repositories.tmpl                        | 4 ++--
 templates/org/team/sidebar.tmpl                             | 2 +-
 templates/org/team/teams.tmpl                               | 2 +-
 templates/package/settings.tmpl                             | 2 +-
 templates/projects/list.tmpl                                | 2 +-
 templates/projects/view.tmpl                                | 4 ++--
 templates/repo/branch/list.tmpl                             | 2 +-
 templates/repo/issue/labels/edit_delete_label.tmpl          | 2 +-
 templates/repo/issue/milestones.tmpl                        | 2 +-
 templates/repo/issue/view_content.tmpl                      | 2 +-
 templates/repo/issue/view_content/comments_delete_time.tmpl | 2 +-
 templates/repo/projects/list.tmpl                           | 2 +-
 templates/repo/projects/view.tmpl                           | 6 ++++--
 templates/repo/release/list.tmpl                            | 2 +-
 templates/repo/release/new.tmpl                             | 2 +-
 templates/repo/settings/branches.tmpl                       | 2 +-
 templates/repo/settings/collaboration.tmpl                  | 2 +-
 templates/repo/settings/deploy_keys.tmpl                    | 2 +-
 templates/repo/settings/lfs.tmpl                            | 2 +-
 templates/repo/settings/options.tmpl                        | 2 +-
 templates/repo/settings/webhook/delete_modal.tmpl           | 2 +-
 templates/repo/wiki/view.tmpl                               | 2 +-
 templates/shared/actions/runner_edit.tmpl                   | 2 +-
 templates/shared/secrets/add_list.tmpl                      | 2 +-
 templates/user/settings/account.tmpl                        | 4 ++--
 templates/user/settings/applications.tmpl                   | 2 +-
 templates/user/settings/applications_oauth2_list.tmpl       | 2 +-
 templates/user/settings/grants_oauth2.tmpl                  | 2 +-
 templates/user/settings/keys_gpg.tmpl                       | 2 +-
 templates/user/settings/keys_principal.tmpl                 | 2 +-
 templates/user/settings/keys_ssh.tmpl                       | 2 +-
 templates/user/settings/organization.tmpl                   | 2 +-
 templates/user/settings/repos.tmpl                          | 4 ++--
 templates/user/settings/security/accountlinks.tmpl          | 2 +-
 templates/user/settings/security/openid.tmpl                | 2 +-
 templates/user/settings/security/twofa.tmpl                 | 2 +-
 templates/user/settings/security/webauthn.tmpl              | 2 +-
 50 files changed, 57 insertions(+), 55 deletions(-)
 rename templates/base/{delete_modal_actions.tmpl => page_dimmer_buttons.tmpl} (100%)

diff --git a/templates/admin/auth/edit.tmpl b/templates/admin/auth/edit.tmpl
index 49007e572da96..5cb5aaae69fa0 100644
--- a/templates/admin/auth/edit.tmpl
+++ b/templates/admin/auth/edit.tmpl
@@ -448,6 +448,6 @@
 	<div class="content">
 		<p>{{.locale.Tr "admin.auths.delete_auth_desc"}}</p>
 	</div>
-	{{template "base/delete_modal_actions" .}}
+	{{template "base/page_dimmer_buttons" .}}
 </div>
 {{template "base/footer" .}}
diff --git a/templates/admin/emails/list.tmpl b/templates/admin/emails/list.tmpl
index d8fa986cff3e3..ca6ebed226c12 100644
--- a/templates/admin/emails/list.tmpl
+++ b/templates/admin/emails/list.tmpl
@@ -94,7 +94,7 @@
 					<input type="hidden" id="form-activate" name="activate" value="" required>
 
 					<div class="center">
-						{{template "base/delete_modal_actions" .}}
+						{{template "base/page_dimmer_buttons" .}}
 					</div>
 				</form>
 			</div>
diff --git a/templates/admin/monitor.tmpl b/templates/admin/monitor.tmpl
index d53e9e18dcc8c..0c1d2193d63d1 100644
--- a/templates/admin/monitor.tmpl
+++ b/templates/admin/monitor.tmpl
@@ -46,6 +46,6 @@
 		<p>{{$.locale.Tr "admin.monitor.process.cancel_notices" `<span class="name"></span>` | Safe}}</p>
 		<p>{{$.locale.Tr "admin.monitor.process.cancel_desc"}}</p>
 	</div>
-	{{template "base/delete_modal_actions" .}}
+	{{template "base/page_dimmer_buttons" .}}
 </div>
 {{template "base/footer" .}}
diff --git a/templates/admin/packages/list.tmpl b/templates/admin/packages/list.tmpl
index 121f575861d99..356cd4d638924 100644
--- a/templates/admin/packages/list.tmpl
+++ b/templates/admin/packages/list.tmpl
@@ -88,6 +88,6 @@
 	<div class="content">
 		{{.locale.Tr "packages.settings.delete.notice" `<span class="name"></span>` `<span class="dataVersion"></span>` | Safe}}
 	</div>
-	{{template "base/delete_modal_actions" .}}
+	{{template "base/page_dimmer_buttons" .}}
 </div>
 {{template "base/footer" .}}
diff --git a/templates/admin/queue.tmpl b/templates/admin/queue.tmpl
index 767c235a385e1..949564dcc2fb5 100644
--- a/templates/admin/queue.tmpl
+++ b/templates/admin/queue.tmpl
@@ -190,7 +190,7 @@
 		<p>{{$.locale.Tr "admin.monitor.queue.pool.cancel_notices" `<span class="name"></span>` | Safe}}</p>
 		<p>{{$.locale.Tr "admin.monitor.queue.pool.cancel_desc"}}</p>
 	</div>
-	{{template "base/delete_modal_actions" .}}
+	{{template "base/page_dimmer_buttons" .}}
 </div>
 
 {{template "base/footer" .}}
diff --git a/templates/admin/repo/list.tmpl b/templates/admin/repo/list.tmpl
index f8e2bbc8444ef..aa65e48f9161e 100644
--- a/templates/admin/repo/list.tmpl
+++ b/templates/admin/repo/list.tmpl
@@ -105,6 +105,6 @@
 		{{.locale.Tr "repo.settings.delete_notices_2" `<span class="name"></span>` | Safe}}<br>
 		{{.locale.Tr "repo.settings.delete_notices_fork_1"}}<br>
 	</div>
-	{{template "base/delete_modal_actions" .}}
+	{{template "base/page_dimmer_buttons" .}}
 </div>
 {{template "base/footer" .}}
diff --git a/templates/admin/stacktrace.tmpl b/templates/admin/stacktrace.tmpl
index 4e16036ae3a3c..aa84e02e06abf 100644
--- a/templates/admin/stacktrace.tmpl
+++ b/templates/admin/stacktrace.tmpl
@@ -27,7 +27,7 @@
 		<p>{{$.locale.Tr "admin.monitor.process.cancel_notices" `<span class="name"></span>` | Safe}}</p>
 		<p>{{$.locale.Tr "admin.monitor.process.cancel_desc"}}</p>
 	</div>
-	{{template "base/delete_modal_actions" .}}
+	{{template "base/page_dimmer_buttons" .}}
 </div>
 
 {{template "base/footer" .}}
diff --git a/templates/admin/user/edit.tmpl b/templates/admin/user/edit.tmpl
index 4fd0d892f258d..4606be39625df 100644
--- a/templates/admin/user/edit.tmpl
+++ b/templates/admin/user/edit.tmpl
@@ -213,7 +213,7 @@
 			</div>
 			<p class="help">{{.locale.Tr "admin.users.purge_help"}}</p>
 		</div>
-		{{template "base/delete_modal_actions" .}}
+		{{template "base/page_dimmer_buttons" .}}
 	</form>
 </div>
 {{template "base/footer" .}}
diff --git a/templates/base/delete_modal_actions.tmpl b/templates/base/page_dimmer_buttons.tmpl
similarity index 100%
rename from templates/base/delete_modal_actions.tmpl
rename to templates/base/page_dimmer_buttons.tmpl
diff --git a/templates/org/member/members.tmpl b/templates/org/member/members.tmpl
index 511d333c29c27..505cffd32a802 100644
--- a/templates/org/member/members.tmpl
+++ b/templates/org/member/members.tmpl
@@ -89,7 +89,7 @@
 	<div class="content">
 		<p>{{$.locale.Tr "org.members.leave.detail" `<span class="dataOrganizationName"></span>` | Safe}}</p>
 	</div>
-	{{template "base/delete_modal_actions" .}}
+	{{template "base/page_dimmer_buttons" .}}
 </div>
 <div class="ui small basic delete modal" id="remove-organization-member">
 	<div class="ui icon header">
@@ -99,7 +99,7 @@
 	<div class="content">
 		<p>{{$.locale.Tr "org.members.remove.detail" `<span class="name"></span>` `<span class="dataOrganizationName"></span>` | Safe}}</p>
 	</div>
-	{{template "base/delete_modal_actions" .}}
+	{{template "base/page_dimmer_buttons" .}}
 </div>
 
 {{template "base/footer" .}}
diff --git a/templates/org/settings/delete.tmpl b/templates/org/settings/delete.tmpl
index 69e226f410a79..56fa3606a9d6e 100644
--- a/templates/org/settings/delete.tmpl
+++ b/templates/org/settings/delete.tmpl
@@ -37,6 +37,6 @@
 	<div class="content">
 		<p>{{.locale.Tr "org.settings.delete_org_desc"}}</p>
 	</div>
-	{{template "base/delete_modal_actions" .}}
+	{{template "base/page_dimmer_buttons" .}}
 </div>
 {{template "base/footer" .}}
diff --git a/templates/org/team/members.tmpl b/templates/org/team/members.tmpl
index bb975c0c4df7a..81562c39edb08 100644
--- a/templates/org/team/members.tmpl
+++ b/templates/org/team/members.tmpl
@@ -72,6 +72,6 @@
 	<div class="content">
 		<p>{{$.locale.Tr "org.members.remove.detail" `<span class="name"></span>` `<span class="dataTeamName"></span>` | Safe}}</p>
 	</div>
-	{{template "base/delete_modal_actions" .}}
+	{{template "base/page_dimmer_buttons" .}}
 </div>
 {{template "base/footer" .}}
diff --git a/templates/org/team/new.tmpl b/templates/org/team/new.tmpl
index 2e65d63580319..8746bccce2bbd 100644
--- a/templates/org/team/new.tmpl
+++ b/templates/org/team/new.tmpl
@@ -156,6 +156,6 @@
 	<div class="content">
 		<p>{{.locale.Tr "org.teams.delete_team_desc"}}</p>
 	</div>
-	{{template "base/delete_modal_actions" .}}
+	{{template "base/page_dimmer_buttons" .}}
 </div>
 {{template "base/footer" .}}
diff --git a/templates/org/team/repositories.tmpl b/templates/org/team/repositories.tmpl
index ac863f3a7ba37..b55b39da1f225 100644
--- a/templates/org/team/repositories.tmpl
+++ b/templates/org/team/repositories.tmpl
@@ -72,7 +72,7 @@
 	<div class="content">
 		<p>{{.locale.Tr "org.teams.remove_all_repos_desc"}}</p>
 	</div>
-	{{template "base/delete_modal_actions" .}}
+	{{template "base/page_dimmer_buttons" .}}
 </div>
 
 <div class="ui small basic addall modal">
@@ -83,7 +83,7 @@
 	<div class="content">
 		<p>{{.locale.Tr "org.teams.add_all_repos_desc"}}</p>
 	</div>
-	{{template "base/delete_modal_actions" .}}
+	{{template "base/page_dimmer_buttons" .}}
 </div>
 
 {{template "base/footer" .}}
diff --git a/templates/org/team/sidebar.tmpl b/templates/org/team/sidebar.tmpl
index cecd8ddee6c1a..9e0239fc83a52 100644
--- a/templates/org/team/sidebar.tmpl
+++ b/templates/org/team/sidebar.tmpl
@@ -91,5 +91,5 @@
 	<div class="content">
 		<p>{{$.locale.Tr "org.teams.leave.detail" `<span class="name"></span>` | Safe}}</p>
 	</div>
-	{{template "base/delete_modal_actions" .}}
+	{{template "base/page_dimmer_buttons" .}}
 </div>
diff --git a/templates/org/team/teams.tmpl b/templates/org/team/teams.tmpl
index 27bbe80a3c535..627b27eb91364 100644
--- a/templates/org/team/teams.tmpl
+++ b/templates/org/team/teams.tmpl
@@ -51,6 +51,6 @@
 	<div class="content">
 		<p>{{$.locale.Tr "org.teams.leave.detail" `<span class="name"></span>` | Safe}}</p>
 	</div>
-	{{template "base/delete_modal_actions" .}}
+	{{template "base/page_dimmer_buttons" .}}
 </div>
 {{template "base/footer" .}}
diff --git a/templates/package/settings.tmpl b/templates/package/settings.tmpl
index 875bf852bb98a..a1b2b2172c99f 100644
--- a/templates/package/settings.tmpl
+++ b/templates/package/settings.tmpl
@@ -57,7 +57,7 @@
 						<form class="ui form" action="{{.Link}}" method="post">
 							{{.CsrfTokenHtml}}
 							<input type="hidden" name="action" value="delete">
-							{{template "base/delete_modal_actions" .}}
+							{{template "base/page_dimmer_buttons" .}}
 						</form>
 					</div>
 				</div>
diff --git a/templates/projects/list.tmpl b/templates/projects/list.tmpl
index 213bab70b66e2..cd15882c03a13 100644
--- a/templates/projects/list.tmpl
+++ b/templates/projects/list.tmpl
@@ -84,6 +84,6 @@
 	<div class="content">
 		<p>{{.locale.Tr "repo.projects.deletion_desc"}}</p>
 	</div>
-	{{template "base/delete_modal_actions" .}}
+	{{template "base/page_dimmer_buttons" .}}
 </div>
 {{end}}
diff --git a/templates/projects/view.tmpl b/templates/projects/view.tmpl
index 02b7c9258c6e5..0df3fa1f48672 100644
--- a/templates/projects/view.tmpl
+++ b/templates/projects/view.tmpl
@@ -162,7 +162,7 @@
 										{{$DataUrl := printf "%s/%d" $.Link .ID}}
 										{{$ModalNoText := $.locale.Tr "settings.cancel"}}
 										{{$ModalYesText := $.locale.Tr "repo.projects.column.delete"}}
-										{{template "base/delete_modal_actions" (dict "." $ "ExtendedClasses" "delete-project-board" "DataUrl" $DataUrl "ModalNoText" $ModalNoText "ModalYesText" $ModalYesText)}}
+										{{template "base/page_dimmer_buttons" (dict "." $ "ExtendedClasses" "delete-project-board" "DataUrl" $DataUrl "ModalNoText" $ModalNoText "ModalYesText" $ModalYesText)}}
 									</div>
 								</div>
 							</div>
@@ -274,6 +274,6 @@
 		<div class="content">
 			<p>{{.locale.Tr "repo.projects.deletion_desc"}}</p>
 		</div>
-		{{template "base/delete_modal_actions" .}}
+		{{template "base/page_dimmer_buttons" .}}
 	</div>
 {{end}}
diff --git a/templates/repo/branch/list.tmpl b/templates/repo/branch/list.tmpl
index 6dd6aecb37f6f..9a46e2cfe5f5d 100644
--- a/templates/repo/branch/list.tmpl
+++ b/templates/repo/branch/list.tmpl
@@ -155,7 +155,7 @@
 	<div class="content">
 		<p>{{.locale.Tr "repo.branch.delete_desc" | Str2html}}</p>
 	</div>
-	{{template "base/delete_modal_actions" .}}
+	{{template "base/page_dimmer_buttons" .}}
 </div>
 
 <div class="ui small modal" id="create-branch-modal">
diff --git a/templates/repo/issue/labels/edit_delete_label.tmpl b/templates/repo/issue/labels/edit_delete_label.tmpl
index 52e586b7831fd..2c62d1a61c68b 100644
--- a/templates/repo/issue/labels/edit_delete_label.tmpl
+++ b/templates/repo/issue/labels/edit_delete_label.tmpl
@@ -6,7 +6,7 @@
 	<div class="content">
 		<p>{{.locale.Tr "repo.issues.label_deletion_desc"}}</p>
 	</div>
-	{{template "base/delete_modal_actions" .}}
+	{{template "base/page_dimmer_buttons" .}}
 </div>
 
 <div class="ui small edit-label modal">
diff --git a/templates/repo/issue/milestones.tmpl b/templates/repo/issue/milestones.tmpl
index 602461400b928..ce0d81c2b930a 100644
--- a/templates/repo/issue/milestones.tmpl
+++ b/templates/repo/issue/milestones.tmpl
@@ -124,7 +124,7 @@
 		<div class="content">
 			<p>{{.locale.Tr "repo.milestones.deletion_desc"}}</p>
 		</div>
-		{{template "base/delete_modal_actions" .}}
+		{{template "base/page_dimmer_buttons" .}}
 	</div>
 {{end}}
 {{template "base/footer" .}}
diff --git a/templates/repo/issue/view_content.tmpl b/templates/repo/issue/view_content.tmpl
index a5d9b0bde0acf..b7bb72fd65ca1 100644
--- a/templates/repo/issue/view_content.tmpl
+++ b/templates/repo/issue/view_content.tmpl
@@ -203,5 +203,5 @@
 	<div class="content">
 		<p>{{.locale.Tr "repo.branch.delete_desc" | Str2html}}</p>
 	</div>
-	{{template "base/delete_modal_actions" .}}
+	{{template "base/page_dimmer_buttons" .}}
 </div>
diff --git a/templates/repo/issue/view_content/comments_delete_time.tmpl b/templates/repo/issue/view_content/comments_delete_time.tmpl
index a0d6b0ea05747..cf3f5c0c8a87f 100644
--- a/templates/repo/issue/view_content/comments_delete_time.tmpl
+++ b/templates/repo/issue/view_content/comments_delete_time.tmpl
@@ -7,7 +7,7 @@
 						{{.ctxData.CsrfTokenHtml}}
 					</form>
 					<div class="header">{{.ctxData.locale.Tr "repo.issues.del_time"}}</div>
-					{{template "base/delete_modal_actions" .}}
+					{{template "base/page_dimmer_buttons" .}}
 				</div>
 				<button class="ui icon button compact mini issue-delete-time" data-id="{{.comment.Time.ID}}" data-tooltip-content="{{.ctxData.locale.Tr "repo.issues.del_time"}}">
 					{{svg "octicon-trash"}}
diff --git a/templates/repo/projects/list.tmpl b/templates/repo/projects/list.tmpl
index fb5bc4f48d91b..21092bfcfc495 100644
--- a/templates/repo/projects/list.tmpl
+++ b/templates/repo/projects/list.tmpl
@@ -86,7 +86,7 @@
 	<div class="content">
 		<p>{{.locale.Tr "repo.projects.deletion_desc"}}</p>
 	</div>
-	{{template "base/delete_modal_actions" .}}
+	{{template "base/page_dimmer_buttons" .}}
 </div>
 {{end}}
 {{template "base/footer" .}}
diff --git a/templates/repo/projects/view.tmpl b/templates/repo/projects/view.tmpl
index aee714dea7b9a..14fc427550240 100644
--- a/templates/repo/projects/view.tmpl
+++ b/templates/repo/projects/view.tmpl
@@ -164,7 +164,9 @@
 									</div>
 									<div class="text right actions">
 										{{$DataUrl := printf "%s/projects/%d/%d" $.RepoLink $.Project.ID .ID}}
-										{{template "base/delete_modal_actions" (dict "." $ "ExtendedClasses" "delete-project-board" "DataUrl" $DataUrl)}}
+										{{$ModalNoText := $.locale.Tr "settings.cancel"}}
+										{{$ModalYesText := $.locale.Tr "repo.projects.column.delete"}}
+										{{template "base/page_dimmer_buttons" (dict "." $ "ExtendedClasses" "delete-project-board" "DataUrl" $DataUrl "ModalNoText" $ModalNoText "ModalYesText" $ModalYesText)}}
 									</div>
 								</div>
 							</div>
@@ -276,7 +278,7 @@
 		<div class="content">
 			<p>{{.locale.Tr "repo.projects.deletion_desc"}}</p>
 		</div>
-		{{template "base/delete_modal_actions" .}}
+		{{template "base/page_dimmer_buttons" .}}
 	</div>
 {{end}}
 
diff --git a/templates/repo/release/list.tmpl b/templates/repo/release/list.tmpl
index 12aaa0bd71723..cd2b4da624cc6 100644
--- a/templates/repo/release/list.tmpl
+++ b/templates/repo/release/list.tmpl
@@ -192,7 +192,7 @@
 		<div class="content">
 			<p>{{.locale.Tr "repo.release.deletion_tag_desc"}}</p>
 		</div>
-		{{template "base/delete_modal_actions" .}}
+		{{template "base/page_dimmer_buttons" .}}
 	</div>
 {{end}}
 
diff --git a/templates/repo/release/new.tmpl b/templates/repo/release/new.tmpl
index 7a4e28cffa1be..f043075249b5f 100644
--- a/templates/repo/release/new.tmpl
+++ b/templates/repo/release/new.tmpl
@@ -146,7 +146,7 @@
 		<div class="content">
 			<p>{{.locale.Tr "repo.release.deletion_desc"}}</p>
 		</div>
-		{{template "base/delete_modal_actions" .}}
+		{{template "base/page_dimmer_buttons" .}}
 	</div>
 {{end}}
 {{template "base/footer" .}}
diff --git a/templates/repo/settings/branches.tmpl b/templates/repo/settings/branches.tmpl
index 6e51fc7bb24b1..11fa3111d008e 100644
--- a/templates/repo/settings/branches.tmpl
+++ b/templates/repo/settings/branches.tmpl
@@ -104,7 +104,7 @@
 	<div class="content">
 		<p>{{.locale.Tr "repo.settings.protected_branch_deletion_desc"}}</p>
 	</div>
-	{{template "base/delete_modal_actions" .}}
+	{{template "base/page_dimmer_buttons" .}}
 </div>
 
 {{template "base/footer" .}}
diff --git a/templates/repo/settings/collaboration.tmpl b/templates/repo/settings/collaboration.tmpl
index 654bbba5d05c8..1f213d701c0eb 100644
--- a/templates/repo/settings/collaboration.tmpl
+++ b/templates/repo/settings/collaboration.tmpl
@@ -120,6 +120,6 @@
 	<div class="content">
 		<p>{{.locale.Tr "repo.settings.collaborator_deletion_desc"}}</p>
 	</div>
-	{{template "base/delete_modal_actions" .}}
+	{{template "base/page_dimmer_buttons" .}}
 </div>
 {{template "base/footer" .}}
diff --git a/templates/repo/settings/deploy_keys.tmpl b/templates/repo/settings/deploy_keys.tmpl
index 33f3937201db1..50269969d58b5 100644
--- a/templates/repo/settings/deploy_keys.tmpl
+++ b/templates/repo/settings/deploy_keys.tmpl
@@ -85,6 +85,6 @@
 	<div class="content">
 		<p>{{.locale.Tr "repo.settings.deploy_key_deletion_desc"}}</p>
 	</div>
-	{{template "base/delete_modal_actions" .}}
+	{{template "base/page_dimmer_buttons" .}}
 </div>
 {{template "base/footer" .}}
diff --git a/templates/repo/settings/lfs.tmpl b/templates/repo/settings/lfs.tmpl
index 8be28ad9edba9..45e237f501e50 100644
--- a/templates/repo/settings/lfs.tmpl
+++ b/templates/repo/settings/lfs.tmpl
@@ -50,7 +50,7 @@
 					</p>
 					<form class="ui form" action="{{$.Link}}/delete/{{.Oid}}" method="post">
 						{{$.CsrfTokenHtml}}
-						<div class="center actions">{{/* TODO: Convert to base/delete_modal_actions */}}
+						<div class="center actions">{{/* TODO: Convert to base/page_dimmer_buttons */}}
 							<button class="ui basic cancel inverted button">{{$.locale.Tr "settings.cancel"}}</button>
 							<button class="ui basic inverted yellow button">{{$.locale.Tr "modal.yes"}}</button>
 						</div>
diff --git a/templates/repo/settings/options.tmpl b/templates/repo/settings/options.tmpl
index 1aaf58ee91ca5..908ef2be361fe 100644
--- a/templates/repo/settings/options.tmpl
+++ b/templates/repo/settings/options.tmpl
@@ -988,7 +988,7 @@
 				{{.CsrfTokenHtml}}
 				<input type="hidden" name="action" value="{{if .Repository.IsArchived}}unarchive{{else}}archive{{end}}">
 				<input type="hidden" name="repo_id" value="{{.Repository.ID}}">
-				{{template "base/delete_modal_actions" .}}
+				{{template "base/page_dimmer_buttons" .}}
 			</form>
 		</div>
 	{{end}}
diff --git a/templates/repo/settings/webhook/delete_modal.tmpl b/templates/repo/settings/webhook/delete_modal.tmpl
index f455899663e8f..c5d05ced478d2 100644
--- a/templates/repo/settings/webhook/delete_modal.tmpl
+++ b/templates/repo/settings/webhook/delete_modal.tmpl
@@ -6,5 +6,5 @@
 	<div class="content">
 		<p>{{.locale.Tr "repo.settings.webhook_deletion_desc"}}</p>
 	</div>
-	{{template "base/delete_modal_actions" .}}
+	{{template "base/page_dimmer_buttons" .}}
 </div>
diff --git a/templates/repo/wiki/view.tmpl b/templates/repo/wiki/view.tmpl
index a1d1c047515be..4b36bfb5e0099 100644
--- a/templates/repo/wiki/view.tmpl
+++ b/templates/repo/wiki/view.tmpl
@@ -121,7 +121,7 @@
 	<div class="content">
 		<p>{{.locale.Tr "repo.wiki.delete_page_notice_1" ($title|Escape) | Safe}}</p>
 	</div>
-	{{template "base/delete_modal_actions" .}}
+	{{template "base/page_dimmer_buttons" .}}
 </div>
 
 {{template "base/footer" .}}
diff --git a/templates/shared/actions/runner_edit.tmpl b/templates/shared/actions/runner_edit.tmpl
index 40b4924743226..9b66402438085 100644
--- a/templates/shared/actions/runner_edit.tmpl
+++ b/templates/shared/actions/runner_edit.tmpl
@@ -97,6 +97,6 @@
 		<div class="content">
 			<p>{{.locale.Tr "actions.runners.delete_runner_notice" | Safe}}</p>
 		</div>
-		{{template "base/delete_modal_actions" .}}
+		{{template "base/page_dimmer_buttons" .}}
 	</div>
 </div>
diff --git a/templates/shared/secrets/add_list.tmpl b/templates/shared/secrets/add_list.tmpl
index 4aa5f0ccd578a..da4a0774a98a8 100644
--- a/templates/shared/secrets/add_list.tmpl
+++ b/templates/shared/secrets/add_list.tmpl
@@ -64,5 +64,5 @@
 	<div class="content">
 		<p>{{.locale.Tr "secrets.deletion.description"}}</p>
 	</div>
-	{{template "base/delete_modal_actions" .}}
+	{{template "base/page_dimmer_buttons" .}}
 </div>
diff --git a/templates/user/settings/account.tmpl b/templates/user/settings/account.tmpl
index 53f7d021e0b6a..a16c6afbffacb 100644
--- a/templates/user/settings/account.tmpl
+++ b/templates/user/settings/account.tmpl
@@ -169,7 +169,7 @@
 	<div class="content">
 		<p>{{.locale.Tr "settings.email_deletion_desc"}}</p>
 	</div>
-	{{template "base/delete_modal_actions" .}}
+	{{template "base/page_dimmer_buttons" .}}
 </div>
 
 <div class="ui small basic delete modal" id="delete-account">
@@ -180,7 +180,7 @@
 	<div class="content">
 		<p>{{.locale.Tr "settings.delete_account_desc"}}</p>
 	</div>
-	{{template "base/delete_modal_actions" .}}
+	{{template "base/page_dimmer_buttons" .}}
 </div>
 
 {{template "base/footer" .}}
diff --git a/templates/user/settings/applications.tmpl b/templates/user/settings/applications.tmpl
index 2694f5cad0d40..21182d09635bd 100644
--- a/templates/user/settings/applications.tmpl
+++ b/templates/user/settings/applications.tmpl
@@ -277,7 +277,7 @@
 		<p>{{.locale.Tr "settings.access_token_deletion_desc"}}</p>
 	</div>
 
-	<div class="actions">{{/* TODO: Convert to base/delete_modal_actions.tmpl */}}
+	<div class="actions">{{/* TODO: Convert to base/page_dimmer_buttons.tmpl */}}
 		<button class="ui green basic inverted cancel button">
 			{{svg "octicon-x"}}
 			{{.locale.Tr "settings.access_token_deletion_cancel_action"}}
diff --git a/templates/user/settings/applications_oauth2_list.tmpl b/templates/user/settings/applications_oauth2_list.tmpl
index 8ec304532422e..c04d132e24e50 100644
--- a/templates/user/settings/applications_oauth2_list.tmpl
+++ b/templates/user/settings/applications_oauth2_list.tmpl
@@ -55,5 +55,5 @@
 	<div class="content">
 		<p>{{.locale.Tr "settings.oauth2_application_remove_description"}}</p>
 	</div>
-	{{template "base/delete_modal_actions" .}}
+	{{template "base/page_dimmer_buttons" .}}
 </div>
diff --git a/templates/user/settings/grants_oauth2.tmpl b/templates/user/settings/grants_oauth2.tmpl
index 3b92f35f37afe..83cfa75883001 100644
--- a/templates/user/settings/grants_oauth2.tmpl
+++ b/templates/user/settings/grants_oauth2.tmpl
@@ -36,5 +36,5 @@
 	<div class="content">
 		<p>{{.locale.Tr "settings.revoke_oauth2_grant_description"}}</p>
 	</div>
-	{{template "base/delete_modal_actions" .}}
+	{{template "base/page_dimmer_buttons" .}}
 </div>
diff --git a/templates/user/settings/keys_gpg.tmpl b/templates/user/settings/keys_gpg.tmpl
index 9ba9199db70d8..bd201149a41b5 100644
--- a/templates/user/settings/keys_gpg.tmpl
+++ b/templates/user/settings/keys_gpg.tmpl
@@ -119,5 +119,5 @@
 	<div class="content">
 		<p>{{.locale.Tr "settings.gpg_key_deletion_desc"}}</p>
 	</div>
-	{{template "base/delete_modal_actions" .}}
+	{{template "base/page_dimmer_buttons" .}}
 </div>
diff --git a/templates/user/settings/keys_principal.tmpl b/templates/user/settings/keys_principal.tmpl
index 6194db13ab7ca..cc354afba499d 100644
--- a/templates/user/settings/keys_principal.tmpl
+++ b/templates/user/settings/keys_principal.tmpl
@@ -62,6 +62,6 @@
 		<div class="content">
 			<p>{{.locale.Tr "settings.ssh_principal_deletion_desc"}}</p>
 		</div>
-		{{template "base/delete_modal_actions" .}}
+		{{template "base/page_dimmer_buttons" .}}
 	</div>
 {{end}}
diff --git a/templates/user/settings/keys_ssh.tmpl b/templates/user/settings/keys_ssh.tmpl
index b60434cae4685..69bde0ca65da2 100644
--- a/templates/user/settings/keys_ssh.tmpl
+++ b/templates/user/settings/keys_ssh.tmpl
@@ -108,5 +108,5 @@
 	<div class="content">
 		<p>{{.locale.Tr "settings.ssh_key_deletion_desc"}}</p>
 	</div>
-	{{template "base/delete_modal_actions" .}}
+	{{template "base/page_dimmer_buttons" .}}
 </div>
diff --git a/templates/user/settings/organization.tmpl b/templates/user/settings/organization.tmpl
index cd513db2490a5..5db6f632a753e 100644
--- a/templates/user/settings/organization.tmpl
+++ b/templates/user/settings/organization.tmpl
@@ -48,6 +48,6 @@
 	<div class="content">
 		<p>{{$.locale.Tr "org.members.leave.detail" `<span class="dataOrganizationName"></span>` | Safe}}</p>
 	</div>
-	{{template "base/delete_modal_actions" .}}
+	{{template "base/page_dimmer_buttons" .}}
 </div>
 {{template "base/footer" .}}
diff --git a/templates/user/settings/repos.tmpl b/templates/user/settings/repos.tmpl
index 6742cb1671826..e1c537c320091 100644
--- a/templates/user/settings/repos.tmpl
+++ b/templates/user/settings/repos.tmpl
@@ -77,7 +77,7 @@
 														{{$.CsrfTokenHtml}}
 														<input type="hidden" name="id" value="{{$dir}}">
 														<input type="hidden" name="action" value="delete">
-														{{template "base/delete_modal_actions" $}}
+														{{template "base/page_dimmer_buttons" $}}
 													</form>
 												</div>
 											{{end}}
@@ -139,6 +139,6 @@
 	<div class="content">
 		<p>{{.locale.Tr "settings.remove_account_link_desc"}}</p>
 	</div>
-	{{template "base/delete_modal_actions" .}}
+	{{template "base/page_dimmer_buttons" .}}
 </div>
 {{template "base/footer" .}}
diff --git a/templates/user/settings/security/accountlinks.tmpl b/templates/user/settings/security/accountlinks.tmpl
index e8eed632946c1..aa8332f6d8054 100644
--- a/templates/user/settings/security/accountlinks.tmpl
+++ b/templates/user/settings/security/accountlinks.tmpl
@@ -49,5 +49,5 @@
 	<div class="content">
 		<p>{{.locale.Tr "settings.remove_account_link_desc"}}</p>
 	</div>
-	{{template "base/delete_modal_actions" .}}
+	{{template "base/page_dimmer_buttons" .}}
 </div>
diff --git a/templates/user/settings/security/openid.tmpl b/templates/user/settings/security/openid.tmpl
index 5d6c9cf8cd425..3fd49300fc7cd 100644
--- a/templates/user/settings/security/openid.tmpl
+++ b/templates/user/settings/security/openid.tmpl
@@ -59,5 +59,5 @@
 	<div class="content">
 		<p>{{.locale.Tr "settings.openid_deletion_desc"}}</p>
 	</div>
-	{{template "base/delete_modal_actions" .}}
+	{{template "base/page_dimmer_buttons" .}}
 </div>
diff --git a/templates/user/settings/security/twofa.tmpl b/templates/user/settings/security/twofa.tmpl
index 1a0a8a6432c09..c4a4e8fbed417 100644
--- a/templates/user/settings/security/twofa.tmpl
+++ b/templates/user/settings/security/twofa.tmpl
@@ -31,5 +31,5 @@
 	<div class="content">
 		<p>{{.locale.Tr "settings.twofa_disable_desc"}}</p>
 	</div>
-	{{template "base/delete_modal_actions" .}}
+	{{template "base/page_dimmer_buttons" .}}
 </div>
diff --git a/templates/user/settings/security/webauthn.tmpl b/templates/user/settings/security/webauthn.tmpl
index 2fea2843f6e05..3c5677aca0e01 100644
--- a/templates/user/settings/security/webauthn.tmpl
+++ b/templates/user/settings/security/webauthn.tmpl
@@ -38,5 +38,5 @@
 	<div class="content">
 		<p>{{.locale.Tr "settings.webauthn_delete_key_desc"}}</p>
 	</div>
-	{{template "base/delete_modal_actions" .}}
+	{{template "base/page_dimmer_buttons" .}}
 </div>

From 1df04eef57e9b9d8020cd460dea87cdd0338b2dd Mon Sep 17 00:00:00 2001
From: HesterG <hestergong@gmail.com>
Date: Thu, 20 Apr 2023 09:00:57 +0800
Subject: [PATCH 08/26] modify css and change button on
 default-project-board-modal

---
 templates/base/page_dimmer_buttons.tmpl | 4 ++--
 templates/projects/view.tmpl            | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/templates/base/page_dimmer_buttons.tmpl b/templates/base/page_dimmer_buttons.tmpl
index 60bb27122c21e..330c1d7542958 100644
--- a/templates/base/page_dimmer_buttons.tmpl
+++ b/templates/base/page_dimmer_buttons.tmpl
@@ -1,9 +1,9 @@
 <div class="actions">
-	<button class="ui red basic inverted cancel button">
+	<button class="ui red cancel button">
 		{{svg "octicon-x"}}
 		{{if .ModalNoText}}{{.ModalNoText}}{{else}}{{.locale.Tr "modal.no"}}{{end}}
 	</button>
-	<button class="ui green basic inverted ok button{{if .ExtendedClasses}} {{.ExtendedClasses}}{{end}}" {{if .DataUrl}}data-url="{{.DataUrl}}"{{end}}>
+	<button class="ui green ok button{{if .ExtendedClasses}} {{.ExtendedClasses}}{{end}}" {{if .DataUrl}}data-url="{{.DataUrl}}"{{end}}>
 		{{svg "octicon-check"}}
 		{{if .ModalYesText}}{{.ModalYesText}}{{else}}{{.locale.Tr "modal.yes"}}{{end}}
 	</button>
diff --git a/templates/projects/view.tmpl b/templates/projects/view.tmpl
index cde653a0609b3..a79f7e363773f 100644
--- a/templates/projects/view.tmpl
+++ b/templates/projects/view.tmpl
@@ -157,8 +157,8 @@
 										<label id="default-project-board-content"></label>
 									</div>
 									<div class="text right actions">
-										<button class="ui cancel button">{{$.locale.Tr "settings.cancel"}}</button>
-										<button class="ui primary button default-project-board-button" id="default-project-board-submit"></button>
+										<button class="ui red cancel button">{{$.locale.Tr "settings.cancel"}}</button>
+										<button class="ui green ok button default-project-board-button" id="default-project-board-submit"></button>
 									</div>
 								</div>
 

From 6651064d61fdc3e83b38efbf65e2d6ceb425f0f3 Mon Sep 17 00:00:00 2001
From: HesterG <hestergong@gmail.com>
Date: Thu, 20 Apr 2023 09:21:48 +0800
Subject: [PATCH 09/26] modify css for repo unset

---
 templates/repo/projects/view.tmpl    | 4 ++--
 web_src/js/features/repo-projects.js | 5 -----
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/templates/repo/projects/view.tmpl b/templates/repo/projects/view.tmpl
index f6adec259c42a..663eb3ab4996d 100644
--- a/templates/repo/projects/view.tmpl
+++ b/templates/repo/projects/view.tmpl
@@ -163,8 +163,8 @@
 										<label id="default-project-board-content"></label>
 									</div>
 									<div class="text right actions">
-										<button class="ui cancel button">{{$.locale.Tr "settings.cancel"}}</button>
-										<button class="ui primary button default-project-board-button" id="default-project-board-submit"></button>
+										<button class="ui red cancel button">{{$.locale.Tr "settings.cancel"}}</button>
+										<button class="ui green ok button default-project-board-button" id="default-project-board-submit"></button>
 									</div>
 								</div>
 
diff --git a/web_src/js/features/repo-projects.js b/web_src/js/features/repo-projects.js
index a2679130d70f3..63ef541c7451f 100644
--- a/web_src/js/features/repo-projects.js
+++ b/web_src/js/features/repo-projects.js
@@ -131,11 +131,6 @@ export function initRepoProject() {
     const showButton = $(boardColumn).find('.default-project-board-show');
     const commitButton = $(this).find('.default-project-board-button');
 
-    if ($(showButton).data('type') === 'unset_default') {
-      $(commitButton).removeClass('primary');
-      $(commitButton).addClass('red');
-    }
-
     $(commitButton).on('click', (e) => {
       e.preventDefault();
 

From f9430f7b13b5169bec9eedde9c89fa5891a0b2da Mon Sep 17 00:00:00 2001
From: HesterG <hestergong@gmail.com>
Date: Thu, 20 Apr 2023 13:33:26 +0800
Subject: [PATCH 10/26] use data- attributes to pass data

---
 templates/base/page_dimmer_buttons.tmpl |  4 ++--
 templates/projects/view.tmpl            | 14 +++++++-------
 templates/repo/projects/view.tmpl       | 14 +++++++-------
 web_src/js/features/repo-projects.js    | 12 ++++++++----
 4 files changed, 24 insertions(+), 20 deletions(-)

diff --git a/templates/base/page_dimmer_buttons.tmpl b/templates/base/page_dimmer_buttons.tmpl
index 330c1d7542958..1c3e78f456cde 100644
--- a/templates/base/page_dimmer_buttons.tmpl
+++ b/templates/base/page_dimmer_buttons.tmpl
@@ -1,9 +1,9 @@
 <div class="actions">
-	<button class="ui red cancel button">
+	<button class="ui red cancel button cancel-button">
 		{{svg "octicon-x"}}
 		{{if .ModalNoText}}{{.ModalNoText}}{{else}}{{.locale.Tr "modal.no"}}{{end}}
 	</button>
-	<button class="ui green ok button{{if .ExtendedClasses}} {{.ExtendedClasses}}{{end}}" {{if .DataUrl}}data-url="{{.DataUrl}}"{{end}}>
+	<button class="ui green ok button confirm-button">
 		{{svg "octicon-check"}}
 		{{if .ModalYesText}}{{.ModalYesText}}{{else}}{{.locale.Tr "modal.yes"}}{{end}}
 	</button>
diff --git a/templates/projects/view.tmpl b/templates/projects/view.tmpl
index a79f7e363773f..9a6d6951e2554 100644
--- a/templates/projects/view.tmpl
+++ b/templates/projects/view.tmpl
@@ -115,7 +115,10 @@
 										{{$.locale.Tr "repo.projects.column.unset_default"}}
 									</a>
 								{{end}}
-								<a class="item show-modal button" data-modal="#delete-board-modal-{{.ID}}">
+								<a class="item show-modal button show-delete-column-modal" 
+									data-modal="#delete-board-modal-{{.ID}}"
+									data-url="{{$.Link}}/{{.ID}}"
+								>
 									{{svg "octicon-trash"}}
 									{{$.locale.Tr "repo.projects.column.delete"}}
 								</a>
@@ -171,12 +174,9 @@
 											{{$.locale.Tr "repo.projects.column.deletion_desc"}}
 										</label>
 									</div>
-									<div class="text right actions">
-										{{$DataUrl := printf "%s/%d" $.Link .ID}}
-										{{$ModalNoText := $.locale.Tr "settings.cancel"}}
-										{{$ModalYesText := $.locale.Tr "repo.projects.column.delete"}}
-										{{template "base/page_dimmer_buttons" (dict "." $ "ExtendedClasses" "delete-project-board" "DataUrl" $DataUrl "ModalNoText" $ModalNoText "ModalYesText" $ModalYesText)}}
-									</div>
+									{{$ModalNoText := $.locale.Tr "settings.cancel"}}
+									{{$ModalYesText := $.locale.Tr "repo.projects.column.delete"}}
+									{{template "base/page_dimmer_buttons" (dict "." $ "ModalNoText" $ModalNoText "ModalYesText" $ModalYesText)}}
 								</div>
 							</div>
 						</div>
diff --git a/templates/repo/projects/view.tmpl b/templates/repo/projects/view.tmpl
index 663eb3ab4996d..29d7eebcd02c1 100644
--- a/templates/repo/projects/view.tmpl
+++ b/templates/repo/projects/view.tmpl
@@ -121,7 +121,10 @@
 										{{$.locale.Tr "repo.projects.column.unset_default"}}
 									</a>
 								{{end}}
-								<a class="item show-modal button" data-modal="#delete-board-modal-{{.ID}}">
+								<a class="item show-modal button show-delete-column-modal" 
+									data-modal="#delete-board-modal-{{.ID}}"
+									data-url="{{$.RepoLink}}/projects/{{$.Project.ID}}/{{.ID}}"
+								>
 									{{svg "octicon-trash"}}
 									{{$.locale.Tr "repo.projects.column.delete"}}
 								</a>
@@ -177,12 +180,9 @@
 											{{$.locale.Tr "repo.projects.column.deletion_desc"}}
 										</label>
 									</div>
-									<div class="text right actions">
-										{{$DataUrl := printf "%s/projects/%d/%d" $.RepoLink $.Project.ID .ID}}
-										{{$ModalNoText := $.locale.Tr "settings.cancel"}}
-										{{$ModalYesText := $.locale.Tr "repo.projects.column.delete"}}
-										{{template "base/page_dimmer_buttons" (dict "." $ "ExtendedClasses" "delete-project-board" "DataUrl" $DataUrl "ModalNoText" $ModalNoText "ModalYesText" $ModalYesText)}}
-									</div>
+									{{$ModalNoText := $.locale.Tr "settings.cancel"}}
+									{{$ModalYesText := $.locale.Tr "repo.projects.column.delete"}}
+									{{template "base/page_dimmer_buttons" (dict "." $ "ModalNoText" $ModalNoText "ModalYesText" $ModalYesText)}}
 								</div>
 							</div>
 						</div>
diff --git a/web_src/js/features/repo-projects.js b/web_src/js/features/repo-projects.js
index 63ef541c7451f..a2a6ff148594b 100644
--- a/web_src/js/features/repo-projects.js
+++ b/web_src/js/features/repo-projects.js
@@ -147,12 +147,16 @@ export function initRepoProject() {
     });
   });
 
-  $('.delete-project-board').each(function () {
-    $(this).click(function (e) {
+  $('.show-delete-column-modal').each(function () {
+    const deleteColumnModal = $(`${$(this).attr('data-modal')}`);
+    const deleteColumnButton = deleteColumnModal.find('.confirm-button');
+    const deleteUrl = $(this).attr('data-url');
+
+    deleteColumnButton.on('click', function (e) {
       e.preventDefault();
 
       $.ajax({
-        url: $(this).data('url'),
+        url: deleteUrl,
         headers: {
           'X-Csrf-Token': csrfToken,
         },
@@ -162,7 +166,7 @@ export function initRepoProject() {
         window.location.reload();
       });
     });
-  });
+  })
 
   $('#new_board_submit').click(function (e) {
     e.preventDefault();

From 68824ff7fa21d95e39250388c9e4a6be2727948c Mon Sep 17 00:00:00 2001
From: HesterG <hestergong@gmail.com>
Date: Thu, 20 Apr 2023 14:36:04 +0800
Subject: [PATCH 11/26] try use template for set/unset columns and fix lint

---
 templates/base/page_dimmer_buttons.tmpl |  4 ++--
 templates/projects/view.tmpl            | 13 ++++++-------
 templates/repo/projects/view.tmpl       | 13 ++++++-------
 web_src/js/features/repo-projects.js    |  8 ++++----
 4 files changed, 18 insertions(+), 20 deletions(-)

diff --git a/templates/base/page_dimmer_buttons.tmpl b/templates/base/page_dimmer_buttons.tmpl
index 1c3e78f456cde..79229b62688ab 100644
--- a/templates/base/page_dimmer_buttons.tmpl
+++ b/templates/base/page_dimmer_buttons.tmpl
@@ -1,9 +1,9 @@
 <div class="actions">
-	<button class="ui red cancel button cancel-button">
+	<button class="ui red cancel button modal-cancel-button">
 		{{svg "octicon-x"}}
 		{{if .ModalNoText}}{{.ModalNoText}}{{else}}{{.locale.Tr "modal.no"}}{{end}}
 	</button>
-	<button class="ui green ok button confirm-button">
+	<button class="ui green ok button modal-confirm-button">
 		{{svg "octicon-check"}}
 		{{if .ModalYesText}}{{.ModalYesText}}{{else}}{{.locale.Tr "modal.yes"}}{{end}}
 	</button>
diff --git a/templates/projects/view.tmpl b/templates/projects/view.tmpl
index 9a6d6951e2554..c4d72e0cf3365 100644
--- a/templates/projects/view.tmpl
+++ b/templates/projects/view.tmpl
@@ -99,7 +99,6 @@
 									data-modal="#default-project-board-modal-{{.ID}}"
 									data-modal-default-project-board-header="{{$.locale.Tr "repo.projects.column.set_default"}}"
 									data-modal-default-project-board-content="{{$.locale.Tr "repo.projects.column.set_default_desc"}}"
-									data-modal-default-project-board-submit="{{$.locale.Tr "repo.projects.column.set_default"}}"
 									data-url="{{$.Link}}/{{.ID}}/default">
 										{{svg "octicon-pin"}}
 										{{$.locale.Tr "repo.projects.column.set_default"}}
@@ -109,7 +108,6 @@
 									data-modal="#default-project-board-modal-{{.ID}}"
 									data-modal-default-project-board-header="{{$.locale.Tr "repo.projects.column.unset_default"}}"
 									data-modal-default-project-board-content="{{$.locale.Tr "repo.projects.column.unset_default_desc"}}"
-									data-modal-default-project-board-submit="{{$.locale.Tr "repo.projects.column.unset_default"}}"
 									data-url="{{$.Link}}/{{.ID}}/unsetdefault">
 										{{svg "octicon-pin"}}
 										{{$.locale.Tr "repo.projects.column.unset_default"}}
@@ -159,10 +157,12 @@
 									<div class="content center">
 										<label id="default-project-board-content"></label>
 									</div>
-									<div class="text right actions">
-										<button class="ui red cancel button">{{$.locale.Tr "settings.cancel"}}</button>
-										<button class="ui green ok button default-project-board-button" id="default-project-board-submit"></button>
-									</div>
+									{{$ModalNoText := $.locale.Tr "settings.cancel"}}
+									{{- $ModalYesText := $.locale.Tr "repo.projects.column.set_default" -}}
+									{{- if .Default -}}
+									{{- $ModalYesText = $.locale.Tr "repo.projects.column.unset_default" -}}
+									{{- end -}}
+									{{template "base/page_dimmer_buttons" (dict "." $ "ModalNoText" $ModalNoText "ModalYesText" $ModalYesText)}}
 								</div>
 
 								<div class="ui basic modal" id="delete-board-modal-{{.ID}}">
@@ -174,7 +174,6 @@
 											{{$.locale.Tr "repo.projects.column.deletion_desc"}}
 										</label>
 									</div>
-									{{$ModalNoText := $.locale.Tr "settings.cancel"}}
 									{{$ModalYesText := $.locale.Tr "repo.projects.column.delete"}}
 									{{template "base/page_dimmer_buttons" (dict "." $ "ModalNoText" $ModalNoText "ModalYesText" $ModalYesText)}}
 								</div>
diff --git a/templates/repo/projects/view.tmpl b/templates/repo/projects/view.tmpl
index 29d7eebcd02c1..a597b5d6c0776 100644
--- a/templates/repo/projects/view.tmpl
+++ b/templates/repo/projects/view.tmpl
@@ -103,7 +103,6 @@
 									data-modal="#default-project-board-modal-{{.ID}}"
 									data-modal-default-project-board-header="{{$.locale.Tr "repo.projects.column.set_default"}}"
 									data-modal-default-project-board-content="{{$.locale.Tr "repo.projects.column.set_default_desc"}}"
-									data-modal-default-project-board-submit="{{$.locale.Tr "repo.projects.column.set_default"}}"
 									data-type="set_default"
 									data-url="{{$.Link}}/{{.ID}}/default">
 										{{svg "octicon-pin"}}
@@ -114,7 +113,6 @@
 									data-modal="#default-project-board-modal-{{.ID}}"
 									data-modal-default-project-board-header="{{$.locale.Tr "repo.projects.column.unset_default"}}"
 									data-modal-default-project-board-content="{{$.locale.Tr "repo.projects.column.unset_default_desc"}}"
-									data-modal-default-project-board-submit="{{$.locale.Tr "repo.projects.column.unset_default"}}"
 									data-type="unset_default"
 									data-url="{{$.Link}}/{{.ID}}/unsetdefault">
 										{{svg "octicon-pin"}}
@@ -165,10 +163,12 @@
 									<div class="content center">
 										<label id="default-project-board-content"></label>
 									</div>
-									<div class="text right actions">
-										<button class="ui red cancel button">{{$.locale.Tr "settings.cancel"}}</button>
-										<button class="ui green ok button default-project-board-button" id="default-project-board-submit"></button>
-									</div>
+									{{$ModalNoText := $.locale.Tr "settings.cancel"}}
+									{{- $ModalYesText := $.locale.Tr "repo.projects.column.set_default" -}}
+									{{- if .Default -}}
+									{{- $ModalYesText = $.locale.Tr "repo.projects.column.unset_default" -}}
+									{{- end -}}
+									{{template "base/page_dimmer_buttons" (dict "." $ "ModalNoText" $ModalNoText "ModalYesText" $ModalYesText)}}
 								</div>
 
 								<div class="ui basic modal" id="delete-board-modal-{{.ID}}">
@@ -180,7 +180,6 @@
 											{{$.locale.Tr "repo.projects.column.deletion_desc"}}
 										</label>
 									</div>
-									{{$ModalNoText := $.locale.Tr "settings.cancel"}}
 									{{$ModalYesText := $.locale.Tr "repo.projects.column.delete"}}
 									{{template "base/page_dimmer_buttons" (dict "." $ "ModalNoText" $ModalNoText "ModalYesText" $ModalYesText)}}
 								</div>
diff --git a/web_src/js/features/repo-projects.js b/web_src/js/features/repo-projects.js
index a2a6ff148594b..32a5b9a8ddedf 100644
--- a/web_src/js/features/repo-projects.js
+++ b/web_src/js/features/repo-projects.js
@@ -129,7 +129,7 @@ export function initRepoProject() {
   $('.default-project-board-modal').each(function () {
     const boardColumn = $(this).closest('.board-column');
     const showButton = $(boardColumn).find('.default-project-board-show');
-    const commitButton = $(this).find('.default-project-board-button');
+    const commitButton = $(this).find('.modal-confirm-button');
 
     $(commitButton).on('click', (e) => {
       e.preventDefault();
@@ -149,10 +149,10 @@ export function initRepoProject() {
 
   $('.show-delete-column-modal').each(function () {
     const deleteColumnModal = $(`${$(this).attr('data-modal')}`);
-    const deleteColumnButton = deleteColumnModal.find('.confirm-button');
+    const deleteColumnButton = deleteColumnModal.find('.modal-confirm-button');
     const deleteUrl = $(this).attr('data-url');
 
-    deleteColumnButton.on('click', function (e) {
+    deleteColumnButton.on('click', (e) => {
       e.preventDefault();
 
       $.ajax({
@@ -166,7 +166,7 @@ export function initRepoProject() {
         window.location.reload();
       });
     });
-  })
+  });
 
   $('#new_board_submit').click(function (e) {
     e.preventDefault();

From c2e81e26a1fce1a273c7fe281f14b0519b6bc4af Mon Sep 17 00:00:00 2001
From: HesterG <hestergong@gmail.com>
Date: Thu, 20 Apr 2023 15:03:58 +0800
Subject: [PATCH 12/26] fix lint and change name to basic_modal_actions for now

---
 templates/admin/auth/edit.tmpl                            | 2 +-
 templates/admin/emails/list.tmpl                          | 2 +-
 templates/admin/monitor.tmpl                              | 2 +-
 templates/admin/packages/list.tmpl                        | 2 +-
 templates/admin/queue.tmpl                                | 2 +-
 templates/admin/repo/list.tmpl                            | 2 +-
 templates/admin/stacktrace.tmpl                           | 2 +-
 templates/admin/user/edit.tmpl                            | 2 +-
 ...{page_dimmer_buttons.tmpl => basic_modal_actions.tmpl} | 0
 templates/org/member/members.tmpl                         | 4 ++--
 templates/org/settings/delete.tmpl                        | 2 +-
 templates/org/team/members.tmpl                           | 2 +-
 templates/org/team/new.tmpl                               | 2 +-
 templates/org/team/repositories.tmpl                      | 4 ++--
 templates/org/team/sidebar.tmpl                           | 2 +-
 templates/org/team/teams.tmpl                             | 2 +-
 templates/package/settings.tmpl                           | 2 +-
 templates/projects/list.tmpl                              | 2 +-
 templates/projects/view.tmpl                              | 8 ++++----
 templates/repo/branch/list.tmpl                           | 2 +-
 templates/repo/issue/labels/edit_delete_label.tmpl        | 2 +-
 templates/repo/issue/milestones.tmpl                      | 2 +-
 templates/repo/issue/view_content.tmpl                    | 2 +-
 .../repo/issue/view_content/comments_delete_time.tmpl     | 2 +-
 templates/repo/projects/list.tmpl                         | 2 +-
 templates/repo/projects/view.tmpl                         | 8 ++++----
 templates/repo/release/list.tmpl                          | 2 +-
 templates/repo/release/new.tmpl                           | 2 +-
 templates/repo/settings/branches.tmpl                     | 2 +-
 templates/repo/settings/collaboration.tmpl                | 2 +-
 templates/repo/settings/deploy_keys.tmpl                  | 2 +-
 templates/repo/settings/lfs.tmpl                          | 2 +-
 templates/repo/settings/options.tmpl                      | 2 +-
 templates/repo/settings/webhook/delete_modal.tmpl         | 2 +-
 templates/repo/wiki/view.tmpl                             | 2 +-
 templates/shared/actions/runner_edit.tmpl                 | 2 +-
 templates/shared/secrets/add_list.tmpl                    | 2 +-
 templates/user/settings/account.tmpl                      | 4 ++--
 templates/user/settings/applications.tmpl                 | 2 +-
 templates/user/settings/applications_oauth2_list.tmpl     | 2 +-
 templates/user/settings/grants_oauth2.tmpl                | 2 +-
 templates/user/settings/keys_gpg.tmpl                     | 2 +-
 templates/user/settings/keys_principal.tmpl               | 2 +-
 templates/user/settings/keys_ssh.tmpl                     | 2 +-
 templates/user/settings/organization.tmpl                 | 2 +-
 templates/user/settings/repos.tmpl                        | 4 ++--
 templates/user/settings/security/accountlinks.tmpl        | 2 +-
 templates/user/settings/security/openid.tmpl              | 2 +-
 templates/user/settings/security/twofa.tmpl               | 2 +-
 templates/user/settings/security/webauthn.tmpl            | 2 +-
 50 files changed, 59 insertions(+), 59 deletions(-)
 rename templates/base/{page_dimmer_buttons.tmpl => basic_modal_actions.tmpl} (100%)

diff --git a/templates/admin/auth/edit.tmpl b/templates/admin/auth/edit.tmpl
index 5cb5aaae69fa0..e46afe4ad686b 100644
--- a/templates/admin/auth/edit.tmpl
+++ b/templates/admin/auth/edit.tmpl
@@ -448,6 +448,6 @@
 	<div class="content">
 		<p>{{.locale.Tr "admin.auths.delete_auth_desc"}}</p>
 	</div>
-	{{template "base/page_dimmer_buttons" .}}
+	{{template "base/basic_modal_actions" .}}
 </div>
 {{template "base/footer" .}}
diff --git a/templates/admin/emails/list.tmpl b/templates/admin/emails/list.tmpl
index ca6ebed226c12..37da00d5e8d42 100644
--- a/templates/admin/emails/list.tmpl
+++ b/templates/admin/emails/list.tmpl
@@ -94,7 +94,7 @@
 					<input type="hidden" id="form-activate" name="activate" value="" required>
 
 					<div class="center">
-						{{template "base/page_dimmer_buttons" .}}
+						{{template "base/basic_modal_actions" .}}
 					</div>
 				</form>
 			</div>
diff --git a/templates/admin/monitor.tmpl b/templates/admin/monitor.tmpl
index 0c1d2193d63d1..c4257a8527c06 100644
--- a/templates/admin/monitor.tmpl
+++ b/templates/admin/monitor.tmpl
@@ -46,6 +46,6 @@
 		<p>{{$.locale.Tr "admin.monitor.process.cancel_notices" `<span class="name"></span>` | Safe}}</p>
 		<p>{{$.locale.Tr "admin.monitor.process.cancel_desc"}}</p>
 	</div>
-	{{template "base/page_dimmer_buttons" .}}
+	{{template "base/basic_modal_actions" .}}
 </div>
 {{template "base/footer" .}}
diff --git a/templates/admin/packages/list.tmpl b/templates/admin/packages/list.tmpl
index 356cd4d638924..d97b41ffa5727 100644
--- a/templates/admin/packages/list.tmpl
+++ b/templates/admin/packages/list.tmpl
@@ -88,6 +88,6 @@
 	<div class="content">
 		{{.locale.Tr "packages.settings.delete.notice" `<span class="name"></span>` `<span class="dataVersion"></span>` | Safe}}
 	</div>
-	{{template "base/page_dimmer_buttons" .}}
+	{{template "base/basic_modal_actions" .}}
 </div>
 {{template "base/footer" .}}
diff --git a/templates/admin/queue.tmpl b/templates/admin/queue.tmpl
index 949564dcc2fb5..2ace03810cb04 100644
--- a/templates/admin/queue.tmpl
+++ b/templates/admin/queue.tmpl
@@ -190,7 +190,7 @@
 		<p>{{$.locale.Tr "admin.monitor.queue.pool.cancel_notices" `<span class="name"></span>` | Safe}}</p>
 		<p>{{$.locale.Tr "admin.monitor.queue.pool.cancel_desc"}}</p>
 	</div>
-	{{template "base/page_dimmer_buttons" .}}
+	{{template "base/basic_modal_actions" .}}
 </div>
 
 {{template "base/footer" .}}
diff --git a/templates/admin/repo/list.tmpl b/templates/admin/repo/list.tmpl
index aa65e48f9161e..7c907e5cfcf16 100644
--- a/templates/admin/repo/list.tmpl
+++ b/templates/admin/repo/list.tmpl
@@ -105,6 +105,6 @@
 		{{.locale.Tr "repo.settings.delete_notices_2" `<span class="name"></span>` | Safe}}<br>
 		{{.locale.Tr "repo.settings.delete_notices_fork_1"}}<br>
 	</div>
-	{{template "base/page_dimmer_buttons" .}}
+	{{template "base/basic_modal_actions" .}}
 </div>
 {{template "base/footer" .}}
diff --git a/templates/admin/stacktrace.tmpl b/templates/admin/stacktrace.tmpl
index aa84e02e06abf..8dfe78422a858 100644
--- a/templates/admin/stacktrace.tmpl
+++ b/templates/admin/stacktrace.tmpl
@@ -27,7 +27,7 @@
 		<p>{{$.locale.Tr "admin.monitor.process.cancel_notices" `<span class="name"></span>` | Safe}}</p>
 		<p>{{$.locale.Tr "admin.monitor.process.cancel_desc"}}</p>
 	</div>
-	{{template "base/page_dimmer_buttons" .}}
+	{{template "base/basic_modal_actions" .}}
 </div>
 
 {{template "base/footer" .}}
diff --git a/templates/admin/user/edit.tmpl b/templates/admin/user/edit.tmpl
index 4606be39625df..17a64359d9c02 100644
--- a/templates/admin/user/edit.tmpl
+++ b/templates/admin/user/edit.tmpl
@@ -213,7 +213,7 @@
 			</div>
 			<p class="help">{{.locale.Tr "admin.users.purge_help"}}</p>
 		</div>
-		{{template "base/page_dimmer_buttons" .}}
+		{{template "base/basic_modal_actions" .}}
 	</form>
 </div>
 {{template "base/footer" .}}
diff --git a/templates/base/page_dimmer_buttons.tmpl b/templates/base/basic_modal_actions.tmpl
similarity index 100%
rename from templates/base/page_dimmer_buttons.tmpl
rename to templates/base/basic_modal_actions.tmpl
diff --git a/templates/org/member/members.tmpl b/templates/org/member/members.tmpl
index 505cffd32a802..d83b742f9f4bf 100644
--- a/templates/org/member/members.tmpl
+++ b/templates/org/member/members.tmpl
@@ -89,7 +89,7 @@
 	<div class="content">
 		<p>{{$.locale.Tr "org.members.leave.detail" `<span class="dataOrganizationName"></span>` | Safe}}</p>
 	</div>
-	{{template "base/page_dimmer_buttons" .}}
+	{{template "base/basic_modal_actions" .}}
 </div>
 <div class="ui small basic delete modal" id="remove-organization-member">
 	<div class="ui icon header">
@@ -99,7 +99,7 @@
 	<div class="content">
 		<p>{{$.locale.Tr "org.members.remove.detail" `<span class="name"></span>` `<span class="dataOrganizationName"></span>` | Safe}}</p>
 	</div>
-	{{template "base/page_dimmer_buttons" .}}
+	{{template "base/basic_modal_actions" .}}
 </div>
 
 {{template "base/footer" .}}
diff --git a/templates/org/settings/delete.tmpl b/templates/org/settings/delete.tmpl
index 56fa3606a9d6e..6352396d867c5 100644
--- a/templates/org/settings/delete.tmpl
+++ b/templates/org/settings/delete.tmpl
@@ -37,6 +37,6 @@
 	<div class="content">
 		<p>{{.locale.Tr "org.settings.delete_org_desc"}}</p>
 	</div>
-	{{template "base/page_dimmer_buttons" .}}
+	{{template "base/basic_modal_actions" .}}
 </div>
 {{template "base/footer" .}}
diff --git a/templates/org/team/members.tmpl b/templates/org/team/members.tmpl
index 81562c39edb08..c59cce11be4fd 100644
--- a/templates/org/team/members.tmpl
+++ b/templates/org/team/members.tmpl
@@ -72,6 +72,6 @@
 	<div class="content">
 		<p>{{$.locale.Tr "org.members.remove.detail" `<span class="name"></span>` `<span class="dataTeamName"></span>` | Safe}}</p>
 	</div>
-	{{template "base/page_dimmer_buttons" .}}
+	{{template "base/basic_modal_actions" .}}
 </div>
 {{template "base/footer" .}}
diff --git a/templates/org/team/new.tmpl b/templates/org/team/new.tmpl
index 8746bccce2bbd..48ec1f4586e05 100644
--- a/templates/org/team/new.tmpl
+++ b/templates/org/team/new.tmpl
@@ -156,6 +156,6 @@
 	<div class="content">
 		<p>{{.locale.Tr "org.teams.delete_team_desc"}}</p>
 	</div>
-	{{template "base/page_dimmer_buttons" .}}
+	{{template "base/basic_modal_actions" .}}
 </div>
 {{template "base/footer" .}}
diff --git a/templates/org/team/repositories.tmpl b/templates/org/team/repositories.tmpl
index 8d1e129016555..0d7da480ddae2 100644
--- a/templates/org/team/repositories.tmpl
+++ b/templates/org/team/repositories.tmpl
@@ -72,7 +72,7 @@
 	<div class="content">
 		<p>{{.locale.Tr "org.teams.remove_all_repos_desc"}}</p>
 	</div>
-	{{template "base/page_dimmer_buttons" .}}
+	{{template "base/basic_modal_actions" .}}
 </div>
 
 <div class="ui small basic addall modal" id="org-team-add-all-repo">
@@ -83,7 +83,7 @@
 	<div class="content">
 		<p>{{.locale.Tr "org.teams.add_all_repos_desc"}}</p>
 	</div>
-	{{template "base/page_dimmer_buttons" .}}
+	{{template "base/basic_modal_actions" .}}
 </div>
 
 {{template "base/footer" .}}
diff --git a/templates/org/team/sidebar.tmpl b/templates/org/team/sidebar.tmpl
index 9e0239fc83a52..1c98315697da5 100644
--- a/templates/org/team/sidebar.tmpl
+++ b/templates/org/team/sidebar.tmpl
@@ -91,5 +91,5 @@
 	<div class="content">
 		<p>{{$.locale.Tr "org.teams.leave.detail" `<span class="name"></span>` | Safe}}</p>
 	</div>
-	{{template "base/page_dimmer_buttons" .}}
+	{{template "base/basic_modal_actions" .}}
 </div>
diff --git a/templates/org/team/teams.tmpl b/templates/org/team/teams.tmpl
index 627b27eb91364..2f9d447b1c43b 100644
--- a/templates/org/team/teams.tmpl
+++ b/templates/org/team/teams.tmpl
@@ -51,6 +51,6 @@
 	<div class="content">
 		<p>{{$.locale.Tr "org.teams.leave.detail" `<span class="name"></span>` | Safe}}</p>
 	</div>
-	{{template "base/page_dimmer_buttons" .}}
+	{{template "base/basic_modal_actions" .}}
 </div>
 {{template "base/footer" .}}
diff --git a/templates/package/settings.tmpl b/templates/package/settings.tmpl
index a1b2b2172c99f..69d4306978e00 100644
--- a/templates/package/settings.tmpl
+++ b/templates/package/settings.tmpl
@@ -57,7 +57,7 @@
 						<form class="ui form" action="{{.Link}}" method="post">
 							{{.CsrfTokenHtml}}
 							<input type="hidden" name="action" value="delete">
-							{{template "base/page_dimmer_buttons" .}}
+							{{template "base/basic_modal_actions" .}}
 						</form>
 					</div>
 				</div>
diff --git a/templates/projects/list.tmpl b/templates/projects/list.tmpl
index 2777e3260eaeb..2ddf7477e857e 100644
--- a/templates/projects/list.tmpl
+++ b/templates/projects/list.tmpl
@@ -84,6 +84,6 @@
 	<div class="content">
 		<p>{{.locale.Tr "repo.projects.deletion_desc"}}</p>
 	</div>
-	{{template "base/page_dimmer_buttons" .}}
+	{{template "base/basic_modal_actions" .}}
 </div>
 {{end}}
diff --git a/templates/projects/view.tmpl b/templates/projects/view.tmpl
index c4d72e0cf3365..c1251df29e25e 100644
--- a/templates/projects/view.tmpl
+++ b/templates/projects/view.tmpl
@@ -113,7 +113,7 @@
 										{{$.locale.Tr "repo.projects.column.unset_default"}}
 									</a>
 								{{end}}
-								<a class="item show-modal button show-delete-column-modal" 
+								<a class="item show-modal button show-delete-column-modal"
 									data-modal="#delete-board-modal-{{.ID}}"
 									data-url="{{$.Link}}/{{.ID}}"
 								>
@@ -162,7 +162,7 @@
 									{{- if .Default -}}
 									{{- $ModalYesText = $.locale.Tr "repo.projects.column.unset_default" -}}
 									{{- end -}}
-									{{template "base/page_dimmer_buttons" (dict "." $ "ModalNoText" $ModalNoText "ModalYesText" $ModalYesText)}}
+									{{template "base/basic_modal_actions" (dict "." $ "ModalNoText" $ModalNoText "ModalYesText" $ModalYesText)}}
 								</div>
 
 								<div class="ui basic modal" id="delete-board-modal-{{.ID}}">
@@ -175,7 +175,7 @@
 										</label>
 									</div>
 									{{$ModalYesText := $.locale.Tr "repo.projects.column.delete"}}
-									{{template "base/page_dimmer_buttons" (dict "." $ "ModalNoText" $ModalNoText "ModalYesText" $ModalYesText)}}
+									{{template "base/basic_modal_actions" (dict "." $ "ModalNoText" $ModalNoText "ModalYesText" $ModalYesText)}}
 								</div>
 							</div>
 						</div>
@@ -286,6 +286,6 @@
 		<div class="content">
 			<p>{{.locale.Tr "repo.projects.deletion_desc"}}</p>
 		</div>
-		{{template "base/page_dimmer_buttons" .}}
+		{{template "base/basic_modal_actions" .}}
 	</div>
 {{end}}
diff --git a/templates/repo/branch/list.tmpl b/templates/repo/branch/list.tmpl
index 9a46e2cfe5f5d..5cea38e7b6bd7 100644
--- a/templates/repo/branch/list.tmpl
+++ b/templates/repo/branch/list.tmpl
@@ -155,7 +155,7 @@
 	<div class="content">
 		<p>{{.locale.Tr "repo.branch.delete_desc" | Str2html}}</p>
 	</div>
-	{{template "base/page_dimmer_buttons" .}}
+	{{template "base/basic_modal_actions" .}}
 </div>
 
 <div class="ui small modal" id="create-branch-modal">
diff --git a/templates/repo/issue/labels/edit_delete_label.tmpl b/templates/repo/issue/labels/edit_delete_label.tmpl
index 2c62d1a61c68b..c90fdc13effc3 100644
--- a/templates/repo/issue/labels/edit_delete_label.tmpl
+++ b/templates/repo/issue/labels/edit_delete_label.tmpl
@@ -6,7 +6,7 @@
 	<div class="content">
 		<p>{{.locale.Tr "repo.issues.label_deletion_desc"}}</p>
 	</div>
-	{{template "base/page_dimmer_buttons" .}}
+	{{template "base/basic_modal_actions" .}}
 </div>
 
 <div class="ui small edit-label modal">
diff --git a/templates/repo/issue/milestones.tmpl b/templates/repo/issue/milestones.tmpl
index 04267e2d3b807..a8c43815be0c8 100644
--- a/templates/repo/issue/milestones.tmpl
+++ b/templates/repo/issue/milestones.tmpl
@@ -124,7 +124,7 @@
 		<div class="content">
 			<p>{{.locale.Tr "repo.milestones.deletion_desc"}}</p>
 		</div>
-		{{template "base/page_dimmer_buttons" .}}
+		{{template "base/basic_modal_actions" .}}
 	</div>
 {{end}}
 {{template "base/footer" .}}
diff --git a/templates/repo/issue/view_content.tmpl b/templates/repo/issue/view_content.tmpl
index 7c68e68886f20..5df7f50c116a1 100644
--- a/templates/repo/issue/view_content.tmpl
+++ b/templates/repo/issue/view_content.tmpl
@@ -205,5 +205,5 @@
 	<div class="content">
 		<p>{{.locale.Tr "repo.branch.delete_desc" | Str2html}}</p>
 	</div>
-	{{template "base/page_dimmer_buttons" .}}
+	{{template "base/basic_modal_actions" .}}
 </div>
diff --git a/templates/repo/issue/view_content/comments_delete_time.tmpl b/templates/repo/issue/view_content/comments_delete_time.tmpl
index cf3f5c0c8a87f..42f142725b21e 100644
--- a/templates/repo/issue/view_content/comments_delete_time.tmpl
+++ b/templates/repo/issue/view_content/comments_delete_time.tmpl
@@ -7,7 +7,7 @@
 						{{.ctxData.CsrfTokenHtml}}
 					</form>
 					<div class="header">{{.ctxData.locale.Tr "repo.issues.del_time"}}</div>
-					{{template "base/page_dimmer_buttons" .}}
+					{{template "base/basic_modal_actions" .}}
 				</div>
 				<button class="ui icon button compact mini issue-delete-time" data-id="{{.comment.Time.ID}}" data-tooltip-content="{{.ctxData.locale.Tr "repo.issues.del_time"}}">
 					{{svg "octicon-trash"}}
diff --git a/templates/repo/projects/list.tmpl b/templates/repo/projects/list.tmpl
index 14f1d1fa111c7..ebe0657504846 100644
--- a/templates/repo/projects/list.tmpl
+++ b/templates/repo/projects/list.tmpl
@@ -86,7 +86,7 @@
 	<div class="content">
 		<p>{{.locale.Tr "repo.projects.deletion_desc"}}</p>
 	</div>
-	{{template "base/page_dimmer_buttons" .}}
+	{{template "base/basic_modal_actions" .}}
 </div>
 {{end}}
 {{template "base/footer" .}}
diff --git a/templates/repo/projects/view.tmpl b/templates/repo/projects/view.tmpl
index a597b5d6c0776..a8411b89aabb7 100644
--- a/templates/repo/projects/view.tmpl
+++ b/templates/repo/projects/view.tmpl
@@ -119,7 +119,7 @@
 										{{$.locale.Tr "repo.projects.column.unset_default"}}
 									</a>
 								{{end}}
-								<a class="item show-modal button show-delete-column-modal" 
+								<a class="item show-modal button show-delete-column-modal"
 									data-modal="#delete-board-modal-{{.ID}}"
 									data-url="{{$.RepoLink}}/projects/{{$.Project.ID}}/{{.ID}}"
 								>
@@ -168,7 +168,7 @@
 									{{- if .Default -}}
 									{{- $ModalYesText = $.locale.Tr "repo.projects.column.unset_default" -}}
 									{{- end -}}
-									{{template "base/page_dimmer_buttons" (dict "." $ "ModalNoText" $ModalNoText "ModalYesText" $ModalYesText)}}
+									{{template "base/basic_modal_actions" (dict "." $ "ModalNoText" $ModalNoText "ModalYesText" $ModalYesText)}}
 								</div>
 
 								<div class="ui basic modal" id="delete-board-modal-{{.ID}}">
@@ -181,7 +181,7 @@
 										</label>
 									</div>
 									{{$ModalYesText := $.locale.Tr "repo.projects.column.delete"}}
-									{{template "base/page_dimmer_buttons" (dict "." $ "ModalNoText" $ModalNoText "ModalYesText" $ModalYesText)}}
+									{{template "base/basic_modal_actions" (dict "." $ "ModalNoText" $ModalNoText "ModalYesText" $ModalYesText)}}
 								</div>
 							</div>
 						</div>
@@ -292,7 +292,7 @@
 		<div class="content">
 			<p>{{.locale.Tr "repo.projects.deletion_desc"}}</p>
 		</div>
-		{{template "base/page_dimmer_buttons" .}}
+		{{template "base/basic_modal_actions" .}}
 	</div>
 {{end}}
 
diff --git a/templates/repo/release/list.tmpl b/templates/repo/release/list.tmpl
index 5771e9f20a7cd..ec270546bebb6 100644
--- a/templates/repo/release/list.tmpl
+++ b/templates/repo/release/list.tmpl
@@ -192,7 +192,7 @@
 		<div class="content">
 			<p>{{.locale.Tr "repo.release.deletion_tag_desc"}}</p>
 		</div>
-		{{template "base/page_dimmer_buttons" .}}
+		{{template "base/basic_modal_actions" .}}
 	</div>
 {{end}}
 
diff --git a/templates/repo/release/new.tmpl b/templates/repo/release/new.tmpl
index 40fbc239063da..7f99ca2873289 100644
--- a/templates/repo/release/new.tmpl
+++ b/templates/repo/release/new.tmpl
@@ -146,7 +146,7 @@
 		<div class="content">
 			<p>{{.locale.Tr "repo.release.deletion_desc"}}</p>
 		</div>
-		{{template "base/page_dimmer_buttons" .}}
+		{{template "base/basic_modal_actions" .}}
 	</div>
 {{end}}
 {{template "base/footer" .}}
diff --git a/templates/repo/settings/branches.tmpl b/templates/repo/settings/branches.tmpl
index 11fa3111d008e..1d4e56e9072d9 100644
--- a/templates/repo/settings/branches.tmpl
+++ b/templates/repo/settings/branches.tmpl
@@ -104,7 +104,7 @@
 	<div class="content">
 		<p>{{.locale.Tr "repo.settings.protected_branch_deletion_desc"}}</p>
 	</div>
-	{{template "base/page_dimmer_buttons" .}}
+	{{template "base/basic_modal_actions" .}}
 </div>
 
 {{template "base/footer" .}}
diff --git a/templates/repo/settings/collaboration.tmpl b/templates/repo/settings/collaboration.tmpl
index 1f213d701c0eb..341c5fc678776 100644
--- a/templates/repo/settings/collaboration.tmpl
+++ b/templates/repo/settings/collaboration.tmpl
@@ -120,6 +120,6 @@
 	<div class="content">
 		<p>{{.locale.Tr "repo.settings.collaborator_deletion_desc"}}</p>
 	</div>
-	{{template "base/page_dimmer_buttons" .}}
+	{{template "base/basic_modal_actions" .}}
 </div>
 {{template "base/footer" .}}
diff --git a/templates/repo/settings/deploy_keys.tmpl b/templates/repo/settings/deploy_keys.tmpl
index 50269969d58b5..9fc2fc27845fd 100644
--- a/templates/repo/settings/deploy_keys.tmpl
+++ b/templates/repo/settings/deploy_keys.tmpl
@@ -85,6 +85,6 @@
 	<div class="content">
 		<p>{{.locale.Tr "repo.settings.deploy_key_deletion_desc"}}</p>
 	</div>
-	{{template "base/page_dimmer_buttons" .}}
+	{{template "base/basic_modal_actions" .}}
 </div>
 {{template "base/footer" .}}
diff --git a/templates/repo/settings/lfs.tmpl b/templates/repo/settings/lfs.tmpl
index 45e237f501e50..8752e1c876537 100644
--- a/templates/repo/settings/lfs.tmpl
+++ b/templates/repo/settings/lfs.tmpl
@@ -50,7 +50,7 @@
 					</p>
 					<form class="ui form" action="{{$.Link}}/delete/{{.Oid}}" method="post">
 						{{$.CsrfTokenHtml}}
-						<div class="center actions">{{/* TODO: Convert to base/page_dimmer_buttons */}}
+						<div class="center actions">{{/* TODO: Convert to base/basic_modal_actions */}}
 							<button class="ui basic cancel inverted button">{{$.locale.Tr "settings.cancel"}}</button>
 							<button class="ui basic inverted yellow button">{{$.locale.Tr "modal.yes"}}</button>
 						</div>
diff --git a/templates/repo/settings/options.tmpl b/templates/repo/settings/options.tmpl
index 908ef2be361fe..32d5fe17f9375 100644
--- a/templates/repo/settings/options.tmpl
+++ b/templates/repo/settings/options.tmpl
@@ -988,7 +988,7 @@
 				{{.CsrfTokenHtml}}
 				<input type="hidden" name="action" value="{{if .Repository.IsArchived}}unarchive{{else}}archive{{end}}">
 				<input type="hidden" name="repo_id" value="{{.Repository.ID}}">
-				{{template "base/page_dimmer_buttons" .}}
+				{{template "base/basic_modal_actions" .}}
 			</form>
 		</div>
 	{{end}}
diff --git a/templates/repo/settings/webhook/delete_modal.tmpl b/templates/repo/settings/webhook/delete_modal.tmpl
index c5d05ced478d2..622d24a46ca90 100644
--- a/templates/repo/settings/webhook/delete_modal.tmpl
+++ b/templates/repo/settings/webhook/delete_modal.tmpl
@@ -6,5 +6,5 @@
 	<div class="content">
 		<p>{{.locale.Tr "repo.settings.webhook_deletion_desc"}}</p>
 	</div>
-	{{template "base/page_dimmer_buttons" .}}
+	{{template "base/basic_modal_actions" .}}
 </div>
diff --git a/templates/repo/wiki/view.tmpl b/templates/repo/wiki/view.tmpl
index 4ba6b74445a0c..0e770ee28e6af 100644
--- a/templates/repo/wiki/view.tmpl
+++ b/templates/repo/wiki/view.tmpl
@@ -107,7 +107,7 @@
 	<div class="content">
 		<p>{{.locale.Tr "repo.wiki.delete_page_notice_1" ($title|Escape) | Safe}}</p>
 	</div>
-	{{template "base/page_dimmer_buttons" .}}
+	{{template "base/basic_modal_actions" .}}
 </div>
 
 {{template "base/footer" .}}
diff --git a/templates/shared/actions/runner_edit.tmpl b/templates/shared/actions/runner_edit.tmpl
index 9b66402438085..4733d2d7b2f5d 100644
--- a/templates/shared/actions/runner_edit.tmpl
+++ b/templates/shared/actions/runner_edit.tmpl
@@ -97,6 +97,6 @@
 		<div class="content">
 			<p>{{.locale.Tr "actions.runners.delete_runner_notice" | Safe}}</p>
 		</div>
-		{{template "base/page_dimmer_buttons" .}}
+		{{template "base/basic_modal_actions" .}}
 	</div>
 </div>
diff --git a/templates/shared/secrets/add_list.tmpl b/templates/shared/secrets/add_list.tmpl
index da4a0774a98a8..8820686aa93a2 100644
--- a/templates/shared/secrets/add_list.tmpl
+++ b/templates/shared/secrets/add_list.tmpl
@@ -64,5 +64,5 @@
 	<div class="content">
 		<p>{{.locale.Tr "secrets.deletion.description"}}</p>
 	</div>
-	{{template "base/page_dimmer_buttons" .}}
+	{{template "base/basic_modal_actions" .}}
 </div>
diff --git a/templates/user/settings/account.tmpl b/templates/user/settings/account.tmpl
index a16c6afbffacb..5c6e35c7140b3 100644
--- a/templates/user/settings/account.tmpl
+++ b/templates/user/settings/account.tmpl
@@ -169,7 +169,7 @@
 	<div class="content">
 		<p>{{.locale.Tr "settings.email_deletion_desc"}}</p>
 	</div>
-	{{template "base/page_dimmer_buttons" .}}
+	{{template "base/basic_modal_actions" .}}
 </div>
 
 <div class="ui small basic delete modal" id="delete-account">
@@ -180,7 +180,7 @@
 	<div class="content">
 		<p>{{.locale.Tr "settings.delete_account_desc"}}</p>
 	</div>
-	{{template "base/page_dimmer_buttons" .}}
+	{{template "base/basic_modal_actions" .}}
 </div>
 
 {{template "base/footer" .}}
diff --git a/templates/user/settings/applications.tmpl b/templates/user/settings/applications.tmpl
index 21182d09635bd..5724bb1fd8473 100644
--- a/templates/user/settings/applications.tmpl
+++ b/templates/user/settings/applications.tmpl
@@ -277,7 +277,7 @@
 		<p>{{.locale.Tr "settings.access_token_deletion_desc"}}</p>
 	</div>
 
-	<div class="actions">{{/* TODO: Convert to base/page_dimmer_buttons.tmpl */}}
+	<div class="actions">{{/* TODO: Convert to base/basic_modal_actions.tmpl */}}
 		<button class="ui green basic inverted cancel button">
 			{{svg "octicon-x"}}
 			{{.locale.Tr "settings.access_token_deletion_cancel_action"}}
diff --git a/templates/user/settings/applications_oauth2_list.tmpl b/templates/user/settings/applications_oauth2_list.tmpl
index c04d132e24e50..c34bf71387bf0 100644
--- a/templates/user/settings/applications_oauth2_list.tmpl
+++ b/templates/user/settings/applications_oauth2_list.tmpl
@@ -55,5 +55,5 @@
 	<div class="content">
 		<p>{{.locale.Tr "settings.oauth2_application_remove_description"}}</p>
 	</div>
-	{{template "base/page_dimmer_buttons" .}}
+	{{template "base/basic_modal_actions" .}}
 </div>
diff --git a/templates/user/settings/grants_oauth2.tmpl b/templates/user/settings/grants_oauth2.tmpl
index 83cfa75883001..a9635543c1542 100644
--- a/templates/user/settings/grants_oauth2.tmpl
+++ b/templates/user/settings/grants_oauth2.tmpl
@@ -36,5 +36,5 @@
 	<div class="content">
 		<p>{{.locale.Tr "settings.revoke_oauth2_grant_description"}}</p>
 	</div>
-	{{template "base/page_dimmer_buttons" .}}
+	{{template "base/basic_modal_actions" .}}
 </div>
diff --git a/templates/user/settings/keys_gpg.tmpl b/templates/user/settings/keys_gpg.tmpl
index bd201149a41b5..86113c4e9085f 100644
--- a/templates/user/settings/keys_gpg.tmpl
+++ b/templates/user/settings/keys_gpg.tmpl
@@ -119,5 +119,5 @@
 	<div class="content">
 		<p>{{.locale.Tr "settings.gpg_key_deletion_desc"}}</p>
 	</div>
-	{{template "base/page_dimmer_buttons" .}}
+	{{template "base/basic_modal_actions" .}}
 </div>
diff --git a/templates/user/settings/keys_principal.tmpl b/templates/user/settings/keys_principal.tmpl
index cc354afba499d..71c51037adc53 100644
--- a/templates/user/settings/keys_principal.tmpl
+++ b/templates/user/settings/keys_principal.tmpl
@@ -62,6 +62,6 @@
 		<div class="content">
 			<p>{{.locale.Tr "settings.ssh_principal_deletion_desc"}}</p>
 		</div>
-		{{template "base/page_dimmer_buttons" .}}
+		{{template "base/basic_modal_actions" .}}
 	</div>
 {{end}}
diff --git a/templates/user/settings/keys_ssh.tmpl b/templates/user/settings/keys_ssh.tmpl
index 69bde0ca65da2..e1412e01e96d3 100644
--- a/templates/user/settings/keys_ssh.tmpl
+++ b/templates/user/settings/keys_ssh.tmpl
@@ -108,5 +108,5 @@
 	<div class="content">
 		<p>{{.locale.Tr "settings.ssh_key_deletion_desc"}}</p>
 	</div>
-	{{template "base/page_dimmer_buttons" .}}
+	{{template "base/basic_modal_actions" .}}
 </div>
diff --git a/templates/user/settings/organization.tmpl b/templates/user/settings/organization.tmpl
index 5db6f632a753e..44d20995af64f 100644
--- a/templates/user/settings/organization.tmpl
+++ b/templates/user/settings/organization.tmpl
@@ -48,6 +48,6 @@
 	<div class="content">
 		<p>{{$.locale.Tr "org.members.leave.detail" `<span class="dataOrganizationName"></span>` | Safe}}</p>
 	</div>
-	{{template "base/page_dimmer_buttons" .}}
+	{{template "base/basic_modal_actions" .}}
 </div>
 {{template "base/footer" .}}
diff --git a/templates/user/settings/repos.tmpl b/templates/user/settings/repos.tmpl
index e1c537c320091..5e1bbcb5c7141 100644
--- a/templates/user/settings/repos.tmpl
+++ b/templates/user/settings/repos.tmpl
@@ -77,7 +77,7 @@
 														{{$.CsrfTokenHtml}}
 														<input type="hidden" name="id" value="{{$dir}}">
 														<input type="hidden" name="action" value="delete">
-														{{template "base/page_dimmer_buttons" $}}
+														{{template "base/basic_modal_actions" $}}
 													</form>
 												</div>
 											{{end}}
@@ -139,6 +139,6 @@
 	<div class="content">
 		<p>{{.locale.Tr "settings.remove_account_link_desc"}}</p>
 	</div>
-	{{template "base/page_dimmer_buttons" .}}
+	{{template "base/basic_modal_actions" .}}
 </div>
 {{template "base/footer" .}}
diff --git a/templates/user/settings/security/accountlinks.tmpl b/templates/user/settings/security/accountlinks.tmpl
index aa8332f6d8054..5bb1a857969d6 100644
--- a/templates/user/settings/security/accountlinks.tmpl
+++ b/templates/user/settings/security/accountlinks.tmpl
@@ -49,5 +49,5 @@
 	<div class="content">
 		<p>{{.locale.Tr "settings.remove_account_link_desc"}}</p>
 	</div>
-	{{template "base/page_dimmer_buttons" .}}
+	{{template "base/basic_modal_actions" .}}
 </div>
diff --git a/templates/user/settings/security/openid.tmpl b/templates/user/settings/security/openid.tmpl
index 3fd49300fc7cd..04356adf9965d 100644
--- a/templates/user/settings/security/openid.tmpl
+++ b/templates/user/settings/security/openid.tmpl
@@ -59,5 +59,5 @@
 	<div class="content">
 		<p>{{.locale.Tr "settings.openid_deletion_desc"}}</p>
 	</div>
-	{{template "base/page_dimmer_buttons" .}}
+	{{template "base/basic_modal_actions" .}}
 </div>
diff --git a/templates/user/settings/security/twofa.tmpl b/templates/user/settings/security/twofa.tmpl
index c4a4e8fbed417..d4e1ef91e8647 100644
--- a/templates/user/settings/security/twofa.tmpl
+++ b/templates/user/settings/security/twofa.tmpl
@@ -31,5 +31,5 @@
 	<div class="content">
 		<p>{{.locale.Tr "settings.twofa_disable_desc"}}</p>
 	</div>
-	{{template "base/page_dimmer_buttons" .}}
+	{{template "base/basic_modal_actions" .}}
 </div>
diff --git a/templates/user/settings/security/webauthn.tmpl b/templates/user/settings/security/webauthn.tmpl
index 3c5677aca0e01..7d52c2bad67b1 100644
--- a/templates/user/settings/security/webauthn.tmpl
+++ b/templates/user/settings/security/webauthn.tmpl
@@ -38,5 +38,5 @@
 	<div class="content">
 		<p>{{.locale.Tr "settings.webauthn_delete_key_desc"}}</p>
 	</div>
-	{{template "base/page_dimmer_buttons" .}}
+	{{template "base/basic_modal_actions" .}}
 </div>

From 159e22880c2accd452a3198f3db72159ebece0c4 Mon Sep 17 00:00:00 2001
From: HesterG <hestergong@gmail.com>
Date: Fri, 21 Apr 2023 09:05:44 +0800
Subject: [PATCH 13/26] use template for delete pr

---
 templates/repo/issue/view_content/sidebar.tmpl | 5 +----
 web_src/css/base.css                           | 4 ++++
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/templates/repo/issue/view_content/sidebar.tmpl b/templates/repo/issue/view_content/sidebar.tmpl
index 290488d9fbb94..eebdf42542361 100644
--- a/templates/repo/issue/view_content/sidebar.tmpl
+++ b/templates/repo/issue/view_content/sidebar.tmpl
@@ -682,10 +682,7 @@
 				</div>
 				<form action="{{.Issue.Link}}/delete" method="post">
 					{{.CsrfTokenHtml}}
-					<div class="center actions">
-						<button class="ui basic cancel inverted button">{{.locale.Tr "settings.cancel"}}</button>
-						<button class="ui basic red inverted button">{{.locale.Tr "modal.yes"}}</button>
-					</div>
+					{{template "base/basic_modal_actions" .}}
 				</form>
 			</div>
 		{{end}}
diff --git a/web_src/css/base.css b/web_src/css/base.css
index 79e1566b64998..e596e3ff41f61 100644
--- a/web_src/css/base.css
+++ b/web_src/css/base.css
@@ -1166,6 +1166,10 @@ a.ui.card:hover {
   color: var(--color-text);
 }
 
+.ui.modal > form > .actions {
+  text-align: right;
+}
+
 .ui.basic.table > tbody > tr {
   border-color: var(--color-secondary);
 }

From 6ea509ed7d5aedccf4486c4a301b259f99c62e3f Mon Sep 17 00:00:00 2001
From: HesterG <hestergong@gmail.com>
Date: Fri, 21 Apr 2023 09:39:08 +0800
Subject: [PATCH 14/26] change to template and add TODOs

---
 templates/admin/repo/unadopted.tmpl            |  4 ++--
 templates/repo/issue/view_content/sidebar.tmpl | 13 +++----------
 templates/user/settings/repos.tmpl             |  2 +-
 3 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/templates/admin/repo/unadopted.tmpl b/templates/admin/repo/unadopted.tmpl
index a8e04850d0dd3..357ca9b042e1b 100644
--- a/templates/admin/repo/unadopted.tmpl
+++ b/templates/admin/repo/unadopted.tmpl
@@ -43,7 +43,7 @@
 												<input type="hidden" name="action" value="adopt">
 												<input type="hidden" name="q" value="{{$.Keyword}}">
 												<input type="hidden" name="page" value="{{$.CurrentPage}}">
-												<div class="actions">
+												<div class="actions">{{/* TODO: Convert to base/basic_modal_actions */}}
 													<button class="ui red basic inverted cancel button">
 														{{svg "octicon-trash" 16 "gt-mr-2"}}
 														{{$.locale.Tr "modal.no"}}
@@ -70,7 +70,7 @@
 												<input type="hidden" name="action" value="delete">
 												<input type="hidden" name="q" value="{{$.Keyword}}">
 												<input type="hidden" name="page" value="{{$.CurrentPage}}">
-												<div class="actions">
+												<div class="actions">{{/* TODO: Convert to base/basic_modal_actions */}}
 													<button class="ui red basic inverted cancel button">
 														{{svg "octicon-trash" 16 "gt-mr-2"}}
 														{{$.locale.Tr "modal.no"}}
diff --git a/templates/repo/issue/view_content/sidebar.tmpl b/templates/repo/issue/view_content/sidebar.tmpl
index eebdf42542361..d767ce6122785 100644
--- a/templates/repo/issue/view_content/sidebar.tmpl
+++ b/templates/repo/issue/view_content/sidebar.tmpl
@@ -559,16 +559,9 @@
 							{{.locale.Tr "repo.issues.dependency.issue_remove_text"}}
 						{{end}}</p>
 					</div>
-					<div class="actions">
-						<button class="ui red cancel inverted button">
-							{{svg "octicon-x"}}
-							{{.locale.Tr "repo.issues.dependency.cancel"}}
-						</button>
-						<button class="ui green ok inverted button">
-							{{svg "octicon-check"}}
-							{{.locale.Tr "repo.issues.dependency.remove"}}
-						</button>
-					</div>
+					{{$ModalNoText := .locale.Tr "repo.issues.dependency.cancel"}}
+					{{$ModalYesText := .locale.Tr "repo.issues.dependency.remove"}}
+					{{template "base/basic_modal_actions" (dict "." . "ModalNoText" $ModalNoText "ModalYesText" $ModalYesText)}}
 				</div>
 			{{end}}
 		{{end}}
diff --git a/templates/user/settings/repos.tmpl b/templates/user/settings/repos.tmpl
index 545671dae5512..9e11786d45c50 100644
--- a/templates/user/settings/repos.tmpl
+++ b/templates/user/settings/repos.tmpl
@@ -50,7 +50,7 @@
 														{{$.CsrfTokenHtml}}
 														<input type="hidden" name="id" value="{{$dir}}">
 														<input type="hidden" name="action" value="adopt">
-														<div class="actions">
+														<div class="actions">{{/* TODO: Convert to base/basic_modal_actions */}}
 															<button class="ui red basic inverted cancel button">
 																{{svg "octicon-x"}}
 																{{$.locale.Tr "modal.no"}}

From 7545bca0eec5fb96673779058c98e22fa6410e1c Mon Sep 17 00:00:00 2001
From: HesterG <hestergong@gmail.com>
Date: Fri, 21 Apr 2023 14:48:16 +0800
Subject: [PATCH 15/26] use centerd style for buttons

---
 web_src/css/base.css | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/web_src/css/base.css b/web_src/css/base.css
index cf440a1df4d69..32dfc8eff0da8 100644
--- a/web_src/css/base.css
+++ b/web_src/css/base.css
@@ -1160,6 +1160,7 @@ a.ui.card:hover {
 .ui.modal > .actions {
   background: var(--color-secondary-bg);
   border-color: var(--color-secondary);
+  text-align: center;
 }
 
 .ui.modal > .close.inside {
@@ -1167,7 +1168,7 @@ a.ui.card:hover {
 }
 
 .ui.modal > form > .actions {
-  text-align: right;
+  text-align: center;
 }
 
 .ui.basic.table > tbody > tr {

From ed7d1912c4bc2433b3268342d599a757ab71a143 Mon Sep 17 00:00:00 2001
From: HesterG <hestergong@gmail.com>
Date: Fri, 21 Apr 2023 14:50:37 +0800
Subject: [PATCH 16/26] move selector

---
 web_src/css/base.css | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/web_src/css/base.css b/web_src/css/base.css
index 32dfc8eff0da8..03f75d48d5fff 100644
--- a/web_src/css/base.css
+++ b/web_src/css/base.css
@@ -1157,7 +1157,8 @@ a.ui.card:hover {
   text-align: left !important;
 }
 
-.ui.modal > .actions {
+.ui.modal > .actions,
+.ui.modal > form > .actions {
   background: var(--color-secondary-bg);
   border-color: var(--color-secondary);
   text-align: center;
@@ -1167,10 +1168,6 @@ a.ui.card:hover {
   color: var(--color-text);
 }
 
-.ui.modal > form > .actions {
-  text-align: center;
-}
-
 .ui.basic.table > tbody > tr {
   border-color: var(--color-secondary);
 }

From ebe447992dd3ffaa5002fd8b0b2367c8b3d504fa Mon Sep 17 00:00:00 2001
From: HesterG <hestergong@gmail.com>
Date: Fri, 21 Apr 2023 14:54:16 +0800
Subject: [PATCH 17/26] revert

---
 web_src/css/base.css | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/web_src/css/base.css b/web_src/css/base.css
index 03f75d48d5fff..32dfc8eff0da8 100644
--- a/web_src/css/base.css
+++ b/web_src/css/base.css
@@ -1157,8 +1157,7 @@ a.ui.card:hover {
   text-align: left !important;
 }
 
-.ui.modal > .actions,
-.ui.modal > form > .actions {
+.ui.modal > .actions {
   background: var(--color-secondary-bg);
   border-color: var(--color-secondary);
   text-align: center;
@@ -1168,6 +1167,10 @@ a.ui.card:hover {
   color: var(--color-text);
 }
 
+.ui.modal > form > .actions {
+  text-align: center;
+}
+
 .ui.basic.table > tbody > tr {
   border-color: var(--color-secondary);
 }

From 4ce523669b6f1d881a02579bef982205abf64106 Mon Sep 17 00:00:00 2001
From: wxiaoguang <wxiaoguang@gmail.com>
Date: Sun, 23 Apr 2023 11:52:41 +0800
Subject: [PATCH 18/26] match Fomantic Modal defination

---
 templates/admin/auth/edit.tmpl                  |  2 +-
 templates/admin/emails/list.tmpl                |  2 +-
 templates/admin/monitor.tmpl                    |  2 +-
 templates/admin/packages/list.tmpl              |  2 +-
 templates/admin/queue.tmpl                      |  2 +-
 templates/admin/repo/list.tmpl                  |  2 +-
 templates/admin/repo/unadopted.tmpl             |  4 ++--
 templates/admin/stacktrace.tmpl                 |  2 +-
 templates/admin/user/edit.tmpl                  |  2 +-
 templates/base/basic_modal_actions.tmpl         | 10 ----------
 templates/base/modal_actions_confirm.tmpl       | 17 +++++++++++++++++
 templates/org/member/members.tmpl               |  4 ++--
 templates/org/settings/delete.tmpl              |  2 +-
 templates/org/team/members.tmpl                 |  2 +-
 templates/org/team/new.tmpl                     |  2 +-
 templates/org/team/repositories.tmpl            |  4 ++--
 templates/org/team/sidebar.tmpl                 |  2 +-
 templates/org/team/teams.tmpl                   |  2 +-
 templates/package/settings.tmpl                 |  2 +-
 templates/projects/list.tmpl                    |  2 +-
 templates/projects/view.tmpl                    | 14 +++++++-------
 templates/repo/branch/list.tmpl                 |  2 +-
 .../repo/issue/labels/edit_delete_label.tmpl    |  2 +-
 templates/repo/issue/milestones.tmpl            |  2 +-
 templates/repo/issue/view_content.tmpl          |  2 +-
 .../view_content/comments_delete_time.tmpl      |  2 +-
 templates/repo/issue/view_content/sidebar.tmpl  |  8 ++++----
 templates/repo/projects/list.tmpl               |  2 +-
 templates/repo/projects/view.tmpl               | 14 +++++++-------
 templates/repo/release/list.tmpl                |  2 +-
 templates/repo/release/new.tmpl                 |  2 +-
 templates/repo/settings/branches.tmpl           |  2 +-
 templates/repo/settings/collaboration.tmpl      |  2 +-
 templates/repo/settings/deploy_keys.tmpl        |  2 +-
 templates/repo/settings/lfs.tmpl                |  2 +-
 templates/repo/settings/options.tmpl            |  2 +-
 .../repo/settings/webhook/delete_modal.tmpl     |  2 +-
 templates/repo/wiki/view.tmpl                   |  2 +-
 templates/shared/actions/runner_edit.tmpl       |  2 +-
 templates/shared/secrets/add_list.tmpl          |  2 +-
 templates/user/settings/account.tmpl            |  4 ++--
 templates/user/settings/applications.tmpl       |  2 +-
 .../user/settings/applications_oauth2_list.tmpl |  2 +-
 templates/user/settings/grants_oauth2.tmpl      |  2 +-
 templates/user/settings/keys_gpg.tmpl           |  2 +-
 templates/user/settings/keys_principal.tmpl     |  2 +-
 templates/user/settings/keys_ssh.tmpl           |  2 +-
 templates/user/settings/organization.tmpl       |  2 +-
 templates/user/settings/repos.tmpl              |  6 +++---
 .../user/settings/security/accountlinks.tmpl    |  2 +-
 templates/user/settings/security/openid.tmpl    |  2 +-
 templates/user/settings/security/twofa.tmpl     |  2 +-
 templates/user/settings/security/webauthn.tmpl  |  2 +-
 web_src/js/features/repo-projects.js            |  4 ++--
 54 files changed, 91 insertions(+), 84 deletions(-)
 delete mode 100644 templates/base/basic_modal_actions.tmpl
 create mode 100644 templates/base/modal_actions_confirm.tmpl

diff --git a/templates/admin/auth/edit.tmpl b/templates/admin/auth/edit.tmpl
index e46afe4ad686b..ec0cb10b56214 100644
--- a/templates/admin/auth/edit.tmpl
+++ b/templates/admin/auth/edit.tmpl
@@ -448,6 +448,6 @@
 	<div class="content">
 		<p>{{.locale.Tr "admin.auths.delete_auth_desc"}}</p>
 	</div>
-	{{template "base/basic_modal_actions" .}}
+	{{template "base/modal_actions_confirm" .}}
 </div>
 {{template "base/footer" .}}
diff --git a/templates/admin/emails/list.tmpl b/templates/admin/emails/list.tmpl
index 37da00d5e8d42..b71acb28d7ad8 100644
--- a/templates/admin/emails/list.tmpl
+++ b/templates/admin/emails/list.tmpl
@@ -94,7 +94,7 @@
 					<input type="hidden" id="form-activate" name="activate" value="" required>
 
 					<div class="center">
-						{{template "base/basic_modal_actions" .}}
+						{{template "base/modal_actions_confirm" .}}
 					</div>
 				</form>
 			</div>
diff --git a/templates/admin/monitor.tmpl b/templates/admin/monitor.tmpl
index c4257a8527c06..31929764a5899 100644
--- a/templates/admin/monitor.tmpl
+++ b/templates/admin/monitor.tmpl
@@ -46,6 +46,6 @@
 		<p>{{$.locale.Tr "admin.monitor.process.cancel_notices" `<span class="name"></span>` | Safe}}</p>
 		<p>{{$.locale.Tr "admin.monitor.process.cancel_desc"}}</p>
 	</div>
-	{{template "base/basic_modal_actions" .}}
+	{{template "base/modal_actions_confirm" .}}
 </div>
 {{template "base/footer" .}}
diff --git a/templates/admin/packages/list.tmpl b/templates/admin/packages/list.tmpl
index d97b41ffa5727..17b4d0afe9e1f 100644
--- a/templates/admin/packages/list.tmpl
+++ b/templates/admin/packages/list.tmpl
@@ -88,6 +88,6 @@
 	<div class="content">
 		{{.locale.Tr "packages.settings.delete.notice" `<span class="name"></span>` `<span class="dataVersion"></span>` | Safe}}
 	</div>
-	{{template "base/basic_modal_actions" .}}
+	{{template "base/modal_actions_confirm" .}}
 </div>
 {{template "base/footer" .}}
diff --git a/templates/admin/queue.tmpl b/templates/admin/queue.tmpl
index 2ace03810cb04..e6f908aefcbe5 100644
--- a/templates/admin/queue.tmpl
+++ b/templates/admin/queue.tmpl
@@ -190,7 +190,7 @@
 		<p>{{$.locale.Tr "admin.monitor.queue.pool.cancel_notices" `<span class="name"></span>` | Safe}}</p>
 		<p>{{$.locale.Tr "admin.monitor.queue.pool.cancel_desc"}}</p>
 	</div>
-	{{template "base/basic_modal_actions" .}}
+	{{template "base/modal_actions_confirm" .}}
 </div>
 
 {{template "base/footer" .}}
diff --git a/templates/admin/repo/list.tmpl b/templates/admin/repo/list.tmpl
index 7c907e5cfcf16..5daf50fc5edb5 100644
--- a/templates/admin/repo/list.tmpl
+++ b/templates/admin/repo/list.tmpl
@@ -105,6 +105,6 @@
 		{{.locale.Tr "repo.settings.delete_notices_2" `<span class="name"></span>` | Safe}}<br>
 		{{.locale.Tr "repo.settings.delete_notices_fork_1"}}<br>
 	</div>
-	{{template "base/basic_modal_actions" .}}
+	{{template "base/modal_actions_confirm" .}}
 </div>
 {{template "base/footer" .}}
diff --git a/templates/admin/repo/unadopted.tmpl b/templates/admin/repo/unadopted.tmpl
index 357ca9b042e1b..fc3a632f02032 100644
--- a/templates/admin/repo/unadopted.tmpl
+++ b/templates/admin/repo/unadopted.tmpl
@@ -43,7 +43,7 @@
 												<input type="hidden" name="action" value="adopt">
 												<input type="hidden" name="q" value="{{$.Keyword}}">
 												<input type="hidden" name="page" value="{{$.CurrentPage}}">
-												<div class="actions">{{/* TODO: Convert to base/basic_modal_actions */}}
+												<div class="actions">{{/* TODO: Convert to base/modal_actions_confirm */}}
 													<button class="ui red basic inverted cancel button">
 														{{svg "octicon-trash" 16 "gt-mr-2"}}
 														{{$.locale.Tr "modal.no"}}
@@ -70,7 +70,7 @@
 												<input type="hidden" name="action" value="delete">
 												<input type="hidden" name="q" value="{{$.Keyword}}">
 												<input type="hidden" name="page" value="{{$.CurrentPage}}">
-												<div class="actions">{{/* TODO: Convert to base/basic_modal_actions */}}
+												<div class="actions">{{/* TODO: Convert to base/modal_actions_confirm */}}
 													<button class="ui red basic inverted cancel button">
 														{{svg "octicon-trash" 16 "gt-mr-2"}}
 														{{$.locale.Tr "modal.no"}}
diff --git a/templates/admin/stacktrace.tmpl b/templates/admin/stacktrace.tmpl
index 8dfe78422a858..f5b2fd25f6aaa 100644
--- a/templates/admin/stacktrace.tmpl
+++ b/templates/admin/stacktrace.tmpl
@@ -27,7 +27,7 @@
 		<p>{{$.locale.Tr "admin.monitor.process.cancel_notices" `<span class="name"></span>` | Safe}}</p>
 		<p>{{$.locale.Tr "admin.monitor.process.cancel_desc"}}</p>
 	</div>
-	{{template "base/basic_modal_actions" .}}
+	{{template "base/modal_actions_confirm" .}}
 </div>
 
 {{template "base/footer" .}}
diff --git a/templates/admin/user/edit.tmpl b/templates/admin/user/edit.tmpl
index 17a64359d9c02..63ac2e0b042da 100644
--- a/templates/admin/user/edit.tmpl
+++ b/templates/admin/user/edit.tmpl
@@ -213,7 +213,7 @@
 			</div>
 			<p class="help">{{.locale.Tr "admin.users.purge_help"}}</p>
 		</div>
-		{{template "base/basic_modal_actions" .}}
+		{{template "base/modal_actions_confirm" .}}
 	</form>
 </div>
 {{template "base/footer" .}}
diff --git a/templates/base/basic_modal_actions.tmpl b/templates/base/basic_modal_actions.tmpl
deleted file mode 100644
index 79229b62688ab..0000000000000
--- a/templates/base/basic_modal_actions.tmpl
+++ /dev/null
@@ -1,10 +0,0 @@
-<div class="actions">
-	<button class="ui red cancel button modal-cancel-button">
-		{{svg "octicon-x"}}
-		{{if .ModalNoText}}{{.ModalNoText}}{{else}}{{.locale.Tr "modal.no"}}{{end}}
-	</button>
-	<button class="ui green ok button modal-confirm-button">
-		{{svg "octicon-check"}}
-		{{if .ModalYesText}}{{.ModalYesText}}{{else}}{{.locale.Tr "modal.yes"}}{{end}}
-	</button>
-</div>
diff --git a/templates/base/modal_actions_confirm.tmpl b/templates/base/modal_actions_confirm.tmpl
new file mode 100644
index 0000000000000..70d3f0af0e65a
--- /dev/null
+++ b/templates/base/modal_actions_confirm.tmpl
@@ -0,0 +1,17 @@
+{{/*
+Template Attributes:
+* ModalButtonCancelText
+* ModalButtonOkText
+
+The ".ok.button" and ".cancel.button" selectors are also used by Fomantic Modal internally
+*/}}
+<div class="actions">
+	<button class="ui red cancel button">
+		{{svg "octicon-x"}}
+		{{if .ModalButtonCancelText}}{{.ModalButtonCancelText}}{{else}}{{.locale.Tr "modal.no"}}{{end}}
+	</button>
+	<button class="ui green ok button">
+		{{svg "octicon-check"}}
+		{{if .ModalButtonOkText}}{{.ModalButtonOkText}}{{else}}{{.locale.Tr "modal.yes"}}{{end}}
+	</button>
+</div>
diff --git a/templates/org/member/members.tmpl b/templates/org/member/members.tmpl
index d83b742f9f4bf..e273e0d2b37c8 100644
--- a/templates/org/member/members.tmpl
+++ b/templates/org/member/members.tmpl
@@ -89,7 +89,7 @@
 	<div class="content">
 		<p>{{$.locale.Tr "org.members.leave.detail" `<span class="dataOrganizationName"></span>` | Safe}}</p>
 	</div>
-	{{template "base/basic_modal_actions" .}}
+	{{template "base/modal_actions_confirm" .}}
 </div>
 <div class="ui small basic delete modal" id="remove-organization-member">
 	<div class="ui icon header">
@@ -99,7 +99,7 @@
 	<div class="content">
 		<p>{{$.locale.Tr "org.members.remove.detail" `<span class="name"></span>` `<span class="dataOrganizationName"></span>` | Safe}}</p>
 	</div>
-	{{template "base/basic_modal_actions" .}}
+	{{template "base/modal_actions_confirm" .}}
 </div>
 
 {{template "base/footer" .}}
diff --git a/templates/org/settings/delete.tmpl b/templates/org/settings/delete.tmpl
index 6352396d867c5..80d0ed212d131 100644
--- a/templates/org/settings/delete.tmpl
+++ b/templates/org/settings/delete.tmpl
@@ -37,6 +37,6 @@
 	<div class="content">
 		<p>{{.locale.Tr "org.settings.delete_org_desc"}}</p>
 	</div>
-	{{template "base/basic_modal_actions" .}}
+	{{template "base/modal_actions_confirm" .}}
 </div>
 {{template "base/footer" .}}
diff --git a/templates/org/team/members.tmpl b/templates/org/team/members.tmpl
index c59cce11be4fd..efe32d09ad8a9 100644
--- a/templates/org/team/members.tmpl
+++ b/templates/org/team/members.tmpl
@@ -72,6 +72,6 @@
 	<div class="content">
 		<p>{{$.locale.Tr "org.members.remove.detail" `<span class="name"></span>` `<span class="dataTeamName"></span>` | Safe}}</p>
 	</div>
-	{{template "base/basic_modal_actions" .}}
+	{{template "base/modal_actions_confirm" .}}
 </div>
 {{template "base/footer" .}}
diff --git a/templates/org/team/new.tmpl b/templates/org/team/new.tmpl
index 48ec1f4586e05..99530b1be61d1 100644
--- a/templates/org/team/new.tmpl
+++ b/templates/org/team/new.tmpl
@@ -156,6 +156,6 @@
 	<div class="content">
 		<p>{{.locale.Tr "org.teams.delete_team_desc"}}</p>
 	</div>
-	{{template "base/basic_modal_actions" .}}
+	{{template "base/modal_actions_confirm" .}}
 </div>
 {{template "base/footer" .}}
diff --git a/templates/org/team/repositories.tmpl b/templates/org/team/repositories.tmpl
index 0d7da480ddae2..e8d3ea66cf849 100644
--- a/templates/org/team/repositories.tmpl
+++ b/templates/org/team/repositories.tmpl
@@ -72,7 +72,7 @@
 	<div class="content">
 		<p>{{.locale.Tr "org.teams.remove_all_repos_desc"}}</p>
 	</div>
-	{{template "base/basic_modal_actions" .}}
+	{{template "base/modal_actions_confirm" .}}
 </div>
 
 <div class="ui small basic addall modal" id="org-team-add-all-repo">
@@ -83,7 +83,7 @@
 	<div class="content">
 		<p>{{.locale.Tr "org.teams.add_all_repos_desc"}}</p>
 	</div>
-	{{template "base/basic_modal_actions" .}}
+	{{template "base/modal_actions_confirm" .}}
 </div>
 
 {{template "base/footer" .}}
diff --git a/templates/org/team/sidebar.tmpl b/templates/org/team/sidebar.tmpl
index 1c98315697da5..311601ac595ea 100644
--- a/templates/org/team/sidebar.tmpl
+++ b/templates/org/team/sidebar.tmpl
@@ -91,5 +91,5 @@
 	<div class="content">
 		<p>{{$.locale.Tr "org.teams.leave.detail" `<span class="name"></span>` | Safe}}</p>
 	</div>
-	{{template "base/basic_modal_actions" .}}
+	{{template "base/modal_actions_confirm" .}}
 </div>
diff --git a/templates/org/team/teams.tmpl b/templates/org/team/teams.tmpl
index 2f9d447b1c43b..56e5ed315d262 100644
--- a/templates/org/team/teams.tmpl
+++ b/templates/org/team/teams.tmpl
@@ -51,6 +51,6 @@
 	<div class="content">
 		<p>{{$.locale.Tr "org.teams.leave.detail" `<span class="name"></span>` | Safe}}</p>
 	</div>
-	{{template "base/basic_modal_actions" .}}
+	{{template "base/modal_actions_confirm" .}}
 </div>
 {{template "base/footer" .}}
diff --git a/templates/package/settings.tmpl b/templates/package/settings.tmpl
index 69d4306978e00..a443a8d27f483 100644
--- a/templates/package/settings.tmpl
+++ b/templates/package/settings.tmpl
@@ -57,7 +57,7 @@
 						<form class="ui form" action="{{.Link}}" method="post">
 							{{.CsrfTokenHtml}}
 							<input type="hidden" name="action" value="delete">
-							{{template "base/basic_modal_actions" .}}
+							{{template "base/modal_actions_confirm" .}}
 						</form>
 					</div>
 				</div>
diff --git a/templates/projects/list.tmpl b/templates/projects/list.tmpl
index 2ddf7477e857e..34460ebe574ac 100644
--- a/templates/projects/list.tmpl
+++ b/templates/projects/list.tmpl
@@ -84,6 +84,6 @@
 	<div class="content">
 		<p>{{.locale.Tr "repo.projects.deletion_desc"}}</p>
 	</div>
-	{{template "base/basic_modal_actions" .}}
+	{{template "base/modal_actions_confirm" .}}
 </div>
 {{end}}
diff --git a/templates/projects/view.tmpl b/templates/projects/view.tmpl
index c1251df29e25e..a9297bf07c10f 100644
--- a/templates/projects/view.tmpl
+++ b/templates/projects/view.tmpl
@@ -157,12 +157,12 @@
 									<div class="content center">
 										<label id="default-project-board-content"></label>
 									</div>
-									{{$ModalNoText := $.locale.Tr "settings.cancel"}}
-									{{- $ModalYesText := $.locale.Tr "repo.projects.column.set_default" -}}
+									{{$ModalButtonCancelText := $.locale.Tr "settings.cancel"}}
+									{{- $ModalButtonOkText := $.locale.Tr "repo.projects.column.set_default" -}}
 									{{- if .Default -}}
-									{{- $ModalYesText = $.locale.Tr "repo.projects.column.unset_default" -}}
+									{{- $ModalButtonOkText = $.locale.Tr "repo.projects.column.unset_default" -}}
 									{{- end -}}
-									{{template "base/basic_modal_actions" (dict "." $ "ModalNoText" $ModalNoText "ModalYesText" $ModalYesText)}}
+									{{template "base/modal_actions_confirm" (dict "." $ "ModalButtonCancelText" $ModalButtonCancelText "ModalButtonOkText" $ModalButtonOkText)}}
 								</div>
 
 								<div class="ui basic modal" id="delete-board-modal-{{.ID}}">
@@ -174,8 +174,8 @@
 											{{$.locale.Tr "repo.projects.column.deletion_desc"}}
 										</label>
 									</div>
-									{{$ModalYesText := $.locale.Tr "repo.projects.column.delete"}}
-									{{template "base/basic_modal_actions" (dict "." $ "ModalNoText" $ModalNoText "ModalYesText" $ModalYesText)}}
+									{{$ModalButtonOkText := $.locale.Tr "repo.projects.column.delete"}}
+									{{template "base/modal_actions_confirm" (dict "." $ "ModalButtonCancelText" $ModalButtonCancelText "ModalButtonOkText" $ModalButtonOkText)}}
 								</div>
 							</div>
 						</div>
@@ -286,6 +286,6 @@
 		<div class="content">
 			<p>{{.locale.Tr "repo.projects.deletion_desc"}}</p>
 		</div>
-		{{template "base/basic_modal_actions" .}}
+		{{template "base/modal_actions_confirm" .}}
 	</div>
 {{end}}
diff --git a/templates/repo/branch/list.tmpl b/templates/repo/branch/list.tmpl
index 5cea38e7b6bd7..6b8d87d3b2739 100644
--- a/templates/repo/branch/list.tmpl
+++ b/templates/repo/branch/list.tmpl
@@ -155,7 +155,7 @@
 	<div class="content">
 		<p>{{.locale.Tr "repo.branch.delete_desc" | Str2html}}</p>
 	</div>
-	{{template "base/basic_modal_actions" .}}
+	{{template "base/modal_actions_confirm" .}}
 </div>
 
 <div class="ui small modal" id="create-branch-modal">
diff --git a/templates/repo/issue/labels/edit_delete_label.tmpl b/templates/repo/issue/labels/edit_delete_label.tmpl
index c90fdc13effc3..e5ef6a3e4163e 100644
--- a/templates/repo/issue/labels/edit_delete_label.tmpl
+++ b/templates/repo/issue/labels/edit_delete_label.tmpl
@@ -6,7 +6,7 @@
 	<div class="content">
 		<p>{{.locale.Tr "repo.issues.label_deletion_desc"}}</p>
 	</div>
-	{{template "base/basic_modal_actions" .}}
+	{{template "base/modal_actions_confirm" .}}
 </div>
 
 <div class="ui small edit-label modal">
diff --git a/templates/repo/issue/milestones.tmpl b/templates/repo/issue/milestones.tmpl
index a8c43815be0c8..2b11be6d5dd40 100644
--- a/templates/repo/issue/milestones.tmpl
+++ b/templates/repo/issue/milestones.tmpl
@@ -124,7 +124,7 @@
 		<div class="content">
 			<p>{{.locale.Tr "repo.milestones.deletion_desc"}}</p>
 		</div>
-		{{template "base/basic_modal_actions" .}}
+		{{template "base/modal_actions_confirm" .}}
 	</div>
 {{end}}
 {{template "base/footer" .}}
diff --git a/templates/repo/issue/view_content.tmpl b/templates/repo/issue/view_content.tmpl
index 5df7f50c116a1..4dab4faf2e704 100644
--- a/templates/repo/issue/view_content.tmpl
+++ b/templates/repo/issue/view_content.tmpl
@@ -205,5 +205,5 @@
 	<div class="content">
 		<p>{{.locale.Tr "repo.branch.delete_desc" | Str2html}}</p>
 	</div>
-	{{template "base/basic_modal_actions" .}}
+	{{template "base/modal_actions_confirm" .}}
 </div>
diff --git a/templates/repo/issue/view_content/comments_delete_time.tmpl b/templates/repo/issue/view_content/comments_delete_time.tmpl
index 42f142725b21e..d86cc52d3a183 100644
--- a/templates/repo/issue/view_content/comments_delete_time.tmpl
+++ b/templates/repo/issue/view_content/comments_delete_time.tmpl
@@ -7,7 +7,7 @@
 						{{.ctxData.CsrfTokenHtml}}
 					</form>
 					<div class="header">{{.ctxData.locale.Tr "repo.issues.del_time"}}</div>
-					{{template "base/basic_modal_actions" .}}
+					{{template "base/modal_actions_confirm" .}}
 				</div>
 				<button class="ui icon button compact mini issue-delete-time" data-id="{{.comment.Time.ID}}" data-tooltip-content="{{.ctxData.locale.Tr "repo.issues.del_time"}}">
 					{{svg "octicon-trash"}}
diff --git a/templates/repo/issue/view_content/sidebar.tmpl b/templates/repo/issue/view_content/sidebar.tmpl
index d767ce6122785..098d642d0f1e7 100644
--- a/templates/repo/issue/view_content/sidebar.tmpl
+++ b/templates/repo/issue/view_content/sidebar.tmpl
@@ -559,9 +559,9 @@
 							{{.locale.Tr "repo.issues.dependency.issue_remove_text"}}
 						{{end}}</p>
 					</div>
-					{{$ModalNoText := .locale.Tr "repo.issues.dependency.cancel"}}
-					{{$ModalYesText := .locale.Tr "repo.issues.dependency.remove"}}
-					{{template "base/basic_modal_actions" (dict "." . "ModalNoText" $ModalNoText "ModalYesText" $ModalYesText)}}
+					{{$ModalButtonCancelText := .locale.Tr "repo.issues.dependency.cancel"}}
+					{{$ModalButtonOkText := .locale.Tr "repo.issues.dependency.remove"}}
+					{{template "base/modal_actions_confirm" (dict "." . "ModalButtonCancelText" $ModalButtonCancelText "ModalButtonOkText" $ModalButtonOkText)}}
 				</div>
 			{{end}}
 		{{end}}
@@ -675,7 +675,7 @@
 				</div>
 				<form action="{{.Issue.Link}}/delete" method="post">
 					{{.CsrfTokenHtml}}
-					{{template "base/basic_modal_actions" .}}
+					{{template "base/modal_actions_confirm" .}}
 				</form>
 			</div>
 		{{end}}
diff --git a/templates/repo/projects/list.tmpl b/templates/repo/projects/list.tmpl
index ebe0657504846..b093d948d26f7 100644
--- a/templates/repo/projects/list.tmpl
+++ b/templates/repo/projects/list.tmpl
@@ -86,7 +86,7 @@
 	<div class="content">
 		<p>{{.locale.Tr "repo.projects.deletion_desc"}}</p>
 	</div>
-	{{template "base/basic_modal_actions" .}}
+	{{template "base/modal_actions_confirm" .}}
 </div>
 {{end}}
 {{template "base/footer" .}}
diff --git a/templates/repo/projects/view.tmpl b/templates/repo/projects/view.tmpl
index a8411b89aabb7..c9b657c862d16 100644
--- a/templates/repo/projects/view.tmpl
+++ b/templates/repo/projects/view.tmpl
@@ -163,12 +163,12 @@
 									<div class="content center">
 										<label id="default-project-board-content"></label>
 									</div>
-									{{$ModalNoText := $.locale.Tr "settings.cancel"}}
-									{{- $ModalYesText := $.locale.Tr "repo.projects.column.set_default" -}}
+									{{$ModalButtonCancelText := $.locale.Tr "settings.cancel"}}
+									{{- $ModalButtonOkText := $.locale.Tr "repo.projects.column.set_default" -}}
 									{{- if .Default -}}
-									{{- $ModalYesText = $.locale.Tr "repo.projects.column.unset_default" -}}
+									{{- $ModalButtonOkText = $.locale.Tr "repo.projects.column.unset_default" -}}
 									{{- end -}}
-									{{template "base/basic_modal_actions" (dict "." $ "ModalNoText" $ModalNoText "ModalYesText" $ModalYesText)}}
+									{{template "base/modal_actions_confirm" (dict "." $ "ModalButtonCancelText" $ModalButtonCancelText "ModalButtonOkText" $ModalButtonOkText)}}
 								</div>
 
 								<div class="ui basic modal" id="delete-board-modal-{{.ID}}">
@@ -180,8 +180,8 @@
 											{{$.locale.Tr "repo.projects.column.deletion_desc"}}
 										</label>
 									</div>
-									{{$ModalYesText := $.locale.Tr "repo.projects.column.delete"}}
-									{{template "base/basic_modal_actions" (dict "." $ "ModalNoText" $ModalNoText "ModalYesText" $ModalYesText)}}
+									{{$ModalButtonOkText := $.locale.Tr "repo.projects.column.delete"}}
+									{{template "base/modal_actions_confirm" (dict "." $ "ModalButtonCancelText" $ModalButtonCancelText "ModalButtonOkText" $ModalButtonOkText)}}
 								</div>
 							</div>
 						</div>
@@ -292,7 +292,7 @@
 		<div class="content">
 			<p>{{.locale.Tr "repo.projects.deletion_desc"}}</p>
 		</div>
-		{{template "base/basic_modal_actions" .}}
+		{{template "base/modal_actions_confirm" .}}
 	</div>
 {{end}}
 
diff --git a/templates/repo/release/list.tmpl b/templates/repo/release/list.tmpl
index ec270546bebb6..aae351324a7eb 100644
--- a/templates/repo/release/list.tmpl
+++ b/templates/repo/release/list.tmpl
@@ -192,7 +192,7 @@
 		<div class="content">
 			<p>{{.locale.Tr "repo.release.deletion_tag_desc"}}</p>
 		</div>
-		{{template "base/basic_modal_actions" .}}
+		{{template "base/modal_actions_confirm" .}}
 	</div>
 {{end}}
 
diff --git a/templates/repo/release/new.tmpl b/templates/repo/release/new.tmpl
index 7f99ca2873289..4f162f924e5a3 100644
--- a/templates/repo/release/new.tmpl
+++ b/templates/repo/release/new.tmpl
@@ -146,7 +146,7 @@
 		<div class="content">
 			<p>{{.locale.Tr "repo.release.deletion_desc"}}</p>
 		</div>
-		{{template "base/basic_modal_actions" .}}
+		{{template "base/modal_actions_confirm" .}}
 	</div>
 {{end}}
 {{template "base/footer" .}}
diff --git a/templates/repo/settings/branches.tmpl b/templates/repo/settings/branches.tmpl
index 1d4e56e9072d9..3258a056a4b5c 100644
--- a/templates/repo/settings/branches.tmpl
+++ b/templates/repo/settings/branches.tmpl
@@ -104,7 +104,7 @@
 	<div class="content">
 		<p>{{.locale.Tr "repo.settings.protected_branch_deletion_desc"}}</p>
 	</div>
-	{{template "base/basic_modal_actions" .}}
+	{{template "base/modal_actions_confirm" .}}
 </div>
 
 {{template "base/footer" .}}
diff --git a/templates/repo/settings/collaboration.tmpl b/templates/repo/settings/collaboration.tmpl
index 341c5fc678776..f378805a4af18 100644
--- a/templates/repo/settings/collaboration.tmpl
+++ b/templates/repo/settings/collaboration.tmpl
@@ -120,6 +120,6 @@
 	<div class="content">
 		<p>{{.locale.Tr "repo.settings.collaborator_deletion_desc"}}</p>
 	</div>
-	{{template "base/basic_modal_actions" .}}
+	{{template "base/modal_actions_confirm" .}}
 </div>
 {{template "base/footer" .}}
diff --git a/templates/repo/settings/deploy_keys.tmpl b/templates/repo/settings/deploy_keys.tmpl
index 9fc2fc27845fd..bf39bd24a2a01 100644
--- a/templates/repo/settings/deploy_keys.tmpl
+++ b/templates/repo/settings/deploy_keys.tmpl
@@ -85,6 +85,6 @@
 	<div class="content">
 		<p>{{.locale.Tr "repo.settings.deploy_key_deletion_desc"}}</p>
 	</div>
-	{{template "base/basic_modal_actions" .}}
+	{{template "base/modal_actions_confirm" .}}
 </div>
 {{template "base/footer" .}}
diff --git a/templates/repo/settings/lfs.tmpl b/templates/repo/settings/lfs.tmpl
index 8752e1c876537..a2dd6224a7765 100644
--- a/templates/repo/settings/lfs.tmpl
+++ b/templates/repo/settings/lfs.tmpl
@@ -50,7 +50,7 @@
 					</p>
 					<form class="ui form" action="{{$.Link}}/delete/{{.Oid}}" method="post">
 						{{$.CsrfTokenHtml}}
-						<div class="center actions">{{/* TODO: Convert to base/basic_modal_actions */}}
+						<div class="center actions">{{/* TODO: Convert to base/modal_actions_confirm */}}
 							<button class="ui basic cancel inverted button">{{$.locale.Tr "settings.cancel"}}</button>
 							<button class="ui basic inverted yellow button">{{$.locale.Tr "modal.yes"}}</button>
 						</div>
diff --git a/templates/repo/settings/options.tmpl b/templates/repo/settings/options.tmpl
index 33ccbbb23da0a..41804ce3b7d05 100644
--- a/templates/repo/settings/options.tmpl
+++ b/templates/repo/settings/options.tmpl
@@ -988,7 +988,7 @@
 				{{.CsrfTokenHtml}}
 				<input type="hidden" name="action" value="{{if .Repository.IsArchived}}unarchive{{else}}archive{{end}}">
 				<input type="hidden" name="repo_id" value="{{.Repository.ID}}">
-				{{template "base/basic_modal_actions" .}}
+				{{template "base/modal_actions_confirm" .}}
 			</form>
 		</div>
 	{{end}}
diff --git a/templates/repo/settings/webhook/delete_modal.tmpl b/templates/repo/settings/webhook/delete_modal.tmpl
index 622d24a46ca90..6dc13c68addaa 100644
--- a/templates/repo/settings/webhook/delete_modal.tmpl
+++ b/templates/repo/settings/webhook/delete_modal.tmpl
@@ -6,5 +6,5 @@
 	<div class="content">
 		<p>{{.locale.Tr "repo.settings.webhook_deletion_desc"}}</p>
 	</div>
-	{{template "base/basic_modal_actions" .}}
+	{{template "base/modal_actions_confirm" .}}
 </div>
diff --git a/templates/repo/wiki/view.tmpl b/templates/repo/wiki/view.tmpl
index 0e770ee28e6af..549be33856325 100644
--- a/templates/repo/wiki/view.tmpl
+++ b/templates/repo/wiki/view.tmpl
@@ -107,7 +107,7 @@
 	<div class="content">
 		<p>{{.locale.Tr "repo.wiki.delete_page_notice_1" ($title|Escape) | Safe}}</p>
 	</div>
-	{{template "base/basic_modal_actions" .}}
+	{{template "base/modal_actions_confirm" .}}
 </div>
 
 {{template "base/footer" .}}
diff --git a/templates/shared/actions/runner_edit.tmpl b/templates/shared/actions/runner_edit.tmpl
index 4733d2d7b2f5d..e68fd1bbc3124 100644
--- a/templates/shared/actions/runner_edit.tmpl
+++ b/templates/shared/actions/runner_edit.tmpl
@@ -97,6 +97,6 @@
 		<div class="content">
 			<p>{{.locale.Tr "actions.runners.delete_runner_notice" | Safe}}</p>
 		</div>
-		{{template "base/basic_modal_actions" .}}
+		{{template "base/modal_actions_confirm" .}}
 	</div>
 </div>
diff --git a/templates/shared/secrets/add_list.tmpl b/templates/shared/secrets/add_list.tmpl
index 8820686aa93a2..bbac728fa4c8b 100644
--- a/templates/shared/secrets/add_list.tmpl
+++ b/templates/shared/secrets/add_list.tmpl
@@ -64,5 +64,5 @@
 	<div class="content">
 		<p>{{.locale.Tr "secrets.deletion.description"}}</p>
 	</div>
-	{{template "base/basic_modal_actions" .}}
+	{{template "base/modal_actions_confirm" .}}
 </div>
diff --git a/templates/user/settings/account.tmpl b/templates/user/settings/account.tmpl
index 5c6e35c7140b3..b94006b86e4a0 100644
--- a/templates/user/settings/account.tmpl
+++ b/templates/user/settings/account.tmpl
@@ -169,7 +169,7 @@
 	<div class="content">
 		<p>{{.locale.Tr "settings.email_deletion_desc"}}</p>
 	</div>
-	{{template "base/basic_modal_actions" .}}
+	{{template "base/modal_actions_confirm" .}}
 </div>
 
 <div class="ui small basic delete modal" id="delete-account">
@@ -180,7 +180,7 @@
 	<div class="content">
 		<p>{{.locale.Tr "settings.delete_account_desc"}}</p>
 	</div>
-	{{template "base/basic_modal_actions" .}}
+	{{template "base/modal_actions_confirm" .}}
 </div>
 
 {{template "base/footer" .}}
diff --git a/templates/user/settings/applications.tmpl b/templates/user/settings/applications.tmpl
index 5724bb1fd8473..ce095d2474d4e 100644
--- a/templates/user/settings/applications.tmpl
+++ b/templates/user/settings/applications.tmpl
@@ -277,7 +277,7 @@
 		<p>{{.locale.Tr "settings.access_token_deletion_desc"}}</p>
 	</div>
 
-	<div class="actions">{{/* TODO: Convert to base/basic_modal_actions.tmpl */}}
+	<div class="actions">{{/* TODO: Convert to base/modal_actions_confirm.tmpl */}}
 		<button class="ui green basic inverted cancel button">
 			{{svg "octicon-x"}}
 			{{.locale.Tr "settings.access_token_deletion_cancel_action"}}
diff --git a/templates/user/settings/applications_oauth2_list.tmpl b/templates/user/settings/applications_oauth2_list.tmpl
index c34bf71387bf0..a0a3effee1a0f 100644
--- a/templates/user/settings/applications_oauth2_list.tmpl
+++ b/templates/user/settings/applications_oauth2_list.tmpl
@@ -55,5 +55,5 @@
 	<div class="content">
 		<p>{{.locale.Tr "settings.oauth2_application_remove_description"}}</p>
 	</div>
-	{{template "base/basic_modal_actions" .}}
+	{{template "base/modal_actions_confirm" .}}
 </div>
diff --git a/templates/user/settings/grants_oauth2.tmpl b/templates/user/settings/grants_oauth2.tmpl
index a9635543c1542..7b37cd6fa835a 100644
--- a/templates/user/settings/grants_oauth2.tmpl
+++ b/templates/user/settings/grants_oauth2.tmpl
@@ -36,5 +36,5 @@
 	<div class="content">
 		<p>{{.locale.Tr "settings.revoke_oauth2_grant_description"}}</p>
 	</div>
-	{{template "base/basic_modal_actions" .}}
+	{{template "base/modal_actions_confirm" .}}
 </div>
diff --git a/templates/user/settings/keys_gpg.tmpl b/templates/user/settings/keys_gpg.tmpl
index 86113c4e9085f..a93e193eae541 100644
--- a/templates/user/settings/keys_gpg.tmpl
+++ b/templates/user/settings/keys_gpg.tmpl
@@ -119,5 +119,5 @@
 	<div class="content">
 		<p>{{.locale.Tr "settings.gpg_key_deletion_desc"}}</p>
 	</div>
-	{{template "base/basic_modal_actions" .}}
+	{{template "base/modal_actions_confirm" .}}
 </div>
diff --git a/templates/user/settings/keys_principal.tmpl b/templates/user/settings/keys_principal.tmpl
index 71c51037adc53..7ee56f54d2944 100644
--- a/templates/user/settings/keys_principal.tmpl
+++ b/templates/user/settings/keys_principal.tmpl
@@ -62,6 +62,6 @@
 		<div class="content">
 			<p>{{.locale.Tr "settings.ssh_principal_deletion_desc"}}</p>
 		</div>
-		{{template "base/basic_modal_actions" .}}
+		{{template "base/modal_actions_confirm" .}}
 	</div>
 {{end}}
diff --git a/templates/user/settings/keys_ssh.tmpl b/templates/user/settings/keys_ssh.tmpl
index e1412e01e96d3..257c7e28178d2 100644
--- a/templates/user/settings/keys_ssh.tmpl
+++ b/templates/user/settings/keys_ssh.tmpl
@@ -108,5 +108,5 @@
 	<div class="content">
 		<p>{{.locale.Tr "settings.ssh_key_deletion_desc"}}</p>
 	</div>
-	{{template "base/basic_modal_actions" .}}
+	{{template "base/modal_actions_confirm" .}}
 </div>
diff --git a/templates/user/settings/organization.tmpl b/templates/user/settings/organization.tmpl
index 44d20995af64f..9f2392aaa7cf8 100644
--- a/templates/user/settings/organization.tmpl
+++ b/templates/user/settings/organization.tmpl
@@ -48,6 +48,6 @@
 	<div class="content">
 		<p>{{$.locale.Tr "org.members.leave.detail" `<span class="dataOrganizationName"></span>` | Safe}}</p>
 	</div>
-	{{template "base/basic_modal_actions" .}}
+	{{template "base/modal_actions_confirm" .}}
 </div>
 {{template "base/footer" .}}
diff --git a/templates/user/settings/repos.tmpl b/templates/user/settings/repos.tmpl
index 9e11786d45c50..4838b954112b6 100644
--- a/templates/user/settings/repos.tmpl
+++ b/templates/user/settings/repos.tmpl
@@ -50,7 +50,7 @@
 														{{$.CsrfTokenHtml}}
 														<input type="hidden" name="id" value="{{$dir}}">
 														<input type="hidden" name="action" value="adopt">
-														<div class="actions">{{/* TODO: Convert to base/basic_modal_actions */}}
+														<div class="actions">{{/* TODO: Convert to base/modal_actions_confirm */}}
 															<button class="ui red basic inverted cancel button">
 																{{svg "octicon-x"}}
 																{{$.locale.Tr "modal.no"}}
@@ -77,7 +77,7 @@
 														{{$.CsrfTokenHtml}}
 														<input type="hidden" name="id" value="{{$dir}}">
 														<input type="hidden" name="action" value="delete">
-														{{template "base/basic_modal_actions" $}}
+														{{template "base/modal_actions_confirm" $}}
 													</form>
 												</div>
 											{{end}}
@@ -139,6 +139,6 @@
 	<div class="content">
 		<p>{{.locale.Tr "settings.remove_account_link_desc"}}</p>
 	</div>
-	{{template "base/basic_modal_actions" .}}
+	{{template "base/modal_actions_confirm" .}}
 </div>
 {{template "base/footer" .}}
diff --git a/templates/user/settings/security/accountlinks.tmpl b/templates/user/settings/security/accountlinks.tmpl
index 5bb1a857969d6..0ccb57ca81742 100644
--- a/templates/user/settings/security/accountlinks.tmpl
+++ b/templates/user/settings/security/accountlinks.tmpl
@@ -49,5 +49,5 @@
 	<div class="content">
 		<p>{{.locale.Tr "settings.remove_account_link_desc"}}</p>
 	</div>
-	{{template "base/basic_modal_actions" .}}
+	{{template "base/modal_actions_confirm" .}}
 </div>
diff --git a/templates/user/settings/security/openid.tmpl b/templates/user/settings/security/openid.tmpl
index 04356adf9965d..18dba417abce5 100644
--- a/templates/user/settings/security/openid.tmpl
+++ b/templates/user/settings/security/openid.tmpl
@@ -59,5 +59,5 @@
 	<div class="content">
 		<p>{{.locale.Tr "settings.openid_deletion_desc"}}</p>
 	</div>
-	{{template "base/basic_modal_actions" .}}
+	{{template "base/modal_actions_confirm" .}}
 </div>
diff --git a/templates/user/settings/security/twofa.tmpl b/templates/user/settings/security/twofa.tmpl
index d4e1ef91e8647..ffc6de452ec1c 100644
--- a/templates/user/settings/security/twofa.tmpl
+++ b/templates/user/settings/security/twofa.tmpl
@@ -31,5 +31,5 @@
 	<div class="content">
 		<p>{{.locale.Tr "settings.twofa_disable_desc"}}</p>
 	</div>
-	{{template "base/basic_modal_actions" .}}
+	{{template "base/modal_actions_confirm" .}}
 </div>
diff --git a/templates/user/settings/security/webauthn.tmpl b/templates/user/settings/security/webauthn.tmpl
index 7d52c2bad67b1..268b2e5cecd55 100644
--- a/templates/user/settings/security/webauthn.tmpl
+++ b/templates/user/settings/security/webauthn.tmpl
@@ -38,5 +38,5 @@
 	<div class="content">
 		<p>{{.locale.Tr "settings.webauthn_delete_key_desc"}}</p>
 	</div>
-	{{template "base/basic_modal_actions" .}}
+	{{template "base/modal_actions_confirm" .}}
 </div>
diff --git a/web_src/js/features/repo-projects.js b/web_src/js/features/repo-projects.js
index 838183e0f6e57..5d4009622057a 100644
--- a/web_src/js/features/repo-projects.js
+++ b/web_src/js/features/repo-projects.js
@@ -129,7 +129,7 @@ export function initRepoProject() {
   $('.default-project-board-modal').each(function () {
     const boardColumn = $(this).closest('.board-column');
     const showButton = $(boardColumn).find('.default-project-board-show');
-    const commitButton = $(this).find('.modal-confirm-button');
+    const commitButton = $(this).find('.actions > .ok.button');
 
     $(commitButton).on('click', (e) => {
       e.preventDefault();
@@ -149,7 +149,7 @@ export function initRepoProject() {
 
   $('.show-delete-column-modal').each(function () {
     const deleteColumnModal = $(`${$(this).attr('data-modal')}`);
-    const deleteColumnButton = deleteColumnModal.find('.modal-confirm-button');
+    const deleteColumnButton = deleteColumnModal.find('.actions > .ok.button');
     const deleteUrl = $(this).attr('data-url');
 
     deleteColumnButton.on('click', (e) => {

From bb7fcf74226b4dc9bbdd74ef7d8bf729948b1f7b Mon Sep 17 00:00:00 2001
From: wxiaoguang <wxiaoguang@gmail.com>
Date: Sun, 23 Apr 2023 12:25:02 +0800
Subject: [PATCH 19/26] temp

---
 options/locale/locale_en-US.ini           |  2 ++
 templates/base/modal_actions_confirm.tmpl | 20 +++++++++------
 templates/projects/view.tmpl              | 10 ++------
 templates/repo/projects/view.tmpl         | 10 ++------
 web_src/css/base.css                      | 31 -----------------------
 web_src/css/index.css                     |  1 +
 web_src/css/modules/modal.css             | 28 ++++++++++++++++++++
 7 files changed, 47 insertions(+), 55 deletions(-)
 create mode 100644 web_src/css/modules/modal.css

diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini
index c0e94d3b87903..b4233d65d1ad8 100644
--- a/options/locale/locale_en-US.ini
+++ b/options/locale/locale_en-US.ini
@@ -462,6 +462,8 @@ team_invite.text_3 = Note: This invitation was intended for %[1]s. If you were n
 [modal]
 yes = Yes
 no = No
+confirm = Confirm
+cancel = Cancel
 modify = Update
 
 [form]
diff --git a/templates/base/modal_actions_confirm.tmpl b/templates/base/modal_actions_confirm.tmpl
index 70d3f0af0e65a..361f214466fd8 100644
--- a/templates/base/modal_actions_confirm.tmpl
+++ b/templates/base/modal_actions_confirm.tmpl
@@ -1,17 +1,21 @@
 {{/*
 Template Attributes:
+* locale
+* ModalButtonStyle: "yes" (default) or "confirm"
 * ModalButtonCancelText
 * ModalButtonOkText
 
 The ".ok.button" and ".cancel.button" selectors are also used by Fomantic Modal internally
 */}}
 <div class="actions">
-	<button class="ui red cancel button">
-		{{svg "octicon-x"}}
-		{{if .ModalButtonCancelText}}{{.ModalButtonCancelText}}{{else}}{{.locale.Tr "modal.no"}}{{end}}
-	</button>
-	<button class="ui green ok button">
-		{{svg "octicon-check"}}
-		{{if .ModalButtonOkText}}{{.ModalButtonOkText}}{{else}}{{.locale.Tr "modal.yes"}}{{end}}
-	</button>
+	{{$textNegitive := .locale.Tr "modal.no"}}
+	{{$textPositive := .locale.Tr "modal.yes"}}
+	{{if eq .ModalButtonStyle "confirm"}}
+		{{$textNegitive = .locale.Tr "modal.cancel"}}
+		{{$textPositive = .locale.Tr "modal.confirm"}}
+	{{end}}
+	{{if .ModalButtonCancelText}}{{$textNegitive = .ModalButtonCancelText}}{{end}}
+	{{if .ModalButtonOkText}}{{$textPositive = .ModalButtonOkText}}{{end}}
+	<button class="ui red cancel button">{{svg "octicon-x"}} {{$textNegitive}}</button>
+	<button class="ui green ok button">{{svg "octicon-check"}} {{$textPositive}}</button>
 </div>
diff --git a/templates/projects/view.tmpl b/templates/projects/view.tmpl
index a9297bf07c10f..777cc0d043da1 100644
--- a/templates/projects/view.tmpl
+++ b/templates/projects/view.tmpl
@@ -157,12 +157,7 @@
 									<div class="content center">
 										<label id="default-project-board-content"></label>
 									</div>
-									{{$ModalButtonCancelText := $.locale.Tr "settings.cancel"}}
-									{{- $ModalButtonOkText := $.locale.Tr "repo.projects.column.set_default" -}}
-									{{- if .Default -}}
-									{{- $ModalButtonOkText = $.locale.Tr "repo.projects.column.unset_default" -}}
-									{{- end -}}
-									{{template "base/modal_actions_confirm" (dict "." $ "ModalButtonCancelText" $ModalButtonCancelText "ModalButtonOkText" $ModalButtonOkText)}}
+									{{template "base/modal_actions_confirm" (dict "locale" $.locale "ModalButtonStyle" "confirm")}}
 								</div>
 
 								<div class="ui basic modal" id="delete-board-modal-{{.ID}}">
@@ -174,8 +169,7 @@
 											{{$.locale.Tr "repo.projects.column.deletion_desc"}}
 										</label>
 									</div>
-									{{$ModalButtonOkText := $.locale.Tr "repo.projects.column.delete"}}
-									{{template "base/modal_actions_confirm" (dict "." $ "ModalButtonCancelText" $ModalButtonCancelText "ModalButtonOkText" $ModalButtonOkText)}}
+									{{template "base/modal_actions_confirm" (dict "locale" $.locale "ModalButtonStyle" "confirm")}}
 								</div>
 							</div>
 						</div>
diff --git a/templates/repo/projects/view.tmpl b/templates/repo/projects/view.tmpl
index c9b657c862d16..e4f8a52971e41 100644
--- a/templates/repo/projects/view.tmpl
+++ b/templates/repo/projects/view.tmpl
@@ -163,12 +163,7 @@
 									<div class="content center">
 										<label id="default-project-board-content"></label>
 									</div>
-									{{$ModalButtonCancelText := $.locale.Tr "settings.cancel"}}
-									{{- $ModalButtonOkText := $.locale.Tr "repo.projects.column.set_default" -}}
-									{{- if .Default -}}
-									{{- $ModalButtonOkText = $.locale.Tr "repo.projects.column.unset_default" -}}
-									{{- end -}}
-									{{template "base/modal_actions_confirm" (dict "." $ "ModalButtonCancelText" $ModalButtonCancelText "ModalButtonOkText" $ModalButtonOkText)}}
+									{{template "base/modal_actions_confirm" (dict "locale" $.locale "ModalButtonStyle" "confirm")}}
 								</div>
 
 								<div class="ui basic modal" id="delete-board-modal-{{.ID}}">
@@ -180,8 +175,7 @@
 											{{$.locale.Tr "repo.projects.column.deletion_desc"}}
 										</label>
 									</div>
-									{{$ModalButtonOkText := $.locale.Tr "repo.projects.column.delete"}}
-									{{template "base/modal_actions_confirm" (dict "." $ "ModalButtonCancelText" $ModalButtonCancelText "ModalButtonOkText" $ModalButtonOkText)}}
+									{{template "base/modal_actions_confirm" (dict "locale" $.locale "ModalButtonStyle" "confirm")}}
 								</div>
 							</div>
 						</div>
diff --git a/web_src/css/base.css b/web_src/css/base.css
index a55a8f244a7e0..42263a974ff5a 100644
--- a/web_src/css/base.css
+++ b/web_src/css/base.css
@@ -1140,37 +1140,6 @@ a.ui.card:hover {
   color: var(--color-text);
 }
 
-.ui.modal {
-  background: var(--color-body);
-}
-
-.ui.modal > .header {
-  color: var(--color-text-dark);
-  background: var(--color-secondary-bg);
-  border-color: var(--color-secondary);
-  border-top-left-radius: var(--border-radius);
-  border-top-right-radius: var(--border-radius);
-}
-
-.ui.modal > .content {
-  background: var(--color-body);
-  text-align: left !important;
-}
-
-.ui.modal > .actions {
-  background: var(--color-secondary-bg);
-  border-color: var(--color-secondary);
-  text-align: center;
-}
-
-.ui.modal > .close.inside {
-  color: var(--color-text);
-}
-
-.ui.modal > form > .actions {
-  text-align: center;
-}
-
 .ui.basic.table > tbody > tr {
   border-color: var(--color-secondary);
 }
diff --git a/web_src/css/index.css b/web_src/css/index.css
index 253083033862c..828251180446c 100644
--- a/web_src/css/index.css
+++ b/web_src/css/index.css
@@ -10,6 +10,7 @@
 @import "./features/codeeditor.css";
 @import "./features/projects.css";
 @import "./modules/tippy.css";
+@import "./modules/modal.css";
 @import "./code/linebutton.css";
 @import "./markup/content.css";
 @import "./markup/codecopy.css";
diff --git a/web_src/css/modules/modal.css b/web_src/css/modules/modal.css
new file mode 100644
index 0000000000000..db2c949362415
--- /dev/null
+++ b/web_src/css/modules/modal.css
@@ -0,0 +1,28 @@
+.ui.modal {
+  background: var(--color-body);
+}
+
+.ui.modal > .header {
+  color: var(--color-text-dark);
+  background: var(--color-secondary-bg);
+  border-color: var(--color-secondary);
+  border-top-left-radius: var(--border-radius);
+  border-top-right-radius: var(--border-radius);
+}
+
+.ui.modal > .content {
+  background: var(--color-body);
+}
+
+.ui.modal > .actions {
+  background: var(--color-secondary-bg);
+  border-color: var(--color-secondary);
+}
+
+.ui.modal > .close.inside {
+  color: var(--color-text);
+}
+
+.ui.modal > form > .actions {
+  text-align: center;
+}

From 246879b5a5d17eee96b958888cf52ea7d926f8f0 Mon Sep 17 00:00:00 2001
From: wxiaoguang <wxiaoguang@gmail.com>
Date: Sun, 23 Apr 2023 12:31:16 +0800
Subject: [PATCH 20/26] replace basic modal => gitea-custom modal

---
 templates/admin/auth/edit.tmpl                     |  2 +-
 templates/admin/emails/list.tmpl                   |  2 +-
 templates/admin/monitor.tmpl                       |  2 +-
 templates/admin/packages/list.tmpl                 |  2 +-
 templates/admin/queue.tmpl                         |  2 +-
 templates/admin/repo/list.tmpl                     |  2 +-
 templates/admin/repo/unadopted.tmpl                |  4 ++--
 templates/admin/stacktrace.tmpl                    |  2 +-
 templates/admin/user/edit.tmpl                     |  2 +-
 templates/org/member/members.tmpl                  |  4 ++--
 templates/org/settings/delete.tmpl                 |  2 +-
 templates/org/team/members.tmpl                    |  2 +-
 templates/org/team/new.tmpl                        |  2 +-
 templates/org/team/repositories.tmpl               |  4 ++--
 templates/org/team/sidebar.tmpl                    |  2 +-
 templates/org/team/teams.tmpl                      |  2 +-
 templates/package/settings.tmpl                    |  2 +-
 templates/projects/list.tmpl                       |  2 +-
 templates/projects/view.tmpl                       |  6 +++---
 templates/repo/branch/list.tmpl                    |  6 +++---
 templates/repo/commit_page.tmpl                    |  2 +-
 templates/repo/editor/edit.tmpl                    |  2 +-
 templates/repo/editor/patch.tmpl                   |  2 +-
 templates/repo/issue/labels/edit_delete_label.tmpl |  2 +-
 templates/repo/issue/milestones.tmpl               |  2 +-
 templates/repo/issue/view_content.tmpl             |  2 +-
 templates/repo/issue/view_content/sidebar.tmpl     |  4 ++--
 templates/repo/migrate/migrating.tmpl              |  2 +-
 templates/repo/projects/list.tmpl                  |  2 +-
 templates/repo/projects/view.tmpl                  |  6 +++---
 templates/repo/release/list.tmpl                   |  2 +-
 templates/repo/release/new.tmpl                    |  2 +-
 templates/repo/settings/branches.tmpl              |  2 +-
 templates/repo/settings/collaboration.tmpl         |  2 +-
 templates/repo/settings/deploy_keys.tmpl           |  2 +-
 templates/repo/settings/lfs.tmpl                   |  4 ++--
 templates/repo/settings/options.tmpl               | 14 +++++++-------
 templates/repo/settings/webhook/delete_modal.tmpl  |  2 +-
 templates/repo/wiki/view.tmpl                      |  2 +-
 templates/shared/actions/runner_edit.tmpl          |  2 +-
 templates/shared/secrets/add_list.tmpl             |  2 +-
 templates/user/settings/account.tmpl               |  4 ++--
 templates/user/settings/applications.tmpl          |  2 +-
 .../user/settings/applications_oauth2_list.tmpl    |  2 +-
 templates/user/settings/grants_oauth2.tmpl         |  2 +-
 templates/user/settings/keys_gpg.tmpl              |  2 +-
 templates/user/settings/keys_principal.tmpl        |  2 +-
 templates/user/settings/keys_ssh.tmpl              |  2 +-
 templates/user/settings/organization.tmpl          |  2 +-
 templates/user/settings/repos.tmpl                 |  6 +++---
 templates/user/settings/security/accountlinks.tmpl |  2 +-
 templates/user/settings/security/openid.tmpl       |  2 +-
 templates/user/settings/security/twofa.tmpl        |  2 +-
 templates/user/settings/security/webauthn.tmpl     |  2 +-
 web_src/css/modules/modal.css                      |  4 ----
 55 files changed, 74 insertions(+), 78 deletions(-)

diff --git a/templates/admin/auth/edit.tmpl b/templates/admin/auth/edit.tmpl
index ec0cb10b56214..980dc10f836ff 100644
--- a/templates/admin/auth/edit.tmpl
+++ b/templates/admin/auth/edit.tmpl
@@ -440,7 +440,7 @@
 	</div>
 </div>
 
-<div class="ui small basic delete modal">
+<div class="ui small gitea-custom delete modal">
 	<div class="ui icon header">
 		{{svg "octicon-trash"}}
 		{{.locale.Tr "admin.auths.delete_auth_title"}}
diff --git a/templates/admin/emails/list.tmpl b/templates/admin/emails/list.tmpl
index b71acb28d7ad8..a3237caa3699b 100644
--- a/templates/admin/emails/list.tmpl
+++ b/templates/admin/emails/list.tmpl
@@ -73,7 +73,7 @@
 
 		{{template "base/paginate" .}}
 
-		<div class="ui basic modal" id="change-email-modal">
+		<div class="ui gitea-custom modal" id="change-email-modal">
 			<div class="ui icon header">
 				{{.locale.Tr "admin.emails.change_email_header"}}
 			</div>
diff --git a/templates/admin/monitor.tmpl b/templates/admin/monitor.tmpl
index 31929764a5899..98a60497084d8 100644
--- a/templates/admin/monitor.tmpl
+++ b/templates/admin/monitor.tmpl
@@ -37,7 +37,7 @@
 		{{template "admin/process" .}}
 	</div>
 </div>
-<div class="ui small basic delete modal">
+<div class="ui small gitea-custom delete modal">
 	<div class="ui icon header">
 		{{svg "octicon-x" 16 "close inside"}}
 		{{.locale.Tr "admin.monitor.process.cancel"}}
diff --git a/templates/admin/packages/list.tmpl b/templates/admin/packages/list.tmpl
index 17b4d0afe9e1f..e37353f5341ac 100644
--- a/templates/admin/packages/list.tmpl
+++ b/templates/admin/packages/list.tmpl
@@ -80,7 +80,7 @@
 	</div>
 </div>
 
-<div class="ui small basic delete modal">
+<div class="ui small gitea-custom delete modal">
 	<div class="ui icon header">
 		{{svg "octicon-trash"}}
 		{{.locale.Tr "packages.settings.delete"}}
diff --git a/templates/admin/queue.tmpl b/templates/admin/queue.tmpl
index e6f908aefcbe5..e4e1a31e573f2 100644
--- a/templates/admin/queue.tmpl
+++ b/templates/admin/queue.tmpl
@@ -181,7 +181,7 @@
 		</div>
 	</div>
 </div>
-<div class="ui small basic delete modal">
+<div class="ui small gitea-custom delete modal">
 	<div class="ui icon header">
 		{{svg "octicon-x" 16 "close inside"}}
 		{{.locale.Tr "admin.monitor.queue.pool.cancel"}}
diff --git a/templates/admin/repo/list.tmpl b/templates/admin/repo/list.tmpl
index 5daf50fc5edb5..f229fb2d76316 100644
--- a/templates/admin/repo/list.tmpl
+++ b/templates/admin/repo/list.tmpl
@@ -95,7 +95,7 @@
 	</div>
 </div>
 
-<div class="ui small basic delete modal">
+<div class="ui small gitea-custom delete modal">
 	<div class="ui icon header">
 		{{svg "octicon-trash"}}
 		{{.locale.Tr "repo.settings.delete"}}
diff --git a/templates/admin/repo/unadopted.tmpl b/templates/admin/repo/unadopted.tmpl
index fc3a632f02032..dff4b342cc8ef 100644
--- a/templates/admin/repo/unadopted.tmpl
+++ b/templates/admin/repo/unadopted.tmpl
@@ -29,7 +29,7 @@
 									<span class="name">{{$dir}}</span>
 									<div class="right floated content">
 										<button class="ui button submit tiny green adopt show-modal" data-modal="#adopt-unadopted-modal-{{$dirI}}"><span class="icon">{{svg "octicon-plus"}}</span><span class="label">{{$.locale.Tr "repo.adopt_preexisting_label"}}</span></button>
-										<div class="ui basic modal" id="adopt-unadopted-modal-{{$dirI}}">
+										<div class="ui gitea-custom modal" id="adopt-unadopted-modal-{{$dirI}}">
 											{{svg "octicon-x" 16 "close inside"}}
 											<div class="header">
 												<span class="label">{{$.locale.Tr "repo.adopt_preexisting"}}</span>
@@ -56,7 +56,7 @@
 											</form>
 										</div>
 										<button class="ui button submit tiny red delete show-modal" data-modal="#delete-unadopted-modal-{{$dirI}}"><span class="icon">{{svg "octicon-x"}}</span><span class="label">{{$.locale.Tr "repo.delete_preexisting_label"}}</span></button>
-										<div class="ui basic modal" id="delete-unadopted-modal-{{$dirI}}">
+										<div class="ui gitea-custom modal" id="delete-unadopted-modal-{{$dirI}}">
 											{{svg "octicon-x" 16 "close inside"}}
 											<div class="header">
 												<span class="label">{{$.locale.Tr "repo.delete_preexisting"}}</span>
diff --git a/templates/admin/stacktrace.tmpl b/templates/admin/stacktrace.tmpl
index f5b2fd25f6aaa..c6fe945892a10 100644
--- a/templates/admin/stacktrace.tmpl
+++ b/templates/admin/stacktrace.tmpl
@@ -18,7 +18,7 @@
 		</div>
 	</div>
 </div>
-<div class="ui small basic delete modal">
+<div class="ui small gitea-custom delete modal">
 	<div class="ui icon header">
 		{{svg "octicon-x" 16 "close inside"}}
 		{{.locale.Tr "admin.monitor.process.cancel"}}
diff --git a/templates/admin/user/edit.tmpl b/templates/admin/user/edit.tmpl
index 63ac2e0b042da..19d8eee626df2 100644
--- a/templates/admin/user/edit.tmpl
+++ b/templates/admin/user/edit.tmpl
@@ -196,7 +196,7 @@
 	</div>
 </div>
 
-<div class="ui small basic delete modal" id="delete-user-modal">
+<div class="ui small gitea-custom delete modal" id="delete-user-modal">
 	<div class="ui icon header">
 		{{svg "octicon-trash"}}
 		{{.locale.Tr "settings.delete_account_title"}}
diff --git a/templates/org/member/members.tmpl b/templates/org/member/members.tmpl
index e273e0d2b37c8..3f674471d1043 100644
--- a/templates/org/member/members.tmpl
+++ b/templates/org/member/members.tmpl
@@ -81,7 +81,7 @@
 		{{template "base/paginate" .}}
 	</div>
 </div>
-<div class="ui small basic delete modal" id="leave-organization">
+<div class="ui small gitea-custom delete modal" id="leave-organization">
 	<div class="ui icon header">
 		{{svg "octicon-x" 16 "close inside"}}
 		{{$.locale.Tr "org.members.leave"}}
@@ -91,7 +91,7 @@
 	</div>
 	{{template "base/modal_actions_confirm" .}}
 </div>
-<div class="ui small basic delete modal" id="remove-organization-member">
+<div class="ui small gitea-custom delete modal" id="remove-organization-member">
 	<div class="ui icon header">
 		{{svg "octicon-x" 16 "close inside"}}
 		{{$.locale.Tr "org.members.remove"}}
diff --git a/templates/org/settings/delete.tmpl b/templates/org/settings/delete.tmpl
index 80d0ed212d131..238976ccd9e51 100644
--- a/templates/org/settings/delete.tmpl
+++ b/templates/org/settings/delete.tmpl
@@ -29,7 +29,7 @@
 	</div>
 </div>
 
-<div class="ui small basic delete modal">
+<div class="ui small gitea-custom delete modal">
 	<div class="ui icon header">
 		{{svg "octicon-trash"}}
 		{{.locale.Tr "org.settings.delete_org_title"}}
diff --git a/templates/org/team/members.tmpl b/templates/org/team/members.tmpl
index efe32d09ad8a9..2acb93d9da62b 100644
--- a/templates/org/team/members.tmpl
+++ b/templates/org/team/members.tmpl
@@ -64,7 +64,7 @@
 		</div>
 	</div>
 </div>
-<div class="ui small basic delete modal" id="remove-team-member">
+<div class="ui small gitea-custom delete modal" id="remove-team-member">
 	<div class="ui icon header">
 		{{svg "octicon-x" 16 "close inside"}}
 		{{$.locale.Tr "org.members.remove"}}
diff --git a/templates/org/team/new.tmpl b/templates/org/team/new.tmpl
index 99530b1be61d1..64427101b535b 100644
--- a/templates/org/team/new.tmpl
+++ b/templates/org/team/new.tmpl
@@ -148,7 +148,7 @@
 	</div>
 </div>
 
-<div class="ui small basic delete modal">
+<div class="ui small gitea-custom delete modal">
 	<div class="ui icon header">
 		{{svg "octicon-trash"}}
 		{{.locale.Tr "org.teams.delete_team_title"}}
diff --git a/templates/org/team/repositories.tmpl b/templates/org/team/repositories.tmpl
index e8d3ea66cf849..9c90b41caa26b 100644
--- a/templates/org/team/repositories.tmpl
+++ b/templates/org/team/repositories.tmpl
@@ -64,7 +64,7 @@
 	</div>
 </div>
 
-<div class="ui small basic delete modal" id="org-team-remove-all-repo">
+<div class="ui small gitea-custom delete modal" id="org-team-remove-all-repo">
 	<div class="ui icon header">
 		{{svg "octicon-trash"}}
 		{{.locale.Tr "org.teams.remove_all_repos_title"}}
@@ -75,7 +75,7 @@
 	{{template "base/modal_actions_confirm" .}}
 </div>
 
-<div class="ui small basic addall modal" id="org-team-add-all-repo">
+<div class="ui small gitea-custom addall modal" id="org-team-add-all-repo">
 	<div class="ui icon header">
 		{{svg "octicon-globe"}}
 		{{.locale.Tr "org.teams.add_all_repos_title"}}
diff --git a/templates/org/team/sidebar.tmpl b/templates/org/team/sidebar.tmpl
index 311601ac595ea..f2167612bc587 100644
--- a/templates/org/team/sidebar.tmpl
+++ b/templates/org/team/sidebar.tmpl
@@ -83,7 +83,7 @@
 		</div>
 	{{end}}
 </div>
-<div class="ui small basic delete modal" id="leave-team-sidebar">
+<div class="ui small gitea-custom delete modal" id="leave-team-sidebar">
 	<div class="ui icon header">
 		{{svg "octicon-x" 16 "close inside"}}
 		{{$.locale.Tr "org.teams.leave"}}
diff --git a/templates/org/team/teams.tmpl b/templates/org/team/teams.tmpl
index 56e5ed315d262..8dd228d274906 100644
--- a/templates/org/team/teams.tmpl
+++ b/templates/org/team/teams.tmpl
@@ -43,7 +43,7 @@
 		</div>
 	</div>
 </div>
-<div class="ui small basic delete modal" id="leave-team">
+<div class="ui small gitea-custom delete modal" id="leave-team">
 	<div class="ui icon header">
 		{{svg "octicon-x" 16 "close inside"}}
 		{{$.locale.Tr "org.teams.leave"}}
diff --git a/templates/package/settings.tmpl b/templates/package/settings.tmpl
index a443a8d27f483..52e4071047069 100644
--- a/templates/package/settings.tmpl
+++ b/templates/package/settings.tmpl
@@ -40,7 +40,7 @@
 		<div class="ui attached error table danger segment">
 			<div class="item">
 				<div class="ui right">
-					<button class="ui basic red show-modal button" data-modal="#delete-package-modal">{{.locale.Tr "packages.settings.delete"}}</button>
+					<button class="ui gitea-custom red show-modal button" data-modal="#delete-package-modal">{{.locale.Tr "packages.settings.delete"}}</button>
 				</div>
 				<div>
 					<h5>{{.locale.Tr "packages.settings.delete"}}</h5>
diff --git a/templates/projects/list.tmpl b/templates/projects/list.tmpl
index 34460ebe574ac..db6ae8aad415d 100644
--- a/templates/projects/list.tmpl
+++ b/templates/projects/list.tmpl
@@ -76,7 +76,7 @@
 </div>
 
 {{if $.CanWriteProjects}}
-<div class="ui small basic delete modal">
+<div class="ui small gitea-custom delete modal">
 	<div class="ui icon header">
 		{{svg "octicon-trash"}}
 		{{.locale.Tr "repo.projects.deletion"}}
diff --git a/templates/projects/view.tmpl b/templates/projects/view.tmpl
index 777cc0d043da1..6e798b9b432af 100644
--- a/templates/projects/view.tmpl
+++ b/templates/projects/view.tmpl
@@ -150,7 +150,7 @@
 									</div>
 								</div>
 
-								<div class="ui basic modal default-project-board-modal" id="default-project-board-modal-{{.ID}}">
+								<div class="ui gitea-custom modal default-project-board-modal" id="default-project-board-modal-{{.ID}}">
 									<div class="ui icon header">
 										<span id="default-project-board-header"></span>
 									</div>
@@ -160,7 +160,7 @@
 									{{template "base/modal_actions_confirm" (dict "locale" $.locale "ModalButtonStyle" "confirm")}}
 								</div>
 
-								<div class="ui basic modal" id="delete-board-modal-{{.ID}}">
+								<div class="ui gitea-custom modal" id="delete-board-modal-{{.ID}}">
 									<div class="ui icon header">
 										{{$.locale.Tr "repo.projects.column.delete"}}
 									</div>
@@ -272,7 +272,7 @@
 </div>
 
 {{if .CanWriteProjects}}
-	<div class="ui small basic delete modal">
+	<div class="ui small gitea-custom delete modal">
 		<div class="ui icon header">
 			{{svg "octicon-trash"}}
 			{{.locale.Tr "repo.projects.deletion"}}
diff --git a/templates/repo/branch/list.tmpl b/templates/repo/branch/list.tmpl
index 6b8d87d3b2739..37b53571739ec 100644
--- a/templates/repo/branch/list.tmpl
+++ b/templates/repo/branch/list.tmpl
@@ -22,7 +22,7 @@
 							</td>
 							<td class="right aligned overflow-visible">
 								{{if and $.IsWriter (not $.Repository.IsArchived) (not .IsDeleted)}}
-									<button class="ui basic jump button icon show-create-branch-modal" data-tooltip-content="{{$.locale.Tr "repo.branch.new_branch_from" ($.DefaultBranch)}}" data-branch-from="{{$.DefaultBranch}}" data-branch-from-urlcomponent="{{PathEscapeSegments $.DefaultBranch}}" data-modal="#create-branch-modal">
+									<button class="ui gitea-custom jump button icon show-create-branch-modal" data-tooltip-content="{{$.locale.Tr "repo.branch.new_branch_from" ($.DefaultBranch)}}" data-branch-from="{{$.DefaultBranch}}" data-branch-from-urlcomponent="{{PathEscapeSegments $.DefaultBranch}}" data-modal="#create-branch-modal">
 										{{svg "octicon-git-branch"}}
 									</button>
 								{{end}}
@@ -109,7 +109,7 @@
 									</td>
 									<td class="three wide right aligned overflow-visible">
 										{{if and $.IsWriter (not $.Repository.IsArchived) (not .IsDeleted)}}
-											<button class="ui basic jump button icon show-create-branch-modal" data-branch-from="{{.Name}}" data-branch-from-urlcomponent="{{PathEscapeSegments .Name}}" data-tooltip-content="{{$.locale.Tr "repo.branch.new_branch_from" .Name}}" data-modal="#create-branch-modal" data-name="{{.Name}}">
+											<button class="ui gitea-custom jump button icon show-create-branch-modal" data-branch-from="{{.Name}}" data-branch-from-urlcomponent="{{PathEscapeSegments .Name}}" data-tooltip-content="{{$.locale.Tr "repo.branch.new_branch_from" .Name}}" data-modal="#create-branch-modal" data-name="{{.Name}}">
 												{{svg "octicon-git-branch"}}
 											</button>
 										{{end}}
@@ -147,7 +147,7 @@
 	</div>
 </div>
 
-<div class="ui small basic delete modal">
+<div class="ui small gitea-custom delete modal">
 	<div class="ui icon header">
 		{{svg "octicon-trash"}}
 		{{.locale.Tr "repo.branch.delete_html"}} <span class="name"></span>
diff --git a/templates/repo/commit_page.tmpl b/templates/repo/commit_page.tmpl
index 8d72cd1420246..6ff155e991c48 100644
--- a/templates/repo/commit_page.tmpl
+++ b/templates/repo/commit_page.tmpl
@@ -59,7 +59,7 @@
 										data-modal-cherry-pick-header="{{$.locale.Tr "repo.commit.cherry-pick-header" (ShortSha .CommitID)}}"
 										data-modal-cherry-pick-content="{{$.locale.Tr "repo.commit.cherry-pick-content"}}"
 										data-modal-cherry-pick-submit="{{.locale.Tr "repo.commit.cherry-pick"}}">{{.locale.Tr "repo.commit.cherry-pick"}}</div>
-									<div class="ui basic modal" id="cherry-pick-modal">
+									<div class="ui gitea-custom modal" id="cherry-pick-modal">
 										<div class="ui icon header">
 											<span id="cherry-pick-header"></span>
 										</div>
diff --git a/templates/repo/editor/edit.tmpl b/templates/repo/editor/edit.tmpl
index 0ac6e93d4956c..8a053d44daaf7 100644
--- a/templates/repo/editor/edit.tmpl
+++ b/templates/repo/editor/edit.tmpl
@@ -56,7 +56,7 @@
 	</div>
 
 
-	<div class="ui small basic modal" id="edit-empty-content-modal">
+	<div class="ui small gitea-custom modal" id="edit-empty-content-modal">
 		<div class="ui icon header">
 			{{svg "octicon-file"}}
 			{{.locale.Tr "repo.editor.commit_empty_file_header"}}
diff --git a/templates/repo/editor/patch.tmpl b/templates/repo/editor/patch.tmpl
index 97637027bbcaa..79535db2bfeac 100644
--- a/templates/repo/editor/patch.tmpl
+++ b/templates/repo/editor/patch.tmpl
@@ -36,7 +36,7 @@
 		</form>
 	</div>
 
-	<div class="ui small basic modal" id="edit-empty-content-modal">
+	<div class="ui small gitea-custom modal" id="edit-empty-content-modal">
 		<div class="ui icon header">
 			{{svg "octicon-file"}}
 			{{.locale.Tr "repo.editor.commit_empty_file_header"}}
diff --git a/templates/repo/issue/labels/edit_delete_label.tmpl b/templates/repo/issue/labels/edit_delete_label.tmpl
index e5ef6a3e4163e..2ea0e7980852a 100644
--- a/templates/repo/issue/labels/edit_delete_label.tmpl
+++ b/templates/repo/issue/labels/edit_delete_label.tmpl
@@ -1,4 +1,4 @@
-<div class="ui small basic delete modal">
+<div class="ui small gitea-custom delete modal">
 	<div class="ui icon header">
 		{{svg "octicon-trash"}}
 		{{.locale.Tr "repo.issues.label_deletion"}}
diff --git a/templates/repo/issue/milestones.tmpl b/templates/repo/issue/milestones.tmpl
index 2b11be6d5dd40..4986a2c76b666 100644
--- a/templates/repo/issue/milestones.tmpl
+++ b/templates/repo/issue/milestones.tmpl
@@ -116,7 +116,7 @@
 </div>
 
 {{if or .CanWriteIssues .CanWritePulls}}
-	<div class="ui small basic delete modal">
+	<div class="ui small gitea-custom delete modal">
 		<div class="ui icon header">
 			{{svg "octicon-trash"}}
 			{{.locale.Tr "repo.milestones.deletion"}}
diff --git a/templates/repo/issue/view_content.tmpl b/templates/repo/issue/view_content.tmpl
index 4dab4faf2e704..726a7eab57b66 100644
--- a/templates/repo/issue/view_content.tmpl
+++ b/templates/repo/issue/view_content.tmpl
@@ -197,7 +197,7 @@
 	<span class="no-content">{{.locale.Tr "repo.issues.no_content"}}</span>
 </div>
 
-<div class="ui small basic delete modal">
+<div class="ui small gitea-custom delete modal">
 	<div class="ui icon header">
 		{{svg "octicon-trash"}}
 		{{.locale.Tr "repo.branch.delete" .HeadTarget}}
diff --git a/templates/repo/issue/view_content/sidebar.tmpl b/templates/repo/issue/view_content/sidebar.tmpl
index 098d642d0f1e7..f48e09eca9057 100644
--- a/templates/repo/issue/view_content/sidebar.tmpl
+++ b/templates/repo/issue/view_content/sidebar.tmpl
@@ -542,7 +542,7 @@
 			{{if and .CanCreateIssueDependencies (not .Repository.IsArchived)}}
 				<input type="hidden" id="crossRepoSearch" value="{{.AllowCrossRepositoryDependencies}}">
 
-				<div class="ui basic modal remove-dependency">
+				<div class="ui gitea-custom modal remove-dependency">
 					<div class="ui icon header">
 						{{svg "octicon-trash"}}
 						{{.locale.Tr "repo.issues.dependency.remove_header"}}
@@ -656,7 +656,7 @@
 				{{svg "octicon-trash"}}
 				{{.locale.Tr "repo.issues.delete"}}
 			</button>
-			<div class="ui basic modal" id="delete">
+			<div class="ui gitea-custom modal" id="delete">
 				<div class="ui icon header">
 					{{if .Issue.IsPull}}
 						{{.locale.Tr "repo.pulls.delete.title"}}
diff --git a/templates/repo/migrate/migrating.tmpl b/templates/repo/migrate/migrating.tmpl
index 51caa28aa18aa..74a98fc94af1e 100644
--- a/templates/repo/migrate/migrating.tmpl
+++ b/templates/repo/migrate/migrating.tmpl
@@ -35,7 +35,7 @@
 							{{if and .Failed .Permission.IsAdmin}}
 								<div class="ui divider"></div>
 								<div class="item">
-									<button class="ui basic red show-modal button" data-modal="#delete-repo-modal">{{.locale.Tr "repo.settings.delete"}}</button>
+									<button class="ui gitea-custom red show-modal button" data-modal="#delete-repo-modal">{{.locale.Tr "repo.settings.delete"}}</button>
 								</div>
 							{{end}}
 						</div>
diff --git a/templates/repo/projects/list.tmpl b/templates/repo/projects/list.tmpl
index b093d948d26f7..3e10d1d5167f2 100644
--- a/templates/repo/projects/list.tmpl
+++ b/templates/repo/projects/list.tmpl
@@ -78,7 +78,7 @@
 </div>
 
 {{if .CanWriteProjects}}
-<div class="ui small basic delete modal">
+<div class="ui small gitea-custom delete modal">
 	<div class="ui icon header">
 		{{svg "octicon-trash"}}
 		{{.locale.Tr "repo.projects.deletion"}}
diff --git a/templates/repo/projects/view.tmpl b/templates/repo/projects/view.tmpl
index e4f8a52971e41..c429827e63a81 100644
--- a/templates/repo/projects/view.tmpl
+++ b/templates/repo/projects/view.tmpl
@@ -156,7 +156,7 @@
 									</div>
 								</div>
 
-								<div class="ui basic modal default-project-board-modal" id="default-project-board-modal-{{.ID}}">
+								<div class="ui gitea-custom modal default-project-board-modal" id="default-project-board-modal-{{.ID}}">
 									<div class="ui icon header">
 										<span id="default-project-board-header"></span>
 									</div>
@@ -166,7 +166,7 @@
 									{{template "base/modal_actions_confirm" (dict "locale" $.locale "ModalButtonStyle" "confirm")}}
 								</div>
 
-								<div class="ui basic modal" id="delete-board-modal-{{.ID}}">
+								<div class="ui gitea-custom modal" id="delete-board-modal-{{.ID}}">
 									<div class="ui icon header">
 										{{$.locale.Tr "repo.projects.column.delete"}}
 									</div>
@@ -278,7 +278,7 @@
 </div>
 
 {{if or .CanWriteIssues .CanWritePulls}}
-	<div class="ui small basic delete modal">
+	<div class="ui small gitea-custom delete modal">
 		<div class="ui icon header">
 			{{svg "octicon-trash"}}
 			{{.locale.Tr "repo.projects.deletion"}}
diff --git a/templates/repo/release/list.tmpl b/templates/repo/release/list.tmpl
index aae351324a7eb..43653869252ae 100644
--- a/templates/repo/release/list.tmpl
+++ b/templates/repo/release/list.tmpl
@@ -184,7 +184,7 @@
 </div>
 
 {{if (and ($.Permission.CanWrite $.UnitTypeCode) .PageIsTagList)}}
-	<div class="ui small basic delete modal">
+	<div class="ui small gitea-custom delete modal">
 		<div class="ui header">
 			{{svg "octicon-trash" 16 "gt-mr-2"}}
 			{{.locale.Tr "repo.release.delete_tag"}}
diff --git a/templates/repo/release/new.tmpl b/templates/repo/release/new.tmpl
index 4f162f924e5a3..56dc11e316a75 100644
--- a/templates/repo/release/new.tmpl
+++ b/templates/repo/release/new.tmpl
@@ -138,7 +138,7 @@
 </div>
 
 {{if .PageIsEditRelease}}
-	<div class="ui small basic delete modal">
+	<div class="ui small gitea-custom delete modal">
 		<div class="ui icon header">
 			{{svg "octicon-trash"}}
 			{{.locale.Tr "repo.release.deletion"}}
diff --git a/templates/repo/settings/branches.tmpl b/templates/repo/settings/branches.tmpl
index 3258a056a4b5c..7a97d421e438a 100644
--- a/templates/repo/settings/branches.tmpl
+++ b/templates/repo/settings/branches.tmpl
@@ -96,7 +96,7 @@
 	</div>
 </div>
 
-<div class="ui small basic delete modal">
+<div class="ui small gitea-custom delete modal">
 	<div class="ui header">
 		{{svg "octicon-trash" 16 "gt-mr-2"}}
 		{{.locale.Tr "repo.settings.protected_branch_deletion"}}
diff --git a/templates/repo/settings/collaboration.tmpl b/templates/repo/settings/collaboration.tmpl
index f378805a4af18..1988ef8c79f60 100644
--- a/templates/repo/settings/collaboration.tmpl
+++ b/templates/repo/settings/collaboration.tmpl
@@ -112,7 +112,7 @@
 	</div>
 </div>
 
-<div class="ui small basic delete modal">
+<div class="ui small gitea-custom delete modal">
 	<div class="ui icon header">
 		{{svg "octicon-trash"}}
 		{{.locale.Tr "repo.settings.collaborator_deletion"}}
diff --git a/templates/repo/settings/deploy_keys.tmpl b/templates/repo/settings/deploy_keys.tmpl
index bf39bd24a2a01..075f0305ed961 100644
--- a/templates/repo/settings/deploy_keys.tmpl
+++ b/templates/repo/settings/deploy_keys.tmpl
@@ -77,7 +77,7 @@
 	</div>
 </div>
 
-<div class="ui small basic delete modal">
+<div class="ui small gitea-custom delete modal">
 	<div class="ui icon header">
 		{{svg "octicon-trash"}}
 		{{.locale.Tr "repo.settings.deploy_key_deletion"}}
diff --git a/templates/repo/settings/lfs.tmpl b/templates/repo/settings/lfs.tmpl
index a2dd6224a7765..9dab97c188ec2 100644
--- a/templates/repo/settings/lfs.tmpl
+++ b/templates/repo/settings/lfs.tmpl
@@ -26,7 +26,7 @@
 						<td>{{TimeSince .CreatedUnix.AsTime $.locale}}</td>
 						<td class="right aligned">
 							<a class="ui primary button" href="{{$.Link}}/find?oid={{.Oid}}&size={{.Size}}">{{$.locale.Tr "repo.settings.lfs_findcommits"}}</a>
-							<button class="ui basic show-modal icon button" data-modal="#delete-{{.Oid}}">
+							<button class="ui gitea-custom show-modal icon button" data-modal="#delete-{{.Oid}}">
 								<span class="btn-octicon btn-octicon-danger"  data-tooltip-content="{{$.locale.Tr "repo.editor.delete_this_file"}}">{{svg "octicon-trash"}}</span>
 							</button>
 						</td>
@@ -40,7 +40,7 @@
 		</table>
 		{{template "base/paginate" .}}
 		{{range .LFSFiles}}
-			<div class="ui basic modal" id="delete-{{.Oid}}">
+			<div class="ui gitea-custom modal" id="delete-{{.Oid}}">
 				<div class="ui icon header">
 					{{$.locale.Tr "repo.settings.lfs_delete" .Oid}}
 				</div>
diff --git a/templates/repo/settings/options.tmpl b/templates/repo/settings/options.tmpl
index 41804ce3b7d05..6305b6e8bcc7b 100644
--- a/templates/repo/settings/options.tmpl
+++ b/templates/repo/settings/options.tmpl
@@ -702,7 +702,7 @@
 			{{if .Repository.IsMirror}}
 				<div class="item">
 					<div class="ui right">
-						<button class="ui basic red show-modal button" data-modal="#convert-mirror-repo-modal">{{.locale.Tr "repo.settings.convert"}}</button>
+						<button class="ui gitea-custom red show-modal button" data-modal="#convert-mirror-repo-modal">{{.locale.Tr "repo.settings.convert"}}</button>
 					</div>
 					<div>
 						<h5>{{.locale.Tr "repo.settings.convert"}}</h5>
@@ -714,7 +714,7 @@
 			{{if and .Repository.IsFork .Repository.Owner.CanCreateRepo}}
 				<div class="item">
 					<div class="ui right">
-						<button class="ui basic red show-modal button" data-modal="#convert-fork-repo-modal">{{.locale.Tr "repo.settings.convert_fork"}}</button>
+						<button class="ui gitea-custom red show-modal button" data-modal="#convert-fork-repo-modal">{{.locale.Tr "repo.settings.convert_fork"}}</button>
 					</div>
 					<div>
 						<h5>{{.locale.Tr "repo.settings.convert_fork"}}</h5>
@@ -732,7 +732,7 @@
 							<button class="ui red button">{{.locale.Tr "repo.settings.transfer_abort"}}</button>
 						</form>
 					{{else}}
-						<button class="ui basic red show-modal button" data-modal="#transfer-repo-modal">{{.locale.Tr "repo.settings.transfer"}}</button>
+						<button class="ui gitea-custom red show-modal button" data-modal="#transfer-repo-modal">{{.locale.Tr "repo.settings.transfer"}}</button>
 					{{end}}
 				</div>
 				<div>
@@ -750,7 +750,7 @@
 
 				<div class="item">
 					<div class="ui right">
-						<button class="ui basic red show-modal button" data-modal="#delete-wiki-modal">{{.locale.Tr "repo.settings.wiki_delete"}}</button>
+						<button class="ui gitea-custom red show-modal button" data-modal="#delete-wiki-modal">{{.locale.Tr "repo.settings.wiki_delete"}}</button>
 					</div>
 					<div>
 						<h5>{{.locale.Tr "repo.settings.wiki_delete"}}</h5>
@@ -763,7 +763,7 @@
 
 			<div class="item">
 				<div class="ui right">
-					<button class="ui basic red show-modal button" data-modal="#delete-repo-modal">{{.locale.Tr "repo.settings.delete"}}</button>
+					<button class="ui gitea-custom red show-modal button" data-modal="#delete-repo-modal">{{.locale.Tr "repo.settings.delete"}}</button>
 				</div>
 				<div>
 					<h5>{{.locale.Tr "repo.settings.delete"}}</h5>
@@ -776,7 +776,7 @@
 
 				<div class="item">
 					<div class="ui right">
-						<button class="ui basic red show-modal button" data-modal="#archive-repo-modal">
+						<button class="ui gitea-custom red show-modal button" data-modal="#archive-repo-modal">
 							{{if .Repository.IsArchived}}
 								{{.locale.Tr "repo.settings.unarchive.button"}}
 							{{else}}
@@ -967,7 +967,7 @@
 	{{end}}
 
 	{{if not .Repository.IsMirror}}
-		<div class="ui basic modal" id="archive-repo-modal">
+		<div class="ui gitea-custom modal" id="archive-repo-modal">
 			<div class="ui icon header">
 				{{if .Repository.IsArchived}}
 					{{.locale.Tr "repo.settings.unarchive.header"}}
diff --git a/templates/repo/settings/webhook/delete_modal.tmpl b/templates/repo/settings/webhook/delete_modal.tmpl
index 6dc13c68addaa..b2d19b171a53d 100644
--- a/templates/repo/settings/webhook/delete_modal.tmpl
+++ b/templates/repo/settings/webhook/delete_modal.tmpl
@@ -1,4 +1,4 @@
-<div class="ui small basic delete modal">
+<div class="ui small gitea-custom delete modal">
 	<div class="ui icon header">
 		{{svg "octicon-trash"}}
 		{{.locale.Tr "repo.settings.webhook_deletion"}}
diff --git a/templates/repo/wiki/view.tmpl b/templates/repo/wiki/view.tmpl
index 549be33856325..7b7147a67aa46 100644
--- a/templates/repo/wiki/view.tmpl
+++ b/templates/repo/wiki/view.tmpl
@@ -99,7 +99,7 @@
 	</div>
 </div>
 
-<div class="ui small basic delete modal">
+<div class="ui small gitea-custom delete modal">
 	<div class="ui icon header">
 		{{svg "octicon-trash"}}
 		{{.locale.Tr "repo.wiki.delete_page_button"}}
diff --git a/templates/shared/actions/runner_edit.tmpl b/templates/shared/actions/runner_edit.tmpl
index e68fd1bbc3124..635914510d38c 100644
--- a/templates/shared/actions/runner_edit.tmpl
+++ b/templates/shared/actions/runner_edit.tmpl
@@ -89,7 +89,7 @@
 		</table>
 		{{template "base/paginate" .}}
 	</div>
-	<div class="ui small basic delete modal" id="runner-delete-modal">
+	<div class="ui small gitea-custom delete modal" id="runner-delete-modal">
 		<div class="ui icon header">
 			{{svg "octicon-trash"}}
 			{{.locale.Tr "actions.runners.delete_runner_header"}}
diff --git a/templates/shared/secrets/add_list.tmpl b/templates/shared/secrets/add_list.tmpl
index bbac728fa4c8b..f6c4145d4f5d5 100644
--- a/templates/shared/secrets/add_list.tmpl
+++ b/templates/shared/secrets/add_list.tmpl
@@ -56,7 +56,7 @@
 		{{.locale.Tr "secrets.none"}}
 	{{end}}
 </div>
-<div class="ui small basic delete modal">
+<div class="ui small gitea-custom delete modal">
 	<div class="ui header">
 		{{svg "octicon-trash" 16 "gt-mr-2"}}
 		{{.locale.Tr "secrets.deletion"}}
diff --git a/templates/user/settings/account.tmpl b/templates/user/settings/account.tmpl
index b94006b86e4a0..a6e37d40697ef 100644
--- a/templates/user/settings/account.tmpl
+++ b/templates/user/settings/account.tmpl
@@ -161,7 +161,7 @@
 	</div>
 </div>
 
-<div class="ui small basic delete modal" id="delete-email">
+<div class="ui small gitea-custom delete modal" id="delete-email">
 	<div class="ui icon header">
 		{{svg "octicon-trash"}}
 		{{.locale.Tr "settings.email_deletion"}}
@@ -172,7 +172,7 @@
 	{{template "base/modal_actions_confirm" .}}
 </div>
 
-<div class="ui small basic delete modal" id="delete-account">
+<div class="ui small gitea-custom delete modal" id="delete-account">
 	<div class="ui icon header">
 		{{svg "octicon-trash"}}
 		{{.locale.Tr "settings.delete_account_title"}}
diff --git a/templates/user/settings/applications.tmpl b/templates/user/settings/applications.tmpl
index ce095d2474d4e..2ac39c0fd1cc1 100644
--- a/templates/user/settings/applications.tmpl
+++ b/templates/user/settings/applications.tmpl
@@ -268,7 +268,7 @@
 	</div>
 </div>
 
-<div class="ui small basic delete modal" id="delete-token">
+<div class="ui small gitea-custom delete modal" id="delete-token">
 	<div class="ui icon header">
 		{{svg "octicon-trash"}}
 		{{.locale.Tr "settings.access_token_deletion"}}
diff --git a/templates/user/settings/applications_oauth2_list.tmpl b/templates/user/settings/applications_oauth2_list.tmpl
index a0a3effee1a0f..5d2055c047bff 100644
--- a/templates/user/settings/applications_oauth2_list.tmpl
+++ b/templates/user/settings/applications_oauth2_list.tmpl
@@ -47,7 +47,7 @@
 	</form>
 </div>
 
-<div class="ui small basic delete modal" id="remove-gitea-oauth2-application">
+<div class="ui small gitea-custom delete modal" id="remove-gitea-oauth2-application">
 	<div class="ui icon header">
 		{{svg "octicon-trash"}}
 		{{.locale.Tr "settings.remove_oauth2_application"}}
diff --git a/templates/user/settings/grants_oauth2.tmpl b/templates/user/settings/grants_oauth2.tmpl
index 7b37cd6fa835a..a12728aadc339 100644
--- a/templates/user/settings/grants_oauth2.tmpl
+++ b/templates/user/settings/grants_oauth2.tmpl
@@ -28,7 +28,7 @@
 	</div>
 </div>
 
-<div class="ui small basic delete modal" id="revoke-gitea-oauth2-grant">
+<div class="ui small gitea-custom delete modal" id="revoke-gitea-oauth2-grant">
 	<div class="ui icon header">
 		{{svg "octicon-shield" 16 "gt-mr-2"}}
 		{{.locale.Tr "settings.revoke_oauth2_grant"}}
diff --git a/templates/user/settings/keys_gpg.tmpl b/templates/user/settings/keys_gpg.tmpl
index a93e193eae541..5a2f69147aa63 100644
--- a/templates/user/settings/keys_gpg.tmpl
+++ b/templates/user/settings/keys_gpg.tmpl
@@ -111,7 +111,7 @@
 <br>
 <p>{{.locale.Tr "settings.gpg_helper" "https://docs.github.com/en/free-pro-team@latest/github/authenticating-to-github/about-commit-signature-verification#gpg-commit-signature-verification" | Str2html}}</p>
 
-<div class="ui small basic delete modal" id="delete-gpg">
+<div class="ui small gitea-custom delete modal" id="delete-gpg">
 	<div class="ui icon header">
 		{{svg "octicon-trash"}}
 		{{.locale.Tr "settings.gpg_key_deletion"}}
diff --git a/templates/user/settings/keys_principal.tmpl b/templates/user/settings/keys_principal.tmpl
index 7ee56f54d2944..efca246964fbc 100644
--- a/templates/user/settings/keys_principal.tmpl
+++ b/templates/user/settings/keys_principal.tmpl
@@ -54,7 +54,7 @@
 		</div>
 	</div>
 
-	<div class="ui small basic delete modal" id="delete-principal">
+	<div class="ui small gitea-custom delete modal" id="delete-principal">
 		<div class="ui icon header">
 			{{svg "octicon-trash"}}
 			{{.locale.Tr "settings.ssh_principal_deletion"}}
diff --git a/templates/user/settings/keys_ssh.tmpl b/templates/user/settings/keys_ssh.tmpl
index 257c7e28178d2..05f8183d8dab2 100644
--- a/templates/user/settings/keys_ssh.tmpl
+++ b/templates/user/settings/keys_ssh.tmpl
@@ -100,7 +100,7 @@
 <br>
 <p>{{.locale.Tr "settings.ssh_helper" "https://docs.github.com/en/free-pro-team@latest/github/authenticating-to-github/connecting-to-github-with-ssh" "https://docs.github.com/en/free-pro-team@latest/github/authenticating-to-github/troubleshooting-ssh" | Str2html}}</p>
 
-<div class="ui small basic delete modal" id="delete-ssh">
+<div class="ui small gitea-custom delete modal" id="delete-ssh">
 	<div class="ui icon header">
 		{{svg "octicon-trash"}}
 		{{.locale.Tr "settings.ssh_key_deletion"}}
diff --git a/templates/user/settings/organization.tmpl b/templates/user/settings/organization.tmpl
index 9f2392aaa7cf8..0637442e6c203 100644
--- a/templates/user/settings/organization.tmpl
+++ b/templates/user/settings/organization.tmpl
@@ -40,7 +40,7 @@
 		</div>
 	</div>
 </div>
-<div class="ui small basic delete modal" id="leave-organization">
+<div class="ui small gitea-custom delete modal" id="leave-organization">
 	<div class="ui icon header">
 		{{svg "octicon-x" 16 "close inside"}}
 		{{$.locale.Tr "org.members.leave"}}
diff --git a/templates/user/settings/repos.tmpl b/templates/user/settings/repos.tmpl
index 4838b954112b6..b6eace78faa4f 100644
--- a/templates/user/settings/repos.tmpl
+++ b/templates/user/settings/repos.tmpl
@@ -38,7 +38,7 @@
 										<div class="right floated content">
 											{{if $.allowAdopt}}
 												<button class="ui button submit tiny green adopt show-modal" data-modal="#adopt-unadopted-modal-{{$dirI}}"><span class="icon">{{svg "octicon-plus"}}</span><span class="label">{{$.locale.Tr "repo.adopt_preexisting_label"}}</span></button>
-												<div class="ui basic modal" id="adopt-unadopted-modal-{{$dirI}}">
+												<div class="ui gitea-custom modal" id="adopt-unadopted-modal-{{$dirI}}">
 													{{svg "octicon-x" 16 "close inside"}}
 													<div class="header">
 														<span class="label">{{$.locale.Tr "repo.adopt_preexisting"}}</span>
@@ -65,7 +65,7 @@
 											{{end}}
 											{{if $.allowDelete}}
 												<button class="ui button submit tiny red delete show-modal" data-modal="#delete-unadopted-modal-{{$dirI}}"><span class="icon">{{svg "octicon-x"}}</span><span class="label">{{$.locale.Tr "repo.delete_preexisting_label"}}</span></button>
-												<div class="ui basic modal" id="delete-unadopted-modal-{{$dirI}}">
+												<div class="ui gitea-custom modal" id="delete-unadopted-modal-{{$dirI}}">
 													{{svg "octicon-x" 16 "close inside"}}
 													<div class="header">
 														<span class="label">{{$.locale.Tr "repo.delete_preexisting"}}</span>
@@ -131,7 +131,7 @@
 	</div>
 </div>
 
-<div class="ui small basic delete modal">
+<div class="ui small gitea-custom delete modal">
 	<div class="ui icon header">
 		{{svg "octicon-trash"}}
 		{{.locale.Tr "settings.remove_account_link"}}
diff --git a/templates/user/settings/security/accountlinks.tmpl b/templates/user/settings/security/accountlinks.tmpl
index 0ccb57ca81742..8805d8d82c49d 100644
--- a/templates/user/settings/security/accountlinks.tmpl
+++ b/templates/user/settings/security/accountlinks.tmpl
@@ -41,7 +41,7 @@
 	</div>
 </div>
 
-<div class="ui small basic delete modal" id="delete-account-link">
+<div class="ui small gitea-custom delete modal" id="delete-account-link">
 	<div class="ui icon header">
 		{{svg "octicon-trash"}}
 		{{.locale.Tr "settings.remove_account_link"}}
diff --git a/templates/user/settings/security/openid.tmpl b/templates/user/settings/security/openid.tmpl
index 18dba417abce5..ce7da88cada4f 100644
--- a/templates/user/settings/security/openid.tmpl
+++ b/templates/user/settings/security/openid.tmpl
@@ -51,7 +51,7 @@
 	</form>
 </div>
 
-<div class="ui small basic delete modal" id="delete-openid">
+<div class="ui small gitea-custom delete modal" id="delete-openid">
 	<div class="ui icon header">
 		{{svg "octicon-trash"}}
 		{{.locale.Tr "settings.openid_deletion"}}
diff --git a/templates/user/settings/security/twofa.tmpl b/templates/user/settings/security/twofa.tmpl
index ffc6de452ec1c..b05bafa90eb9e 100644
--- a/templates/user/settings/security/twofa.tmpl
+++ b/templates/user/settings/security/twofa.tmpl
@@ -23,7 +23,7 @@
 	{{end}}
 </div>
 
-<div class="ui small basic delete modal" id="disable-twofa">
+<div class="ui small gitea-custom delete modal" id="disable-twofa">
 	<div class="ui icon header">
 		{{svg "octicon-trash"}}
 		{{.locale.Tr "settings.twofa_disable"}}
diff --git a/templates/user/settings/security/webauthn.tmpl b/templates/user/settings/security/webauthn.tmpl
index 268b2e5cecd55..b741adec213f6 100644
--- a/templates/user/settings/security/webauthn.tmpl
+++ b/templates/user/settings/security/webauthn.tmpl
@@ -30,7 +30,7 @@
 
 {{template "user/auth/webauthn_error" .}}
 
-<div class="ui small basic delete modal" id="delete-registration">
+<div class="ui small gitea-custom delete modal" id="delete-registration">
 	<div class="ui icon header">
 		{{svg "octicon-trash"}}
 	{{.locale.Tr "settings.webauthn_delete_key"}}
diff --git a/web_src/css/modules/modal.css b/web_src/css/modules/modal.css
index db2c949362415..0454b605fad74 100644
--- a/web_src/css/modules/modal.css
+++ b/web_src/css/modules/modal.css
@@ -22,7 +22,3 @@
 .ui.modal > .close.inside {
   color: var(--color-text);
 }
-
-.ui.modal > form > .actions {
-  text-align: center;
-}

From cbf3b16c61f09be7da84d4dbd104414a0ef26bb7 Mon Sep 17 00:00:00 2001
From: wxiaoguang <wxiaoguang@gmail.com>
Date: Sun, 23 Apr 2023 12:35:59 +0800
Subject: [PATCH 21/26] reset actions alignment

---
 templates/admin/emails/list.tmpl               | 2 +-
 templates/projects/view.tmpl                   | 4 ++--
 templates/repo/commit_page.tmpl                | 2 +-
 templates/repo/issue/view_content/sidebar.tmpl | 2 +-
 templates/repo/projects/view.tmpl              | 4 ++--
 templates/repo/settings/lfs.tmpl               | 4 ++--
 templates/repo/settings/options.tmpl           | 2 +-
 7 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/templates/admin/emails/list.tmpl b/templates/admin/emails/list.tmpl
index a3237caa3699b..91d33921dc578 100644
--- a/templates/admin/emails/list.tmpl
+++ b/templates/admin/emails/list.tmpl
@@ -77,7 +77,7 @@
 			<div class="ui icon header">
 				{{.locale.Tr "admin.emails.change_email_header"}}
 			</div>
-			<div class="content center">
+			<div class="content">
 				<p class="center">{{.locale.Tr "admin.emails.change_email_text"}}</p>
 
 				<form class="ui form" id="email-action-form" action="{{AppSubUrl}}/admin/emails/activate" method="post">
diff --git a/templates/projects/view.tmpl b/templates/projects/view.tmpl
index 6e798b9b432af..944b9d22b24d2 100644
--- a/templates/projects/view.tmpl
+++ b/templates/projects/view.tmpl
@@ -154,7 +154,7 @@
 									<div class="ui icon header">
 										<span id="default-project-board-header"></span>
 									</div>
-									<div class="content center">
+									<div class="content">
 										<label id="default-project-board-content"></label>
 									</div>
 									{{template "base/modal_actions_confirm" (dict "locale" $.locale "ModalButtonStyle" "confirm")}}
@@ -164,7 +164,7 @@
 									<div class="ui icon header">
 										{{$.locale.Tr "repo.projects.column.delete"}}
 									</div>
-									<div class="content center">
+									<div class="content">
 										<label>
 											{{$.locale.Tr "repo.projects.column.deletion_desc"}}
 										</label>
diff --git a/templates/repo/commit_page.tmpl b/templates/repo/commit_page.tmpl
index 6ff155e991c48..ab6e605344c98 100644
--- a/templates/repo/commit_page.tmpl
+++ b/templates/repo/commit_page.tmpl
@@ -63,7 +63,7 @@
 										<div class="ui icon header">
 											<span id="cherry-pick-header"></span>
 										</div>
-										<div class="content center">
+										<div class="content">
 											<p id="cherry-pick-content" class="branch-dropdown"></p>
 											{{template "repo/branch_dropdown" dict "root" .
 												"noTag" true "disableCreateBranch" true
diff --git a/templates/repo/issue/view_content/sidebar.tmpl b/templates/repo/issue/view_content/sidebar.tmpl
index f48e09eca9057..22d98fa043c5d 100644
--- a/templates/repo/issue/view_content/sidebar.tmpl
+++ b/templates/repo/issue/view_content/sidebar.tmpl
@@ -664,7 +664,7 @@
 						{{.locale.Tr "repo.issues.delete.title"}}
 					{{end}}
 				</div>
-				<div class="content center">
+				<div class="content">
 					<p>
 						{{if .Issue.IsPull}}
 							{{.locale.Tr "repo.pulls.delete.text"}}
diff --git a/templates/repo/projects/view.tmpl b/templates/repo/projects/view.tmpl
index c429827e63a81..a2933003fe0d1 100644
--- a/templates/repo/projects/view.tmpl
+++ b/templates/repo/projects/view.tmpl
@@ -160,7 +160,7 @@
 									<div class="ui icon header">
 										<span id="default-project-board-header"></span>
 									</div>
-									<div class="content center">
+									<div class="content">
 										<label id="default-project-board-content"></label>
 									</div>
 									{{template "base/modal_actions_confirm" (dict "locale" $.locale "ModalButtonStyle" "confirm")}}
@@ -170,7 +170,7 @@
 									<div class="ui icon header">
 										{{$.locale.Tr "repo.projects.column.delete"}}
 									</div>
-									<div class="content center">
+									<div class="content">
 										<label>
 											{{$.locale.Tr "repo.projects.column.deletion_desc"}}
 										</label>
diff --git a/templates/repo/settings/lfs.tmpl b/templates/repo/settings/lfs.tmpl
index 9dab97c188ec2..9b782edba6f8d 100644
--- a/templates/repo/settings/lfs.tmpl
+++ b/templates/repo/settings/lfs.tmpl
@@ -44,13 +44,13 @@
 				<div class="ui icon header">
 					{{$.locale.Tr "repo.settings.lfs_delete" .Oid}}
 				</div>
-				<div class="content center">
+				<div class="content">
 					<p>
 						{{$.locale.Tr "repo.settings.lfs_delete_warning"}}
 					</p>
 					<form class="ui form" action="{{$.Link}}/delete/{{.Oid}}" method="post">
 						{{$.CsrfTokenHtml}}
-						<div class="center actions">{{/* TODO: Convert to base/modal_actions_confirm */}}
+						<div class="actions">{{/* TODO: Convert to base/modal_actions_confirm */}}
 							<button class="ui basic cancel inverted button">{{$.locale.Tr "settings.cancel"}}</button>
 							<button class="ui basic inverted yellow button">{{$.locale.Tr "modal.yes"}}</button>
 						</div>
diff --git a/templates/repo/settings/options.tmpl b/templates/repo/settings/options.tmpl
index 6305b6e8bcc7b..f34db46ff5467 100644
--- a/templates/repo/settings/options.tmpl
+++ b/templates/repo/settings/options.tmpl
@@ -975,7 +975,7 @@
 					{{.locale.Tr "repo.settings.archive.header"}}
 				{{end}}
 			</div>
-			<div class="content center">
+			<div class="content">
 				<p>
 					{{if .Repository.IsArchived}}
 						{{.locale.Tr "repo.settings.unarchive.text"}}

From 76813a41c4a3f42215b3f68b37e0ca4f77c72a33 Mon Sep 17 00:00:00 2001
From: wxiaoguang <wxiaoguang@gmail.com>
Date: Sun, 23 Apr 2023 12:38:43 +0800
Subject: [PATCH 22/26] reset header classes

---
 templates/admin/auth/edit.tmpl                        | 2 +-
 templates/admin/emails/list.tmpl                      | 2 +-
 templates/admin/monitor.tmpl                          | 2 +-
 templates/admin/packages/list.tmpl                    | 2 +-
 templates/admin/queue.tmpl                            | 2 +-
 templates/admin/repo/list.tmpl                        | 2 +-
 templates/admin/stacktrace.tmpl                       | 2 +-
 templates/admin/user/edit.tmpl                        | 2 +-
 templates/org/member/members.tmpl                     | 4 ++--
 templates/org/settings/delete.tmpl                    | 2 +-
 templates/org/team/members.tmpl                       | 2 +-
 templates/org/team/new.tmpl                           | 2 +-
 templates/org/team/repositories.tmpl                  | 4 ++--
 templates/org/team/sidebar.tmpl                       | 2 +-
 templates/org/team/teams.tmpl                         | 2 +-
 templates/projects/list.tmpl                          | 2 +-
 templates/projects/view.tmpl                          | 6 +++---
 templates/repo/branch/list.tmpl                       | 2 +-
 templates/repo/commit_page.tmpl                       | 2 +-
 templates/repo/editor/edit.tmpl                       | 2 +-
 templates/repo/editor/patch.tmpl                      | 2 +-
 templates/repo/issue/labels/edit_delete_label.tmpl    | 2 +-
 templates/repo/issue/milestones.tmpl                  | 2 +-
 templates/repo/issue/view_content.tmpl                | 2 +-
 templates/repo/issue/view_content/sidebar.tmpl        | 4 ++--
 templates/repo/projects/list.tmpl                     | 2 +-
 templates/repo/projects/view.tmpl                     | 6 +++---
 templates/repo/release/new.tmpl                       | 2 +-
 templates/repo/settings/collaboration.tmpl            | 2 +-
 templates/repo/settings/deploy_keys.tmpl              | 2 +-
 templates/repo/settings/lfs.tmpl                      | 2 +-
 templates/repo/settings/options.tmpl                  | 2 +-
 templates/repo/settings/webhook/delete_modal.tmpl     | 2 +-
 templates/repo/wiki/view.tmpl                         | 2 +-
 templates/shared/actions/runner_edit.tmpl             | 2 +-
 templates/user/settings/account.tmpl                  | 4 ++--
 templates/user/settings/applications.tmpl             | 2 +-
 templates/user/settings/applications_oauth2_list.tmpl | 2 +-
 templates/user/settings/grants_oauth2.tmpl            | 2 +-
 templates/user/settings/keys_gpg.tmpl                 | 2 +-
 templates/user/settings/keys_principal.tmpl           | 2 +-
 templates/user/settings/keys_ssh.tmpl                 | 2 +-
 templates/user/settings/organization.tmpl             | 2 +-
 templates/user/settings/repos.tmpl                    | 2 +-
 templates/user/settings/security/accountlinks.tmpl    | 2 +-
 templates/user/settings/security/openid.tmpl          | 2 +-
 templates/user/settings/security/twofa.tmpl           | 2 +-
 templates/user/settings/security/webauthn.tmpl        | 2 +-
 48 files changed, 56 insertions(+), 56 deletions(-)

diff --git a/templates/admin/auth/edit.tmpl b/templates/admin/auth/edit.tmpl
index 980dc10f836ff..f0ff0e04964e1 100644
--- a/templates/admin/auth/edit.tmpl
+++ b/templates/admin/auth/edit.tmpl
@@ -441,7 +441,7 @@
 </div>
 
 <div class="ui small gitea-custom delete modal">
-	<div class="ui icon header">
+	<div class="header">
 		{{svg "octicon-trash"}}
 		{{.locale.Tr "admin.auths.delete_auth_title"}}
 	</div>
diff --git a/templates/admin/emails/list.tmpl b/templates/admin/emails/list.tmpl
index 91d33921dc578..8db879fb4fa9d 100644
--- a/templates/admin/emails/list.tmpl
+++ b/templates/admin/emails/list.tmpl
@@ -74,7 +74,7 @@
 		{{template "base/paginate" .}}
 
 		<div class="ui gitea-custom modal" id="change-email-modal">
-			<div class="ui icon header">
+			<div class="header">
 				{{.locale.Tr "admin.emails.change_email_header"}}
 			</div>
 			<div class="content">
diff --git a/templates/admin/monitor.tmpl b/templates/admin/monitor.tmpl
index 98a60497084d8..fd347971abfa2 100644
--- a/templates/admin/monitor.tmpl
+++ b/templates/admin/monitor.tmpl
@@ -38,7 +38,7 @@
 	</div>
 </div>
 <div class="ui small gitea-custom delete modal">
-	<div class="ui icon header">
+	<div class="header">
 		{{svg "octicon-x" 16 "close inside"}}
 		{{.locale.Tr "admin.monitor.process.cancel"}}
 	</div>
diff --git a/templates/admin/packages/list.tmpl b/templates/admin/packages/list.tmpl
index e37353f5341ac..f5277efa82348 100644
--- a/templates/admin/packages/list.tmpl
+++ b/templates/admin/packages/list.tmpl
@@ -81,7 +81,7 @@
 </div>
 
 <div class="ui small gitea-custom delete modal">
-	<div class="ui icon header">
+	<div class="header">
 		{{svg "octicon-trash"}}
 		{{.locale.Tr "packages.settings.delete"}}
 	</div>
diff --git a/templates/admin/queue.tmpl b/templates/admin/queue.tmpl
index e4e1a31e573f2..d79b96f525a6b 100644
--- a/templates/admin/queue.tmpl
+++ b/templates/admin/queue.tmpl
@@ -182,7 +182,7 @@
 	</div>
 </div>
 <div class="ui small gitea-custom delete modal">
-	<div class="ui icon header">
+	<div class="header">
 		{{svg "octicon-x" 16 "close inside"}}
 		{{.locale.Tr "admin.monitor.queue.pool.cancel"}}
 	</div>
diff --git a/templates/admin/repo/list.tmpl b/templates/admin/repo/list.tmpl
index f229fb2d76316..dbfc19ea9987e 100644
--- a/templates/admin/repo/list.tmpl
+++ b/templates/admin/repo/list.tmpl
@@ -96,7 +96,7 @@
 </div>
 
 <div class="ui small gitea-custom delete modal">
-	<div class="ui icon header">
+	<div class="header">
 		{{svg "octicon-trash"}}
 		{{.locale.Tr "repo.settings.delete"}}
 	</div>
diff --git a/templates/admin/stacktrace.tmpl b/templates/admin/stacktrace.tmpl
index c6fe945892a10..88fa89322f30e 100644
--- a/templates/admin/stacktrace.tmpl
+++ b/templates/admin/stacktrace.tmpl
@@ -19,7 +19,7 @@
 	</div>
 </div>
 <div class="ui small gitea-custom delete modal">
-	<div class="ui icon header">
+	<div class="header">
 		{{svg "octicon-x" 16 "close inside"}}
 		{{.locale.Tr "admin.monitor.process.cancel"}}
 	</div>
diff --git a/templates/admin/user/edit.tmpl b/templates/admin/user/edit.tmpl
index 19d8eee626df2..872d1ea64ed55 100644
--- a/templates/admin/user/edit.tmpl
+++ b/templates/admin/user/edit.tmpl
@@ -197,7 +197,7 @@
 </div>
 
 <div class="ui small gitea-custom delete modal" id="delete-user-modal">
-	<div class="ui icon header">
+	<div class="header">
 		{{svg "octicon-trash"}}
 		{{.locale.Tr "settings.delete_account_title"}}
 	</div>
diff --git a/templates/org/member/members.tmpl b/templates/org/member/members.tmpl
index 3f674471d1043..6082880a70696 100644
--- a/templates/org/member/members.tmpl
+++ b/templates/org/member/members.tmpl
@@ -82,7 +82,7 @@
 	</div>
 </div>
 <div class="ui small gitea-custom delete modal" id="leave-organization">
-	<div class="ui icon header">
+	<div class="header">
 		{{svg "octicon-x" 16 "close inside"}}
 		{{$.locale.Tr "org.members.leave"}}
 	</div>
@@ -92,7 +92,7 @@
 	{{template "base/modal_actions_confirm" .}}
 </div>
 <div class="ui small gitea-custom delete modal" id="remove-organization-member">
-	<div class="ui icon header">
+	<div class="header">
 		{{svg "octicon-x" 16 "close inside"}}
 		{{$.locale.Tr "org.members.remove"}}
 	</div>
diff --git a/templates/org/settings/delete.tmpl b/templates/org/settings/delete.tmpl
index 238976ccd9e51..676e3bdf20a9c 100644
--- a/templates/org/settings/delete.tmpl
+++ b/templates/org/settings/delete.tmpl
@@ -30,7 +30,7 @@
 </div>
 
 <div class="ui small gitea-custom delete modal">
-	<div class="ui icon header">
+	<div class="header">
 		{{svg "octicon-trash"}}
 		{{.locale.Tr "org.settings.delete_org_title"}}
 	</div>
diff --git a/templates/org/team/members.tmpl b/templates/org/team/members.tmpl
index 2acb93d9da62b..98548b7001da7 100644
--- a/templates/org/team/members.tmpl
+++ b/templates/org/team/members.tmpl
@@ -65,7 +65,7 @@
 	</div>
 </div>
 <div class="ui small gitea-custom delete modal" id="remove-team-member">
-	<div class="ui icon header">
+	<div class="header">
 		{{svg "octicon-x" 16 "close inside"}}
 		{{$.locale.Tr "org.members.remove"}}
 	</div>
diff --git a/templates/org/team/new.tmpl b/templates/org/team/new.tmpl
index 64427101b535b..3f490b8456cff 100644
--- a/templates/org/team/new.tmpl
+++ b/templates/org/team/new.tmpl
@@ -149,7 +149,7 @@
 </div>
 
 <div class="ui small gitea-custom delete modal">
-	<div class="ui icon header">
+	<div class="header">
 		{{svg "octicon-trash"}}
 		{{.locale.Tr "org.teams.delete_team_title"}}
 	</div>
diff --git a/templates/org/team/repositories.tmpl b/templates/org/team/repositories.tmpl
index 9c90b41caa26b..3a3658e5e7dc6 100644
--- a/templates/org/team/repositories.tmpl
+++ b/templates/org/team/repositories.tmpl
@@ -65,7 +65,7 @@
 </div>
 
 <div class="ui small gitea-custom delete modal" id="org-team-remove-all-repo">
-	<div class="ui icon header">
+	<div class="header">
 		{{svg "octicon-trash"}}
 		{{.locale.Tr "org.teams.remove_all_repos_title"}}
 	</div>
@@ -76,7 +76,7 @@
 </div>
 
 <div class="ui small gitea-custom addall modal" id="org-team-add-all-repo">
-	<div class="ui icon header">
+	<div class="header">
 		{{svg "octicon-globe"}}
 		{{.locale.Tr "org.teams.add_all_repos_title"}}
 	</div>
diff --git a/templates/org/team/sidebar.tmpl b/templates/org/team/sidebar.tmpl
index f2167612bc587..3ed73b9c645f8 100644
--- a/templates/org/team/sidebar.tmpl
+++ b/templates/org/team/sidebar.tmpl
@@ -84,7 +84,7 @@
 	{{end}}
 </div>
 <div class="ui small gitea-custom delete modal" id="leave-team-sidebar">
-	<div class="ui icon header">
+	<div class="header">
 		{{svg "octicon-x" 16 "close inside"}}
 		{{$.locale.Tr "org.teams.leave"}}
 	</div>
diff --git a/templates/org/team/teams.tmpl b/templates/org/team/teams.tmpl
index 8dd228d274906..80e2a75e4668d 100644
--- a/templates/org/team/teams.tmpl
+++ b/templates/org/team/teams.tmpl
@@ -44,7 +44,7 @@
 	</div>
 </div>
 <div class="ui small gitea-custom delete modal" id="leave-team">
-	<div class="ui icon header">
+	<div class="header">
 		{{svg "octicon-x" 16 "close inside"}}
 		{{$.locale.Tr "org.teams.leave"}}
 	</div>
diff --git a/templates/projects/list.tmpl b/templates/projects/list.tmpl
index db6ae8aad415d..bb8c61c65bc5e 100644
--- a/templates/projects/list.tmpl
+++ b/templates/projects/list.tmpl
@@ -77,7 +77,7 @@
 
 {{if $.CanWriteProjects}}
 <div class="ui small gitea-custom delete modal">
-	<div class="ui icon header">
+	<div class="header">
 		{{svg "octicon-trash"}}
 		{{.locale.Tr "repo.projects.deletion"}}
 	</div>
diff --git a/templates/projects/view.tmpl b/templates/projects/view.tmpl
index 944b9d22b24d2..f6de6d2a8927f 100644
--- a/templates/projects/view.tmpl
+++ b/templates/projects/view.tmpl
@@ -151,7 +151,7 @@
 								</div>
 
 								<div class="ui gitea-custom modal default-project-board-modal" id="default-project-board-modal-{{.ID}}">
-									<div class="ui icon header">
+									<div class="header">
 										<span id="default-project-board-header"></span>
 									</div>
 									<div class="content">
@@ -161,7 +161,7 @@
 								</div>
 
 								<div class="ui gitea-custom modal" id="delete-board-modal-{{.ID}}">
-									<div class="ui icon header">
+									<div class="header">
 										{{$.locale.Tr "repo.projects.column.delete"}}
 									</div>
 									<div class="content">
@@ -273,7 +273,7 @@
 
 {{if .CanWriteProjects}}
 	<div class="ui small gitea-custom delete modal">
-		<div class="ui icon header">
+		<div class="header">
 			{{svg "octicon-trash"}}
 			{{.locale.Tr "repo.projects.deletion"}}
 		</div>
diff --git a/templates/repo/branch/list.tmpl b/templates/repo/branch/list.tmpl
index 37b53571739ec..1ed07d8e779be 100644
--- a/templates/repo/branch/list.tmpl
+++ b/templates/repo/branch/list.tmpl
@@ -148,7 +148,7 @@
 </div>
 
 <div class="ui small gitea-custom delete modal">
-	<div class="ui icon header">
+	<div class="header">
 		{{svg "octicon-trash"}}
 		{{.locale.Tr "repo.branch.delete_html"}} <span class="name"></span>
 	</div>
diff --git a/templates/repo/commit_page.tmpl b/templates/repo/commit_page.tmpl
index ab6e605344c98..d102f649250eb 100644
--- a/templates/repo/commit_page.tmpl
+++ b/templates/repo/commit_page.tmpl
@@ -60,7 +60,7 @@
 										data-modal-cherry-pick-content="{{$.locale.Tr "repo.commit.cherry-pick-content"}}"
 										data-modal-cherry-pick-submit="{{.locale.Tr "repo.commit.cherry-pick"}}">{{.locale.Tr "repo.commit.cherry-pick"}}</div>
 									<div class="ui gitea-custom modal" id="cherry-pick-modal">
-										<div class="ui icon header">
+										<div class="header">
 											<span id="cherry-pick-header"></span>
 										</div>
 										<div class="content">
diff --git a/templates/repo/editor/edit.tmpl b/templates/repo/editor/edit.tmpl
index 8a053d44daaf7..e57f9d87da62b 100644
--- a/templates/repo/editor/edit.tmpl
+++ b/templates/repo/editor/edit.tmpl
@@ -57,7 +57,7 @@
 
 
 	<div class="ui small gitea-custom modal" id="edit-empty-content-modal">
-		<div class="ui icon header">
+		<div class="header">
 			{{svg "octicon-file"}}
 			{{.locale.Tr "repo.editor.commit_empty_file_header"}}
 		</div>
diff --git a/templates/repo/editor/patch.tmpl b/templates/repo/editor/patch.tmpl
index 79535db2bfeac..6919f7490b41c 100644
--- a/templates/repo/editor/patch.tmpl
+++ b/templates/repo/editor/patch.tmpl
@@ -37,7 +37,7 @@
 	</div>
 
 	<div class="ui small gitea-custom modal" id="edit-empty-content-modal">
-		<div class="ui icon header">
+		<div class="header">
 			{{svg "octicon-file"}}
 			{{.locale.Tr "repo.editor.commit_empty_file_header"}}
 		</div>
diff --git a/templates/repo/issue/labels/edit_delete_label.tmpl b/templates/repo/issue/labels/edit_delete_label.tmpl
index 2ea0e7980852a..471a066914afe 100644
--- a/templates/repo/issue/labels/edit_delete_label.tmpl
+++ b/templates/repo/issue/labels/edit_delete_label.tmpl
@@ -1,5 +1,5 @@
 <div class="ui small gitea-custom delete modal">
-	<div class="ui icon header">
+	<div class="header">
 		{{svg "octicon-trash"}}
 		{{.locale.Tr "repo.issues.label_deletion"}}
 	</div>
diff --git a/templates/repo/issue/milestones.tmpl b/templates/repo/issue/milestones.tmpl
index 4986a2c76b666..397a8e43070e3 100644
--- a/templates/repo/issue/milestones.tmpl
+++ b/templates/repo/issue/milestones.tmpl
@@ -117,7 +117,7 @@
 
 {{if or .CanWriteIssues .CanWritePulls}}
 	<div class="ui small gitea-custom delete modal">
-		<div class="ui icon header">
+		<div class="header">
 			{{svg "octicon-trash"}}
 			{{.locale.Tr "repo.milestones.deletion"}}
 		</div>
diff --git a/templates/repo/issue/view_content.tmpl b/templates/repo/issue/view_content.tmpl
index 726a7eab57b66..5aba8fa016d71 100644
--- a/templates/repo/issue/view_content.tmpl
+++ b/templates/repo/issue/view_content.tmpl
@@ -198,7 +198,7 @@
 </div>
 
 <div class="ui small gitea-custom delete modal">
-	<div class="ui icon header">
+	<div class="header">
 		{{svg "octicon-trash"}}
 		{{.locale.Tr "repo.branch.delete" .HeadTarget}}
 	</div>
diff --git a/templates/repo/issue/view_content/sidebar.tmpl b/templates/repo/issue/view_content/sidebar.tmpl
index 22d98fa043c5d..5c0b93881cfd4 100644
--- a/templates/repo/issue/view_content/sidebar.tmpl
+++ b/templates/repo/issue/view_content/sidebar.tmpl
@@ -543,7 +543,7 @@
 				<input type="hidden" id="crossRepoSearch" value="{{.AllowCrossRepositoryDependencies}}">
 
 				<div class="ui gitea-custom modal remove-dependency">
-					<div class="ui icon header">
+					<div class="header">
 						{{svg "octicon-trash"}}
 						{{.locale.Tr "repo.issues.dependency.remove_header"}}
 					</div>
@@ -657,7 +657,7 @@
 				{{.locale.Tr "repo.issues.delete"}}
 			</button>
 			<div class="ui gitea-custom modal" id="delete">
-				<div class="ui icon header">
+				<div class="header">
 					{{if .Issue.IsPull}}
 						{{.locale.Tr "repo.pulls.delete.title"}}
 					{{else}}
diff --git a/templates/repo/projects/list.tmpl b/templates/repo/projects/list.tmpl
index 3e10d1d5167f2..d9cd4478cf78b 100644
--- a/templates/repo/projects/list.tmpl
+++ b/templates/repo/projects/list.tmpl
@@ -79,7 +79,7 @@
 
 {{if .CanWriteProjects}}
 <div class="ui small gitea-custom delete modal">
-	<div class="ui icon header">
+	<div class="header">
 		{{svg "octicon-trash"}}
 		{{.locale.Tr "repo.projects.deletion"}}
 	</div>
diff --git a/templates/repo/projects/view.tmpl b/templates/repo/projects/view.tmpl
index a2933003fe0d1..df37c01775f7e 100644
--- a/templates/repo/projects/view.tmpl
+++ b/templates/repo/projects/view.tmpl
@@ -157,7 +157,7 @@
 								</div>
 
 								<div class="ui gitea-custom modal default-project-board-modal" id="default-project-board-modal-{{.ID}}">
-									<div class="ui icon header">
+									<div class="header">
 										<span id="default-project-board-header"></span>
 									</div>
 									<div class="content">
@@ -167,7 +167,7 @@
 								</div>
 
 								<div class="ui gitea-custom modal" id="delete-board-modal-{{.ID}}">
-									<div class="ui icon header">
+									<div class="header">
 										{{$.locale.Tr "repo.projects.column.delete"}}
 									</div>
 									<div class="content">
@@ -279,7 +279,7 @@
 
 {{if or .CanWriteIssues .CanWritePulls}}
 	<div class="ui small gitea-custom delete modal">
-		<div class="ui icon header">
+		<div class="header">
 			{{svg "octicon-trash"}}
 			{{.locale.Tr "repo.projects.deletion"}}
 		</div>
diff --git a/templates/repo/release/new.tmpl b/templates/repo/release/new.tmpl
index 56dc11e316a75..6474ca4ad2457 100644
--- a/templates/repo/release/new.tmpl
+++ b/templates/repo/release/new.tmpl
@@ -139,7 +139,7 @@
 
 {{if .PageIsEditRelease}}
 	<div class="ui small gitea-custom delete modal">
-		<div class="ui icon header">
+		<div class="header">
 			{{svg "octicon-trash"}}
 			{{.locale.Tr "repo.release.deletion"}}
 		</div>
diff --git a/templates/repo/settings/collaboration.tmpl b/templates/repo/settings/collaboration.tmpl
index 1988ef8c79f60..0d4dad57114a6 100644
--- a/templates/repo/settings/collaboration.tmpl
+++ b/templates/repo/settings/collaboration.tmpl
@@ -113,7 +113,7 @@
 </div>
 
 <div class="ui small gitea-custom delete modal">
-	<div class="ui icon header">
+	<div class="header">
 		{{svg "octicon-trash"}}
 		{{.locale.Tr "repo.settings.collaborator_deletion"}}
 	</div>
diff --git a/templates/repo/settings/deploy_keys.tmpl b/templates/repo/settings/deploy_keys.tmpl
index 075f0305ed961..e49071f1ac69d 100644
--- a/templates/repo/settings/deploy_keys.tmpl
+++ b/templates/repo/settings/deploy_keys.tmpl
@@ -78,7 +78,7 @@
 </div>
 
 <div class="ui small gitea-custom delete modal">
-	<div class="ui icon header">
+	<div class="header">
 		{{svg "octicon-trash"}}
 		{{.locale.Tr "repo.settings.deploy_key_deletion"}}
 	</div>
diff --git a/templates/repo/settings/lfs.tmpl b/templates/repo/settings/lfs.tmpl
index 9b782edba6f8d..348fb6f4db9ce 100644
--- a/templates/repo/settings/lfs.tmpl
+++ b/templates/repo/settings/lfs.tmpl
@@ -41,7 +41,7 @@
 		{{template "base/paginate" .}}
 		{{range .LFSFiles}}
 			<div class="ui gitea-custom modal" id="delete-{{.Oid}}">
-				<div class="ui icon header">
+				<div class="header">
 					{{$.locale.Tr "repo.settings.lfs_delete" .Oid}}
 				</div>
 				<div class="content">
diff --git a/templates/repo/settings/options.tmpl b/templates/repo/settings/options.tmpl
index f34db46ff5467..1e7d519ae8bdc 100644
--- a/templates/repo/settings/options.tmpl
+++ b/templates/repo/settings/options.tmpl
@@ -968,7 +968,7 @@
 
 	{{if not .Repository.IsMirror}}
 		<div class="ui gitea-custom modal" id="archive-repo-modal">
-			<div class="ui icon header">
+			<div class="header">
 				{{if .Repository.IsArchived}}
 					{{.locale.Tr "repo.settings.unarchive.header"}}
 				{{else}}
diff --git a/templates/repo/settings/webhook/delete_modal.tmpl b/templates/repo/settings/webhook/delete_modal.tmpl
index b2d19b171a53d..9a254b21f7733 100644
--- a/templates/repo/settings/webhook/delete_modal.tmpl
+++ b/templates/repo/settings/webhook/delete_modal.tmpl
@@ -1,5 +1,5 @@
 <div class="ui small gitea-custom delete modal">
-	<div class="ui icon header">
+	<div class="header">
 		{{svg "octicon-trash"}}
 		{{.locale.Tr "repo.settings.webhook_deletion"}}
 	</div>
diff --git a/templates/repo/wiki/view.tmpl b/templates/repo/wiki/view.tmpl
index 7b7147a67aa46..9d1d4b2206f72 100644
--- a/templates/repo/wiki/view.tmpl
+++ b/templates/repo/wiki/view.tmpl
@@ -100,7 +100,7 @@
 </div>
 
 <div class="ui small gitea-custom delete modal">
-	<div class="ui icon header">
+	<div class="header">
 		{{svg "octicon-trash"}}
 		{{.locale.Tr "repo.wiki.delete_page_button"}}
 	</div>
diff --git a/templates/shared/actions/runner_edit.tmpl b/templates/shared/actions/runner_edit.tmpl
index 635914510d38c..ec50605fe4333 100644
--- a/templates/shared/actions/runner_edit.tmpl
+++ b/templates/shared/actions/runner_edit.tmpl
@@ -90,7 +90,7 @@
 		{{template "base/paginate" .}}
 	</div>
 	<div class="ui small gitea-custom delete modal" id="runner-delete-modal">
-		<div class="ui icon header">
+		<div class="header">
 			{{svg "octicon-trash"}}
 			{{.locale.Tr "actions.runners.delete_runner_header"}}
 		</div>
diff --git a/templates/user/settings/account.tmpl b/templates/user/settings/account.tmpl
index a6e37d40697ef..f87b05b2335fd 100644
--- a/templates/user/settings/account.tmpl
+++ b/templates/user/settings/account.tmpl
@@ -162,7 +162,7 @@
 </div>
 
 <div class="ui small gitea-custom delete modal" id="delete-email">
-	<div class="ui icon header">
+	<div class="header">
 		{{svg "octicon-trash"}}
 		{{.locale.Tr "settings.email_deletion"}}
 	</div>
@@ -173,7 +173,7 @@
 </div>
 
 <div class="ui small gitea-custom delete modal" id="delete-account">
-	<div class="ui icon header">
+	<div class="header">
 		{{svg "octicon-trash"}}
 		{{.locale.Tr "settings.delete_account_title"}}
 	</div>
diff --git a/templates/user/settings/applications.tmpl b/templates/user/settings/applications.tmpl
index 2ac39c0fd1cc1..d8568efcdc515 100644
--- a/templates/user/settings/applications.tmpl
+++ b/templates/user/settings/applications.tmpl
@@ -269,7 +269,7 @@
 </div>
 
 <div class="ui small gitea-custom delete modal" id="delete-token">
-	<div class="ui icon header">
+	<div class="header">
 		{{svg "octicon-trash"}}
 		{{.locale.Tr "settings.access_token_deletion"}}
 	</div>
diff --git a/templates/user/settings/applications_oauth2_list.tmpl b/templates/user/settings/applications_oauth2_list.tmpl
index 5d2055c047bff..653ef3bb8ad3f 100644
--- a/templates/user/settings/applications_oauth2_list.tmpl
+++ b/templates/user/settings/applications_oauth2_list.tmpl
@@ -48,7 +48,7 @@
 </div>
 
 <div class="ui small gitea-custom delete modal" id="remove-gitea-oauth2-application">
-	<div class="ui icon header">
+	<div class="header">
 		{{svg "octicon-trash"}}
 		{{.locale.Tr "settings.remove_oauth2_application"}}
 	</div>
diff --git a/templates/user/settings/grants_oauth2.tmpl b/templates/user/settings/grants_oauth2.tmpl
index a12728aadc339..dd3410e4d9d3b 100644
--- a/templates/user/settings/grants_oauth2.tmpl
+++ b/templates/user/settings/grants_oauth2.tmpl
@@ -29,7 +29,7 @@
 </div>
 
 <div class="ui small gitea-custom delete modal" id="revoke-gitea-oauth2-grant">
-	<div class="ui icon header">
+	<div class="header">
 		{{svg "octicon-shield" 16 "gt-mr-2"}}
 		{{.locale.Tr "settings.revoke_oauth2_grant"}}
 	</div>
diff --git a/templates/user/settings/keys_gpg.tmpl b/templates/user/settings/keys_gpg.tmpl
index 5a2f69147aa63..d73aa2515faab 100644
--- a/templates/user/settings/keys_gpg.tmpl
+++ b/templates/user/settings/keys_gpg.tmpl
@@ -112,7 +112,7 @@
 <p>{{.locale.Tr "settings.gpg_helper" "https://docs.github.com/en/free-pro-team@latest/github/authenticating-to-github/about-commit-signature-verification#gpg-commit-signature-verification" | Str2html}}</p>
 
 <div class="ui small gitea-custom delete modal" id="delete-gpg">
-	<div class="ui icon header">
+	<div class="header">
 		{{svg "octicon-trash"}}
 		{{.locale.Tr "settings.gpg_key_deletion"}}
 	</div>
diff --git a/templates/user/settings/keys_principal.tmpl b/templates/user/settings/keys_principal.tmpl
index efca246964fbc..1ceb5ccc9a708 100644
--- a/templates/user/settings/keys_principal.tmpl
+++ b/templates/user/settings/keys_principal.tmpl
@@ -55,7 +55,7 @@
 	</div>
 
 	<div class="ui small gitea-custom delete modal" id="delete-principal">
-		<div class="ui icon header">
+		<div class="header">
 			{{svg "octicon-trash"}}
 			{{.locale.Tr "settings.ssh_principal_deletion"}}
 		</div>
diff --git a/templates/user/settings/keys_ssh.tmpl b/templates/user/settings/keys_ssh.tmpl
index 05f8183d8dab2..8170a1b0729f4 100644
--- a/templates/user/settings/keys_ssh.tmpl
+++ b/templates/user/settings/keys_ssh.tmpl
@@ -101,7 +101,7 @@
 <p>{{.locale.Tr "settings.ssh_helper" "https://docs.github.com/en/free-pro-team@latest/github/authenticating-to-github/connecting-to-github-with-ssh" "https://docs.github.com/en/free-pro-team@latest/github/authenticating-to-github/troubleshooting-ssh" | Str2html}}</p>
 
 <div class="ui small gitea-custom delete modal" id="delete-ssh">
-	<div class="ui icon header">
+	<div class="header">
 		{{svg "octicon-trash"}}
 		{{.locale.Tr "settings.ssh_key_deletion"}}
 	</div>
diff --git a/templates/user/settings/organization.tmpl b/templates/user/settings/organization.tmpl
index 0637442e6c203..e29b749e7e864 100644
--- a/templates/user/settings/organization.tmpl
+++ b/templates/user/settings/organization.tmpl
@@ -41,7 +41,7 @@
 	</div>
 </div>
 <div class="ui small gitea-custom delete modal" id="leave-organization">
-	<div class="ui icon header">
+	<div class="header">
 		{{svg "octicon-x" 16 "close inside"}}
 		{{$.locale.Tr "org.members.leave"}}
 	</div>
diff --git a/templates/user/settings/repos.tmpl b/templates/user/settings/repos.tmpl
index b6eace78faa4f..26a6eee7c4759 100644
--- a/templates/user/settings/repos.tmpl
+++ b/templates/user/settings/repos.tmpl
@@ -132,7 +132,7 @@
 </div>
 
 <div class="ui small gitea-custom delete modal">
-	<div class="ui icon header">
+	<div class="header">
 		{{svg "octicon-trash"}}
 		{{.locale.Tr "settings.remove_account_link"}}
 	</div>
diff --git a/templates/user/settings/security/accountlinks.tmpl b/templates/user/settings/security/accountlinks.tmpl
index 8805d8d82c49d..29d7e1724ffad 100644
--- a/templates/user/settings/security/accountlinks.tmpl
+++ b/templates/user/settings/security/accountlinks.tmpl
@@ -42,7 +42,7 @@
 </div>
 
 <div class="ui small gitea-custom delete modal" id="delete-account-link">
-	<div class="ui icon header">
+	<div class="header">
 		{{svg "octicon-trash"}}
 		{{.locale.Tr "settings.remove_account_link"}}
 	</div>
diff --git a/templates/user/settings/security/openid.tmpl b/templates/user/settings/security/openid.tmpl
index ce7da88cada4f..4c4e14ac36728 100644
--- a/templates/user/settings/security/openid.tmpl
+++ b/templates/user/settings/security/openid.tmpl
@@ -52,7 +52,7 @@
 </div>
 
 <div class="ui small gitea-custom delete modal" id="delete-openid">
-	<div class="ui icon header">
+	<div class="header">
 		{{svg "octicon-trash"}}
 		{{.locale.Tr "settings.openid_deletion"}}
 	</div>
diff --git a/templates/user/settings/security/twofa.tmpl b/templates/user/settings/security/twofa.tmpl
index b05bafa90eb9e..51da637b35f80 100644
--- a/templates/user/settings/security/twofa.tmpl
+++ b/templates/user/settings/security/twofa.tmpl
@@ -24,7 +24,7 @@
 </div>
 
 <div class="ui small gitea-custom delete modal" id="disable-twofa">
-	<div class="ui icon header">
+	<div class="header">
 		{{svg "octicon-trash"}}
 		{{.locale.Tr "settings.twofa_disable"}}
 	</div>
diff --git a/templates/user/settings/security/webauthn.tmpl b/templates/user/settings/security/webauthn.tmpl
index b741adec213f6..64ec9d85759b7 100644
--- a/templates/user/settings/security/webauthn.tmpl
+++ b/templates/user/settings/security/webauthn.tmpl
@@ -31,7 +31,7 @@
 {{template "user/auth/webauthn_error" .}}
 
 <div class="ui small gitea-custom delete modal" id="delete-registration">
-	<div class="ui icon header">
+	<div class="header">
 		{{svg "octicon-trash"}}
 	{{.locale.Tr "settings.webauthn_delete_key"}}
 	</div>

From 4918b76cdb3746fc889ce6098c57ea5067d139d6 Mon Sep 17 00:00:00 2001
From: wxiaoguang <wxiaoguang@gmail.com>
Date: Sun, 23 Apr 2023 13:30:26 +0800
Subject: [PATCH 23/26] fine tune

---
 templates/admin/auth/edit.tmpl                |  2 +-
 templates/admin/emails/list.tmpl              |  2 +-
 templates/admin/monitor.tmpl                  |  3 +-
 templates/admin/notice.tmpl                   |  1 -
 templates/admin/packages/list.tmpl            |  2 +-
 templates/admin/queue.tmpl                    |  3 +-
 templates/admin/repo/list.tmpl                |  2 +-
 templates/admin/repo/unadopted.tmpl           |  6 +--
 templates/admin/stacktrace.tmpl               |  3 +-
 templates/admin/user/edit.tmpl                |  2 +-
 templates/org/member/members.tmpl             |  6 +--
 templates/org/settings/delete.tmpl            |  2 +-
 templates/org/team/members.tmpl               |  3 +-
 templates/org/team/new.tmpl                   |  2 +-
 templates/org/team/repositories.tmpl          |  4 +-
 templates/org/team/sidebar.tmpl               |  3 +-
 templates/org/team/teams.tmpl                 |  3 +-
 templates/package/settings.tmpl               |  2 +-
 templates/projects/list.tmpl                  |  2 +-
 templates/projects/view.tmpl                  |  6 +--
 templates/repo/branch/list.tmpl               |  6 +--
 templates/repo/commit_page.tmpl               |  2 +-
 templates/repo/editor/edit.tmpl               |  2 +-
 templates/repo/editor/patch.tmpl              |  2 +-
 templates/repo/header.tmpl                    |  1 -
 .../repo/issue/labels/edit_delete_label.tmpl  |  2 +-
 templates/repo/issue/milestones.tmpl          |  2 +-
 templates/repo/issue/view_content.tmpl        |  2 +-
 .../repo/issue/view_content/sidebar.tmpl      |  4 +-
 templates/repo/migrate/migrating.tmpl         |  2 +-
 templates/repo/projects/list.tmpl             |  2 +-
 templates/repo/projects/view.tmpl             |  6 +--
 templates/repo/release/list.tmpl              |  2 +-
 templates/repo/release/new.tmpl               |  2 +-
 templates/repo/settings/branches.tmpl         |  2 +-
 templates/repo/settings/collaboration.tmpl    |  2 +-
 templates/repo/settings/deploy_keys.tmpl      |  2 +-
 templates/repo/settings/lfs.tmpl              |  4 +-
 templates/repo/settings/options.tmpl          | 14 +++----
 .../repo/settings/webhook/delete_modal.tmpl   |  2 +-
 templates/repo/wiki/view.tmpl                 |  2 +-
 templates/shared/actions/runner_edit.tmpl     |  2 +-
 templates/shared/secrets/add_list.tmpl        |  2 +-
 templates/user/settings/account.tmpl          |  4 +-
 templates/user/settings/applications.tmpl     |  2 +-
 .../settings/applications_oauth2_list.tmpl    |  2 +-
 templates/user/settings/grants_oauth2.tmpl    |  2 +-
 templates/user/settings/keys_gpg.tmpl         |  2 +-
 templates/user/settings/keys_principal.tmpl   |  2 +-
 templates/user/settings/keys_ssh.tmpl         |  2 +-
 templates/user/settings/organization.tmpl     |  3 +-
 templates/user/settings/repos.tmpl            |  8 ++--
 .../user/settings/security/accountlinks.tmpl  |  2 +-
 templates/user/settings/security/openid.tmpl  |  2 +-
 templates/user/settings/security/twofa.tmpl   |  2 +-
 .../user/settings/security/webauthn.tmpl      |  2 +-
 web_src/css/modules/modal.css                 | 41 +++++++++++++++----
 57 files changed, 108 insertions(+), 96 deletions(-)

diff --git a/templates/admin/auth/edit.tmpl b/templates/admin/auth/edit.tmpl
index f0ff0e04964e1..c3ff228ac0522 100644
--- a/templates/admin/auth/edit.tmpl
+++ b/templates/admin/auth/edit.tmpl
@@ -440,7 +440,7 @@
 	</div>
 </div>
 
-<div class="ui small gitea-custom delete modal">
+<div class="ui gitea-confirm-modal delete modal">
 	<div class="header">
 		{{svg "octicon-trash"}}
 		{{.locale.Tr "admin.auths.delete_auth_title"}}
diff --git a/templates/admin/emails/list.tmpl b/templates/admin/emails/list.tmpl
index 8db879fb4fa9d..61af57109548c 100644
--- a/templates/admin/emails/list.tmpl
+++ b/templates/admin/emails/list.tmpl
@@ -73,7 +73,7 @@
 
 		{{template "base/paginate" .}}
 
-		<div class="ui gitea-custom modal" id="change-email-modal">
+		<div class="ui gitea-confirm-modal modal" id="change-email-modal">
 			<div class="header">
 				{{.locale.Tr "admin.emails.change_email_header"}}
 			</div>
diff --git a/templates/admin/monitor.tmpl b/templates/admin/monitor.tmpl
index fd347971abfa2..4d66d3bfbb64a 100644
--- a/templates/admin/monitor.tmpl
+++ b/templates/admin/monitor.tmpl
@@ -37,9 +37,8 @@
 		{{template "admin/process" .}}
 	</div>
 </div>
-<div class="ui small gitea-custom delete modal">
+<div class="ui gitea-confirm-modal delete modal">
 	<div class="header">
-		{{svg "octicon-x" 16 "close inside"}}
 		{{.locale.Tr "admin.monitor.process.cancel"}}
 	</div>
 	<div class="content">
diff --git a/templates/admin/notice.tmpl b/templates/admin/notice.tmpl
index dd17bde036ad3..850b6333f2447 100644
--- a/templates/admin/notice.tmpl
+++ b/templates/admin/notice.tmpl
@@ -72,7 +72,6 @@
 </div>
 
 <div class="ui modal admin" id="detail-modal">
-	{{svg "octicon-x" 16 "close inside"}}
 	<div class="header">{{$.locale.Tr "admin.notices.view_detail_header"}}</div>
 	<div class="content">
 		<div class="sub header"></div>
diff --git a/templates/admin/packages/list.tmpl b/templates/admin/packages/list.tmpl
index f5277efa82348..6b3480d427557 100644
--- a/templates/admin/packages/list.tmpl
+++ b/templates/admin/packages/list.tmpl
@@ -80,7 +80,7 @@
 	</div>
 </div>
 
-<div class="ui small gitea-custom delete modal">
+<div class="ui gitea-confirm-modal delete modal">
 	<div class="header">
 		{{svg "octicon-trash"}}
 		{{.locale.Tr "packages.settings.delete"}}
diff --git a/templates/admin/queue.tmpl b/templates/admin/queue.tmpl
index d79b96f525a6b..10c35bd59971c 100644
--- a/templates/admin/queue.tmpl
+++ b/templates/admin/queue.tmpl
@@ -181,9 +181,8 @@
 		</div>
 	</div>
 </div>
-<div class="ui small gitea-custom delete modal">
+<div class="ui gitea-confirm-modal delete modal">
 	<div class="header">
-		{{svg "octicon-x" 16 "close inside"}}
 		{{.locale.Tr "admin.monitor.queue.pool.cancel"}}
 	</div>
 	<div class="content">
diff --git a/templates/admin/repo/list.tmpl b/templates/admin/repo/list.tmpl
index dbfc19ea9987e..1574a376688ce 100644
--- a/templates/admin/repo/list.tmpl
+++ b/templates/admin/repo/list.tmpl
@@ -95,7 +95,7 @@
 	</div>
 </div>
 
-<div class="ui small gitea-custom delete modal">
+<div class="ui gitea-confirm-modal delete modal">
 	<div class="header">
 		{{svg "octicon-trash"}}
 		{{.locale.Tr "repo.settings.delete"}}
diff --git a/templates/admin/repo/unadopted.tmpl b/templates/admin/repo/unadopted.tmpl
index dff4b342cc8ef..fbb0bdf0e8ca1 100644
--- a/templates/admin/repo/unadopted.tmpl
+++ b/templates/admin/repo/unadopted.tmpl
@@ -29,8 +29,7 @@
 									<span class="name">{{$dir}}</span>
 									<div class="right floated content">
 										<button class="ui button submit tiny green adopt show-modal" data-modal="#adopt-unadopted-modal-{{$dirI}}"><span class="icon">{{svg "octicon-plus"}}</span><span class="label">{{$.locale.Tr "repo.adopt_preexisting_label"}}</span></button>
-										<div class="ui gitea-custom modal" id="adopt-unadopted-modal-{{$dirI}}">
-											{{svg "octicon-x" 16 "close inside"}}
+										<div class="ui gitea-confirm-modal modal" id="adopt-unadopted-modal-{{$dirI}}">
 											<div class="header">
 												<span class="label">{{$.locale.Tr "repo.adopt_preexisting"}}</span>
 											</div>
@@ -56,8 +55,7 @@
 											</form>
 										</div>
 										<button class="ui button submit tiny red delete show-modal" data-modal="#delete-unadopted-modal-{{$dirI}}"><span class="icon">{{svg "octicon-x"}}</span><span class="label">{{$.locale.Tr "repo.delete_preexisting_label"}}</span></button>
-										<div class="ui gitea-custom modal" id="delete-unadopted-modal-{{$dirI}}">
-											{{svg "octicon-x" 16 "close inside"}}
+										<div class="ui gitea-confirm-modal modal" id="delete-unadopted-modal-{{$dirI}}">
 											<div class="header">
 												<span class="label">{{$.locale.Tr "repo.delete_preexisting"}}</span>
 											</div>
diff --git a/templates/admin/stacktrace.tmpl b/templates/admin/stacktrace.tmpl
index 88fa89322f30e..2bef11fcf68db 100644
--- a/templates/admin/stacktrace.tmpl
+++ b/templates/admin/stacktrace.tmpl
@@ -18,9 +18,8 @@
 		</div>
 	</div>
 </div>
-<div class="ui small gitea-custom delete modal">
+<div class="ui gitea-confirm-modal delete modal">
 	<div class="header">
-		{{svg "octicon-x" 16 "close inside"}}
 		{{.locale.Tr "admin.monitor.process.cancel"}}
 	</div>
 	<div class="content">
diff --git a/templates/admin/user/edit.tmpl b/templates/admin/user/edit.tmpl
index 872d1ea64ed55..6d916ae207c84 100644
--- a/templates/admin/user/edit.tmpl
+++ b/templates/admin/user/edit.tmpl
@@ -196,7 +196,7 @@
 	</div>
 </div>
 
-<div class="ui small gitea-custom delete modal" id="delete-user-modal">
+<div class="ui gitea-confirm-modal delete modal" id="delete-user-modal">
 	<div class="header">
 		{{svg "octicon-trash"}}
 		{{.locale.Tr "settings.delete_account_title"}}
diff --git a/templates/org/member/members.tmpl b/templates/org/member/members.tmpl
index 6082880a70696..7b6c83cfcc044 100644
--- a/templates/org/member/members.tmpl
+++ b/templates/org/member/members.tmpl
@@ -81,9 +81,8 @@
 		{{template "base/paginate" .}}
 	</div>
 </div>
-<div class="ui small gitea-custom delete modal" id="leave-organization">
+<div class="ui gitea-confirm-modal delete modal" id="leave-organization">
 	<div class="header">
-		{{svg "octicon-x" 16 "close inside"}}
 		{{$.locale.Tr "org.members.leave"}}
 	</div>
 	<div class="content">
@@ -91,9 +90,8 @@
 	</div>
 	{{template "base/modal_actions_confirm" .}}
 </div>
-<div class="ui small gitea-custom delete modal" id="remove-organization-member">
+<div class="ui gitea-confirm-modal delete modal" id="remove-organization-member">
 	<div class="header">
-		{{svg "octicon-x" 16 "close inside"}}
 		{{$.locale.Tr "org.members.remove"}}
 	</div>
 	<div class="content">
diff --git a/templates/org/settings/delete.tmpl b/templates/org/settings/delete.tmpl
index 676e3bdf20a9c..e8a8f5b185aa2 100644
--- a/templates/org/settings/delete.tmpl
+++ b/templates/org/settings/delete.tmpl
@@ -29,7 +29,7 @@
 	</div>
 </div>
 
-<div class="ui small gitea-custom delete modal">
+<div class="ui gitea-confirm-modal delete modal">
 	<div class="header">
 		{{svg "octicon-trash"}}
 		{{.locale.Tr "org.settings.delete_org_title"}}
diff --git a/templates/org/team/members.tmpl b/templates/org/team/members.tmpl
index 98548b7001da7..e387090b3b617 100644
--- a/templates/org/team/members.tmpl
+++ b/templates/org/team/members.tmpl
@@ -64,9 +64,8 @@
 		</div>
 	</div>
 </div>
-<div class="ui small gitea-custom delete modal" id="remove-team-member">
+<div class="ui gitea-confirm-modal delete modal" id="remove-team-member">
 	<div class="header">
-		{{svg "octicon-x" 16 "close inside"}}
 		{{$.locale.Tr "org.members.remove"}}
 	</div>
 	<div class="content">
diff --git a/templates/org/team/new.tmpl b/templates/org/team/new.tmpl
index 3f490b8456cff..2860ea497b44d 100644
--- a/templates/org/team/new.tmpl
+++ b/templates/org/team/new.tmpl
@@ -148,7 +148,7 @@
 	</div>
 </div>
 
-<div class="ui small gitea-custom delete modal">
+<div class="ui gitea-confirm-modal delete modal">
 	<div class="header">
 		{{svg "octicon-trash"}}
 		{{.locale.Tr "org.teams.delete_team_title"}}
diff --git a/templates/org/team/repositories.tmpl b/templates/org/team/repositories.tmpl
index 3a3658e5e7dc6..41561da311445 100644
--- a/templates/org/team/repositories.tmpl
+++ b/templates/org/team/repositories.tmpl
@@ -64,7 +64,7 @@
 	</div>
 </div>
 
-<div class="ui small gitea-custom delete modal" id="org-team-remove-all-repo">
+<div class="ui gitea-confirm-modal delete modal" id="org-team-remove-all-repo">
 	<div class="header">
 		{{svg "octicon-trash"}}
 		{{.locale.Tr "org.teams.remove_all_repos_title"}}
@@ -75,7 +75,7 @@
 	{{template "base/modal_actions_confirm" .}}
 </div>
 
-<div class="ui small gitea-custom addall modal" id="org-team-add-all-repo">
+<div class="ui gitea-confirm-modal addall modal" id="org-team-add-all-repo">
 	<div class="header">
 		{{svg "octicon-globe"}}
 		{{.locale.Tr "org.teams.add_all_repos_title"}}
diff --git a/templates/org/team/sidebar.tmpl b/templates/org/team/sidebar.tmpl
index 3ed73b9c645f8..f2652552569c9 100644
--- a/templates/org/team/sidebar.tmpl
+++ b/templates/org/team/sidebar.tmpl
@@ -83,9 +83,8 @@
 		</div>
 	{{end}}
 </div>
-<div class="ui small gitea-custom delete modal" id="leave-team-sidebar">
+<div class="ui gitea-confirm-modal delete modal" id="leave-team-sidebar">
 	<div class="header">
-		{{svg "octicon-x" 16 "close inside"}}
 		{{$.locale.Tr "org.teams.leave"}}
 	</div>
 	<div class="content">
diff --git a/templates/org/team/teams.tmpl b/templates/org/team/teams.tmpl
index 80e2a75e4668d..c31b6caf1c1da 100644
--- a/templates/org/team/teams.tmpl
+++ b/templates/org/team/teams.tmpl
@@ -43,9 +43,8 @@
 		</div>
 	</div>
 </div>
-<div class="ui small gitea-custom delete modal" id="leave-team">
+<div class="ui gitea-confirm-modal delete modal" id="leave-team">
 	<div class="header">
-		{{svg "octicon-x" 16 "close inside"}}
 		{{$.locale.Tr "org.teams.leave"}}
 	</div>
 	<div class="content">
diff --git a/templates/package/settings.tmpl b/templates/package/settings.tmpl
index 52e4071047069..85a5c9678a5e9 100644
--- a/templates/package/settings.tmpl
+++ b/templates/package/settings.tmpl
@@ -40,7 +40,7 @@
 		<div class="ui attached error table danger segment">
 			<div class="item">
 				<div class="ui right">
-					<button class="ui gitea-custom red show-modal button" data-modal="#delete-package-modal">{{.locale.Tr "packages.settings.delete"}}</button>
+					<button class="ui gitea-confirm-modal red show-modal button" data-modal="#delete-package-modal">{{.locale.Tr "packages.settings.delete"}}</button>
 				</div>
 				<div>
 					<h5>{{.locale.Tr "packages.settings.delete"}}</h5>
diff --git a/templates/projects/list.tmpl b/templates/projects/list.tmpl
index bb8c61c65bc5e..bcb402601ce0d 100644
--- a/templates/projects/list.tmpl
+++ b/templates/projects/list.tmpl
@@ -76,7 +76,7 @@
 </div>
 
 {{if $.CanWriteProjects}}
-<div class="ui small gitea-custom delete modal">
+<div class="ui gitea-confirm-modal delete modal">
 	<div class="header">
 		{{svg "octicon-trash"}}
 		{{.locale.Tr "repo.projects.deletion"}}
diff --git a/templates/projects/view.tmpl b/templates/projects/view.tmpl
index f6de6d2a8927f..34eaf9367053e 100644
--- a/templates/projects/view.tmpl
+++ b/templates/projects/view.tmpl
@@ -150,7 +150,7 @@
 									</div>
 								</div>
 
-								<div class="ui gitea-custom modal default-project-board-modal" id="default-project-board-modal-{{.ID}}">
+								<div class="ui gitea-confirm-modal modal default-project-board-modal" id="default-project-board-modal-{{.ID}}">
 									<div class="header">
 										<span id="default-project-board-header"></span>
 									</div>
@@ -160,7 +160,7 @@
 									{{template "base/modal_actions_confirm" (dict "locale" $.locale "ModalButtonStyle" "confirm")}}
 								</div>
 
-								<div class="ui gitea-custom modal" id="delete-board-modal-{{.ID}}">
+								<div class="ui gitea-confirm-modal modal" id="delete-board-modal-{{.ID}}">
 									<div class="header">
 										{{$.locale.Tr "repo.projects.column.delete"}}
 									</div>
@@ -272,7 +272,7 @@
 </div>
 
 {{if .CanWriteProjects}}
-	<div class="ui small gitea-custom delete modal">
+	<div class="ui gitea-confirm-modal delete modal">
 		<div class="header">
 			{{svg "octicon-trash"}}
 			{{.locale.Tr "repo.projects.deletion"}}
diff --git a/templates/repo/branch/list.tmpl b/templates/repo/branch/list.tmpl
index 1ed07d8e779be..296dfd3221511 100644
--- a/templates/repo/branch/list.tmpl
+++ b/templates/repo/branch/list.tmpl
@@ -22,7 +22,7 @@
 							</td>
 							<td class="right aligned overflow-visible">
 								{{if and $.IsWriter (not $.Repository.IsArchived) (not .IsDeleted)}}
-									<button class="ui gitea-custom jump button icon show-create-branch-modal" data-tooltip-content="{{$.locale.Tr "repo.branch.new_branch_from" ($.DefaultBranch)}}" data-branch-from="{{$.DefaultBranch}}" data-branch-from-urlcomponent="{{PathEscapeSegments $.DefaultBranch}}" data-modal="#create-branch-modal">
+									<button class="ui gitea-confirm-modal jump button icon show-create-branch-modal" data-tooltip-content="{{$.locale.Tr "repo.branch.new_branch_from" ($.DefaultBranch)}}" data-branch-from="{{$.DefaultBranch}}" data-branch-from-urlcomponent="{{PathEscapeSegments $.DefaultBranch}}" data-modal="#create-branch-modal">
 										{{svg "octicon-git-branch"}}
 									</button>
 								{{end}}
@@ -109,7 +109,7 @@
 									</td>
 									<td class="three wide right aligned overflow-visible">
 										{{if and $.IsWriter (not $.Repository.IsArchived) (not .IsDeleted)}}
-											<button class="ui gitea-custom jump button icon show-create-branch-modal" data-branch-from="{{.Name}}" data-branch-from-urlcomponent="{{PathEscapeSegments .Name}}" data-tooltip-content="{{$.locale.Tr "repo.branch.new_branch_from" .Name}}" data-modal="#create-branch-modal" data-name="{{.Name}}">
+											<button class="ui gitea-confirm-modal jump button icon show-create-branch-modal" data-branch-from="{{.Name}}" data-branch-from-urlcomponent="{{PathEscapeSegments .Name}}" data-tooltip-content="{{$.locale.Tr "repo.branch.new_branch_from" .Name}}" data-modal="#create-branch-modal" data-name="{{.Name}}">
 												{{svg "octicon-git-branch"}}
 											</button>
 										{{end}}
@@ -147,7 +147,7 @@
 	</div>
 </div>
 
-<div class="ui small gitea-custom delete modal">
+<div class="ui gitea-confirm-modal delete modal">
 	<div class="header">
 		{{svg "octicon-trash"}}
 		{{.locale.Tr "repo.branch.delete_html"}} <span class="name"></span>
diff --git a/templates/repo/commit_page.tmpl b/templates/repo/commit_page.tmpl
index d102f649250eb..00e6220c3e398 100644
--- a/templates/repo/commit_page.tmpl
+++ b/templates/repo/commit_page.tmpl
@@ -59,7 +59,7 @@
 										data-modal-cherry-pick-header="{{$.locale.Tr "repo.commit.cherry-pick-header" (ShortSha .CommitID)}}"
 										data-modal-cherry-pick-content="{{$.locale.Tr "repo.commit.cherry-pick-content"}}"
 										data-modal-cherry-pick-submit="{{.locale.Tr "repo.commit.cherry-pick"}}">{{.locale.Tr "repo.commit.cherry-pick"}}</div>
-									<div class="ui gitea-custom modal" id="cherry-pick-modal">
+									<div class="ui gitea-confirm-modal modal" id="cherry-pick-modal">
 										<div class="header">
 											<span id="cherry-pick-header"></span>
 										</div>
diff --git a/templates/repo/editor/edit.tmpl b/templates/repo/editor/edit.tmpl
index e57f9d87da62b..1c0682f4d570e 100644
--- a/templates/repo/editor/edit.tmpl
+++ b/templates/repo/editor/edit.tmpl
@@ -56,7 +56,7 @@
 	</div>
 
 
-	<div class="ui small gitea-custom modal" id="edit-empty-content-modal">
+	<div class="ui gitea-confirm-modal modal" id="edit-empty-content-modal">
 		<div class="header">
 			{{svg "octicon-file"}}
 			{{.locale.Tr "repo.editor.commit_empty_file_header"}}
diff --git a/templates/repo/editor/patch.tmpl b/templates/repo/editor/patch.tmpl
index 6919f7490b41c..a211187d069a9 100644
--- a/templates/repo/editor/patch.tmpl
+++ b/templates/repo/editor/patch.tmpl
@@ -36,7 +36,7 @@
 		</form>
 	</div>
 
-	<div class="ui small gitea-custom modal" id="edit-empty-content-modal">
+	<div class="ui gitea-confirm-modal modal" id="edit-empty-content-modal">
 		<div class="header">
 			{{svg "octicon-file"}}
 			{{.locale.Tr "repo.editor.commit_empty_file_header"}}
diff --git a/templates/repo/header.tmpl b/templates/repo/header.tmpl
index a999c73804f1c..5f2e135b98699 100644
--- a/templates/repo/header.tmpl
+++ b/templates/repo/header.tmpl
@@ -118,7 +118,6 @@
 								{{svg "octicon-repo-forked"}}{{$.locale.Tr "repo.fork"}}
 							</a>
 							<div class="ui small modal" id="fork-repo-modal">
-								{{svg "octicon-x" 16 "close inside"}}
 								<div class="header">
 									{{$.locale.Tr "repo.already_forked" .Name}}
 								</div>
diff --git a/templates/repo/issue/labels/edit_delete_label.tmpl b/templates/repo/issue/labels/edit_delete_label.tmpl
index 471a066914afe..32e5a140ae76a 100644
--- a/templates/repo/issue/labels/edit_delete_label.tmpl
+++ b/templates/repo/issue/labels/edit_delete_label.tmpl
@@ -1,4 +1,4 @@
-<div class="ui small gitea-custom delete modal">
+<div class="ui gitea-confirm-modal delete modal">
 	<div class="header">
 		{{svg "octicon-trash"}}
 		{{.locale.Tr "repo.issues.label_deletion"}}
diff --git a/templates/repo/issue/milestones.tmpl b/templates/repo/issue/milestones.tmpl
index 397a8e43070e3..c07232c759584 100644
--- a/templates/repo/issue/milestones.tmpl
+++ b/templates/repo/issue/milestones.tmpl
@@ -116,7 +116,7 @@
 </div>
 
 {{if or .CanWriteIssues .CanWritePulls}}
-	<div class="ui small gitea-custom delete modal">
+	<div class="ui gitea-confirm-modal delete modal">
 		<div class="header">
 			{{svg "octicon-trash"}}
 			{{.locale.Tr "repo.milestones.deletion"}}
diff --git a/templates/repo/issue/view_content.tmpl b/templates/repo/issue/view_content.tmpl
index 5aba8fa016d71..8112373f06b20 100644
--- a/templates/repo/issue/view_content.tmpl
+++ b/templates/repo/issue/view_content.tmpl
@@ -197,7 +197,7 @@
 	<span class="no-content">{{.locale.Tr "repo.issues.no_content"}}</span>
 </div>
 
-<div class="ui small gitea-custom delete modal">
+<div class="ui gitea-confirm-modal delete modal">
 	<div class="header">
 		{{svg "octicon-trash"}}
 		{{.locale.Tr "repo.branch.delete" .HeadTarget}}
diff --git a/templates/repo/issue/view_content/sidebar.tmpl b/templates/repo/issue/view_content/sidebar.tmpl
index 5c0b93881cfd4..bab9ff1936659 100644
--- a/templates/repo/issue/view_content/sidebar.tmpl
+++ b/templates/repo/issue/view_content/sidebar.tmpl
@@ -542,7 +542,7 @@
 			{{if and .CanCreateIssueDependencies (not .Repository.IsArchived)}}
 				<input type="hidden" id="crossRepoSearch" value="{{.AllowCrossRepositoryDependencies}}">
 
-				<div class="ui gitea-custom modal remove-dependency">
+				<div class="ui gitea-confirm-modal modal remove-dependency">
 					<div class="header">
 						{{svg "octicon-trash"}}
 						{{.locale.Tr "repo.issues.dependency.remove_header"}}
@@ -656,7 +656,7 @@
 				{{svg "octicon-trash"}}
 				{{.locale.Tr "repo.issues.delete"}}
 			</button>
-			<div class="ui gitea-custom modal" id="delete">
+			<div class="ui gitea-confirm-modal modal" id="delete">
 				<div class="header">
 					{{if .Issue.IsPull}}
 						{{.locale.Tr "repo.pulls.delete.title"}}
diff --git a/templates/repo/migrate/migrating.tmpl b/templates/repo/migrate/migrating.tmpl
index 74a98fc94af1e..214f5e93e5517 100644
--- a/templates/repo/migrate/migrating.tmpl
+++ b/templates/repo/migrate/migrating.tmpl
@@ -35,7 +35,7 @@
 							{{if and .Failed .Permission.IsAdmin}}
 								<div class="ui divider"></div>
 								<div class="item">
-									<button class="ui gitea-custom red show-modal button" data-modal="#delete-repo-modal">{{.locale.Tr "repo.settings.delete"}}</button>
+									<button class="ui gitea-confirm-modal red show-modal button" data-modal="#delete-repo-modal">{{.locale.Tr "repo.settings.delete"}}</button>
 								</div>
 							{{end}}
 						</div>
diff --git a/templates/repo/projects/list.tmpl b/templates/repo/projects/list.tmpl
index d9cd4478cf78b..ebe6008bbaca8 100644
--- a/templates/repo/projects/list.tmpl
+++ b/templates/repo/projects/list.tmpl
@@ -78,7 +78,7 @@
 </div>
 
 {{if .CanWriteProjects}}
-<div class="ui small gitea-custom delete modal">
+<div class="ui gitea-confirm-modal delete modal">
 	<div class="header">
 		{{svg "octicon-trash"}}
 		{{.locale.Tr "repo.projects.deletion"}}
diff --git a/templates/repo/projects/view.tmpl b/templates/repo/projects/view.tmpl
index df37c01775f7e..cff78df70bfe9 100644
--- a/templates/repo/projects/view.tmpl
+++ b/templates/repo/projects/view.tmpl
@@ -156,7 +156,7 @@
 									</div>
 								</div>
 
-								<div class="ui gitea-custom modal default-project-board-modal" id="default-project-board-modal-{{.ID}}">
+								<div class="ui gitea-confirm-modal modal default-project-board-modal" id="default-project-board-modal-{{.ID}}">
 									<div class="header">
 										<span id="default-project-board-header"></span>
 									</div>
@@ -166,7 +166,7 @@
 									{{template "base/modal_actions_confirm" (dict "locale" $.locale "ModalButtonStyle" "confirm")}}
 								</div>
 
-								<div class="ui gitea-custom modal" id="delete-board-modal-{{.ID}}">
+								<div class="ui gitea-confirm-modal modal" id="delete-board-modal-{{.ID}}">
 									<div class="header">
 										{{$.locale.Tr "repo.projects.column.delete"}}
 									</div>
@@ -278,7 +278,7 @@
 </div>
 
 {{if or .CanWriteIssues .CanWritePulls}}
-	<div class="ui small gitea-custom delete modal">
+	<div class="ui gitea-confirm-modal delete modal">
 		<div class="header">
 			{{svg "octicon-trash"}}
 			{{.locale.Tr "repo.projects.deletion"}}
diff --git a/templates/repo/release/list.tmpl b/templates/repo/release/list.tmpl
index 43653869252ae..db66c045b3d50 100644
--- a/templates/repo/release/list.tmpl
+++ b/templates/repo/release/list.tmpl
@@ -184,7 +184,7 @@
 </div>
 
 {{if (and ($.Permission.CanWrite $.UnitTypeCode) .PageIsTagList)}}
-	<div class="ui small gitea-custom delete modal">
+	<div class="ui gitea-confirm-modal delete modal">
 		<div class="ui header">
 			{{svg "octicon-trash" 16 "gt-mr-2"}}
 			{{.locale.Tr "repo.release.delete_tag"}}
diff --git a/templates/repo/release/new.tmpl b/templates/repo/release/new.tmpl
index 6474ca4ad2457..de5946fe6897b 100644
--- a/templates/repo/release/new.tmpl
+++ b/templates/repo/release/new.tmpl
@@ -138,7 +138,7 @@
 </div>
 
 {{if .PageIsEditRelease}}
-	<div class="ui small gitea-custom delete modal">
+	<div class="ui gitea-confirm-modal delete modal">
 		<div class="header">
 			{{svg "octicon-trash"}}
 			{{.locale.Tr "repo.release.deletion"}}
diff --git a/templates/repo/settings/branches.tmpl b/templates/repo/settings/branches.tmpl
index 7a97d421e438a..d1fa5627f5a17 100644
--- a/templates/repo/settings/branches.tmpl
+++ b/templates/repo/settings/branches.tmpl
@@ -96,7 +96,7 @@
 	</div>
 </div>
 
-<div class="ui small gitea-custom delete modal">
+<div class="ui gitea-confirm-modal delete modal">
 	<div class="ui header">
 		{{svg "octicon-trash" 16 "gt-mr-2"}}
 		{{.locale.Tr "repo.settings.protected_branch_deletion"}}
diff --git a/templates/repo/settings/collaboration.tmpl b/templates/repo/settings/collaboration.tmpl
index 0d4dad57114a6..d9a415662e8c5 100644
--- a/templates/repo/settings/collaboration.tmpl
+++ b/templates/repo/settings/collaboration.tmpl
@@ -112,7 +112,7 @@
 	</div>
 </div>
 
-<div class="ui small gitea-custom delete modal">
+<div class="ui gitea-confirm-modal delete modal">
 	<div class="header">
 		{{svg "octicon-trash"}}
 		{{.locale.Tr "repo.settings.collaborator_deletion"}}
diff --git a/templates/repo/settings/deploy_keys.tmpl b/templates/repo/settings/deploy_keys.tmpl
index e49071f1ac69d..a0f802e49a772 100644
--- a/templates/repo/settings/deploy_keys.tmpl
+++ b/templates/repo/settings/deploy_keys.tmpl
@@ -77,7 +77,7 @@
 	</div>
 </div>
 
-<div class="ui small gitea-custom delete modal">
+<div class="ui gitea-confirm-modal delete modal">
 	<div class="header">
 		{{svg "octicon-trash"}}
 		{{.locale.Tr "repo.settings.deploy_key_deletion"}}
diff --git a/templates/repo/settings/lfs.tmpl b/templates/repo/settings/lfs.tmpl
index 348fb6f4db9ce..8a8d1983f6b02 100644
--- a/templates/repo/settings/lfs.tmpl
+++ b/templates/repo/settings/lfs.tmpl
@@ -26,7 +26,7 @@
 						<td>{{TimeSince .CreatedUnix.AsTime $.locale}}</td>
 						<td class="right aligned">
 							<a class="ui primary button" href="{{$.Link}}/find?oid={{.Oid}}&size={{.Size}}">{{$.locale.Tr "repo.settings.lfs_findcommits"}}</a>
-							<button class="ui gitea-custom show-modal icon button" data-modal="#delete-{{.Oid}}">
+							<button class="ui gitea-confirm-modal show-modal icon button" data-modal="#delete-{{.Oid}}">
 								<span class="btn-octicon btn-octicon-danger"  data-tooltip-content="{{$.locale.Tr "repo.editor.delete_this_file"}}">{{svg "octicon-trash"}}</span>
 							</button>
 						</td>
@@ -40,7 +40,7 @@
 		</table>
 		{{template "base/paginate" .}}
 		{{range .LFSFiles}}
-			<div class="ui gitea-custom modal" id="delete-{{.Oid}}">
+			<div class="ui gitea-confirm-modal modal" id="delete-{{.Oid}}">
 				<div class="header">
 					{{$.locale.Tr "repo.settings.lfs_delete" .Oid}}
 				</div>
diff --git a/templates/repo/settings/options.tmpl b/templates/repo/settings/options.tmpl
index 1e7d519ae8bdc..8a1d9f4c5862b 100644
--- a/templates/repo/settings/options.tmpl
+++ b/templates/repo/settings/options.tmpl
@@ -702,7 +702,7 @@
 			{{if .Repository.IsMirror}}
 				<div class="item">
 					<div class="ui right">
-						<button class="ui gitea-custom red show-modal button" data-modal="#convert-mirror-repo-modal">{{.locale.Tr "repo.settings.convert"}}</button>
+						<button class="ui gitea-confirm-modal red show-modal button" data-modal="#convert-mirror-repo-modal">{{.locale.Tr "repo.settings.convert"}}</button>
 					</div>
 					<div>
 						<h5>{{.locale.Tr "repo.settings.convert"}}</h5>
@@ -714,7 +714,7 @@
 			{{if and .Repository.IsFork .Repository.Owner.CanCreateRepo}}
 				<div class="item">
 					<div class="ui right">
-						<button class="ui gitea-custom red show-modal button" data-modal="#convert-fork-repo-modal">{{.locale.Tr "repo.settings.convert_fork"}}</button>
+						<button class="ui gitea-confirm-modal red show-modal button" data-modal="#convert-fork-repo-modal">{{.locale.Tr "repo.settings.convert_fork"}}</button>
 					</div>
 					<div>
 						<h5>{{.locale.Tr "repo.settings.convert_fork"}}</h5>
@@ -732,7 +732,7 @@
 							<button class="ui red button">{{.locale.Tr "repo.settings.transfer_abort"}}</button>
 						</form>
 					{{else}}
-						<button class="ui gitea-custom red show-modal button" data-modal="#transfer-repo-modal">{{.locale.Tr "repo.settings.transfer"}}</button>
+						<button class="ui gitea-confirm-modal red show-modal button" data-modal="#transfer-repo-modal">{{.locale.Tr "repo.settings.transfer"}}</button>
 					{{end}}
 				</div>
 				<div>
@@ -750,7 +750,7 @@
 
 				<div class="item">
 					<div class="ui right">
-						<button class="ui gitea-custom red show-modal button" data-modal="#delete-wiki-modal">{{.locale.Tr "repo.settings.wiki_delete"}}</button>
+						<button class="ui gitea-confirm-modal red show-modal button" data-modal="#delete-wiki-modal">{{.locale.Tr "repo.settings.wiki_delete"}}</button>
 					</div>
 					<div>
 						<h5>{{.locale.Tr "repo.settings.wiki_delete"}}</h5>
@@ -763,7 +763,7 @@
 
 			<div class="item">
 				<div class="ui right">
-					<button class="ui gitea-custom red show-modal button" data-modal="#delete-repo-modal">{{.locale.Tr "repo.settings.delete"}}</button>
+					<button class="ui gitea-confirm-modal red show-modal button" data-modal="#delete-repo-modal">{{.locale.Tr "repo.settings.delete"}}</button>
 				</div>
 				<div>
 					<h5>{{.locale.Tr "repo.settings.delete"}}</h5>
@@ -776,7 +776,7 @@
 
 				<div class="item">
 					<div class="ui right">
-						<button class="ui gitea-custom red show-modal button" data-modal="#archive-repo-modal">
+						<button class="ui gitea-confirm-modal red show-modal button" data-modal="#archive-repo-modal">
 							{{if .Repository.IsArchived}}
 								{{.locale.Tr "repo.settings.unarchive.button"}}
 							{{else}}
@@ -967,7 +967,7 @@
 	{{end}}
 
 	{{if not .Repository.IsMirror}}
-		<div class="ui gitea-custom modal" id="archive-repo-modal">
+		<div class="ui gitea-confirm-modal modal" id="archive-repo-modal">
 			<div class="header">
 				{{if .Repository.IsArchived}}
 					{{.locale.Tr "repo.settings.unarchive.header"}}
diff --git a/templates/repo/settings/webhook/delete_modal.tmpl b/templates/repo/settings/webhook/delete_modal.tmpl
index 9a254b21f7733..209e39a96be6e 100644
--- a/templates/repo/settings/webhook/delete_modal.tmpl
+++ b/templates/repo/settings/webhook/delete_modal.tmpl
@@ -1,4 +1,4 @@
-<div class="ui small gitea-custom delete modal">
+<div class="ui gitea-confirm-modal delete modal">
 	<div class="header">
 		{{svg "octicon-trash"}}
 		{{.locale.Tr "repo.settings.webhook_deletion"}}
diff --git a/templates/repo/wiki/view.tmpl b/templates/repo/wiki/view.tmpl
index 9d1d4b2206f72..74e4090b9a897 100644
--- a/templates/repo/wiki/view.tmpl
+++ b/templates/repo/wiki/view.tmpl
@@ -99,7 +99,7 @@
 	</div>
 </div>
 
-<div class="ui small gitea-custom delete modal">
+<div class="ui gitea-confirm-modal delete modal">
 	<div class="header">
 		{{svg "octicon-trash"}}
 		{{.locale.Tr "repo.wiki.delete_page_button"}}
diff --git a/templates/shared/actions/runner_edit.tmpl b/templates/shared/actions/runner_edit.tmpl
index ec50605fe4333..d92010ce11516 100644
--- a/templates/shared/actions/runner_edit.tmpl
+++ b/templates/shared/actions/runner_edit.tmpl
@@ -89,7 +89,7 @@
 		</table>
 		{{template "base/paginate" .}}
 	</div>
-	<div class="ui small gitea-custom delete modal" id="runner-delete-modal">
+	<div class="ui gitea-confirm-modal delete modal" id="runner-delete-modal">
 		<div class="header">
 			{{svg "octicon-trash"}}
 			{{.locale.Tr "actions.runners.delete_runner_header"}}
diff --git a/templates/shared/secrets/add_list.tmpl b/templates/shared/secrets/add_list.tmpl
index f6c4145d4f5d5..39b978ae54aa7 100644
--- a/templates/shared/secrets/add_list.tmpl
+++ b/templates/shared/secrets/add_list.tmpl
@@ -56,7 +56,7 @@
 		{{.locale.Tr "secrets.none"}}
 	{{end}}
 </div>
-<div class="ui small gitea-custom delete modal">
+<div class="ui gitea-confirm-modal delete modal">
 	<div class="ui header">
 		{{svg "octicon-trash" 16 "gt-mr-2"}}
 		{{.locale.Tr "secrets.deletion"}}
diff --git a/templates/user/settings/account.tmpl b/templates/user/settings/account.tmpl
index f87b05b2335fd..2ad3eb7af2b95 100644
--- a/templates/user/settings/account.tmpl
+++ b/templates/user/settings/account.tmpl
@@ -161,7 +161,7 @@
 	</div>
 </div>
 
-<div class="ui small gitea-custom delete modal" id="delete-email">
+<div class="ui gitea-confirm-modal delete modal" id="delete-email">
 	<div class="header">
 		{{svg "octicon-trash"}}
 		{{.locale.Tr "settings.email_deletion"}}
@@ -172,7 +172,7 @@
 	{{template "base/modal_actions_confirm" .}}
 </div>
 
-<div class="ui small gitea-custom delete modal" id="delete-account">
+<div class="ui gitea-confirm-modal delete modal" id="delete-account">
 	<div class="header">
 		{{svg "octicon-trash"}}
 		{{.locale.Tr "settings.delete_account_title"}}
diff --git a/templates/user/settings/applications.tmpl b/templates/user/settings/applications.tmpl
index d8568efcdc515..bb0fba8f4f176 100644
--- a/templates/user/settings/applications.tmpl
+++ b/templates/user/settings/applications.tmpl
@@ -268,7 +268,7 @@
 	</div>
 </div>
 
-<div class="ui small gitea-custom delete modal" id="delete-token">
+<div class="ui gitea-confirm-modal delete modal" id="delete-token">
 	<div class="header">
 		{{svg "octicon-trash"}}
 		{{.locale.Tr "settings.access_token_deletion"}}
diff --git a/templates/user/settings/applications_oauth2_list.tmpl b/templates/user/settings/applications_oauth2_list.tmpl
index 653ef3bb8ad3f..5a9554b0309fa 100644
--- a/templates/user/settings/applications_oauth2_list.tmpl
+++ b/templates/user/settings/applications_oauth2_list.tmpl
@@ -47,7 +47,7 @@
 	</form>
 </div>
 
-<div class="ui small gitea-custom delete modal" id="remove-gitea-oauth2-application">
+<div class="ui gitea-confirm-modal delete modal" id="remove-gitea-oauth2-application">
 	<div class="header">
 		{{svg "octicon-trash"}}
 		{{.locale.Tr "settings.remove_oauth2_application"}}
diff --git a/templates/user/settings/grants_oauth2.tmpl b/templates/user/settings/grants_oauth2.tmpl
index dd3410e4d9d3b..205b374176bc4 100644
--- a/templates/user/settings/grants_oauth2.tmpl
+++ b/templates/user/settings/grants_oauth2.tmpl
@@ -28,7 +28,7 @@
 	</div>
 </div>
 
-<div class="ui small gitea-custom delete modal" id="revoke-gitea-oauth2-grant">
+<div class="ui gitea-confirm-modal delete modal" id="revoke-gitea-oauth2-grant">
 	<div class="header">
 		{{svg "octicon-shield" 16 "gt-mr-2"}}
 		{{.locale.Tr "settings.revoke_oauth2_grant"}}
diff --git a/templates/user/settings/keys_gpg.tmpl b/templates/user/settings/keys_gpg.tmpl
index d73aa2515faab..46b60aafd861d 100644
--- a/templates/user/settings/keys_gpg.tmpl
+++ b/templates/user/settings/keys_gpg.tmpl
@@ -111,7 +111,7 @@
 <br>
 <p>{{.locale.Tr "settings.gpg_helper" "https://docs.github.com/en/free-pro-team@latest/github/authenticating-to-github/about-commit-signature-verification#gpg-commit-signature-verification" | Str2html}}</p>
 
-<div class="ui small gitea-custom delete modal" id="delete-gpg">
+<div class="ui gitea-confirm-modal delete modal" id="delete-gpg">
 	<div class="header">
 		{{svg "octicon-trash"}}
 		{{.locale.Tr "settings.gpg_key_deletion"}}
diff --git a/templates/user/settings/keys_principal.tmpl b/templates/user/settings/keys_principal.tmpl
index 1ceb5ccc9a708..5251e465fd964 100644
--- a/templates/user/settings/keys_principal.tmpl
+++ b/templates/user/settings/keys_principal.tmpl
@@ -54,7 +54,7 @@
 		</div>
 	</div>
 
-	<div class="ui small gitea-custom delete modal" id="delete-principal">
+	<div class="ui gitea-confirm-modal delete modal" id="delete-principal">
 		<div class="header">
 			{{svg "octicon-trash"}}
 			{{.locale.Tr "settings.ssh_principal_deletion"}}
diff --git a/templates/user/settings/keys_ssh.tmpl b/templates/user/settings/keys_ssh.tmpl
index 8170a1b0729f4..d66b4ea528c41 100644
--- a/templates/user/settings/keys_ssh.tmpl
+++ b/templates/user/settings/keys_ssh.tmpl
@@ -100,7 +100,7 @@
 <br>
 <p>{{.locale.Tr "settings.ssh_helper" "https://docs.github.com/en/free-pro-team@latest/github/authenticating-to-github/connecting-to-github-with-ssh" "https://docs.github.com/en/free-pro-team@latest/github/authenticating-to-github/troubleshooting-ssh" | Str2html}}</p>
 
-<div class="ui small gitea-custom delete modal" id="delete-ssh">
+<div class="ui gitea-confirm-modal delete modal" id="delete-ssh">
 	<div class="header">
 		{{svg "octicon-trash"}}
 		{{.locale.Tr "settings.ssh_key_deletion"}}
diff --git a/templates/user/settings/organization.tmpl b/templates/user/settings/organization.tmpl
index e29b749e7e864..97b5a6a0bce58 100644
--- a/templates/user/settings/organization.tmpl
+++ b/templates/user/settings/organization.tmpl
@@ -40,9 +40,8 @@
 		</div>
 	</div>
 </div>
-<div class="ui small gitea-custom delete modal" id="leave-organization">
+<div class="ui gitea-confirm-modal delete modal" id="leave-organization">
 	<div class="header">
-		{{svg "octicon-x" 16 "close inside"}}
 		{{$.locale.Tr "org.members.leave"}}
 	</div>
 	<div class="content">
diff --git a/templates/user/settings/repos.tmpl b/templates/user/settings/repos.tmpl
index 26a6eee7c4759..7f0b10661415d 100644
--- a/templates/user/settings/repos.tmpl
+++ b/templates/user/settings/repos.tmpl
@@ -38,8 +38,7 @@
 										<div class="right floated content">
 											{{if $.allowAdopt}}
 												<button class="ui button submit tiny green adopt show-modal" data-modal="#adopt-unadopted-modal-{{$dirI}}"><span class="icon">{{svg "octicon-plus"}}</span><span class="label">{{$.locale.Tr "repo.adopt_preexisting_label"}}</span></button>
-												<div class="ui gitea-custom modal" id="adopt-unadopted-modal-{{$dirI}}">
-													{{svg "octicon-x" 16 "close inside"}}
+												<div class="ui gitea-confirm-modal modal" id="adopt-unadopted-modal-{{$dirI}}">
 													<div class="header">
 														<span class="label">{{$.locale.Tr "repo.adopt_preexisting"}}</span>
 													</div>
@@ -65,8 +64,7 @@
 											{{end}}
 											{{if $.allowDelete}}
 												<button class="ui button submit tiny red delete show-modal" data-modal="#delete-unadopted-modal-{{$dirI}}"><span class="icon">{{svg "octicon-x"}}</span><span class="label">{{$.locale.Tr "repo.delete_preexisting_label"}}</span></button>
-												<div class="ui gitea-custom modal" id="delete-unadopted-modal-{{$dirI}}">
-													{{svg "octicon-x" 16 "close inside"}}
+												<div class="ui gitea-confirm-modal modal" id="delete-unadopted-modal-{{$dirI}}">
 													<div class="header">
 														<span class="label">{{$.locale.Tr "repo.delete_preexisting"}}</span>
 													</div>
@@ -131,7 +129,7 @@
 	</div>
 </div>
 
-<div class="ui small gitea-custom delete modal">
+<div class="ui gitea-confirm-modal delete modal">
 	<div class="header">
 		{{svg "octicon-trash"}}
 		{{.locale.Tr "settings.remove_account_link"}}
diff --git a/templates/user/settings/security/accountlinks.tmpl b/templates/user/settings/security/accountlinks.tmpl
index 29d7e1724ffad..196d07c56ff94 100644
--- a/templates/user/settings/security/accountlinks.tmpl
+++ b/templates/user/settings/security/accountlinks.tmpl
@@ -41,7 +41,7 @@
 	</div>
 </div>
 
-<div class="ui small gitea-custom delete modal" id="delete-account-link">
+<div class="ui gitea-confirm-modal delete modal" id="delete-account-link">
 	<div class="header">
 		{{svg "octicon-trash"}}
 		{{.locale.Tr "settings.remove_account_link"}}
diff --git a/templates/user/settings/security/openid.tmpl b/templates/user/settings/security/openid.tmpl
index 4c4e14ac36728..7a206a021a6e6 100644
--- a/templates/user/settings/security/openid.tmpl
+++ b/templates/user/settings/security/openid.tmpl
@@ -51,7 +51,7 @@
 	</form>
 </div>
 
-<div class="ui small gitea-custom delete modal" id="delete-openid">
+<div class="ui gitea-confirm-modal delete modal" id="delete-openid">
 	<div class="header">
 		{{svg "octicon-trash"}}
 		{{.locale.Tr "settings.openid_deletion"}}
diff --git a/templates/user/settings/security/twofa.tmpl b/templates/user/settings/security/twofa.tmpl
index 51da637b35f80..f00651e7fca72 100644
--- a/templates/user/settings/security/twofa.tmpl
+++ b/templates/user/settings/security/twofa.tmpl
@@ -23,7 +23,7 @@
 	{{end}}
 </div>
 
-<div class="ui small gitea-custom delete modal" id="disable-twofa">
+<div class="ui gitea-confirm-modal delete modal" id="disable-twofa">
 	<div class="header">
 		{{svg "octicon-trash"}}
 		{{.locale.Tr "settings.twofa_disable"}}
diff --git a/templates/user/settings/security/webauthn.tmpl b/templates/user/settings/security/webauthn.tmpl
index 64ec9d85759b7..25b7f03fca6f7 100644
--- a/templates/user/settings/security/webauthn.tmpl
+++ b/templates/user/settings/security/webauthn.tmpl
@@ -30,7 +30,7 @@
 
 {{template "user/auth/webauthn_error" .}}
 
-<div class="ui small gitea-custom delete modal" id="delete-registration">
+<div class="ui gitea-confirm-modal delete modal" id="delete-registration">
 	<div class="header">
 		{{svg "octicon-trash"}}
 	{{.locale.Tr "settings.webauthn_delete_key"}}
diff --git a/web_src/css/modules/modal.css b/web_src/css/modules/modal.css
index 0454b605fad74..69558ab99c872 100644
--- a/web_src/css/modules/modal.css
+++ b/web_src/css/modules/modal.css
@@ -1,24 +1,51 @@
-.ui.modal {
-  background: var(--color-body);
+.ui.modal.gitea-confirm-modal {
+  max-width: min(800px, 90vw);
+  width: fit-content;
 }
 
 .ui.modal > .header {
+  /* can't use display:flex, because some headers have space-separated elements, eg: delete branch modal */
   color: var(--color-text-dark);
-  background: var(--color-secondary-bg);
+  background: var(--color-body);
   border-color: var(--color-secondary);
   border-top-left-radius: var(--border-radius);
   border-top-right-radius: var(--border-radius);
+  vertical-align: middle;
+}
+
+.ui.modal > .header .svg {
+  vertical-align: middle;
+  display: inline-block;
+}
+
+
+.ui.modal > .close.inside {
+  color: var(--color-text);
 }
 
-.ui.modal > .content {
+/* Gitea sometimes use a form in a modal dialog, then the "positive" button could submit the form directly */
+
+.ui.modal > .content,
+.ui.modal > form > .content {
   background: var(--color-body);
 }
 
-.ui.modal > .actions {
+.ui.modal > .actions,
+.ui.modal > form > .actions {
   background: var(--color-secondary-bg);
   border-color: var(--color-secondary);
+
+  padding: 1rem 1rem;
+  text-align: right;
 }
 
-.ui.modal > .close.inside {
-  color: var(--color-text);
+/* positive/negative action buttons */
+.ui.modal .actions > .ui.button {
+  display: inline-flex;
+  align-items: center;
+  padding: 10px 12px 10px 10px;
+}
+
+.ui.modal .actions > .ui.button .svg {
+  margin-right: 5px;
 }

From c2c24422fd2e83040df801658ba326987dc389ef Mon Sep 17 00:00:00 2001
From: wxiaoguang <wxiaoguang@gmail.com>
Date: Sun, 23 Apr 2023 13:40:43 +0800
Subject: [PATCH 24/26] fix incorrect replacements

---
 templates/package/settings.tmpl       |  2 +-
 templates/repo/branch/list.tmpl       |  4 ++--
 templates/repo/migrate/migrating.tmpl |  2 +-
 templates/repo/settings/lfs.tmpl      |  2 +-
 templates/repo/settings/options.tmpl  | 12 ++++++------
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/templates/package/settings.tmpl b/templates/package/settings.tmpl
index 85a5c9678a5e9..a443a8d27f483 100644
--- a/templates/package/settings.tmpl
+++ b/templates/package/settings.tmpl
@@ -40,7 +40,7 @@
 		<div class="ui attached error table danger segment">
 			<div class="item">
 				<div class="ui right">
-					<button class="ui gitea-confirm-modal red show-modal button" data-modal="#delete-package-modal">{{.locale.Tr "packages.settings.delete"}}</button>
+					<button class="ui basic red show-modal button" data-modal="#delete-package-modal">{{.locale.Tr "packages.settings.delete"}}</button>
 				</div>
 				<div>
 					<h5>{{.locale.Tr "packages.settings.delete"}}</h5>
diff --git a/templates/repo/branch/list.tmpl b/templates/repo/branch/list.tmpl
index 296dfd3221511..98862bfd8e448 100644
--- a/templates/repo/branch/list.tmpl
+++ b/templates/repo/branch/list.tmpl
@@ -22,7 +22,7 @@
 							</td>
 							<td class="right aligned overflow-visible">
 								{{if and $.IsWriter (not $.Repository.IsArchived) (not .IsDeleted)}}
-									<button class="ui gitea-confirm-modal jump button icon show-create-branch-modal" data-tooltip-content="{{$.locale.Tr "repo.branch.new_branch_from" ($.DefaultBranch)}}" data-branch-from="{{$.DefaultBranch}}" data-branch-from-urlcomponent="{{PathEscapeSegments $.DefaultBranch}}" data-modal="#create-branch-modal">
+									<button class="ui basic jump button icon show-create-branch-modal" data-tooltip-content="{{$.locale.Tr "repo.branch.new_branch_from" ($.DefaultBranch)}}" data-branch-from="{{$.DefaultBranch}}" data-branch-from-urlcomponent="{{PathEscapeSegments $.DefaultBranch}}" data-modal="#create-branch-modal">
 										{{svg "octicon-git-branch"}}
 									</button>
 								{{end}}
@@ -109,7 +109,7 @@
 									</td>
 									<td class="three wide right aligned overflow-visible">
 										{{if and $.IsWriter (not $.Repository.IsArchived) (not .IsDeleted)}}
-											<button class="ui gitea-confirm-modal jump button icon show-create-branch-modal" data-branch-from="{{.Name}}" data-branch-from-urlcomponent="{{PathEscapeSegments .Name}}" data-tooltip-content="{{$.locale.Tr "repo.branch.new_branch_from" .Name}}" data-modal="#create-branch-modal" data-name="{{.Name}}">
+											<button class="ui basic jump button icon show-create-branch-modal" data-branch-from="{{.Name}}" data-branch-from-urlcomponent="{{PathEscapeSegments .Name}}" data-tooltip-content="{{$.locale.Tr "repo.branch.new_branch_from" .Name}}" data-modal="#create-branch-modal" data-name="{{.Name}}">
 												{{svg "octicon-git-branch"}}
 											</button>
 										{{end}}
diff --git a/templates/repo/migrate/migrating.tmpl b/templates/repo/migrate/migrating.tmpl
index 214f5e93e5517..51caa28aa18aa 100644
--- a/templates/repo/migrate/migrating.tmpl
+++ b/templates/repo/migrate/migrating.tmpl
@@ -35,7 +35,7 @@
 							{{if and .Failed .Permission.IsAdmin}}
 								<div class="ui divider"></div>
 								<div class="item">
-									<button class="ui gitea-confirm-modal red show-modal button" data-modal="#delete-repo-modal">{{.locale.Tr "repo.settings.delete"}}</button>
+									<button class="ui basic red show-modal button" data-modal="#delete-repo-modal">{{.locale.Tr "repo.settings.delete"}}</button>
 								</div>
 							{{end}}
 						</div>
diff --git a/templates/repo/settings/lfs.tmpl b/templates/repo/settings/lfs.tmpl
index 8a8d1983f6b02..b4ffa1894ff41 100644
--- a/templates/repo/settings/lfs.tmpl
+++ b/templates/repo/settings/lfs.tmpl
@@ -26,7 +26,7 @@
 						<td>{{TimeSince .CreatedUnix.AsTime $.locale}}</td>
 						<td class="right aligned">
 							<a class="ui primary button" href="{{$.Link}}/find?oid={{.Oid}}&size={{.Size}}">{{$.locale.Tr "repo.settings.lfs_findcommits"}}</a>
-							<button class="ui gitea-confirm-modal show-modal icon button" data-modal="#delete-{{.Oid}}">
+							<button class="ui basic show-modal icon button" data-modal="#delete-{{.Oid}}">
 								<span class="btn-octicon btn-octicon-danger"  data-tooltip-content="{{$.locale.Tr "repo.editor.delete_this_file"}}">{{svg "octicon-trash"}}</span>
 							</button>
 						</td>
diff --git a/templates/repo/settings/options.tmpl b/templates/repo/settings/options.tmpl
index 8a1d9f4c5862b..70850a6ea42ea 100644
--- a/templates/repo/settings/options.tmpl
+++ b/templates/repo/settings/options.tmpl
@@ -702,7 +702,7 @@
 			{{if .Repository.IsMirror}}
 				<div class="item">
 					<div class="ui right">
-						<button class="ui gitea-confirm-modal red show-modal button" data-modal="#convert-mirror-repo-modal">{{.locale.Tr "repo.settings.convert"}}</button>
+						<button class="ui basic red show-modal button" data-modal="#convert-mirror-repo-modal">{{.locale.Tr "repo.settings.convert"}}</button>
 					</div>
 					<div>
 						<h5>{{.locale.Tr "repo.settings.convert"}}</h5>
@@ -714,7 +714,7 @@
 			{{if and .Repository.IsFork .Repository.Owner.CanCreateRepo}}
 				<div class="item">
 					<div class="ui right">
-						<button class="ui gitea-confirm-modal red show-modal button" data-modal="#convert-fork-repo-modal">{{.locale.Tr "repo.settings.convert_fork"}}</button>
+						<button class="ui basic red show-modal button" data-modal="#convert-fork-repo-modal">{{.locale.Tr "repo.settings.convert_fork"}}</button>
 					</div>
 					<div>
 						<h5>{{.locale.Tr "repo.settings.convert_fork"}}</h5>
@@ -732,7 +732,7 @@
 							<button class="ui red button">{{.locale.Tr "repo.settings.transfer_abort"}}</button>
 						</form>
 					{{else}}
-						<button class="ui gitea-confirm-modal red show-modal button" data-modal="#transfer-repo-modal">{{.locale.Tr "repo.settings.transfer"}}</button>
+						<button class="ui basic red show-modal button" data-modal="#transfer-repo-modal">{{.locale.Tr "repo.settings.transfer"}}</button>
 					{{end}}
 				</div>
 				<div>
@@ -750,7 +750,7 @@
 
 				<div class="item">
 					<div class="ui right">
-						<button class="ui gitea-confirm-modal red show-modal button" data-modal="#delete-wiki-modal">{{.locale.Tr "repo.settings.wiki_delete"}}</button>
+						<button class="ui basic red show-modal button" data-modal="#delete-wiki-modal">{{.locale.Tr "repo.settings.wiki_delete"}}</button>
 					</div>
 					<div>
 						<h5>{{.locale.Tr "repo.settings.wiki_delete"}}</h5>
@@ -763,7 +763,7 @@
 
 			<div class="item">
 				<div class="ui right">
-					<button class="ui gitea-confirm-modal red show-modal button" data-modal="#delete-repo-modal">{{.locale.Tr "repo.settings.delete"}}</button>
+					<button class="ui basic red show-modal button" data-modal="#delete-repo-modal">{{.locale.Tr "repo.settings.delete"}}</button>
 				</div>
 				<div>
 					<h5>{{.locale.Tr "repo.settings.delete"}}</h5>
@@ -776,7 +776,7 @@
 
 				<div class="item">
 					<div class="ui right">
-						<button class="ui gitea-confirm-modal red show-modal button" data-modal="#archive-repo-modal">
+						<button class="ui basic red show-modal button" data-modal="#archive-repo-modal">
 							{{if .Repository.IsArchived}}
 								{{.locale.Tr "repo.settings.unarchive.button"}}
 							{{else}}

From 135ea31bb52600b12cbfb7ed9eeea2724ce6eed2 Mon Sep 17 00:00:00 2001
From: wxiaoguang <wxiaoguang@gmail.com>
Date: Sun, 23 Apr 2023 13:55:48 +0800
Subject: [PATCH 25/26] fine tune

---
 web_src/css/modules/modal.css | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/web_src/css/modules/modal.css b/web_src/css/modules/modal.css
index 69558ab99c872..60d096dfbfe1f 100644
--- a/web_src/css/modules/modal.css
+++ b/web_src/css/modules/modal.css
@@ -18,11 +18,6 @@
   display: inline-block;
 }
 
-
-.ui.modal > .close.inside {
-  color: var(--color-text);
-}
-
 /* Gitea sometimes use a form in a modal dialog, then the "positive" button could submit the form directly */
 
 .ui.modal > .content,
@@ -35,7 +30,8 @@
   background: var(--color-secondary-bg);
   border-color: var(--color-secondary);
 
-  padding: 1rem 1rem;
+  /* these styles are from Fomantic UI */
+  padding: 1rem;
   text-align: right;
 }
 

From 9b843cfc0e74736de04669b4839d79b49f3a530f Mon Sep 17 00:00:00 2001
From: HesterG <hestergong@gmail.com>
Date: Sun, 23 Apr 2023 15:14:02 +0800
Subject: [PATCH 26/26] unify some modal headers

---
 templates/repo/release/list.tmpl       | 4 ++--
 templates/repo/settings/branches.tmpl  | 4 ++--
 templates/shared/secrets/add_list.tmpl | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/templates/repo/release/list.tmpl b/templates/repo/release/list.tmpl
index db66c045b3d50..1ddb479317722 100644
--- a/templates/repo/release/list.tmpl
+++ b/templates/repo/release/list.tmpl
@@ -185,8 +185,8 @@
 
 {{if (and ($.Permission.CanWrite $.UnitTypeCode) .PageIsTagList)}}
 	<div class="ui gitea-confirm-modal delete modal">
-		<div class="ui header">
-			{{svg "octicon-trash" 16 "gt-mr-2"}}
+		<div class="header">
+			{{svg "octicon-trash"}}
 			{{.locale.Tr "repo.release.delete_tag"}}
 		</div>
 		<div class="content">
diff --git a/templates/repo/settings/branches.tmpl b/templates/repo/settings/branches.tmpl
index d1fa5627f5a17..53e1b00f6faff 100644
--- a/templates/repo/settings/branches.tmpl
+++ b/templates/repo/settings/branches.tmpl
@@ -97,8 +97,8 @@
 </div>
 
 <div class="ui gitea-confirm-modal delete modal">
-	<div class="ui header">
-		{{svg "octicon-trash" 16 "gt-mr-2"}}
+	<div class="header">
+		{{svg "octicon-trash"}}
 		{{.locale.Tr "repo.settings.protected_branch_deletion"}}
 	</div>
 	<div class="content">
diff --git a/templates/shared/secrets/add_list.tmpl b/templates/shared/secrets/add_list.tmpl
index 39b978ae54aa7..659836eadde1b 100644
--- a/templates/shared/secrets/add_list.tmpl
+++ b/templates/shared/secrets/add_list.tmpl
@@ -57,8 +57,8 @@
 	{{end}}
 </div>
 <div class="ui gitea-confirm-modal delete modal">
-	<div class="ui header">
-		{{svg "octicon-trash" 16 "gt-mr-2"}}
+	<div class="header">
+		{{svg "octicon-trash"}}
 		{{.locale.Tr "secrets.deletion"}}
 	</div>
 	<div class="content">