From e82f3caa6bbf087b3a1a2e4e93a1063004b1fa40 Mon Sep 17 00:00:00 2001 From: silverwind Date: Fri, 28 Jun 2024 23:29:15 +0200 Subject: [PATCH] Always use HTML attributes for avatar size (#31509) Many avatars were rendered in HTML with certain width/height but then resized again in CSS. This was pointless so I removed all these cases and made the HTML size match the previous render size. Also did a few CSS cleanups in the tribute rendering: image --- templates/repo/editor/commit_form.tmpl | 2 +- templates/repo/graph/commits.tmpl | 6 +++--- templates/repo/shabox_badge.tmpl | 4 ++-- templates/repo/user_cards.tmpl | 2 +- web_src/css/features/gitgraph.css | 6 ------ web_src/css/features/tribute.css | 12 +---------- web_src/css/modules/comment.css | 4 ---- web_src/css/org.css | 2 -- web_src/css/repo.css | 30 ++------------------------ web_src/js/features/tribute.js | 2 +- 10 files changed, 11 insertions(+), 59 deletions(-) diff --git a/templates/repo/editor/commit_form.tmpl b/templates/repo/editor/commit_form.tmpl index 61122417d..c050324e9 100644 --- a/templates/repo/editor/commit_form.tmpl +++ b/templates/repo/editor/commit_form.tmpl @@ -1,5 +1,5 @@
- {{ctx.AvatarUtils.Avatar .SignedUser 48 "commit-avatar"}} + {{ctx.AvatarUtils.Avatar .SignedUser 40 "commit-avatar"}}

{{- if .CanCommitToBranch.WillSign}} {{svg "octicon-lock" 24}} diff --git a/templates/repo/graph/commits.tmpl b/templates/repo/graph/commits.tmpl index a90c5309b..39b86d9a1 100644 --- a/templates/repo/graph/commits.tmpl +++ b/templates/repo/graph/commits.tmpl @@ -58,16 +58,16 @@ {{end}} {{end}} - + {{$userName := $commit.Commit.Author.Name}} {{if $commit.User}} {{if and $commit.User.FullName DefaultShowFullName}} {{$userName = $commit.User.FullName}} {{end}} - {{ctx.AvatarUtils.Avatar $commit.User}} + {{ctx.AvatarUtils.Avatar $commit.User 18}} {{$userName}} {{else}} - {{ctx.AvatarUtils.AvatarByEmail $commit.Commit.Author.Email $userName}} + {{ctx.AvatarUtils.AvatarByEmail $commit.Commit.Author.Email $userName 18}} {{$userName}} {{end}} diff --git a/templates/repo/shabox_badge.tmpl b/templates/repo/shabox_badge.tmpl index 939292ba9..36fc9e04b 100644 --- a/templates/repo/shabox_badge.tmpl +++ b/templates/repo/shabox_badge.tmpl @@ -3,10 +3,10 @@
{{if ne .verification.SigningUser.ID 0}} {{svg "gitea-lock"}} - {{ctx.AvatarUtils.Avatar .verification.SigningUser 28 "signature"}} + {{ctx.AvatarUtils.Avatar .verification.SigningUser 16 "signature"}} {{else}} {{svg "gitea-lock-cog"}} - {{ctx.AvatarUtils.AvatarByEmail .verification.SigningEmail "" 28 "signature"}} + {{ctx.AvatarUtils.AvatarByEmail .verification.SigningEmail "" 16 "signature"}} {{end}}
{{else}} diff --git a/templates/repo/user_cards.tmpl b/templates/repo/user_cards.tmpl index 5accc2c7a..a3f36985f 100644 --- a/templates/repo/user_cards.tmpl +++ b/templates/repo/user_cards.tmpl @@ -8,7 +8,7 @@ {{range .Cards}}
  • - {{ctx.AvatarUtils.Avatar .}} + {{ctx.AvatarUtils.Avatar . 48}}

    {{.DisplayName}}

    diff --git a/web_src/css/features/gitgraph.css b/web_src/css/features/gitgraph.css index 6a04c44e5..f8f7e35cd 100644 --- a/web_src/css/features/gitgraph.css +++ b/web_src/css/features/gitgraph.css @@ -123,12 +123,6 @@ padding-bottom: 1px; } -#git-graph-container #rev-list .author img.ui.avatar { - width: auto; - height: 18px; - max-width: none; -} - #git-graph-container #graph-raw-list { margin: 0; } diff --git a/web_src/css/features/tribute.css b/web_src/css/features/tribute.css index bd843675e..99a026b9b 100644 --- a/web_src/css/features/tribute.css +++ b/web_src/css/features/tribute.css @@ -17,7 +17,6 @@ .tribute-container li span.fullname { font-weight: var(--font-weight-normal); font-size: 0.8rem; - margin-left: 3px; } .tribute-container li.highlight, @@ -29,14 +28,5 @@ .tribute-item { display: flex; align-items: center; -} - -.tribute-item .emoji, -.tribute-item img[src*="/avatar/"] { - margin-right: 0.5rem; -} - -.tribute-container img { - width: 1.5rem !important; - height: 1.5rem !important; + gap: 6px; } diff --git a/web_src/css/modules/comment.css b/web_src/css/modules/comment.css index 672808e9c..cda16fddd 100644 --- a/web_src/css/modules/comment.css +++ b/web_src/css/modules/comment.css @@ -50,10 +50,6 @@ background: none; } -.ui.comments .comment .avatar { - width: 30px; -} - .ui.comments .comment > .content { display: flex; flex-direction: column; diff --git a/web_src/css/org.css b/web_src/css/org.css index 32e8a914f..148cb975e 100644 --- a/web_src/css/org.css +++ b/web_src/css/org.css @@ -127,8 +127,6 @@ } .page-content.organization .members .ui.avatar { - width: 48px; - height: 48px; margin-right: 5px; margin-bottom: 5px; } diff --git a/web_src/css/repo.css b/web_src/css/repo.css index f37ea3110..f34b1e7ea 100644 --- a/web_src/css/repo.css +++ b/web_src/css/repo.css @@ -460,14 +460,12 @@ td .commit-summary { } .repository.file.editor .commit-form-wrapper { - padding-left: 64px; + padding-left: 48px; } .repository.file.editor .commit-form-wrapper .commit-avatar { float: left; - margin-left: -64px; - width: 3em; - height: auto; + margin-left: -48px; } .repository.file.editor .commit-form-wrapper .commit-form { @@ -535,10 +533,6 @@ td .commit-summary { min-width: 100px; } -#new-issue .comment .avatar { - width: 3em; -} - .repository.new.issue .comment.form .content::before, .repository.new.issue .comment.form .content::after { right: 100%; @@ -1216,16 +1210,6 @@ td .commit-summary { border: 1px solid var(--color-light-border); } -.repository #commits-table td.sha .sha.label .ui.signature.avatar, -.repository #repo-files-table .sha.label .ui.signature.avatar, -.repository #repo-file-commit-box .sha.label .ui.signature.avatar, -.repository #rev-list .sha.label .ui.signature.avatar, -.repository .timeline-item.commits-list .singular-commit .sha.label .ui.signature.avatar { - height: 16px; - margin-bottom: 0; - width: 16px; -} - .repository #commits-table td.sha .sha.label .detail.icon, .repository #repo-files-table .sha.label .detail.icon, .repository #repo-file-commit-box .sha.label .detail.icon, @@ -1242,14 +1226,6 @@ td .commit-summary { border-bottom-left-radius: 0; } -.repository #commits-table td.sha .sha.label .detail.icon img, -.repository #repo-files-table .sha.label .detail.icon img, -.repository #repo-file-commit-box .sha.label .detail.icon img, -.repository #rev-list .sha.label .detail.icon img, -.repository .timeline-item.commits-list .singular-commit .sha.label .detail.icon img { - margin-right: 0; -} - .repository #commits-table td.sha .sha.label .detail.icon .svg, .repository #repo-files-table .sha.label .detail.icon .svg, .repository #repo-file-commit-box .sha.label .detail.icon .svg, @@ -1931,8 +1907,6 @@ td .commit-summary { } .user-cards .list .item .avatar { - width: 48px; - height: 48px; float: left; display: block; margin-right: 10px; diff --git a/web_src/js/features/tribute.js b/web_src/js/features/tribute.js index 02cd48437..30e957f2e 100644 --- a/web_src/js/features/tribute.js +++ b/web_src/js/features/tribute.js @@ -36,7 +36,7 @@ function makeCollections({mentions, emoji}) { menuItemTemplate: (item) => { return `
    - + ${htmlEscape(item.original.name)} ${item.original.fullname && item.original.fullname !== '' ? `${htmlEscape(item.original.fullname)}` : ''}