From 0e66b0105e69f93dfc67bd2e8de23f6d08b69fdb Mon Sep 17 00:00:00 2001 From: iamyaash Date: Thu, 19 Jun 2025 22:33:05 +0530 Subject: [PATCH] fixes: removed tooltip, renamed css selector for new ui and fixed the repo commit page's commit count - annoying tooltip in mobile view - renamed copy_hash to copy and updated the functioning $commitLink - renamed commit-ui-redesign to commit-timeline in web_src/css/repo.css - added condition to show total commit count in repective pages; 2 rows of commit count was displayed instead of 1, so I added an if condition to fix the issue --- templates/repo/commits_table.tmpl | 45 +++++++++++++------------- templates/repo/pulls/commits_list.tmpl | 9 ++---- web_src/css/repo.css | 16 ++++----- 3 files changed, 34 insertions(+), 36 deletions(-) diff --git a/templates/repo/commits_table.tmpl b/templates/repo/commits_table.tmpl index aa833a4a8f..64079ab787 100644 --- a/templates/repo/commits_table.tmpl +++ b/templates/repo/commits_table.tmpl @@ -1,27 +1,28 @@ -

-
- {{if or .PageIsCommits (gt .CommitCount 0)}} - {{ctx.Locale.TrN .CommitCount "repo.n_commit_one" "repo.n_commit_few" (ctx.Locale.PrettyNumber .CommitCount)}} - {{else if .IsNothingToCompare}} - {{ctx.Locale.Tr "repo.commits.nothing_to_compare"}} - {{else}} - {{ctx.Locale.Tr "repo.commits.no_commits" $.BaseBranch $.HeadBranch}} - {{end}} -
- {{if .IsDiffCompare}} -
- - {{if not .BaseIsCommit}}{{if .BaseIsBranch}}{{svg "octicon-git-branch"}}{{else if .BaseIsTag}}{{svg "octicon-tag"}}{{end}}{{.BaseBranch}}{{else}}{{ShortSha .BaseBranch}}{{end}} - - ... - - {{if not .HeadIsCommit}}{{if .HeadIsBranch}}{{svg "octicon-git-branch"}}{{else if .HeadIsTag}}{{svg "octicon-tag"}}{{end}}{{.HeadBranch}}{{else}}{{ShortSha .HeadBranch}}{{end}} - +{{if.PageIsPullCommits}} +

+
+ {{if or .PageIsCommits (gt .CommitCount 0)}} + {{ctx.Locale.TrN .CommitCount "repo.n_commit_one" "repo.n_commit_few" (StringUtils.ToString .CommitCount)}} + {{else if .IsNothingToCompare}} + {{ctx.Locale.Tr "repo.commits.nothing_to_compare"}} + {{else}} + {{ctx.Locale.Tr "repo.commits.no_commits" $.BaseBranch $.HeadBranch}} + {{end}}
- {{end}} -

+ {{if .IsDiffCompare}} +
+ + {{if not .BaseIsCommit}}{{if .BaseIsBranch}}{{svg "octicon-git-branch"}}{{else if .BaseIsTag}}{{svg "octicon-tag"}}{{end}}{{.BaseBranch}}{{else}}{{ShortSha .BaseBranch}}{{end}} + + ... + + {{if not .HeadIsCommit}}{{if .HeadIsBranch}}{{svg "octicon-git-branch"}}{{else if .HeadIsTag}}{{svg "octicon-tag"}}{{end}}{{.HeadBranch}}{{else}}{{ShortSha .HeadBranch}}{{end}} + +
+ {{end}} +

-{{if .PageIsCommits}} +{{else if .PageIsCommits}}

{{if or .PageIsCommits (gt .CommitCount 0)}} diff --git a/templates/repo/pulls/commits_list.tmpl b/templates/repo/pulls/commits_list.tmpl index bcbd7daa63..38b4ac99a3 100644 --- a/templates/repo/pulls/commits_list.tmpl +++ b/templates/repo/pulls/commits_list.tmpl @@ -15,7 +15,7 @@
{{end}} -
+
{{$userName := .Author.Name}} @@ -32,7 +32,7 @@
- {{$commitLink:= printf "%s/pulls/%d/commits/%s" $commitRepoLink (PathEscape .ID.String)}} + {{$commitLink := (printf "%s/pulls/%d/commits/%s" $commitRepoLink $.Issue.Index (PathEscape .ID.String))}}
{{RenderCommitMessageLinkSubject $.Context .Message $commitLink ($.Repository.ComposeMetas ctx)}} {{if IsMultilineCommitMessage .Message}} @@ -73,14 +73,11 @@
-
+
{{svg "octicon-kebab-horizontal"}}
{{svg "octicon-copy"}} {{ctx.Locale.Tr "copy_hash"}} - - {{ShortSha .ID.String}} - {{if not $.PageIsWiki}} {{if $.FileName}} diff --git a/web_src/css/repo.css b/web_src/css/repo.css index f178fab75a..8df5768c0a 100644 --- a/web_src/css/repo.css +++ b/web_src/css/repo.css @@ -2769,7 +2769,7 @@ tbody.commit-list { /* Layout for templates/repo/pulls/commits_list.tmpl */ /* Redesigned commit layout using responsive grid configuration */ -.commit-ui-redesign { +.commit-timeline { display: grid; background: var(--color-box-body); padding: 0.5rem; @@ -2781,16 +2781,16 @@ tbody.commit-list { } @media (max-width: 640px) { - .commit-ui-redesign { + .commit-timeline { grid-template-columns: 1fr 1fr; } /* manual div allocation in grid cols, since it uses a new layout for mobile */ - .commit-ui-redesign .author { + .commit-timeline .author { grid-row: 1; grid-column: 1; } - .commit-ui-redesign .mobile-btn { + .commit-timeline .mobile-btn { grid-row: 1; grid-column: 2; justify-self: end; @@ -2798,21 +2798,21 @@ tbody.commit-list { display: flex; } - .commit-ui-redesign .btn { display: none;} /* manually hiding it, but we need to write this in a better way, */ + .commit-timeline .btn { display: none;} /* manually hiding it, but we need to write this in a better way, */ - .commit-ui-redesign .message { + .commit-timeline .message { grid-row: 2; grid-column: 1 / span 2; padding-inline: 0.5rem; } - .commit-ui-redesign .ui.sha.label { + .commit-timeline .ui.sha.label { grid-row: 3; grid-column: 1; } - .commit-ui-redesign .timeline { + .commit-timeline .timeline { grid-row: 3; grid-column: 2; }