From 51383ec0841ec2562e5c4a9dadd4fef82974dd5c Mon Sep 17 00:00:00 2001 From: zeripath Date: Mon, 13 Feb 2023 17:59:59 +0000 Subject: Move helpers to be prefixed with `gt-` (#22879) As discussed in #22847 the helpers in helpers.less need to have a separate prefix as they are causing conflicts with fomantic styles This will allow us to have the `.gt-hidden { display:none !important; }` style that is needed to for the reverted PR. Of note in doing this I have noticed that there was already a conflict with at least one chroma style which this PR now avoids. I've also added in the `gt-hidden` style that matches the tailwind one and switched the code that needed it to use that. Signed-off-by: Andrew Thornton --------- Signed-off-by: Andrew Thornton Co-authored-by: wxiaoguang --- routers/web/repo/blame.go | 4 ++-- routers/web/repo/issue_content_history.go | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'routers') diff --git a/routers/web/repo/blame.go b/routers/web/repo/blame.go index def7cfcadb..2380a95e34 100644 --- a/routers/web/repo/blame.go +++ b/routers/web/repo/blame.go @@ -262,9 +262,9 @@ func renderBlame(ctx *context.Context, blameParts []git.BlamePart, commitNames m var avatar string if commit.User != nil { - avatar = string(templates.Avatar(commit.User, 18, "mr-3")) + avatar = string(templates.Avatar(commit.User, 18, "gt-mr-3")) } else { - avatar = string(templates.AvatarByEmail(commit.Author.Email, commit.Author.Name, 18, "mr-3")) + avatar = string(templates.AvatarByEmail(commit.Author.Email, commit.Author.Name, 18, "gt-mr-3")) } br.Avatar = gotemplate.HTML(avatar) diff --git a/routers/web/repo/issue_content_history.go b/routers/web/repo/issue_content_history.go index 3e6b31f8f7..7e5295e757 100644 --- a/routers/web/repo/issue_content_history.go +++ b/routers/web/repo/issue_content_history.go @@ -71,7 +71,7 @@ func GetContentHistoryList(ctx *context.Context) { } src := html.EscapeString(item.UserAvatarLink) - class := avatars.DefaultAvatarClass + " mr-3" + class := avatars.DefaultAvatarClass + " gt-mr-3" name := html.EscapeString(username) avatarHTML := string(templates.AvatarHTML(src, 28, class, username)) timeSinceText := string(timeutil.TimeSinceUnix(item.EditedUnix, ctx.Locale)) -- cgit v1.2.3