0
0
mirror of https://github.com/go-gitea/gitea.git synced 2025-12-08 11:25:21 +01:00

Merge b14c757a819f2641e18568032bbc997756752ba8 into 98ef79d73a6a546241dd02959ae17f136369b604

This commit is contained in:
silverwind 2025-12-07 23:24:07 +01:00 committed by GitHub
commit 44d5264d68
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 10 additions and 8 deletions

View File

@ -128,19 +128,21 @@
</div> </div>
<div class="ui bottom attached segment flex-text-block tw-flex-wrap"> <div class="ui bottom attached segment flex-text-block tw-flex-wrap">
<div class="flex-text-inline"> {{if .Author}}
{{if .Author}} <div class="flex-text-inline">
{{ctx.AvatarUtils.Avatar .Author 20}} {{ctx.AvatarUtils.Avatar .Author 20}}
{{if .Author.FullName}} {{if .Author.FullName}}
<a href="{{.Author.HomeLink}}"><strong>{{.Author.FullName}}</strong></a> <a href="{{.Author.HomeLink}}"><strong>{{.Author.FullName}}</strong></a>
{{else}} {{else}}
<a href="{{.Author.HomeLink}}"><strong>{{.Commit.Author.Name}}</strong></a> <a href="{{.Author.HomeLink}}"><strong>{{.Commit.Author.Name}}</strong></a>
{{end}} {{end}}
{{else}} </div>
{{else}}
<div class="flex-text-inline" data-tooltip-content={{.Commit.Author.Email}}>
{{ctx.AvatarUtils.AvatarByEmail .Commit.Author.Email .Commit.Author.Email 20}} {{ctx.AvatarUtils.AvatarByEmail .Commit.Author.Email .Commit.Author.Email 20}}
<strong>{{.Commit.Author.Name}}</strong> <strong>{{.Commit.Author.Name}}</strong>
{{end}} </div>
</div> {{end}}
<span class="text grey">{{DateUtils.TimeSince .Commit.Author.When}}</span> <span class="text grey">{{DateUtils.TimeSince .Commit.Author.When}}</span>

View File

@ -22,8 +22,8 @@
{{end}} {{end}}
{{ctx.AvatarUtils.Avatar .User 28 "tw-mr-2"}}<a class="muted author-wrapper" href="{{.User.HomeLink}}">{{$userName}}</a> {{ctx.AvatarUtils.Avatar .User 28 "tw-mr-2"}}<a class="muted author-wrapper" href="{{.User.HomeLink}}">{{$userName}}</a>
{{else}} {{else}}
{{ctx.AvatarUtils.AvatarByEmail .Author.Email .Author.Name 28 "tw-mr-2"}} {{ctx.AvatarUtils.AvatarByEmail .Author.Email .Author.Email 28 "tw-mr-2"}}
<span class="author-wrapper">{{$userName}}</span> <span class="author-wrapper" data-tooltip-content={{.Author.Email}}>{{$userName}}</span>
{{end}} {{end}}
</div> </div>
</td> </td>

View File

@ -12,7 +12,7 @@
{{else}} {{else}}
{{if .LatestCommit.Author}} {{if .LatestCommit.Author}}
{{ctx.AvatarUtils.AvatarByEmail .LatestCommit.Author.Email .LatestCommit.Author.Name 24}} {{ctx.AvatarUtils.AvatarByEmail .LatestCommit.Author.Email .LatestCommit.Author.Name 24}}
<span class="author-wrapper" title="{{.LatestCommit.Author.Name}}"><strong>{{.LatestCommit.Author.Name}}</strong></span> <span class="author-wrapper" data-tooltip-content={{.LatestCommit.Author.Email}}><strong>{{.LatestCommit.Author.Name}}</strong></span>
{{end}} {{end}}
{{end}} {{end}}