Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix vertical align of committer avatar rendered by email address #21884

Merged
merged 12 commits into from Nov 23, 2022
Merged

Fix vertical align of committer avatar rendered by email address #21884

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
90aef80
Fix vertical align for avatar rendered by email address
Nov 21, 2022
95f844b
apply grouping syntax to const
Nov 21, 2022
f67d1b0
Merge branch 'main' into bugfix/avatar-align
lunny Nov 21, 2022
afdf401
Merge branch 'main' into bugfix/avatar-align
lunny Nov 22, 2022
a002374
Merge branch 'main' into bugfix/avatar-align
lunny Nov 22, 2022
11018fa
Merge branch 'main' into bugfix/avatar-align
lunny Nov 22, 2022
af1007c
Merge branch 'main' into bugfix/avatar-align
lunny Nov 23, 2022
bc47a6f
Merge branch 'main' into bugfix/avatar-align
lunny Nov 23, 2022
289fa2a
Merge branch 'main' into bugfix/avatar-align
lunny Nov 23, 2022
65aab92
Merge branch 'main' into bugfix/avatar-align
lunny Nov 23, 2022
bf9f8ec
Merge branch 'main' into bugfix/avatar-align
lunny Nov 23, 2022
573ce5b
Merge branch 'main' into bugfix/avatar-align
jolheiser Nov 23, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions models/avatars/avatar.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,12 @@ import (
"code.gitea.io/gitea/modules/setting"
)

// DefaultAvatarPixelSize is the default size in pixels of a rendered avatar
const DefaultAvatarPixelSize = 28
const (
// DefaultAvatarClass is the default class of a rendered avatar
DefaultAvatarClass = "ui avatar vm"
// DefaultAvatarPixelSize is the default size in pixels of a rendered avatar
DefaultAvatarPixelSize = 28
)

// EmailHash represents a pre-generated hash map (mainly used by LibravatarURL, it queries email server's DNS records)
type EmailHash struct {
Expand Down
6 changes: 3 additions & 3 deletions modules/templates/helper.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -607,7 +607,7 @@ func AvatarHTML(src string, size int, class, name string) template.HTML {

// Avatar renders user avatars. args: user, size (int), class (string)
func Avatar(item interface{}, others ...interface{}) template.HTML {
size, class := gitea_html.ParseSizeAndClass(avatars.DefaultAvatarPixelSize, "ui avatar vm", others...)
size, class := gitea_html.ParseSizeAndClass(avatars.DefaultAvatarPixelSize, avatars.DefaultAvatarClass, others...)

switch t := item.(type) {
case *user_model.User:
Expand Down Expand Up @@ -638,7 +638,7 @@ func AvatarByAction(action *activities_model.Action, others ...interface{}) temp

// RepoAvatar renders repo avatars. args: repo, size(int), class (string)
func RepoAvatar(repo *repo_model.Repository, others ...interface{}) template.HTML {
size, class := gitea_html.ParseSizeAndClass(avatars.DefaultAvatarPixelSize, "ui avatar", others...)
size, class := gitea_html.ParseSizeAndClass(avatars.DefaultAvatarPixelSize, avatars.DefaultAvatarClass, others...)

src := repo.RelAvatarLink()
if src != "" {
Expand All @@ -649,7 +649,7 @@ func RepoAvatar(repo *repo_model.Repository, others ...interface{}) template.HTM

// AvatarByEmail renders avatars by email address. args: email, name, size (int), class (string)
func AvatarByEmail(email, name string, others ...interface{}) template.HTML {
size, class := gitea_html.ParseSizeAndClass(avatars.DefaultAvatarPixelSize, "ui avatar", others...)
size, class := gitea_html.ParseSizeAndClass(avatars.DefaultAvatarPixelSize, avatars.DefaultAvatarClass, others...)
src := avatars.GenerateEmailAvatarFastLink(email, size*setting.Avatar.RenderedSizeFactor)

if src != "" {
Expand Down