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 --- templates/repo/graph/commits.tmpl | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'templates/repo/graph') diff --git a/templates/repo/graph/commits.tmpl b/templates/repo/graph/commits.tmpl index fc4b1a1ea3..485227e9bf 100644 --- a/templates/repo/graph/commits.tmpl +++ b/templates/repo/graph/commits.tmpl @@ -28,37 +28,37 @@ {{- end -}} - + {{RenderCommitMessage $.Context $commit.Subject $.RepoLink $.Repository.ComposeMetas}} - + {{range $commit.Refs}} {{$refGroup := .RefGroup}} {{if eq $refGroup "pull"}} {{if or (not $.HidePRRefs) (containGeneric $.SelectedBranches .Name)}} - - {{svg "octicon-git-pull-request" 16 "mr-2"}}#{{.ShortName}} + + {{svg "octicon-git-pull-request" 16 "gt-mr-2"}}#{{.ShortName}} {{end}} {{else if eq $refGroup "tags"}} - - {{svg "octicon-tag" 16 "mr-2"}}{{.ShortName}} + + {{svg "octicon-tag" 16 "gt-mr-2"}}{{.ShortName}} {{else if eq $refGroup "remotes"}} - - {{svg "octicon-cross-reference" 16 "mr-2"}}{{.ShortName}} + + {{svg "octicon-cross-reference" 16 "gt-mr-2"}}{{.ShortName}} {{else if eq $refGroup "heads"}} - - {{svg "octicon-git-branch" 16 "mr-2"}}{{.ShortName}} + + {{svg "octicon-git-branch" 16 "gt-mr-2"}}{{.ShortName}} {{else}} {{end}} {{end}} - + {{$userName := $commit.Commit.Author.Name}} {{if $commit.User}} {{if $commit.User.FullName}} @@ -71,7 +71,7 @@ {{$userName}} {{end}} - {{$commit.Date}} + {{$commit.Date}} {{end}} {{end}} -- cgit v1.2.3