mirror of
				https://github.com/go-gitea/gitea.git
				synced 2025-10-31 19:06:18 +01:00 
			
		
		
		
	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: <img width="648" alt="image" src="https://github.com/go-gitea/gitea/assets/115237/cb2fafb3-5e20-46e9-814f-07df20038beb">
This commit is contained in:
		| @@ -1,5 +1,5 @@ | |||||||
| <div class="commit-form-wrapper"> | <div class="commit-form-wrapper"> | ||||||
| 	{{ctx.AvatarUtils.Avatar .SignedUser 48 "commit-avatar"}} | 	{{ctx.AvatarUtils.Avatar .SignedUser 40 "commit-avatar"}} | ||||||
| 	<div class="commit-form"> | 	<div class="commit-form"> | ||||||
| 		<h3>{{- if .CanCommitToBranch.WillSign}} | 		<h3>{{- if .CanCommitToBranch.WillSign}} | ||||||
| 			<span title="{{ctx.Locale.Tr "repo.signing.will_sign" .CanCommitToBranch.SigningKey}}">{{svg "octicon-lock" 24}}</span> | 			<span title="{{ctx.Locale.Tr "repo.signing.will_sign" .CanCommitToBranch.SigningKey}}">{{svg "octicon-lock" 24}}</span> | ||||||
|   | |||||||
| @@ -58,16 +58,16 @@ | |||||||
| 							{{end}} | 							{{end}} | ||||||
| 						{{end}} | 						{{end}} | ||||||
| 					</span> | 					</span> | ||||||
| 					<span class="author tw-flex tw-items-center tw-mr-2"> | 					<span class="author tw-flex tw-items-center tw-mr-2 tw-gap-[1px]"> | ||||||
| 						{{$userName := $commit.Commit.Author.Name}} | 						{{$userName := $commit.Commit.Author.Name}} | ||||||
| 						{{if $commit.User}} | 						{{if $commit.User}} | ||||||
| 							{{if and $commit.User.FullName DefaultShowFullName}} | 							{{if and $commit.User.FullName DefaultShowFullName}} | ||||||
| 								{{$userName = $commit.User.FullName}} | 								{{$userName = $commit.User.FullName}} | ||||||
| 							{{end}} | 							{{end}} | ||||||
| 							<span class="tw-mr-1">{{ctx.AvatarUtils.Avatar $commit.User}}</span> | 							{{ctx.AvatarUtils.Avatar $commit.User 18}} | ||||||
| 							<a href="{{$commit.User.HomeLink}}">{{$userName}}</a> | 							<a href="{{$commit.User.HomeLink}}">{{$userName}}</a> | ||||||
| 						{{else}} | 						{{else}} | ||||||
| 							<span class="tw-mr-1">{{ctx.AvatarUtils.AvatarByEmail $commit.Commit.Author.Email $userName}}</span> | 							{{ctx.AvatarUtils.AvatarByEmail $commit.Commit.Author.Email $userName 18}} | ||||||
| 							{{$userName}} | 							{{$userName}} | ||||||
| 						{{end}} | 						{{end}} | ||||||
| 					</span> | 					</span> | ||||||
|   | |||||||
| @@ -3,10 +3,10 @@ | |||||||
| 		<div title="{{if eq .verification.TrustStatus "trusted"}}{{else if eq .verification.TrustStatus "untrusted"}}{{ctx.Locale.Tr "repo.commits.signed_by_untrusted_user"}}: {{else}}{{ctx.Locale.Tr "repo.commits.signed_by_untrusted_user_unmatched"}}: {{end}}{{.verification.Reason}}"> | 		<div title="{{if eq .verification.TrustStatus "trusted"}}{{else if eq .verification.TrustStatus "untrusted"}}{{ctx.Locale.Tr "repo.commits.signed_by_untrusted_user"}}: {{else}}{{ctx.Locale.Tr "repo.commits.signed_by_untrusted_user_unmatched"}}: {{end}}{{.verification.Reason}}"> | ||||||
| 		{{if ne .verification.SigningUser.ID 0}} | 		{{if ne .verification.SigningUser.ID 0}} | ||||||
| 			{{svg "gitea-lock"}} | 			{{svg "gitea-lock"}} | ||||||
| 			{{ctx.AvatarUtils.Avatar .verification.SigningUser 28 "signature"}} | 			{{ctx.AvatarUtils.Avatar .verification.SigningUser 16 "signature"}} | ||||||
| 		{{else}} | 		{{else}} | ||||||
| 			<span title="{{ctx.Locale.Tr "gpg.default_key"}}">{{svg "gitea-lock-cog"}}</span> | 			<span title="{{ctx.Locale.Tr "gpg.default_key"}}">{{svg "gitea-lock-cog"}}</span> | ||||||
| 			{{ctx.AvatarUtils.AvatarByEmail .verification.SigningEmail "" 28 "signature"}} | 			{{ctx.AvatarUtils.AvatarByEmail .verification.SigningEmail "" 16 "signature"}} | ||||||
| 		{{end}} | 		{{end}} | ||||||
| 		</div> | 		</div> | ||||||
| 	{{else}} | 	{{else}} | ||||||
|   | |||||||
| @@ -8,7 +8,7 @@ | |||||||
| 		{{range .Cards}} | 		{{range .Cards}} | ||||||
| 			<li class="item ui segment"> | 			<li class="item ui segment"> | ||||||
| 				<a href="{{.HomeLink}}"> | 				<a href="{{.HomeLink}}"> | ||||||
| 					{{ctx.AvatarUtils.Avatar .}} | 					{{ctx.AvatarUtils.Avatar . 48}} | ||||||
| 				</a> | 				</a> | ||||||
| 				<h3 class="name"><a href="{{.HomeLink}}">{{.DisplayName}}</a></h3> | 				<h3 class="name"><a href="{{.HomeLink}}">{{.DisplayName}}</a></h3> | ||||||
|  |  | ||||||
|   | |||||||
| @@ -123,12 +123,6 @@ | |||||||
|   padding-bottom: 1px; |   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 { | #git-graph-container #graph-raw-list { | ||||||
|   margin: 0; |   margin: 0; | ||||||
| } | } | ||||||
|   | |||||||
| @@ -17,7 +17,6 @@ | |||||||
| .tribute-container li span.fullname { | .tribute-container li span.fullname { | ||||||
|   font-weight: var(--font-weight-normal); |   font-weight: var(--font-weight-normal); | ||||||
|   font-size: 0.8rem; |   font-size: 0.8rem; | ||||||
|   margin-left: 3px; |  | ||||||
| } | } | ||||||
|  |  | ||||||
| .tribute-container li.highlight, | .tribute-container li.highlight, | ||||||
| @@ -29,14 +28,5 @@ | |||||||
| .tribute-item { | .tribute-item { | ||||||
|   display: flex; |   display: flex; | ||||||
|   align-items: center; |   align-items: center; | ||||||
| } |   gap: 6px; | ||||||
|  |  | ||||||
| .tribute-item .emoji, |  | ||||||
| .tribute-item img[src*="/avatar/"] { |  | ||||||
|   margin-right: 0.5rem; |  | ||||||
| } |  | ||||||
|  |  | ||||||
| .tribute-container img { |  | ||||||
|   width: 1.5rem !important; |  | ||||||
|   height: 1.5rem !important; |  | ||||||
| } | } | ||||||
|   | |||||||
| @@ -50,10 +50,6 @@ | |||||||
|   background: none; |   background: none; | ||||||
| } | } | ||||||
|  |  | ||||||
| .ui.comments .comment .avatar { |  | ||||||
|   width: 30px; |  | ||||||
| } |  | ||||||
|  |  | ||||||
| .ui.comments .comment > .content { | .ui.comments .comment > .content { | ||||||
|   display: flex; |   display: flex; | ||||||
|   flex-direction: column; |   flex-direction: column; | ||||||
|   | |||||||
| @@ -127,8 +127,6 @@ | |||||||
| } | } | ||||||
|  |  | ||||||
| .page-content.organization .members .ui.avatar { | .page-content.organization .members .ui.avatar { | ||||||
|   width: 48px; |  | ||||||
|   height: 48px; |  | ||||||
|   margin-right: 5px; |   margin-right: 5px; | ||||||
|   margin-bottom: 5px; |   margin-bottom: 5px; | ||||||
| } | } | ||||||
|   | |||||||
| @@ -460,14 +460,12 @@ td .commit-summary { | |||||||
| } | } | ||||||
|  |  | ||||||
| .repository.file.editor .commit-form-wrapper { | .repository.file.editor .commit-form-wrapper { | ||||||
|   padding-left: 64px; |   padding-left: 48px; | ||||||
| } | } | ||||||
|  |  | ||||||
| .repository.file.editor .commit-form-wrapper .commit-avatar { | .repository.file.editor .commit-form-wrapper .commit-avatar { | ||||||
|   float: left; |   float: left; | ||||||
|   margin-left: -64px; |   margin-left: -48px; | ||||||
|   width: 3em; |  | ||||||
|   height: auto; |  | ||||||
| } | } | ||||||
|  |  | ||||||
| .repository.file.editor .commit-form-wrapper .commit-form { | .repository.file.editor .commit-form-wrapper .commit-form { | ||||||
| @@ -535,10 +533,6 @@ td .commit-summary { | |||||||
|   min-width: 100px; |   min-width: 100px; | ||||||
| } | } | ||||||
|  |  | ||||||
| #new-issue .comment .avatar { |  | ||||||
|   width: 3em; |  | ||||||
| } |  | ||||||
|  |  | ||||||
| .repository.new.issue .comment.form .content::before, | .repository.new.issue .comment.form .content::before, | ||||||
| .repository.new.issue .comment.form .content::after { | .repository.new.issue .comment.form .content::after { | ||||||
|   right: 100%; |   right: 100%; | ||||||
| @@ -1216,16 +1210,6 @@ td .commit-summary { | |||||||
|   border: 1px solid var(--color-light-border); |   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 #commits-table td.sha .sha.label .detail.icon, | ||||||
| .repository #repo-files-table .sha.label .detail.icon, | .repository #repo-files-table .sha.label .detail.icon, | ||||||
| .repository #repo-file-commit-box .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; |   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 #commits-table td.sha .sha.label .detail.icon .svg, | ||||||
| .repository #repo-files-table .sha.label .detail.icon .svg, | .repository #repo-files-table .sha.label .detail.icon .svg, | ||||||
| .repository #repo-file-commit-box .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 { | .user-cards .list .item .avatar { | ||||||
|   width: 48px; |  | ||||||
|   height: 48px; |  | ||||||
|   float: left; |   float: left; | ||||||
|   display: block; |   display: block; | ||||||
|   margin-right: 10px; |   margin-right: 10px; | ||||||
|   | |||||||
| @@ -36,7 +36,7 @@ function makeCollections({mentions, emoji}) { | |||||||
|       menuItemTemplate: (item) => { |       menuItemTemplate: (item) => { | ||||||
|         return ` |         return ` | ||||||
|           <div class="tribute-item"> |           <div class="tribute-item"> | ||||||
|             <img src="${htmlEscape(item.original.avatar)}" class="tw-mr-2"/> |             <img src="${htmlEscape(item.original.avatar)}" width="21" height="21"/> | ||||||
|             <span class="name">${htmlEscape(item.original.name)}</span> |             <span class="name">${htmlEscape(item.original.name)}</span> | ||||||
|             ${item.original.fullname && item.original.fullname !== '' ? `<span class="fullname">${htmlEscape(item.original.fullname)}</span>` : ''} |             ${item.original.fullname && item.original.fullname !== '' ? `<span class="fullname">${htmlEscape(item.original.fullname)}</span>` : ''} | ||||||
|           </div> |           </div> | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user