From 59115bacd47aafb00c811f9aa702d4ff7e885050 Mon Sep 17 00:00:00 2001
From: Kerwin Bryant <kerwin612@qq.com>
Date: Thu, 24 Apr 2025 02:19:32 +0000
Subject: [PATCH 1/6] Fix button alignments

---
 templates/repo/pulse.tmpl                  | 2 +-
 templates/repo/wiki/revision.tmpl          | 2 +-
 web_src/js/components/RepoContributors.vue | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/templates/repo/pulse.tmpl b/templates/repo/pulse.tmpl
index cbafee9ba9d9e..650f226e95731 100644
--- a/templates/repo/pulse.tmpl
+++ b/templates/repo/pulse.tmpl
@@ -1,7 +1,7 @@
 <h2 class="ui header activity-header">
 	<span>{{DateUtils.AbsoluteLong .DateFrom}} - {{DateUtils.AbsoluteLong .DateUntil}}</span>
 	<!-- Period -->
-	<div class="ui floating dropdown jump">
+	<div class="ui floating dropdown jump flex-text-block">
 		<div class="ui basic compact button">
 			{{ctx.Locale.Tr "repo.activity.period.filter_label"}} <strong>{{.PeriodText}}</strong>
 			{{svg "octicon-triangle-down" 14 "dropdown icon"}}
diff --git a/templates/repo/wiki/revision.tmpl b/templates/repo/wiki/revision.tmpl
index f305238fc908c..108e3789378c1 100644
--- a/templates/repo/wiki/revision.tmpl
+++ b/templates/repo/wiki/revision.tmpl
@@ -14,7 +14,7 @@
 					</div>
 				</div>
 			</div>
-			<div>
+			<div class="flex-text-block">
 				{{template "repo/clone_panel" .}}
 			</div>
 		</div>
diff --git a/web_src/js/components/RepoContributors.vue b/web_src/js/components/RepoContributors.vue
index 969a869e0d83e..b667624805ac0 100644
--- a/web_src/js/components/RepoContributors.vue
+++ b/web_src/js/components/RepoContributors.vue
@@ -353,8 +353,8 @@ export default defineComponent({
       </div>
       <div>
         <!-- Contribution type -->
-        <div class="ui floating dropdown jump" id="repo-contributors">
-          <div class="ui basic compact button tw-mr-0">
+        <div class="ui floating dropdown jump flex-text-block" id="repo-contributors">
+          <div class="ui basic compact button">
             <span class="not-mobile">{{ locale.filterLabel }}</span> <strong>{{ locale.contributionType[type] }}</strong>
             <svg-icon name="octicon-triangle-down" :size="14"/>
           </div>

From 5ebabd8b5d5b64102208822ed6660af7018ccd98 Mon Sep 17 00:00:00 2001
From: Kerwin Bryant <kerwin612@qq.com>
Date: Thu, 24 Apr 2025 11:49:54 +0800
Subject: [PATCH 2/6] Update branch_dropdown.tmpl

---
 templates/repo/branch_dropdown.tmpl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/templates/repo/branch_dropdown.tmpl b/templates/repo/branch_dropdown.tmpl
index 261d0ea409bdc..72a2b60798df8 100644
--- a/templates/repo/branch_dropdown.tmpl
+++ b/templates/repo/branch_dropdown.tmpl
@@ -47,7 +47,7 @@ Search "repo/branch_dropdown" in the template directory to find all occurrences.
 >
 	{{/* show dummy elements before Vue componment is mounted, this code must match the code in BranchTagSelector.vue */}}
 	<div class="ui dropdown custom branch-selector-dropdown ellipsis-text-items">
-		<div class="ui button branch-dropdown-button">
+		<div class="ui compact button branch-dropdown-button">
 			<span class="flex-text-block gt-ellipsis">
 				{{if not .DropdownFixedText}}
 					{{if .ShowTabTags}}
@@ -56,7 +56,7 @@ Search "repo/branch_dropdown" in the template directory to find all occurrences.
 						{{svg "octicon-git-branch"}}
 					{{end}}
 				{{end}}
-				<strong class="tw-ml-2 tw-inline-block gt-ellipsis">{{Iif .DropdownFixedText .SelectedRefShortName}}</strong>
+				<strong class="tw-inline-block gt-ellipsis">{{Iif .DropdownFixedText .SelectedRefShortName}}</strong>
 			</span>
 			{{svg "octicon-triangle-down" 14 "dropdown icon"}}
 		</div>

From ac012464e99dd0c3ee69510510f95fa2619ceb62 Mon Sep 17 00:00:00 2001
From: Kerwin Bryant <kerwin612@qq.com>
Date: Thu, 24 Apr 2025 03:55:33 +0000
Subject: [PATCH 3/6] fix

---
 templates/repo/pulse.tmpl                  | 2 +-
 web_src/css/base.css                       | 1 +
 web_src/js/components/RepoContributors.vue | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/templates/repo/pulse.tmpl b/templates/repo/pulse.tmpl
index 650f226e95731..cbafee9ba9d9e 100644
--- a/templates/repo/pulse.tmpl
+++ b/templates/repo/pulse.tmpl
@@ -1,7 +1,7 @@
 <h2 class="ui header activity-header">
 	<span>{{DateUtils.AbsoluteLong .DateFrom}} - {{DateUtils.AbsoluteLong .DateUntil}}</span>
 	<!-- Period -->
-	<div class="ui floating dropdown jump flex-text-block">
+	<div class="ui floating dropdown jump">
 		<div class="ui basic compact button">
 			{{ctx.Locale.Tr "repo.activity.period.filter_label"}} <strong>{{.PeriodText}}</strong>
 			{{svg "octicon-triangle-down" 14 "dropdown icon"}}
diff --git a/web_src/css/base.css b/web_src/css/base.css
index 204b6a1560f3b..d1b647622300a 100644
--- a/web_src/css/base.css
+++ b/web_src/css/base.css
@@ -1149,6 +1149,7 @@ table th[data-sortt-desc] .svg {
   min-width: 0;
 }
 
+.ui.dropdown > .ui.button,
 .flex-text-block > .ui.button,
 .flex-text-inline > .ui.button {
   margin: 0; /* fomantic buttons have default margin, when we use them in a flex container with gap, we do not need these margins */
diff --git a/web_src/js/components/RepoContributors.vue b/web_src/js/components/RepoContributors.vue
index b667624805ac0..1006ea30bb910 100644
--- a/web_src/js/components/RepoContributors.vue
+++ b/web_src/js/components/RepoContributors.vue
@@ -353,7 +353,7 @@ export default defineComponent({
       </div>
       <div>
         <!-- Contribution type -->
-        <div class="ui floating dropdown jump flex-text-block" id="repo-contributors">
+        <div class="ui floating dropdown jump" id="repo-contributors">
           <div class="ui basic compact button">
             <span class="not-mobile">{{ locale.filterLabel }}</span> <strong>{{ locale.contributionType[type] }}</strong>
             <svg-icon name="octicon-triangle-down" :size="14"/>

From 14df3886d9835a7596d485287d4b1e85fed0afad Mon Sep 17 00:00:00 2001
From: Kerwin Bryant <kerwin612@qq.com>
Date: Sun, 27 Apr 2025 00:33:15 +0000
Subject: [PATCH 4/6] fix

---
 templates/repo/branch_dropdown.tmpl | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/templates/repo/branch_dropdown.tmpl b/templates/repo/branch_dropdown.tmpl
index 72a2b60798df8..9aa35a5abee0e 100644
--- a/templates/repo/branch_dropdown.tmpl
+++ b/templates/repo/branch_dropdown.tmpl
@@ -49,14 +49,16 @@ Search "repo/branch_dropdown" in the template directory to find all occurrences.
 	<div class="ui dropdown custom branch-selector-dropdown ellipsis-text-items">
 		<div class="ui compact button branch-dropdown-button">
 			<span class="flex-text-block gt-ellipsis">
-				{{if not .DropdownFixedText}}
+				{{if .DropdownFixedText}}
+					{{.DropdownFixedText}}
+				{{else}}
 					{{if .ShowTabTags}}
 						{{svg "octicon-tag"}}
 					{{else if .ShowTabBranches}}
 						{{svg "octicon-git-branch"}}
 					{{end}}
+					<strong class="tw-inline-block gt-ellipsis">{{.SelectedRefShortName}}</strong>
 				{{end}}
-				<strong class="tw-inline-block gt-ellipsis">{{Iif .DropdownFixedText .SelectedRefShortName}}</strong>
 			</span>
 			{{svg "octicon-triangle-down" 14 "dropdown icon"}}
 		</div>

From d9e8eb0f19c18b33f017eeebd61fdc581ed58256 Mon Sep 17 00:00:00 2001
From: wxiaoguang <wxiaoguang@gmail.com>
Date: Sun, 27 Apr 2025 16:50:14 +0800
Subject: [PATCH 5/6] fix branch dropdown

---
 templates/repo/branch_dropdown.tmpl             | 8 +++++---
 web_src/js/components/RepoBranchTagSelector.vue | 3 ++-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/templates/repo/branch_dropdown.tmpl b/templates/repo/branch_dropdown.tmpl
index 9aa35a5abee0e..0fb532b52f675 100644
--- a/templates/repo/branch_dropdown.tmpl
+++ b/templates/repo/branch_dropdown.tmpl
@@ -52,12 +52,14 @@ Search "repo/branch_dropdown" in the template directory to find all occurrences.
 				{{if .DropdownFixedText}}
 					{{.DropdownFixedText}}
 				{{else}}
-					{{if .ShowTabTags}}
+					{{if eq .CurrentRefType "tag"}}
 						{{svg "octicon-tag"}}
-					{{else if .ShowTabBranches}}
+					{{else if  eq .CurrentRefType "branch"}}
 						{{svg "octicon-git-branch"}}
+					{{else}}
+						{{svg "octicon-git-commit"}}
 					{{end}}
-					<strong class="tw-inline-block gt-ellipsis">{{.SelectedRefShortName}}</strong>
+					<strong class="tw-inline-block gt-ellipsis">{{.CurrentRefShortName}}</strong>
 				{{end}}
 			</span>
 			{{svg "octicon-triangle-down" 14 "dropdown icon"}}
diff --git a/web_src/js/components/RepoBranchTagSelector.vue b/web_src/js/components/RepoBranchTagSelector.vue
index aaef8045a0196..8e3a29a0e0020 100644
--- a/web_src/js/components/RepoBranchTagSelector.vue
+++ b/web_src/js/components/RepoBranchTagSelector.vue
@@ -222,7 +222,8 @@ export default defineComponent({
         <template v-if="dropdownFixedText">{{ dropdownFixedText }}</template>
         <template v-else>
           <svg-icon v-if="currentRefType === 'tag'" name="octicon-tag"/>
-          <svg-icon v-else name="octicon-git-branch"/>
+          <svg-icon v-else-if="currentRefType === 'branch'" name="octicon-git-branch"/>
+          <svg-icon v-else name="octicon-git-commit"/>
           <strong ref="dropdownRefName" class="tw-inline-block gt-ellipsis">{{ currentRefShortName }}</strong>
         </template>
       </span>

From 844f7406163320eec6ce989afe76b8e674cca8c1 Mon Sep 17 00:00:00 2001
From: Lunny Xiao <xiaolunwen@gmail.com>
Date: Sun, 27 Apr 2025 12:13:23 -0700
Subject: [PATCH 6/6] Fix template lint

---
 templates/repo/branch_dropdown.tmpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/repo/branch_dropdown.tmpl b/templates/repo/branch_dropdown.tmpl
index 0fb532b52f675..36dc047c23e07 100644
--- a/templates/repo/branch_dropdown.tmpl
+++ b/templates/repo/branch_dropdown.tmpl
@@ -54,7 +54,7 @@ Search "repo/branch_dropdown" in the template directory to find all occurrences.
 				{{else}}
 					{{if eq .CurrentRefType "tag"}}
 						{{svg "octicon-tag"}}
-					{{else if  eq .CurrentRefType "branch"}}
+					{{else if eq .CurrentRefType "branch"}}
 						{{svg "octicon-git-branch"}}
 					{{else}}
 						{{svg "octicon-git-commit"}}