forks/forgejo
1
0
Fork 0
Code Releases Activity

[PORT] gitea#30396: Fix author name alignment in commits table

Browse source 
Fixes https://github.com/go-gitea/gitea/issues/30129 by introducing a
wrapper div with flexbox that collapses any inter-tag whitespace within.
View diff with whitespace hidden.

Author names aligned:
<img width="172" alt="Screenshot 2024-04-10 at 19 41 27"
src="https://github.com/go-gitea/gitea/assets/115237/d761e8f2-0e67-4f84-8d37-9ed73850470a">

Vertically centered on expand:
<img width="466" alt="Screenshot 2024-04-10 at 19 43 02"
src="https://github.com/go-gitea/gitea/assets/115237/decd68b3-19b5-4cfa-a505-b358e4a0715b">

Ellipsis works:

<img width="344" alt="image"
src="https://github.com/go-gitea/gitea/assets/115237/6f8624a2-f8b6-4f3e-ac98-c44dd0cdfca5">

---

Conflict resolution: Trivial
(cherry picked from commit 50dbed652738182eb42af51967ec7bd10e84ede9)
This commit is contained in:
silverwind 2024-04-11 05:16:44 +02:00 committed by Gusted
parent ceba1abe06
commit 6ece8c0ad7
No known key found for this signature in database
GPG key ID: FD821B732837125F
1 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
templates/repo/commits_list.tmpl
View file

@ -13,7 +13,8 @@
{{$commitRepoLink := $.RepoLink}}{{if $.CommitRepoLink}}{{$commitRepoLink = $.CommitRepoLink}}{{end}} {{$commitRepoLink := $.RepoLink}}{{if $.CommitRepoLink}}{{$commitRepoLink = $.CommitRepoLink}}{{end}}
{{range .Commits}} {{range .Commits}}
<tr> <tr>
<td class="author tw-flex"> <td class="author">
<div class="tw-flex">
{{$userName := .Author.Name}} {{$userName := .Author.Name}}
{{if .User}} {{if .User}}
{{if and .User.FullName DefaultShowFullName}} {{if and .User.FullName DefaultShowFullName}}
@ -24,6 +25,7 @@
{{ctx.AvatarUtils.AvatarByEmail .Author.Email .Author.Name 28 "tw-mr-2"}} {{ctx.AvatarUtils.AvatarByEmail .Author.Email .Author.Name 28 "tw-mr-2"}}
<span class="author-wrapper">{{$userName}}</span> <span class="author-wrapper">{{$userName}}</span>
{{end}} {{end}}
</div>
</td> </td>
<td class="sha"> <td class="sha">
{{$class := "ui sha label"}} {{$class := "ui sha label"}}