From 60d9d9637399474baac167c9c1a0cc1b0c20efb5 Mon Sep 17 00:00:00 2001
From: bb-ben <70356237+bboerben@users.noreply.github.com>
Date: Thu, 31 Oct 2024 22:11:03 +0800
Subject: [PATCH] update template to merge main

---
 templates/repo/issue/new_form.tmpl             | 14 +++++++++-----
 templates/repo/issue/view_content/sidebar.tmpl |  2 +-
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/templates/repo/issue/new_form.tmpl b/templates/repo/issue/new_form.tmpl
index 80714e8db7..fe856807a5 100644
--- a/templates/repo/issue/new_form.tmpl
+++ b/templates/repo/issue/new_form.tmpl
@@ -63,10 +63,10 @@
 					<div class="no-select item">{{ctx.Locale.Tr "repo.issues.new.clear_reviewers"}}</div>
 					{{range .Reviewers}}
 						{{if .User}}
-							<a class="item muted" data-id="{{.ItemID}}" data-id-selector="#reviewer_{{.ItemID}}">
-								<span class="octicon-check gt-invisible">{{svg "octicon-check"}}</span>
+							<a class="item muted" href="#" data-id="{{.ItemID}}" data-id-selector="#reviewer_{{.ItemID}}">
+								<span class="octicon-check tw-invisible">{{svg "octicon-check"}}</span>
 								<span class="text">
-									{{ctx.AvatarUtils.Avatar .User 28 "gt-mr-3"}}{{template "repo/search_name" .User}}
+									{{ctx.AvatarUtils.Avatar .User 28 "tw-mr-2"}}{{template "repo/search_name" .User}}
 								</span>
 							</a>
 						{{end}}
@@ -91,9 +91,13 @@
 				<div class="selected">
 					{{range .Reviewers}}
 								{{if .User}}
-									<a id="reviewer_{{.ItemID}}" class="muted sidebar-item-link item gt-df gt-ac gt-f1 gt-py-3 gt-hidden" href="{{.User.HomeLink}}">{{ctx.AvatarUtils.Avatar .User 20 "gt-mr-3"}}{{.User.GetDisplayName}}</a>
+									<a class="item tw-p-1 muted tw-hidden" id="reviewer_{{.ItemID}}" href="{{.User.HomeLink}}">
+										{{ctx.AvatarUtils.Avatar .User 28 "tw-mr-2 tw-align-middle"}}{{.User.GetDisplayName}}
+									</a>
 								{{else if .Team}}
-									<span id="reviewer_{{.ItemID}}" class="text item gt-df gt-ac gt-f1 gt-py-3 gt-hidden">{{svg "octicon-people" 20 "gt-mr-3"}}{{$.Repository.OwnerName}}/{{.Team.Name}}</span>
+									<a class="item tw-p-1 muted tw-hidden" id="reviewer_{{.ItemID}}" href="{{.Team.Name}}">
+										{{ctx.AvatarUtils.Avatar .Team 28 "tw-mr-2 tw-align-middle"}}{{$.Repository.OwnerName}}/{{.Team.Name}}
+									</a>
 								{{end}}
 					{{end}}
 				</div>
diff --git a/templates/repo/issue/view_content/sidebar.tmpl b/templates/repo/issue/view_content/sidebar.tmpl
index e49e90df56..8cb9c80e5a 100644
--- a/templates/repo/issue/view_content/sidebar.tmpl
+++ b/templates/repo/issue/view_content/sidebar.tmpl
@@ -53,7 +53,7 @@
 					<div class="item tw-flex tw-items-center tw-py-2">
 						<div class="tw-flex tw-items-center tw-flex-1">
 							{{if .User}}
-								<a class="muted sidebar-item-link" href="{{.User.HomeLink}}">{{ctx.AvatarUtils.Avatar .User 20 "tw-mr-2"}}{{.User.GetDisplayName}}</a>
+								<a class="muted sidebar-item-link" href="{{.User.HomeLink}}">{{ctx.AvatarUtils.Avatar .User 28 "tw-mr-2"}}{{.User.GetDisplayName}}</a>
 							{{else if .Team}}
 								<span class="text">{{svg "octicon-people" 20 "tw-mr-2"}}{{$.Issue.Repo.OwnerName}}/{{.Team.Name}}</span>
 							{{end}}