From 53810c121ac852b0169f44a29d50addb82b0d550 Mon Sep 17 00:00:00 2001
From: silverwind <me@silverwind.io>
Date: Fri, 24 Apr 2026 13:48:25 +0200
Subject: [PATCH 1/8] Make logged-out repo header buttons visually consistent

Move the `disabled` class from the inner `<button>` to the wrapping
`.ui.labeled.button` div on watch and star so all three buttons render
consistently, matching the existing fork button pattern. Re-enable
pointer events on the wrapper itself (so the tooltip still fires) and
apply `pointer-events: none` only to the inner button, leaving the
label link clickable.

Co-Authored-By: Claude (Opus 4.7) <noreply@anthropic.com>
---
 templates/repo/star_unstar.tmpl   | 4 +---
 templates/repo/watch_unwatch.tmpl | 4 +---
 web_src/css/modules/button.css    | 7 +++++++
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/templates/repo/star_unstar.tmpl b/templates/repo/star_unstar.tmpl
index 7e4c61aa28693..5b5a31433f957 100644
--- a/templates/repo/star_unstar.tmpl
+++ b/templates/repo/star_unstar.tmpl
@@ -1,4 +1,4 @@
-<div class="ui labeled button" {{if not $.IsSigned}}data-tooltip-content="{{ctx.Locale.Tr "repo.star_guest_user"}}"{{end}}>
+<div class="ui labeled button{{if not $.IsSigned}} disabled{{end}}" {{if not $.IsSigned}}data-tooltip-content="{{ctx.Locale.Tr "repo.star_guest_user"}}"{{end}}>
 	{{$buttonText := ctx.Locale.Tr "repo.star"}}
 	{{if $.IsStaringRepo}}{{$buttonText = ctx.Locale.Tr "repo.unstar"}}{{end}}
 	<button type="button" class="ui compact small basic button" aria-label="{{$buttonText}}"
@@ -6,8 +6,6 @@
 			data-fetch-method="post"
 			data-fetch-url="{{$.RepoLink}}/action/{{if $.IsStaringRepo}}unstar{{else}}star{{end}}"
 			data-fetch-sync="$closest(.ui.labeled.button)"
-		{{else}}
-			disabled
 		{{end}}
 	>
 		{{svg (Iif $.IsStaringRepo "octicon-star-fill" "octicon-star")}}
diff --git a/templates/repo/watch_unwatch.tmpl b/templates/repo/watch_unwatch.tmpl
index 1d6daac25229a..53aa373e25e02 100644
--- a/templates/repo/watch_unwatch.tmpl
+++ b/templates/repo/watch_unwatch.tmpl
@@ -1,4 +1,4 @@
-<div class="ui labeled button" {{if not $.IsSigned}}data-tooltip-content="{{ctx.Locale.Tr "repo.watch_guest_user"}}"{{end}}>
+<div class="ui labeled button{{if not $.IsSigned}} disabled{{end}}" {{if not $.IsSigned}}data-tooltip-content="{{ctx.Locale.Tr "repo.watch_guest_user"}}"{{end}}>
 	{{$buttonText := ctx.Locale.Tr "repo.watch"}}
 	{{if $.IsWatchingRepo}}{{$buttonText = ctx.Locale.Tr "repo.unwatch"}}{{end}}
 	<button type="button" class="ui compact small basic button" aria-label="{{$buttonText}}"
@@ -6,8 +6,6 @@
 			data-fetch-method="post"
 			data-fetch-url="{{$.RepoLink}}/action/{{if $.IsWatchingRepo}}unwatch{{else}}watch{{end}}"
 			data-fetch-sync="$closest(.ui.labeled.button)"
-		{{else}}
-			disabled
 		{{end}}
 	>
 		{{svg "octicon-eye"}}
diff --git a/web_src/css/modules/button.css b/web_src/css/modules/button.css
index 9b509f8cd40bd..858cc3f54b71b 100644
--- a/web_src/css/modules/button.css
+++ b/web_src/css/modules/button.css
@@ -55,6 +55,13 @@
   pointer-events: none !important;
 }
 
+.ui.labeled.button.disabled {
+  pointer-events: auto !important;
+}
+.ui.labeled.button.disabled > .button {
+  pointer-events: none;
+}
+
 /* there is no "ui labeled icon button" support" because it is not used */
 .ui.labeled.button:not(.icon) {
   flex-direction: row;

From 89469fecd86e8f0aad8606580dbc38573161b59a Mon Sep 17 00:00:00 2001
From: wxiaoguang <wxiaoguang@gmail.com>
Date: Fri, 24 Apr 2026 22:31:49 +0800
Subject: [PATCH 2/8] fix

---
 templates/repo/star_unstar.tmpl   | 14 +++++++-------
 templates/repo/watch_unwatch.tmpl | 14 +++++++-------
 web_src/css/modules/button.css    |  7 -------
 3 files changed, 14 insertions(+), 21 deletions(-)

diff --git a/templates/repo/star_unstar.tmpl b/templates/repo/star_unstar.tmpl
index 5b5a31433f957..e2e1bc360582f 100644
--- a/templates/repo/star_unstar.tmpl
+++ b/templates/repo/star_unstar.tmpl
@@ -1,12 +1,12 @@
-<div class="ui labeled button{{if not $.IsSigned}} disabled{{end}}" {{if not $.IsSigned}}data-tooltip-content="{{ctx.Locale.Tr "repo.star_guest_user"}}"{{end}}>
+{{/* not using "disabled" to show the tooltip and keep the link clickable, let the sub buttons decide their cursor */}}
+<div class="ui labeled button tw-cursor-default" {{if not $.IsSigned}}data-tooltip-content="{{ctx.Locale.Tr "repo.star_guest_user"}}"{{end}}>
 	{{$buttonText := ctx.Locale.Tr "repo.star"}}
 	{{if $.IsStaringRepo}}{{$buttonText = ctx.Locale.Tr "repo.unstar"}}{{end}}
-	<button type="button" class="ui compact small basic button" aria-label="{{$buttonText}}"
-		{{if $.IsSigned}}
-			data-fetch-method="post"
-			data-fetch-url="{{$.RepoLink}}/action/{{if $.IsStaringRepo}}unstar{{else}}star{{end}}"
-			data-fetch-sync="$closest(.ui.labeled.button)"
-		{{end}}
+	{{/* not using "disabled" to make this button have the the same style as the clickable link alongside */}}
+	<button type="button" class="ui compact small basic button {{if not $.IsSigned}}tw-pointer-events-none tw-cursor-default{{end}}" aria-label="{{$buttonText}}"
+		data-fetch-method="post"
+		data-fetch-url="{{$.RepoLink}}/action/{{if $.IsStaringRepo}}unstar{{else}}star{{end}}"
+		data-fetch-sync="$closest(.ui.labeled.button)"
 	>
 		{{svg (Iif $.IsStaringRepo "octicon-star-fill" "octicon-star")}}
 		<span class="not-mobile" aria-hidden="true">{{$buttonText}}</span>
diff --git a/templates/repo/watch_unwatch.tmpl b/templates/repo/watch_unwatch.tmpl
index 53aa373e25e02..87efefc6a9f22 100644
--- a/templates/repo/watch_unwatch.tmpl
+++ b/templates/repo/watch_unwatch.tmpl
@@ -1,12 +1,12 @@
-<div class="ui labeled button{{if not $.IsSigned}} disabled{{end}}" {{if not $.IsSigned}}data-tooltip-content="{{ctx.Locale.Tr "repo.watch_guest_user"}}"{{end}}>
+{{/* not using "disabled" to show the tooltip and keep the link clickable, let the sub buttons decide their cursor */}}
+<div class="ui labeled button tw-cursor-default" {{if not $.IsSigned}}data-tooltip-content="{{ctx.Locale.Tr "repo.watch_guest_user"}}"{{end}}>
 	{{$buttonText := ctx.Locale.Tr "repo.watch"}}
 	{{if $.IsWatchingRepo}}{{$buttonText = ctx.Locale.Tr "repo.unwatch"}}{{end}}
-	<button type="button" class="ui compact small basic button" aria-label="{{$buttonText}}"
-		{{if $.IsSigned}}
-			data-fetch-method="post"
-			data-fetch-url="{{$.RepoLink}}/action/{{if $.IsWatchingRepo}}unwatch{{else}}watch{{end}}"
-			data-fetch-sync="$closest(.ui.labeled.button)"
-		{{end}}
+	{{/* not using "disabled" to make this button have the the same style as the clickable link alongside */}}
+	<button type="button" class="ui compact small basic button {{if not $.IsSigned}}tw-pointer-events-none{{end}}" aria-label="{{$buttonText}}"
+		data-fetch-method="post"
+		data-fetch-url="{{$.RepoLink}}/action/{{if $.IsWatchingRepo}}unwatch{{else}}watch{{end}}"
+		data-fetch-sync="$closest(.ui.labeled.button)"
 	>
 		{{svg "octicon-eye"}}
 		<span class="not-mobile" aria-hidden="true">{{$buttonText}}</span>
diff --git a/web_src/css/modules/button.css b/web_src/css/modules/button.css
index 858cc3f54b71b..9b509f8cd40bd 100644
--- a/web_src/css/modules/button.css
+++ b/web_src/css/modules/button.css
@@ -55,13 +55,6 @@
   pointer-events: none !important;
 }
 
-.ui.labeled.button.disabled {
-  pointer-events: auto !important;
-}
-.ui.labeled.button.disabled > .button {
-  pointer-events: none;
-}
-
 /* there is no "ui labeled icon button" support" because it is not used */
 .ui.labeled.button:not(.icon) {
   flex-direction: row;

From 7dd0453edde5c849de107dacaeb1d5d0720ec6db Mon Sep 17 00:00:00 2001
From: wxiaoguang <wxiaoguang@gmail.com>
Date: Fri, 24 Apr 2026 22:33:52 +0800
Subject: [PATCH 3/8] fix comment

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

diff --git a/templates/repo/star_unstar.tmpl b/templates/repo/star_unstar.tmpl
index e2e1bc360582f..62b5dca7a7114 100644
--- a/templates/repo/star_unstar.tmpl
+++ b/templates/repo/star_unstar.tmpl
@@ -1,8 +1,8 @@
-{{/* not using "disabled" to show the tooltip and keep the link clickable, let the sub buttons decide their cursor */}}
+{{/* not using "disabled": need to show the tooltip and keep the link clickable, let the sub buttons decide their cursor */}}
 <div class="ui labeled button tw-cursor-default" {{if not $.IsSigned}}data-tooltip-content="{{ctx.Locale.Tr "repo.star_guest_user"}}"{{end}}>
 	{{$buttonText := ctx.Locale.Tr "repo.star"}}
 	{{if $.IsStaringRepo}}{{$buttonText = ctx.Locale.Tr "repo.unstar"}}{{end}}
-	{{/* not using "disabled" to make this button have the the same style as the clickable link alongside */}}
+	{{/* not using "disabled": make this button have the the same style as the clickable link alongside */}}
 	<button type="button" class="ui compact small basic button {{if not $.IsSigned}}tw-pointer-events-none tw-cursor-default{{end}}" aria-label="{{$buttonText}}"
 		data-fetch-method="post"
 		data-fetch-url="{{$.RepoLink}}/action/{{if $.IsStaringRepo}}unstar{{else}}star{{end}}"
diff --git a/templates/repo/watch_unwatch.tmpl b/templates/repo/watch_unwatch.tmpl
index 87efefc6a9f22..87e4f7ef5ddfa 100644
--- a/templates/repo/watch_unwatch.tmpl
+++ b/templates/repo/watch_unwatch.tmpl
@@ -1,8 +1,8 @@
-{{/* not using "disabled" to show the tooltip and keep the link clickable, let the sub buttons decide their cursor */}}
+{{/* not using "disabled": need to show the tooltip and keep the link clickable, let the sub buttons decide their cursor */}}
 <div class="ui labeled button tw-cursor-default" {{if not $.IsSigned}}data-tooltip-content="{{ctx.Locale.Tr "repo.watch_guest_user"}}"{{end}}>
 	{{$buttonText := ctx.Locale.Tr "repo.watch"}}
 	{{if $.IsWatchingRepo}}{{$buttonText = ctx.Locale.Tr "repo.unwatch"}}{{end}}
-	{{/* not using "disabled" to make this button have the the same style as the clickable link alongside */}}
+	{{/* not using "disabled": make this button have the the same style as the clickable link alongside */}}
 	<button type="button" class="ui compact small basic button {{if not $.IsSigned}}tw-pointer-events-none{{end}}" aria-label="{{$buttonText}}"
 		data-fetch-method="post"
 		data-fetch-url="{{$.RepoLink}}/action/{{if $.IsWatchingRepo}}unwatch{{else}}watch{{end}}"

From d2b183b05fe57b10533f1825d4695f44a9bc0f92 Mon Sep 17 00:00:00 2001
From: silverwind <me@silverwind.io>
Date: Fri, 24 Apr 2026 17:46:34 +0200
Subject: [PATCH 4/8] Restore faded look and apply pattern to fork button

Add tw-opacity-[var(--opacity-disabled)] to the wrapper so the three
buttons visually fade when unavailable, matching the previous look.
Apply the same pointer-events-none + opacity pattern to the fork
button for full three-way consistency.

Co-Authored-By: Claude (Opus 4.7) <noreply@anthropic.com>
---
 templates/repo/header.tmpl        | 10 +++++-----
 templates/repo/star_unstar.tmpl   |  2 +-
 templates/repo/watch_unwatch.tmpl |  2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/templates/repo/header.tmpl b/templates/repo/header.tmpl
index 9ed74d50bc0e3..3cc5597614d55 100644
--- a/templates/repo/header.tmpl
+++ b/templates/repo/header.tmpl
@@ -62,17 +62,17 @@
 					{{template "repo/star_unstar" $}}
 					{{end}}
 					{{if and (not .IsEmpty) ($.Permission.CanRead ctx.Consts.RepoUnitTypeCode)}}
-						<div class="ui labeled button
-							{{if or (not $.IsSigned) (and (not $.CanSignedUserFork) (not $.UserAndOrgForks))}}
-								disabled
-							{{end}}"
+						{{$forkDisabled := or (not $.IsSigned) (and (not $.CanSignedUserFork) (not $.UserAndOrgForks))}}
+						{{/* not using "disabled": need to show the tooltip and keep the link clickable, let the sub buttons decide their cursor */}}
+						<div class="ui labeled button tw-cursor-default{{if $forkDisabled}} tw-opacity-[var(--opacity-disabled)]{{end}}"
 							{{if not $.IsSigned}}
 								data-tooltip-content="{{ctx.Locale.Tr "repo.fork_guest_user"}}"
 							{{else if and (not $.CanSignedUserFork) (not $.UserAndOrgForks)}}
 								data-tooltip-content="{{ctx.Locale.Tr "repo.fork_from_self"}}"
 							{{end}}
 						>
-							<a class="ui compact{{if $.ShowForkModal}} show-modal{{end}} small basic button"
+							{{/* not using "disabled": make this button have the same style as the clickable link alongside */}}
+							<a class="ui compact{{if $.ShowForkModal}} show-modal{{end}} small basic button {{if $forkDisabled}}tw-pointer-events-none{{end}}"
 								{{if not $.CanSignedUserFork}}
 									{{if gt (len $.UserAndOrgForks) 1}}
 										href="#" data-modal="#fork-repo-modal"
diff --git a/templates/repo/star_unstar.tmpl b/templates/repo/star_unstar.tmpl
index 62b5dca7a7114..82d3cafab5fdf 100644
--- a/templates/repo/star_unstar.tmpl
+++ b/templates/repo/star_unstar.tmpl
@@ -1,5 +1,5 @@
 {{/* not using "disabled": need to show the tooltip and keep the link clickable, let the sub buttons decide their cursor */}}
-<div class="ui labeled button tw-cursor-default" {{if not $.IsSigned}}data-tooltip-content="{{ctx.Locale.Tr "repo.star_guest_user"}}"{{end}}>
+<div class="ui labeled button tw-cursor-default{{if not $.IsSigned}} tw-opacity-[var(--opacity-disabled)]{{end}}" {{if not $.IsSigned}}data-tooltip-content="{{ctx.Locale.Tr "repo.star_guest_user"}}"{{end}}>
 	{{$buttonText := ctx.Locale.Tr "repo.star"}}
 	{{if $.IsStaringRepo}}{{$buttonText = ctx.Locale.Tr "repo.unstar"}}{{end}}
 	{{/* not using "disabled": make this button have the the same style as the clickable link alongside */}}
diff --git a/templates/repo/watch_unwatch.tmpl b/templates/repo/watch_unwatch.tmpl
index 87e4f7ef5ddfa..35a10a4ac0402 100644
--- a/templates/repo/watch_unwatch.tmpl
+++ b/templates/repo/watch_unwatch.tmpl
@@ -1,5 +1,5 @@
 {{/* not using "disabled": need to show the tooltip and keep the link clickable, let the sub buttons decide their cursor */}}
-<div class="ui labeled button tw-cursor-default" {{if not $.IsSigned}}data-tooltip-content="{{ctx.Locale.Tr "repo.watch_guest_user"}}"{{end}}>
+<div class="ui labeled button tw-cursor-default{{if not $.IsSigned}} tw-opacity-[var(--opacity-disabled)]{{end}}" {{if not $.IsSigned}}data-tooltip-content="{{ctx.Locale.Tr "repo.watch_guest_user"}}"{{end}}>
 	{{$buttonText := ctx.Locale.Tr "repo.watch"}}
 	{{if $.IsWatchingRepo}}{{$buttonText = ctx.Locale.Tr "repo.unwatch"}}{{end}}
 	{{/* not using "disabled": make this button have the the same style as the clickable link alongside */}}

From e7cba5c3ebb2aa39b377ffdd2daa11a1176007c1 Mon Sep 17 00:00:00 2001
From: silverwind <me@silverwind.io>
Date: Fri, 24 Apr 2026 18:09:17 +0200
Subject: [PATCH 5/8] Move repo header button templates into a dedicated folder

Relocate watch_unwatch.tmpl and star_unstar.tmpl into templates/repo/header/
and extract the inline fork button (+ modal) out of header.tmpl into
header/fork.tmpl.

Co-Authored-By: Claude (Opus 4.7) <noreply@anthropic.com>
---
 routers/web/repo/star.go                      |  2 +-
 routers/web/repo/watch.go                     |  2 +-
 templates/repo/header.tmpl                    | 53 ++-----------------
 templates/repo/header/fork.tmpl               | 48 +++++++++++++++++
 .../{star_unstar.tmpl => header/star.tmpl}    |  0
 .../{watch_unwatch.tmpl => header/watch.tmpl} |  0
 6 files changed, 53 insertions(+), 52 deletions(-)
 create mode 100644 templates/repo/header/fork.tmpl
 rename templates/repo/{star_unstar.tmpl => header/star.tmpl} (100%)
 rename templates/repo/{watch_unwatch.tmpl => header/watch.tmpl} (100%)

diff --git a/routers/web/repo/star.go b/routers/web/repo/star.go
index 8cfbfefdf14d3..c93c877d6363f 100644
--- a/routers/web/repo/star.go
+++ b/routers/web/repo/star.go
@@ -11,7 +11,7 @@ import (
 	"code.gitea.io/gitea/services/context"
 )
 
-const tplStarUnstar templates.TplName = "repo/star_unstar"
+const tplStarUnstar templates.TplName = "repo/header/star"
 
 func ActionStar(ctx *context.Context) {
 	err := repo_model.StarRepo(ctx, ctx.Doer, ctx.Repo.Repository, ctx.PathParam("action") == "star")
diff --git a/routers/web/repo/watch.go b/routers/web/repo/watch.go
index a7fbfc168be7e..616e1ee89c7b5 100644
--- a/routers/web/repo/watch.go
+++ b/routers/web/repo/watch.go
@@ -11,7 +11,7 @@ import (
 	"code.gitea.io/gitea/services/context"
 )
 
-const tplWatchUnwatch templates.TplName = "repo/watch_unwatch"
+const tplWatchUnwatch templates.TplName = "repo/header/watch"
 
 func ActionWatch(ctx *context.Context) {
 	err := repo_model.WatchRepo(ctx, ctx.Doer, ctx.Repo.Repository, ctx.PathParam("action") == "watch")
diff --git a/templates/repo/header.tmpl b/templates/repo/header.tmpl
index 3cc5597614d55..9fbe6a9a1141f 100644
--- a/templates/repo/header.tmpl
+++ b/templates/repo/header.tmpl
@@ -57,59 +57,12 @@
 						{{svg "octicon-rss" 16}}
 					</a>
 					{{end}}
-					{{template "repo/watch_unwatch" $}}
+					{{template "repo/header/watch" $}}
 					{{if not $.DisableStars}}
-					{{template "repo/star_unstar" $}}
+					{{template "repo/header/star" $}}
 					{{end}}
 					{{if and (not .IsEmpty) ($.Permission.CanRead ctx.Consts.RepoUnitTypeCode)}}
-						{{$forkDisabled := or (not $.IsSigned) (and (not $.CanSignedUserFork) (not $.UserAndOrgForks))}}
-						{{/* not using "disabled": need to show the tooltip and keep the link clickable, let the sub buttons decide their cursor */}}
-						<div class="ui labeled button tw-cursor-default{{if $forkDisabled}} tw-opacity-[var(--opacity-disabled)]{{end}}"
-							{{if not $.IsSigned}}
-								data-tooltip-content="{{ctx.Locale.Tr "repo.fork_guest_user"}}"
-							{{else if and (not $.CanSignedUserFork) (not $.UserAndOrgForks)}}
-								data-tooltip-content="{{ctx.Locale.Tr "repo.fork_from_self"}}"
-							{{end}}
-						>
-							{{/* not using "disabled": make this button have the same style as the clickable link alongside */}}
-							<a class="ui compact{{if $.ShowForkModal}} show-modal{{end}} small basic button {{if $forkDisabled}}tw-pointer-events-none{{end}}"
-								{{if not $.CanSignedUserFork}}
-									{{if gt (len $.UserAndOrgForks) 1}}
-										href="#" data-modal="#fork-repo-modal"
-									{{else if eq (len $.UserAndOrgForks) 1}}
-										href="{{AppSubUrl}}/{{(index $.UserAndOrgForks 0).FullName}}"
-									{{/*else is not required here, because the button shouldn't link to any site if you can't create a fork*/}}
-									{{end}}
-								{{else if not $.UserAndOrgForks}}
-									href="{{$.RepoLink}}/fork"
-								{{else}}
-									href="#" data-modal="#fork-repo-modal"
-								{{end}}
-							>
-								{{svg "octicon-repo-forked"}}<span class="text not-mobile">{{ctx.Locale.Tr "repo.fork"}}</span>
-							</a>
-							<a class="ui basic label" href="{{.Link}}/forks">
-								{{CountFmt .NumForks}}
-							</a>
-						</div>
-						<div class="ui small modal" id="fork-repo-modal">
-							<div class="header">
-								{{ctx.Locale.Tr "repo.already_forked" .Name}}
-							</div>
-							<div class="content tw-text-left">
-								<div class="ui list">
-									{{range $.UserAndOrgForks}}
-										<div class="ui item tw-py-2">
-											<a href="{{.Link}}">{{svg "octicon-repo-forked" 16 "tw-mr-2"}}{{.FullName}}</a>
-										</div>
-									{{end}}
-								</div>
-								{{if $.CanSignedUserFork}}
-								<div class="divider"></div>
-								<a href="{{$.RepoLink}}/fork">{{ctx.Locale.Tr "repo.fork_to_different_account"}}</a>
-								{{end}}
-							</div>
-						</div>
+						{{template "repo/header/fork" $}}
 					{{end}}
 				</div>
 			{{end}}
diff --git a/templates/repo/header/fork.tmpl b/templates/repo/header/fork.tmpl
new file mode 100644
index 0000000000000..f4aadb29349ef
--- /dev/null
+++ b/templates/repo/header/fork.tmpl
@@ -0,0 +1,48 @@
+{{$forkDisabled := or (not $.IsSigned) (and (not $.CanSignedUserFork) (not $.UserAndOrgForks))}}
+{{/* not using "disabled": need to show the tooltip and keep the link clickable, let the sub buttons decide their cursor */}}
+<div class="ui labeled button tw-cursor-default{{if $forkDisabled}} tw-opacity-[var(--opacity-disabled)]{{end}}"
+	{{if not $.IsSigned}}
+		data-tooltip-content="{{ctx.Locale.Tr "repo.fork_guest_user"}}"
+	{{else if and (not $.CanSignedUserFork) (not $.UserAndOrgForks)}}
+		data-tooltip-content="{{ctx.Locale.Tr "repo.fork_from_self"}}"
+	{{end}}
+>
+	{{/* not using "disabled": make this button have the same style as the clickable link alongside */}}
+	<a class="ui compact{{if $.ShowForkModal}} show-modal{{end}} small basic button {{if $forkDisabled}}tw-pointer-events-none{{end}}"
+		{{if not $.CanSignedUserFork}}
+			{{if gt (len $.UserAndOrgForks) 1}}
+				href="#" data-modal="#fork-repo-modal"
+			{{else if eq (len $.UserAndOrgForks) 1}}
+				href="{{AppSubUrl}}/{{(index $.UserAndOrgForks 0).FullName}}"
+			{{/*else is not required here, because the button shouldn't link to any site if you can't create a fork*/}}
+			{{end}}
+		{{else if not $.UserAndOrgForks}}
+			href="{{$.RepoLink}}/fork"
+		{{else}}
+			href="#" data-modal="#fork-repo-modal"
+		{{end}}
+	>
+		{{svg "octicon-repo-forked"}}<span class="text not-mobile">{{ctx.Locale.Tr "repo.fork"}}</span>
+	</a>
+	<a class="ui basic label" href="{{$.Repository.Link}}/forks">
+		{{CountFmt $.Repository.NumForks}}
+	</a>
+</div>
+<div class="ui small modal" id="fork-repo-modal">
+	<div class="header">
+		{{ctx.Locale.Tr "repo.already_forked" $.Repository.Name}}
+	</div>
+	<div class="content tw-text-left">
+		<div class="ui list">
+			{{range $.UserAndOrgForks}}
+				<div class="ui item tw-py-2">
+					<a href="{{.Link}}">{{svg "octicon-repo-forked" 16 "tw-mr-2"}}{{.FullName}}</a>
+				</div>
+			{{end}}
+		</div>
+		{{if $.CanSignedUserFork}}
+		<div class="divider"></div>
+		<a href="{{$.RepoLink}}/fork">{{ctx.Locale.Tr "repo.fork_to_different_account"}}</a>
+		{{end}}
+	</div>
+</div>
diff --git a/templates/repo/star_unstar.tmpl b/templates/repo/header/star.tmpl
similarity index 100%
rename from templates/repo/star_unstar.tmpl
rename to templates/repo/header/star.tmpl
diff --git a/templates/repo/watch_unwatch.tmpl b/templates/repo/header/watch.tmpl
similarity index 100%
rename from templates/repo/watch_unwatch.tmpl
rename to templates/repo/header/watch.tmpl

From 23bcbbd1f1ae4b78aaf6beb8497d28a2659232e7 Mon Sep 17 00:00:00 2001
From: silverwind <me@silverwind.io>
Date: Fri, 24 Apr 2026 18:46:50 +0200
Subject: [PATCH 6/8] Lead logged-out users to login instead of disabling the
 buttons

Remove all disabled-state visual styling (opacity, cursor-default,
pointer-events helpers, "not using disabled" comments) on the watch,
star and fork buttons. For logged-out users the action element becomes
a plain link to /user/login?redirect_to=<current-page>, so the buttons
render identically whether signed in or not.

Fork's signed-but-cannot-fork-own-repo path keeps tw-pointer-events-none
on the inner link to block clicks while still showing its tooltip.

Co-Authored-By: Claude (Opus 4.7) <noreply@anthropic.com>
---
 templates/repo/header/fork.tmpl  | 14 +++++++-------
 templates/repo/header/star.tmpl  | 27 ++++++++++++++++-----------
 templates/repo/header/watch.tmpl | 29 +++++++++++++++++------------
 3 files changed, 40 insertions(+), 30 deletions(-)

diff --git a/templates/repo/header/fork.tmpl b/templates/repo/header/fork.tmpl
index f4aadb29349ef..3ac76b2d2d0e5 100644
--- a/templates/repo/header/fork.tmpl
+++ b/templates/repo/header/fork.tmpl
@@ -1,15 +1,15 @@
-{{$forkDisabled := or (not $.IsSigned) (and (not $.CanSignedUserFork) (not $.UserAndOrgForks))}}
-{{/* not using "disabled": need to show the tooltip and keep the link clickable, let the sub buttons decide their cursor */}}
-<div class="ui labeled button tw-cursor-default{{if $forkDisabled}} tw-opacity-[var(--opacity-disabled)]{{end}}"
+{{$cantForkOwn := and $.IsSigned (not $.CanSignedUserFork) (not $.UserAndOrgForks)}}
+<div class="ui labeled button"
 	{{if not $.IsSigned}}
 		data-tooltip-content="{{ctx.Locale.Tr "repo.fork_guest_user"}}"
-	{{else if and (not $.CanSignedUserFork) (not $.UserAndOrgForks)}}
+	{{else if $cantForkOwn}}
 		data-tooltip-content="{{ctx.Locale.Tr "repo.fork_from_self"}}"
 	{{end}}
 >
-	{{/* not using "disabled": make this button have the same style as the clickable link alongside */}}
-	<a class="ui compact{{if $.ShowForkModal}} show-modal{{end}} small basic button {{if $forkDisabled}}tw-pointer-events-none{{end}}"
-		{{if not $.CanSignedUserFork}}
+	<a class="ui compact{{if $.ShowForkModal}} show-modal{{end}} small basic button{{if $cantForkOwn}} tw-pointer-events-none{{end}}"
+		{{if not $.IsSigned}}
+			href="{{AppSubUrl}}/user/login?redirect_to={{$.Link | QueryEscape}}"
+		{{else if not $.CanSignedUserFork}}
 			{{if gt (len $.UserAndOrgForks) 1}}
 				href="#" data-modal="#fork-repo-modal"
 			{{else if eq (len $.UserAndOrgForks) 1}}
diff --git a/templates/repo/header/star.tmpl b/templates/repo/header/star.tmpl
index 82d3cafab5fdf..56fdcda77a69a 100644
--- a/templates/repo/header/star.tmpl
+++ b/templates/repo/header/star.tmpl
@@ -1,16 +1,21 @@
-{{/* not using "disabled": need to show the tooltip and keep the link clickable, let the sub buttons decide their cursor */}}
-<div class="ui labeled button tw-cursor-default{{if not $.IsSigned}} tw-opacity-[var(--opacity-disabled)]{{end}}" {{if not $.IsSigned}}data-tooltip-content="{{ctx.Locale.Tr "repo.star_guest_user"}}"{{end}}>
+<div class="ui labeled button" {{if not $.IsSigned}}data-tooltip-content="{{ctx.Locale.Tr "repo.star_guest_user"}}"{{end}}>
 	{{$buttonText := ctx.Locale.Tr "repo.star"}}
 	{{if $.IsStaringRepo}}{{$buttonText = ctx.Locale.Tr "repo.unstar"}}{{end}}
-	{{/* not using "disabled": make this button have the the same style as the clickable link alongside */}}
-	<button type="button" class="ui compact small basic button {{if not $.IsSigned}}tw-pointer-events-none tw-cursor-default{{end}}" aria-label="{{$buttonText}}"
-		data-fetch-method="post"
-		data-fetch-url="{{$.RepoLink}}/action/{{if $.IsStaringRepo}}unstar{{else}}star{{end}}"
-		data-fetch-sync="$closest(.ui.labeled.button)"
-	>
-		{{svg (Iif $.IsStaringRepo "octicon-star-fill" "octicon-star")}}
-		<span class="not-mobile" aria-hidden="true">{{$buttonText}}</span>
-	</button>
+	{{if $.IsSigned}}
+		<button type="button" class="ui compact small basic button" aria-label="{{$buttonText}}"
+			data-fetch-method="post"
+			data-fetch-url="{{$.RepoLink}}/action/{{if $.IsStaringRepo}}unstar{{else}}star{{end}}"
+			data-fetch-sync="$closest(.ui.labeled.button)"
+		>
+			{{svg (Iif $.IsStaringRepo "octicon-star-fill" "octicon-star")}}
+			<span class="not-mobile" aria-hidden="true">{{$buttonText}}</span>
+		</button>
+	{{else}}
+		<a class="ui compact small basic button" aria-label="{{$buttonText}}" href="{{AppSubUrl}}/user/login?redirect_to={{$.Link | QueryEscape}}">
+			{{svg (Iif $.IsStaringRepo "octicon-star-fill" "octicon-star")}}
+			<span class="not-mobile" aria-hidden="true">{{$buttonText}}</span>
+		</a>
+	{{end}}
 	<a class="ui basic label" href="{{$.RepoLink}}/stars">
 		{{CountFmt .Repository.NumStars}}
 	</a>
diff --git a/templates/repo/header/watch.tmpl b/templates/repo/header/watch.tmpl
index 35a10a4ac0402..5501fd2cacb98 100644
--- a/templates/repo/header/watch.tmpl
+++ b/templates/repo/header/watch.tmpl
@@ -1,17 +1,22 @@
-{{/* not using "disabled": need to show the tooltip and keep the link clickable, let the sub buttons decide their cursor */}}
-<div class="ui labeled button tw-cursor-default{{if not $.IsSigned}} tw-opacity-[var(--opacity-disabled)]{{end}}" {{if not $.IsSigned}}data-tooltip-content="{{ctx.Locale.Tr "repo.watch_guest_user"}}"{{end}}>
+<div class="ui labeled button" {{if not $.IsSigned}}data-tooltip-content="{{ctx.Locale.Tr "repo.watch_guest_user"}}"{{end}}>
 	{{$buttonText := ctx.Locale.Tr "repo.watch"}}
 	{{if $.IsWatchingRepo}}{{$buttonText = ctx.Locale.Tr "repo.unwatch"}}{{end}}
-	{{/* not using "disabled": make this button have the the same style as the clickable link alongside */}}
-	<button type="button" class="ui compact small basic button {{if not $.IsSigned}}tw-pointer-events-none{{end}}" aria-label="{{$buttonText}}"
-		data-fetch-method="post"
-		data-fetch-url="{{$.RepoLink}}/action/{{if $.IsWatchingRepo}}unwatch{{else}}watch{{end}}"
-		data-fetch-sync="$closest(.ui.labeled.button)"
-	>
-		{{svg "octicon-eye"}}
-		<span class="not-mobile" aria-hidden="true">{{$buttonText}}</span>
-	</button>
-	<a class="ui basic label" href="{{.RepoLink}}/watchers">
+	{{if $.IsSigned}}
+		<button type="button" class="ui compact small basic button" aria-label="{{$buttonText}}"
+			data-fetch-method="post"
+			data-fetch-url="{{$.RepoLink}}/action/{{if $.IsWatchingRepo}}unwatch{{else}}watch{{end}}"
+			data-fetch-sync="$closest(.ui.labeled.button)"
+		>
+			{{svg "octicon-eye"}}
+			<span class="not-mobile" aria-hidden="true">{{$buttonText}}</span>
+		</button>
+	{{else}}
+		<a class="ui compact small basic button" aria-label="{{$buttonText}}" href="{{AppSubUrl}}/user/login?redirect_to={{$.Link | QueryEscape}}">
+			{{svg "octicon-eye"}}
+			<span class="not-mobile" aria-hidden="true">{{$buttonText}}</span>
+		</a>
+	{{end}}
+	<a class="ui basic label" href="{{$.RepoLink}}/watchers">
 		{{CountFmt .Repository.NumWatches}}
 	</a>
 </div>

From 5a8d7713a8dc784ca1b817f65358539fbe3e1657 Mon Sep 17 00:00:00 2001
From: wxiaoguang <wxiaoguang@gmail.com>
Date: Sat, 25 Apr 2026 01:36:40 +0800
Subject: [PATCH 7/8] fix

---
 templates/repo/header/fork.tmpl  | 27 +++++++++++++--------------
 templates/repo/header/star.tmpl  | 21 +++++++++------------
 templates/repo/header/watch.tmpl | 21 +++++++++------------
 3 files changed, 31 insertions(+), 38 deletions(-)

diff --git a/templates/repo/header/fork.tmpl b/templates/repo/header/fork.tmpl
index 3ac76b2d2d0e5..cf99681f23dc0 100644
--- a/templates/repo/header/fork.tmpl
+++ b/templates/repo/header/fork.tmpl
@@ -1,25 +1,22 @@
-{{$cantForkOwn := and $.IsSigned (not $.CanSignedUserFork) (not $.UserAndOrgForks)}}
+{{$canNotForkOwn := and $.IsSigned (not $.CanSignedUserFork) (not $.UserAndOrgForks)}}
 <div class="ui labeled button"
 	{{if not $.IsSigned}}
 		data-tooltip-content="{{ctx.Locale.Tr "repo.fork_guest_user"}}"
-	{{else if $cantForkOwn}}
+	{{else if $canNotForkOwn}}
 		data-tooltip-content="{{ctx.Locale.Tr "repo.fork_from_self"}}"
 	{{end}}
 >
-	<a class="ui compact{{if $.ShowForkModal}} show-modal{{end}} small basic button{{if $cantForkOwn}} tw-pointer-events-none{{end}}"
+	<a role="button" class="ui compact small basic button {{if $.ShowForkModal}}show-modal{{end}}"
 		{{if not $.IsSigned}}
-			href="{{AppSubUrl}}/user/login?redirect_to={{$.Link | QueryEscape}}"
-		{{else if not $.CanSignedUserFork}}
-			{{if gt (len $.UserAndOrgForks) 1}}
-				href="#" data-modal="#fork-repo-modal"
-			{{else if eq (len $.UserAndOrgForks) 1}}
-				href="{{AppSubUrl}}/{{(index $.UserAndOrgForks 0).FullName}}"
-			{{/*else is not required here, because the button shouldn't link to any site if you can't create a fork*/}}
-			{{end}}
-		{{else if not $.UserAndOrgForks}}
-			href="{{$.RepoLink}}/fork"
-		{{else}}
+			href="{{AppSubUrl}}/user/login"
+		{{else if $.ShowForkModal}}{{/* see backend comment for this logic */}}
 			href="#" data-modal="#fork-repo-modal"
+		{{else if eq (len $.UserAndOrgForks) 1}}
+			href="{{AppSubUrl}}/{{(index $.UserAndOrgForks 0).FullName}}"
+		{{else if $canNotForkOwn}}
+			href="#"
+		{{else}}
+  		href="{{$.RepoLink}}/fork"
 		{{end}}
 	>
 		{{svg "octicon-repo-forked"}}<span class="text not-mobile">{{ctx.Locale.Tr "repo.fork"}}</span>
@@ -28,6 +25,7 @@
 		{{CountFmt $.Repository.NumForks}}
 	</a>
 </div>
+{{if $.ShowForkModal}}
 <div class="ui small modal" id="fork-repo-modal">
 	<div class="header">
 		{{ctx.Locale.Tr "repo.already_forked" $.Repository.Name}}
@@ -46,3 +44,4 @@
 		{{end}}
 	</div>
 </div>
+{{end}}
diff --git a/templates/repo/header/star.tmpl b/templates/repo/header/star.tmpl
index 56fdcda77a69a..d1762bc004e00 100644
--- a/templates/repo/header/star.tmpl
+++ b/templates/repo/header/star.tmpl
@@ -1,21 +1,18 @@
 <div class="ui labeled button" {{if not $.IsSigned}}data-tooltip-content="{{ctx.Locale.Tr "repo.star_guest_user"}}"{{end}}>
 	{{$buttonText := ctx.Locale.Tr "repo.star"}}
 	{{if $.IsStaringRepo}}{{$buttonText = ctx.Locale.Tr "repo.unstar"}}{{end}}
-	{{if $.IsSigned}}
-		<button type="button" class="ui compact small basic button" aria-label="{{$buttonText}}"
+	<a role="button" class="ui compact small basic button" aria-label="{{$buttonText}}"
+		{{if $.IsSigned}}
 			data-fetch-method="post"
 			data-fetch-url="{{$.RepoLink}}/action/{{if $.IsStaringRepo}}unstar{{else}}star{{end}}"
 			data-fetch-sync="$closest(.ui.labeled.button)"
-		>
-			{{svg (Iif $.IsStaringRepo "octicon-star-fill" "octicon-star")}}
-			<span class="not-mobile" aria-hidden="true">{{$buttonText}}</span>
-		</button>
-	{{else}}
-		<a class="ui compact small basic button" aria-label="{{$buttonText}}" href="{{AppSubUrl}}/user/login?redirect_to={{$.Link | QueryEscape}}">
-			{{svg (Iif $.IsStaringRepo "octicon-star-fill" "octicon-star")}}
-			<span class="not-mobile" aria-hidden="true">{{$buttonText}}</span>
-		</a>
-	{{end}}
+		{{else}}
+			href="{{AppSubUrl}}/user/login"
+		{{end}}
+	>
+		{{svg (Iif $.IsStaringRepo "octicon-star-fill" "octicon-star")}}
+		<span class="not-mobile" aria-hidden="true">{{$buttonText}}</span>
+	</a>
 	<a class="ui basic label" href="{{$.RepoLink}}/stars">
 		{{CountFmt .Repository.NumStars}}
 	</a>
diff --git a/templates/repo/header/watch.tmpl b/templates/repo/header/watch.tmpl
index 5501fd2cacb98..a00fd01c804da 100644
--- a/templates/repo/header/watch.tmpl
+++ b/templates/repo/header/watch.tmpl
@@ -1,21 +1,18 @@
 <div class="ui labeled button" {{if not $.IsSigned}}data-tooltip-content="{{ctx.Locale.Tr "repo.watch_guest_user"}}"{{end}}>
 	{{$buttonText := ctx.Locale.Tr "repo.watch"}}
 	{{if $.IsWatchingRepo}}{{$buttonText = ctx.Locale.Tr "repo.unwatch"}}{{end}}
-	{{if $.IsSigned}}
-		<button type="button" class="ui compact small basic button" aria-label="{{$buttonText}}"
+	<a role="button" class="ui compact small basic button" aria-label="{{$buttonText}}"
+		{{if $.IsSigned}}
 			data-fetch-method="post"
 			data-fetch-url="{{$.RepoLink}}/action/{{if $.IsWatchingRepo}}unwatch{{else}}watch{{end}}"
 			data-fetch-sync="$closest(.ui.labeled.button)"
-		>
-			{{svg "octicon-eye"}}
-			<span class="not-mobile" aria-hidden="true">{{$buttonText}}</span>
-		</button>
-	{{else}}
-		<a class="ui compact small basic button" aria-label="{{$buttonText}}" href="{{AppSubUrl}}/user/login?redirect_to={{$.Link | QueryEscape}}">
-			{{svg "octicon-eye"}}
-			<span class="not-mobile" aria-hidden="true">{{$buttonText}}</span>
-		</a>
-	{{end}}
+		{{else}}
+			href="{{AppSubUrl}}/user/login"
+		{{end}}
+	>
+		{{svg "octicon-eye"}}
+		<span class="not-mobile" aria-hidden="true">{{$buttonText}}</span>
+	</a>
 	<a class="ui basic label" href="{{$.RepoLink}}/watchers">
 		{{CountFmt .Repository.NumWatches}}
 	</a>

From 9679e209e4e634d64b2a0d45355b77f34b38b9e1 Mon Sep 17 00:00:00 2001
From: wxiaoguang <wxiaoguang@gmail.com>
Date: Sat, 25 Apr 2026 01:40:56 +0800
Subject: [PATCH 8/8] fix layout

---
 templates/repo/header/fork.tmpl | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/templates/repo/header/fork.tmpl b/templates/repo/header/fork.tmpl
index cf99681f23dc0..e14851f0684ae 100644
--- a/templates/repo/header/fork.tmpl
+++ b/templates/repo/header/fork.tmpl
@@ -16,7 +16,7 @@
 		{{else if $canNotForkOwn}}
 			href="#"
 		{{else}}
-  		href="{{$.RepoLink}}/fork"
+			href="{{$.RepoLink}}/fork"
 		{{end}}
 	>
 		{{svg "octicon-repo-forked"}}<span class="text not-mobile">{{ctx.Locale.Tr "repo.fork"}}</span>
@@ -30,11 +30,11 @@
 	<div class="header">
 		{{ctx.Locale.Tr "repo.already_forked" $.Repository.Name}}
 	</div>
-	<div class="content tw-text-left">
-		<div class="ui list">
+	<div class="content">
+		<div class="ui relaxed list">
 			{{range $.UserAndOrgForks}}
-				<div class="ui item tw-py-2">
-					<a href="{{.Link}}">{{svg "octicon-repo-forked" 16 "tw-mr-2"}}{{.FullName}}</a>
+				<div class="item">
+					<a class="flex-text-block" href="{{.Link}}">{{svg "octicon-repo-forked"}}{{.FullName}}</a>
 				</div>
 			{{end}}
 		</div>