From 5e39f65d8bd274a1c0a113866c6bc7b271e4d07c Mon Sep 17 00:00:00 2001
From: Kerwin Bryant <kerwin612@qq.com>
Date: Fri, 22 Nov 2024 01:31:26 +0000
Subject: [PATCH 1/2] Fix issues with inconsistent spacing in areas where the
 branch_dropdown component is used.

---
 templates/repo/commits.tmpl | 4 ++--
 templates/repo/home.tmpl    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/templates/repo/commits.tmpl b/templates/repo/commits.tmpl
index e6efe1ff5426c..8eaa5e477b0d1 100644
--- a/templates/repo/commits.tmpl
+++ b/templates/repo/commits.tmpl
@@ -4,8 +4,8 @@
 	<div class="ui container">
 		{{template "repo/sub_menu" .}}
 		<div class="repo-button-row">
-			<div class="tw-flex tw-items-center">
-				{{template "repo/branch_dropdown" dict "root" . "ContainerClasses" "tw-mr-1"}}
+			<div class="tw-flex tw-items-center repo-button-row-left">
+				{{template "repo/branch_dropdown" dict "root" .}}
 				<a href="{{.RepoLink}}/graph" class="ui basic small compact button">
 					{{svg "octicon-git-branch"}}
 					{{ctx.Locale.Tr "repo.commit_graph"}}
diff --git a/templates/repo/home.tmpl b/templates/repo/home.tmpl
index 0a8391b55353b..12c4a17234d3a 100644
--- a/templates/repo/home.tmpl
+++ b/templates/repo/home.tmpl
@@ -47,7 +47,7 @@
 		{{$isHomepage := (eq $n 0)}}
 		<div class="repo-button-row" data-is-homepage="{{$isHomepage}}">
 			<div class="repo-button-row-left">
-				{{template "repo/branch_dropdown" dict "root" . "ContainerClasses" "tw-mr-1"}}
+				{{template "repo/branch_dropdown" dict "root" .}}
 				{{if and .CanCompareOrPull .IsViewBranch (not .Repository.IsArchived)}}
 					{{$cmpBranch := ""}}
 					{{if ne .Repository.ID .BaseRepo.ID}}

From 8b03ca6ea48e81673fd6720ed074621f85cebdfa Mon Sep 17 00:00:00 2001
From: Kerwin Bryant <kerwin612@qq.com>
Date: Fri, 22 Nov 2024 09:49:22 +0800
Subject: [PATCH 2/2] Update templates/repo/commits.tmpl

Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
---
 templates/repo/commits.tmpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/repo/commits.tmpl b/templates/repo/commits.tmpl
index 8eaa5e477b0d1..6bce58577442b 100644
--- a/templates/repo/commits.tmpl
+++ b/templates/repo/commits.tmpl
@@ -4,7 +4,7 @@
 	<div class="ui container">
 		{{template "repo/sub_menu" .}}
 		<div class="repo-button-row">
-			<div class="tw-flex tw-items-center repo-button-row-left">
+			<div class="repo-button-row-left">
 				{{template "repo/branch_dropdown" dict "root" .}}
 				<a href="{{.RepoLink}}/graph" class="ui basic small compact button">
 					{{svg "octicon-git-branch"}}