Merge branch 'main' of https://github.com/go-gitea/gitea into feature/oauth_userinfo

Author: Nils Hillmann

templates/repo/graph/commits.tmpl

@@ -33,14 +33,8 @@
 						{{range $commit.Refs}}
 							{{$refGroup := .RefGroup}}
 							{{if eq $refGroup "pull"}}
-								{{if $.HidePRRefs}}
-									{{if (containGeneric $.SelectedBranches .Name) }}
-										<a class="ui labelled icon button basic tiny" href="{{$.RepoLink}}/issues/{{.ShortName|PathEscape}}">
-											{{svg "octicon-git-pull-request" 16 "mr-2"}}#{{.ShortName}}
-										</a>
-									{{end}}
-								{{else}}
-									<a class="ui labelled icon button basic tiny" href="{{$.RepoLink}}/issues/{{.ShortName|PathEscape}}">
+								{{if or (not $.HidePRRefs) (containGeneric $.SelectedBranches .Name)}}
+									<a class="ui labelled icon button basic tiny" href="{{$.RepoLink}}/pulls/{{.ShortName|PathEscape}}">
 										{{svg "octicon-git-pull-request" 16 "mr-2"}}#{{.ShortName}}
 									</a>
 								{{end}}

templates/shared/issuelist.tmpl

@@ -2,7 +2,7 @@
 	{{ $approvalCounts := .ApprovalCounts}}
 	{{range .Issues}}
 		<li class="item df py-3">
-			<div class="issue-item-left df py-1">
+			<div class="issue-item-left df">
 				{{if $.CanWriteIssuesOrPulls}}
 					<div class="ui checkbox issue-checkbox">
 						<input type="checkbox" data-issue-id={{.ID}}></input>

web_src/less/shared/issuelist.less

@@ -13,6 +13,7 @@
 
     .issue-item-icon svg {
       margin-right: .75rem;
+      margin-top: 1px;
     }
 
     .issue-item-icons-right > * + * {
@@ -29,10 +30,11 @@
       font-size: 16px;
       min-width: 0;
       font-weight: 600;
+    }
 
-      > * {
-        vertical-align: middle;
-      }
+    .labels-list {
+      position: relative;
+      top: -1.5px;
     }
 
     .issue-item-bottom-row {