Merge branch 'main' into patch-22

GiteaBot · web-flow · commit 979d0c06d674 · 2024-11-22T12:33:43.000+08:00
diff --git a/templates/repo/issue/sidebar/issue_management.tmpl b/templates/repo/issue/sidebar/issue_management.tmpl
@@ -6,10 +6,10 @@
 			{{$.CsrfTokenHtml}}
 			<button class="fluid ui button {{if not $.NewPinAllowed}}disabled{{end}}">
 				{{if not .Issue.IsPinned}}
-					{{svg "octicon-pin" 16 "tw-mr-2"}}
+					{{svg "octicon-pin"}}
 					{{ctx.Locale.Tr "pin"}}
 				{{else}}
-					{{svg "octicon-pin-slash" 16 "tw-mr-2"}}
+					{{svg "octicon-pin-slash"}}
 					{{ctx.Locale.Tr "unpin"}}
 				{{end}}
 			</button>
diff --git a/templates/repo/issue/sidebar/milestone_list.tmpl b/templates/repo/issue/sidebar/milestone_list.tmpl
@@ -39,7 +39,7 @@
 						{{end}}
 					{{end}}
 				</div>
-				{{end}}
+			{{end}}
 		</div>
 	</div>
 

-Original file line number
+Diff line change
 						{{end}}
 					{{end}}
 				</div>
 -				{{end}}
 +			{{end}}
 		</div>
 	</div>