loading up the forgejo repo on tangled to test page performance
0
fork

Configure Feed

Select the types of activity you want to include in your feed.

Fix protected branch icon location (#26576)

authored by

yp05327 and committed by
GitHub
e5e1d842 70f8d10f

+10 -8
+8 -8
templates/repo/branch/list.tmpl
··· 19 19 <tbody> 20 20 <tr> 21 21 <td> 22 - {{if .DefaultBranchBranch.IsProtected}} 23 - {{svg "octicon-shield-lock"}} 24 - {{end}} 25 22 <div class="gt-df gt-ac"> 23 + {{if .DefaultBranchBranch.IsProtected}} 24 + <span class="gt-df gt-pr-2">{{svg "octicon-shield-lock"}}</span> 25 + {{end}} 26 26 <a class="gt-ellipsis" href="{{.RepoLink}}/src/branch/{{PathEscapeSegments .DefaultBranchBranch.DBBranch.Name}}">{{.DefaultBranchBranch.DBBranch.Name}}</a> 27 - <button class="btn interact-fg gt-p-3" data-clipboard-text="{{.DefaultBranchBranch.DBBranch.Name}}">{{svg "octicon-copy" 14}}</button> 27 + <button class="btn interact-fg gt-df gt-p-3" data-clipboard-text="{{.DefaultBranchBranch.DBBranch.Name}}">{{svg "octicon-copy" 14}}</button> 28 28 {{template "repo/commit_statuses" dict "Status" (index $.CommitStatus .DefaultBranchBranch.DBBranch.CommitID) "Statuses" (index $.CommitStatuses .DefaultBranchBranch.DBBranch.CommitID)}} 29 29 </div> 30 30 <p class="info gt-df gt-ac gt-my-2">{{svg "octicon-git-commit" 16 "gt-mr-2"}}<a href="{{.RepoLink}}/commit/{{PathEscape .DefaultBranchBranch.DBBranch.CommitID}}">{{ShortSha .DefaultBranchBranch.DBBranch.CommitID}}</a> · <span class="commit-message">{{RenderCommitMessage $.Context .DefaultBranchBranch.DBBranch.CommitMessage .RepoLink .Repository.ComposeMetas}}</span> · {{ctx.Locale.Tr "org.repo_updated"}} {{TimeSince .DefaultBranchBranch.DBBranch.CommitTime.AsTime ctx.Locale}}{{if .DefaultBranchBranch.DBBranch.Pusher}} &nbsp;{{template "shared/user/avatarlink" dict "user" .DefaultBranchBranch.DBBranch.Pusher}}{{template "shared/user/namelink" .DefaultBranchBranch.DBBranch.Pusher}}{{end}}</p> ··· 97 97 </div> 98 98 <p class="info">{{ctx.Locale.Tr "repo.branch.deleted_by" .DBBranch.DeletedBy.Name}} {{TimeSinceUnix .DBBranch.DeletedUnix ctx.Locale}}</p> 99 99 {{else}} 100 - {{if .IsProtected}} 101 - {{svg "octicon-shield-lock"}} 102 - {{end}} 103 100 <div class="gt-df gt-ac"> 101 + {{if .IsProtected}} 102 + <span class="gt-df gt-pr-2">{{svg "octicon-shield-lock"}}</span> 103 + {{end}} 104 104 <a class="gt-ellipsis" href="{{$.RepoLink}}/src/branch/{{PathEscapeSegments .DBBranch.Name}}">{{.DBBranch.Name}}</a> 105 - <button class="btn interact-fg gt-p-3" data-clipboard-text="{{.DBBranch.Name}}">{{svg "octicon-copy" 14}}</button> 105 + <button class="btn interact-fg gt-df gt-p-3" data-clipboard-text="{{.DBBranch.Name}}">{{svg "octicon-copy" 14}}</button> 106 106 {{template "repo/commit_statuses" dict "Status" (index $.CommitStatus .DBBranch.CommitID) "Statuses" (index $.CommitStatuses .DBBranch.CommitID)}} 107 107 </div> 108 108 <p class="info gt-df gt-ac gt-my-2">{{svg "octicon-git-commit" 16 "gt-mr-2"}}<a href="{{$.RepoLink}}/commit/{{PathEscape .DBBranch.CommitID}}">{{ShortSha .DBBranch.CommitID}}</a> · <span class="commit-message">{{RenderCommitMessage $.Context .DBBranch.CommitMessage $.RepoLink $.Repository.ComposeMetas}}</span> · {{ctx.Locale.Tr "org.repo_updated"}} {{TimeSince .DBBranch.CommitTime.AsTime ctx.Locale}}{{if .DBBranch.Pusher}} &nbsp;{{template "shared/user/avatarlink" dict "user" .DBBranch.Pusher}} &nbsp;{{template "shared/user/namelink" .DBBranch.Pusher}}{{end}}</p>
+2
templates/repo/commit_status.tmpl
··· 1 1 <!-- make sure this matches the color logic in web_src/js/components/DashboardRepoList.vue --> 2 + <span class="gt-df"> 2 3 {{if eq .State "pending"}} 3 4 {{svg "octicon-dot-fill" 18 "commit-status icon text yellow"}} 4 5 {{end}} ··· 11 12 {{if eq .State "failure"}} 12 13 {{svg "octicon-x" 18 "commit-status icon text red"}} 13 14 {{end}} 15 + </span>