From 3ea7437fa61a012ac34e0696196d3dd9f4839106 Mon Sep 17 00:00:00 2001 From: silverwind Date: Fri, 22 Mar 2024 20:51:29 +0100 Subject: [PATCH] Fix incorrect tailwind migration (#30007) Fixes https://github.com/go-gitea/gitea/issues/30005. Regression from https://github.com/go-gitea/gitea/pull/29945. There was only once instance of `tw-content-center` before that PR, so I just ran below command and reverted that one instance. ```sh perl -p -i -e 's#tw-content-center#tw-items-center#g' web_src/js/**/* templates/**/* models/**/* tests/**/* ``` (cherry picked from commit 04f9ad056882fc3f21b247b16f84437adf0f36d8) Conflicts: templates/repo/diff/conversation.tmpl templates/repo/header.tmpl templates/repo/issue/filter_list.tmpl templates/repo/issue/view_content/conversation.tmpl templates/repo/wiki/view.tmpl web_src/js/components/DashboardRepoList.vue re-ran the command after discarding the Gitea changes to ensure all Forgejo files are also covered --- templates/admin/emails/list.tmpl | 2 +- templates/admin/org/list.tmpl | 2 +- templates/admin/repo/unadopted.tmpl | 2 +- templates/admin/stacktrace-row.tmpl | 4 +-- templates/admin/stacktrace.tmpl | 2 +- templates/base/head_navbar.tmpl | 8 ++--- templates/base/paginate.tmpl | 2 +- templates/explore/search.tmpl | 2 +- templates/explore/user_list.tmpl | 2 +- templates/org/header.tmpl | 2 +- templates/org/home.tmpl | 4 +-- templates/org/member/members.tmpl | 2 +- templates/org/settings/labels.tmpl | 2 +- templates/org/team/members.tmpl | 4 +-- templates/org/team/repositories.tmpl | 2 +- templates/projects/view.tmpl | 2 +- templates/repo/actions/list.tmpl | 2 +- templates/repo/actions/runs_list.tmpl | 2 +- templates/repo/actions/status.tmpl | 2 +- templates/repo/blame.tmpl | 6 ++-- templates/repo/branch/list.tmpl | 8 ++--- templates/repo/branch_dropdown.tmpl | 2 +- .../code/recently_pushed_new_branches.tmpl | 2 +- templates/repo/commit_page.tmpl | 12 +++---- templates/repo/commits.tmpl | 2 +- templates/repo/commits_list_small.tmpl | 2 +- templates/repo/commits_table.tmpl | 4 +-- templates/repo/diff/box.tmpl | 16 ++++----- templates/repo/diff/comments.tmpl | 6 ++-- templates/repo/diff/conversation.tmpl | 12 +++---- templates/repo/diff/new_review.tmpl | 2 +- templates/repo/find/files.tmpl | 2 +- templates/repo/forks.tmpl | 2 +- templates/repo/graph/commits.tmpl | 6 ++-- templates/repo/header.tmpl | 2 +- templates/repo/home.tmpl | 6 ++-- templates/repo/issue/card.tmpl | 2 +- templates/repo/issue/filter_list.tmpl | 2 +- templates/repo/issue/milestone_issues.tmpl | 2 +- templates/repo/issue/milestones.tmpl | 2 +- templates/repo/issue/view_content.tmpl | 6 ++-- .../repo/issue/view_content/attachments.tmpl | 2 +- .../repo/issue/view_content/comments.tmpl | 14 ++++---- .../repo/issue/view_content/conversation.tmpl | 14 ++++---- .../repo/issue/view_content/sidebar.tmpl | 36 +++++++++---------- templates/repo/migrate/migrate.tmpl | 2 +- templates/repo/projects/view.tmpl | 2 +- templates/repo/pulls/tab_menu.tmpl | 2 +- templates/repo/release/list.tmpl | 2 +- templates/repo/release_tag_header.tmpl | 2 +- templates/repo/settings/branches.tmpl | 2 +- templates/repo/settings/collaboration.tmpl | 2 +- templates/repo/settings/options.tmpl | 2 +- templates/repo/tag/list.tmpl | 8 ++--- templates/repo/view_file.tmpl | 6 ++-- templates/repo/wiki/pages.tmpl | 2 +- templates/repo/wiki/view.tmpl | 2 +- templates/shared/repo_search.tmpl | 2 +- templates/shared/searchbottom.tmpl | 4 +-- templates/shared/secrets/add_list.tmpl | 2 +- templates/shared/user/org_profile_avatar.tmpl | 2 +- templates/shared/variables/variable_list.tmpl | 2 +- templates/user/auth/signin_inner.tmpl | 4 +-- templates/user/auth/signup_inner.tmpl | 4 +-- templates/user/auth/webauthn.tmpl | 2 +- templates/user/dashboard/milestones.tmpl | 2 +- .../user/notification/notification_div.tmpl | 10 +++--- .../settings/applications_oauth2_list.tmpl | 2 +- templates/user/settings/security/openid.tmpl | 2 +- templates/webhook/new.tmpl | 2 +- tests/integration/release_test.go | 2 +- web_src/js/components/ActionRunStatus.vue | 2 +- web_src/js/components/DashboardRepoList.vue | 12 +++---- web_src/js/components/DiffFileList.vue | 4 +-- .../js/components/RepoBranchTagSelector.vue | 2 +- web_src/js/components/RepoCodeFrequency.vue | 2 +- web_src/js/components/RepoContributors.vue | 2 +- web_src/js/components/RepoRecentCommits.vue | 2 +- web_src/js/features/repo-issue-content.js | 2 +- 79 files changed, 163 insertions(+), 163 deletions(-) diff --git a/templates/admin/emails/list.tmpl b/templates/admin/emails/list.tmpl index 0b5249fbd9..b72aef8f35 100644 --- a/templates/admin/emails/list.tmpl +++ b/templates/admin/emails/list.tmpl @@ -4,7 +4,7 @@ {{ctx.Locale.Tr "admin.emails.email_manage_panel"}} ({{ctx.Locale.Tr "admin.total" .Total}})
-
+
{{template "shared/search/combo" dict "Value" .Keyword}}
diff --git a/templates/admin/org/list.tmpl b/templates/admin/org/list.tmpl index abd43d297e..ca0ee30092 100644 --- a/templates/admin/org/list.tmpl +++ b/templates/admin/org/list.tmpl @@ -7,7 +7,7 @@
-
+
{{template "shared/search/combo" dict "Value" .Keyword "Placeholder" (ctx.Locale.Tr "search.org_kind")}}
diff --git a/templates/admin/repo/unadopted.tmpl b/templates/admin/repo/unadopted.tmpl index eb8188de14..9166a844a7 100644 --- a/templates/admin/repo/unadopted.tmpl +++ b/templates/admin/repo/unadopted.tmpl @@ -20,7 +20,7 @@ {{if .Dirs}}
{{range $dirI, $dir := .Dirs}} -
+
{{svg "octicon-file-directory-fill"}} {{$dir}}
diff --git a/templates/admin/stacktrace-row.tmpl b/templates/admin/stacktrace-row.tmpl index fdce81eda7..3f639ba161 100644 --- a/templates/admin/stacktrace-row.tmpl +++ b/templates/admin/stacktrace-row.tmpl @@ -1,5 +1,5 @@
-
+
{{if eq .Process.Type "request"}} {{svg "octicon-globe" 16}} @@ -40,7 +40,7 @@
{{range .Entry}} -
+
{{svg "octicon-dot-fill" 16}}
{{.Function}}
diff --git a/templates/admin/stacktrace.tmpl b/templates/admin/stacktrace.tmpl index 3c13c1e9dd..e324570c96 100644 --- a/templates/admin/stacktrace.tmpl +++ b/templates/admin/stacktrace.tmpl @@ -1,7 +1,7 @@ {{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin monitor")}}
-
+
{{ctx.Locale.Tr "admin.monitor.process"}} diff --git a/templates/base/head_navbar.tmpl b/templates/base/head_navbar.tmpl index 03ece45fe2..ad80d3367c 100644 --- a/templates/base/head_navbar.tmpl +++ b/templates/base/head_navbar.tmpl @@ -56,7 +56,7 @@
{{if and .IsSigned .MustChangePassword}}
- + {{ctx.AvatarUtils.Avatar .SignedUser 24 "gt-mr-2"}} {{.SignedUser.Name}} {{svg "octicon-triangle-down"}} @@ -83,8 +83,8 @@ {{ctx.Locale.Tr "active_stopwatch"}}
-
- +
+ {{svg "octicon-issue-opened" 16 "gt-mr-3"}} {{.ActiveStopwatch.RepoSlug}}#{{.ActiveStopwatch.IssueIndex}} @@ -142,7 +142,7 @@
- + {{ctx.AvatarUtils.Avatar .SignedUser 24 "gt-mr-2"}} {{.SignedUser.Name}} {{svg "octicon-triangle-down"}} diff --git a/templates/base/paginate.tmpl b/templates/base/paginate.tmpl index 8c2adc1f94..4455c20b3f 100644 --- a/templates/base/paginate.tmpl +++ b/templates/base/paginate.tmpl @@ -17,7 +17,7 @@ {{if eq .Num -1}} ... {{else}} - {{.Num}} + {{.Num}} {{end}} {{end}} diff --git a/templates/explore/search.tmpl b/templates/explore/search.tmpl index 505fc64548..c12ff325f9 100644 --- a/templates/explore/search.tmpl +++ b/templates/explore/search.tmpl @@ -1,4 +1,4 @@ -
+
{{if .PageIsExploreUsers}} {{template "shared/search/combo" dict "Value" .Keyword "Placeholder" (ctx.Locale.Tr "search.user_kind")}} diff --git a/templates/explore/user_list.tmpl b/templates/explore/user_list.tmpl index e49ca1d069..f2cf939ffb 100644 --- a/templates/explore/user_list.tmpl +++ b/templates/explore/user_list.tmpl @@ -1,6 +1,6 @@
{{range .Users}} -
+
{{ctx.AvatarUtils.Avatar . 48}}
diff --git a/templates/org/header.tmpl b/templates/org/header.tmpl index c8a0ad3ab0..204ba7e3c1 100644 --- a/templates/org/header.tmpl +++ b/templates/org/header.tmpl @@ -7,7 +7,7 @@ {{if .Org.Visibility.IsLimited}}{{ctx.Locale.Tr "org.settings.visibility.limited_shortname"}}{{end}} {{if .Org.Visibility.IsPrivate}}{{ctx.Locale.Tr "org.settings.visibility.private_shortname"}}{{end}} - + {{if .EnableFeed}} {{svg "octicon-rss" 24}} diff --git a/templates/org/home.tmpl b/templates/org/home.tmpl index 0ea0a280fd..920a42a5da 100644 --- a/templates/org/home.tmpl +++ b/templates/org/home.tmpl @@ -32,7 +32,7 @@ {{if .NumMembers}}

{{ctx.Locale.Tr "org.members"}} - {{.NumMembers}} {{svg "octicon-chevron-right"}} + {{.NumMembers}} {{svg "octicon-chevron-right"}}

{{$isMember := .IsOrganizationMember}} @@ -46,7 +46,7 @@ {{if .IsOrganizationMember}}
{{ctx.Locale.Tr "org.teams"}} - {{.Org.NumTeams}} {{svg "octicon-chevron-right"}} + {{.Org.NumTeams}} {{svg "octicon-chevron-right"}}
{{range .Teams}} diff --git a/templates/org/member/members.tmpl b/templates/org/member/members.tmpl index cb9e60da29..4388dc9520 100644 --- a/templates/org/member/members.tmpl +++ b/templates/org/member/members.tmpl @@ -7,7 +7,7 @@
{{range .Members}} {{$isPublic := index $.MembersIsPublicMember .ID}} -
+
{{ctx.AvatarUtils.Avatar . 48}}
diff --git a/templates/org/settings/labels.tmpl b/templates/org/settings/labels.tmpl index 19a7d5355e..25a562c975 100644 --- a/templates/org/settings/labels.tmpl +++ b/templates/org/settings/labels.tmpl @@ -1,6 +1,6 @@ {{template "org/settings/layout_head" (dict "ctxData" . "pageClass" "organization settings labels")}}
-
+
{{ctx.Locale.Tr "org.settings.labels_desc"}}
diff --git a/templates/org/team/members.tmpl b/templates/org/team/members.tmpl index d86aeb7ce4..65430cbda3 100644 --- a/templates/org/team/members.tmpl +++ b/templates/org/team/members.tmpl @@ -24,7 +24,7 @@
{{range .Team.Members}} -
+
{{ctx.AvatarUtils.Avatar . 32}}
@@ -56,7 +56,7 @@
{{range .Invites}} -
+
{{.Email}}
diff --git a/templates/org/team/repositories.tmpl b/templates/org/team/repositories.tmpl index 9efe8f9f09..0c59eafbe1 100644 --- a/templates/org/team/repositories.tmpl +++ b/templates/org/team/repositories.tmpl @@ -28,7 +28,7 @@
{{range .Team.Repos}} -
+
{{template "repo/icon" .}}
diff --git a/templates/projects/view.tmpl b/templates/projects/view.tmpl index d36ecdfc85..93c2cdbb57 100644 --- a/templates/projects/view.tmpl +++ b/templates/projects/view.tmpl @@ -1,7 +1,7 @@ {{$canWriteProject := and .CanWriteProjects (or (not .Repository) (not .Repository.IsArchived))}}
-
+

{{.Project.Title}}

{{if $canWriteProject}}
diff --git a/templates/repo/actions/list.tmpl b/templates/repo/actions/list.tmpl index f4215829ba..916949d4f9 100644 --- a/templates/repo/actions/list.tmpl +++ b/templates/repo/actions/list.tmpl @@ -25,7 +25,7 @@
-
+
{{ctx.Locale.Tr "actions.runs.actor"}} diff --git a/templates/repo/actions/runs_list.tmpl b/templates/repo/actions/runs_list.tmpl index b898837a26..d393df6539 100644 --- a/templates/repo/actions/runs_list.tmpl +++ b/templates/repo/actions/runs_list.tmpl @@ -6,7 +6,7 @@
{{end}} {{range .Runs}} -
+
{{template "repo/actions/status" (dict "status" .Status.String)}}
diff --git a/templates/repo/actions/status.tmpl b/templates/repo/actions/status.tmpl index e42eafe8f6..a0e02cf8d7 100644 --- a/templates/repo/actions/status.tmpl +++ b/templates/repo/actions/status.tmpl @@ -12,7 +12,7 @@ {{- $className = .className -}} {{- end -}} - + {{if eq .status "success"}} {{svg "octicon-check-circle-fill" $size (printf "text green %s" $className)}} {{else if eq .status "skipped"}} diff --git a/templates/repo/blame.tmpl b/templates/repo/blame.tmpl index 4d4f2069ee..67046b814c 100644 --- a/templates/repo/blame.tmpl +++ b/templates/repo/blame.tmpl @@ -11,11 +11,11 @@ {{end}} {{end}}
-

-
+

+
{{template "repo/file_info" .}}
-
+
{{ctx.Locale.Tr "repo.file_raw"}} {{if not .IsViewCommit}} diff --git a/templates/repo/branch/list.tmpl b/templates/repo/branch/list.tmpl index 21121c4f09..7e061696e4 100644 --- a/templates/repo/branch/list.tmpl +++ b/templates/repo/branch/list.tmpl @@ -25,7 +25,7 @@ {{template "repo/commit_statuses" dict "Status" (index $.CommitStatus .DefaultBranchBranch.DBBranch.CommitID) "Statuses" (index $.CommitStatuses .DefaultBranchBranch.DBBranch.CommitID)}}
-

{{svg "octicon-git-commit" 16 "gt-mr-2"}}{{ShortSha .DefaultBranchBranch.DBBranch.CommitID}} · {{RenderCommitMessage $.Context .DefaultBranchBranch.DBBranch.CommitMessage (.Repository.ComposeMetas ctx)}} · {{ctx.Locale.Tr "org.repo_updated"}} {{TimeSince .DefaultBranchBranch.DBBranch.CommitTime.AsTime ctx.Locale}}{{if .DefaultBranchBranch.DBBranch.Pusher}}  {{template "shared/user/avatarlink" dict "user" .DefaultBranchBranch.DBBranch.Pusher}}{{template "shared/user/namelink" .DefaultBranchBranch.DBBranch.Pusher}}{{end}}

+

{{svg "octicon-git-commit" 16 "gt-mr-2"}}{{ShortSha .DefaultBranchBranch.DBBranch.CommitID}} · {{RenderCommitMessage $.Context .DefaultBranchBranch.DBBranch.CommitMessage (.Repository.ComposeMetas ctx)}} · {{ctx.Locale.Tr "org.repo_updated"}} {{TimeSince .DefaultBranchBranch.DBBranch.CommitTime.AsTime ctx.Locale}}{{if .DefaultBranchBranch.DBBranch.Pusher}}  {{template "shared/user/avatarlink" dict "user" .DefaultBranchBranch.DBBranch.Pusher}}{{template "shared/user/namelink" .DefaultBranchBranch.DBBranch.Pusher}}{{end}}

{{if and $.IsWriter (not $.Repository.IsArchived) (not .IsDeleted)}} @@ -67,8 +67,8 @@
{{end}} -

-
+

+
{{ctx.Locale.Tr "repo.branches"}}

@@ -98,7 +98,7 @@ {{template "repo/commit_statuses" dict "Status" (index $.CommitStatus .DBBranch.CommitID) "Statuses" (index $.CommitStatuses .DBBranch.CommitID)}}
-

{{svg "octicon-git-commit" 16 "gt-mr-2"}}{{ShortSha .DBBranch.CommitID}} · {{RenderCommitMessage $.Context .DBBranch.CommitMessage ($.Repository.ComposeMetas ctx)}} · {{ctx.Locale.Tr "org.repo_updated"}} {{TimeSince .DBBranch.CommitTime.AsTime ctx.Locale}}{{if .DBBranch.Pusher}}  {{template "shared/user/avatarlink" dict "user" .DBBranch.Pusher}}  {{template "shared/user/namelink" .DBBranch.Pusher}}{{end}}

+

{{svg "octicon-git-commit" 16 "gt-mr-2"}}{{ShortSha .DBBranch.CommitID}} · {{RenderCommitMessage $.Context .DBBranch.CommitMessage ($.Repository.ComposeMetas ctx)}} · {{ctx.Locale.Tr "org.repo_updated"}} {{TimeSince .DBBranch.CommitTime.AsTime ctx.Locale}}{{if .DBBranch.Pusher}}  {{template "shared/user/avatarlink" dict "user" .DBBranch.Pusher}}  {{template "shared/user/namelink" .DBBranch.Pusher}}{{end}}

{{end}} diff --git a/templates/repo/branch_dropdown.tmpl b/templates/repo/branch_dropdown.tmpl index 19da1b6474..e389a3c758 100644 --- a/templates/repo/branch_dropdown.tmpl +++ b/templates/repo/branch_dropdown.tmpl @@ -71,7 +71,7 @@ {{/* show dummy elements before Vue componment is mounted, this code must match the code in BranchTagSelector.vue */}}
-
+
{{if $file.IsBin}} {{ctx.Locale.Tr "repo.diff.bin"}} @@ -144,7 +144,7 @@ {{ctx.Locale.Tr ($file.ModeTranslationKey $file.Mode)}} {{end}}
-
+
{{if $showFileViewToggle}}
@@ -221,7 +221,7 @@ {{if .Diff.IsIncomplete}}
-

+

{{ctx.Locale.Tr "repo.diff.too_many_files"}} {{ctx.Locale.Tr "repo.diff.show_more"}}

diff --git a/templates/repo/diff/comments.tmpl b/templates/repo/diff/comments.tmpl index 6747328bb7..b561f094c5 100644 --- a/templates/repo/diff/comments.tmpl +++ b/templates/repo/diff/comments.tmpl @@ -8,8 +8,8 @@ {{template "shared/user/avatarlink" dict "user" .Poster}} {{end}}
-
-
+
+
{{if .OriginalAuthor}} {{svg (MigrationIcon $.root.Repository.GetOriginalURLHostname)}} @@ -30,7 +30,7 @@ {{end}}
-
+
{{if .Invalidated}} {{$referenceUrl := printf "%s#%s" $.root.Issue.Link .HashTag}} diff --git a/templates/repo/diff/conversation.tmpl b/templates/repo/diff/conversation.tmpl index e2e87646aa..a453c6bd09 100644 --- a/templates/repo/diff/conversation.tmpl +++ b/templates/repo/diff/conversation.tmpl @@ -5,8 +5,8 @@ {{$referenceUrl := printf "%s#%s" $.Issue.Link (index .comments 0).HashTag}}
{{if $resolved}} -
-
+
+
{{svg "octicon-check" 16 "icon gt-mr-2"}} {{$resolveDoer.Name}} {{ctx.Locale.Tr "repo.issues.review.resolved_by"}} {{if $invalid}} @@ -19,12 +19,12 @@ {{end}}
-
- - @@ -37,7 +37,7 @@ {{template "repo/diff/comments" dict "root" $ "comments" .comments}}
-
+

{{range .Forks}} -
+
{{ctx.AvatarUtils.Avatar .Owner}} {{.Owner.Name}} / {{.Name}}
diff --git a/templates/repo/graph/commits.tmpl b/templates/repo/graph/commits.tmpl index fc7cf925ab..b22527c8ef 100644 --- a/templates/repo/graph/commits.tmpl +++ b/templates/repo/graph/commits.tmpl @@ -31,7 +31,7 @@ {{RenderCommitMessage $.Context $commit.Subject ($.Repository.ComposeMetas ctx)}} - + {{range $commit.Refs}} {{$refGroup := .RefGroup}} {{if eq $refGroup "pull"}} @@ -58,7 +58,7 @@ {{end}} {{end}} - + {{$userName := $commit.Commit.Author.Name}} {{if $commit.User}} {{if $commit.User.FullName}} @@ -71,7 +71,7 @@ {{$userName}} {{end}} - {{DateTime "full" $commit.Date}} + {{DateTime "full" $commit.Date}} {{end}} {{end}} diff --git a/templates/repo/header.tmpl b/templates/repo/header.tmpl index 128c794ddc..b6f5ed4996 100644 --- a/templates/repo/header.tmpl +++ b/templates/repo/header.tmpl @@ -2,7 +2,7 @@ {{with .Repository}}
-
+
{{template "repo/icon" .}}
diff --git a/templates/repo/home.tmpl b/templates/repo/home.tmpl index 05524e79a3..60be13b132 100644 --- a/templates/repo/home.tmpl +++ b/templates/repo/home.tmpl @@ -27,7 +27,7 @@
-
+
{{range .Topics}}{{.Name}}{{end}} {{if and .Permission.IsAdmin (not .Repository.IsArchived)}}{{end}}
@@ -69,7 +69,7 @@ {{end}} {{template "repo/sub_menu" .}}
-
+
{{template "repo/branch_dropdown" dict "root" . "ContainerClasses" "gt-mr-2"}} {{if and .CanCompareOrPull .IsViewBranch (not .Repository.IsArchived)}} {{$cmpBranch := ""}} @@ -129,7 +129,7 @@ {{end}}
-
+
{{if eq $n 0}}
diff --git a/templates/repo/issue/card.tmpl b/templates/repo/issue/card.tmpl index 3e1af71b21..3790e42b96 100644 --- a/templates/repo/issue/card.tmpl +++ b/templates/repo/issue/card.tmpl @@ -13,7 +13,7 @@
{{.Title | RenderEmoji ctx | RenderCodeBlock}} {{if and $.isPinnedIssueCard $.Page.IsRepoAdmin}} - + {{svg "octicon-x" 16}} {{end}} diff --git a/templates/repo/issue/filter_list.tmpl b/templates/repo/issue/filter_list.tmpl index 3cae8d8b19..cdb4b36bfd 100644 --- a/templates/repo/issue/filter_list.tmpl +++ b/templates/repo/issue/filter_list.tmpl @@ -32,7 +32,7 @@
{{end}} {{$previousExclusiveScope = $exclusiveScope}} - + {{if .IsExcluded}} {{svg "octicon-circle-slash"}} {{else if .IsSelected}} diff --git a/templates/repo/issue/milestone_issues.tmpl b/templates/repo/issue/milestone_issues.tmpl index e029bf6031..2028375c03 100644 --- a/templates/repo/issue/milestone_issues.tmpl +++ b/templates/repo/issue/milestone_issues.tmpl @@ -29,7 +29,7 @@
-

-
+
{{.Completeness}}%
diff --git a/templates/repo/issue/view_content.tmpl b/templates/repo/issue/view_content.tmpl index e7d25ed8a3..d885b47908 100644 --- a/templates/repo/issue/view_content.tmpl +++ b/templates/repo/issue/view_content.tmpl @@ -20,8 +20,8 @@ {{end}}
-
-
+
+
{{if .Issue.OriginalAuthor}} {{svg (MigrationIcon .Repository.GetOriginalURLHostname)}} @@ -43,7 +43,7 @@ {{end}}
-
+
{{template "repo/issue/view_content/show_role" dict "ShowRole" .Issue.ShowRole "IgnorePoster" true}} {{if not $.Repository.IsArchived}} {{template "repo/issue/view_content/add_reaction" dict "ctxData" $ "ActionURL" (printf "%s/issues/%d/reactions" $.RepoLink .Issue.Index)}} diff --git a/templates/repo/issue/view_content/attachments.tmpl b/templates/repo/issue/view_content/attachments.tmpl index 151131366f..0635a201be 100644 --- a/templates/repo/issue/view_content/attachments.tmpl +++ b/templates/repo/issue/view_content/attachments.tmpl @@ -18,7 +18,7 @@ {{.Name}}
-
+
{{.Size | FileSize}}
diff --git a/templates/repo/issue/view_content/comments.tmpl b/templates/repo/issue/view_content/comments.tmpl index b593eb8b4a..a6d0b801f0 100644 --- a/templates/repo/issue/view_content/comments.tmpl +++ b/templates/repo/issue/view_content/comments.tmpl @@ -25,8 +25,8 @@ {{end}}
-
-
+
+
{{if .OriginalAuthor}} {{svg (MigrationIcon $.Repository.GetOriginalURLHostname)}} @@ -50,7 +50,7 @@ {{end}}
-
+
{{template "repo/issue/view_content/show_role" dict "ShowRole" .ShowRole}} {{if not $.Repository.IsArchived}} {{template "repo/issue/view_content/add_reaction" dict "ctxData" $ "ActionURL" (printf "%s/comments/%d/reactions" $.RepoLink .ID)}} @@ -403,8 +403,8 @@ {{if or .Content .Attachments}}
-
-
+
+
{{if gt .Poster.ID 0}} {{ctx.AvatarUtils.Avatar .Poster 24}} @@ -425,7 +425,7 @@ {{ctx.Locale.Tr "repo.issues.review.left_comment"}}
-
+
{{template "repo/issue/view_content/show_role" dict "ShowRole" .ShowRole}} {{if not $.Repository.IsArchived}} {{template "repo/issue/view_content/add_reaction" dict "ctxData" $ "ActionURL" (printf "%s/comments/%d/reactions" $.RepoLink .ID)}} @@ -622,7 +622,7 @@ {{if .Content}}
-
+
{{if gt .Poster.ID 0}} {{ctx.AvatarUtils.Avatar .Poster 24}} diff --git a/templates/repo/issue/view_content/conversation.tmpl b/templates/repo/issue/view_content/conversation.tmpl index b302ee8c2d..f94aa290fd 100644 --- a/templates/repo/issue/view_content/conversation.tmpl +++ b/templates/repo/issue/view_content/conversation.tmpl @@ -3,8 +3,8 @@ {{$resolveDoer := (index .comments 0).ResolveDoer}} {{$isNotPending := (not (eq (index .comments 0).Review.Type 0))}}
-
-
+
+
{{(index .comments 0).TreePath}} {{if $invalid}} @@ -14,7 +14,7 @@
{{if or $invalid $resolved}} - -
diff --git a/templates/repo/migrate/migrate.tmpl b/templates/repo/migrate/migrate.tmpl index c0336b9b97..32465bc394 100644 --- a/templates/repo/migrate/migrate.tmpl +++ b/templates/repo/migrate/migrate.tmpl @@ -5,7 +5,7 @@ {{template "repo/migrate/helper" .}}
{{range .Services}} - + {{if eq .Name "github"}} {{svg "octicon-mark-github" 184 "gt-p-4"}} {{else if eq .Name "gitlab"}} diff --git a/templates/repo/projects/view.tmpl b/templates/repo/projects/view.tmpl index b227ce4439..eea1057a50 100644 --- a/templates/repo/projects/view.tmpl +++ b/templates/repo/projects/view.tmpl @@ -2,7 +2,7 @@
{{template "repo/header" .}}
-
+
{{template "repo/issue/navbar" .}} {{ctx.Locale.Tr "repo.issues.new"}}
diff --git a/templates/repo/pulls/tab_menu.tmpl b/templates/repo/pulls/tab_menu.tmpl index fb00acde32..2a653c7c69 100644 --- a/templates/repo/pulls/tab_menu.tmpl +++ b/templates/repo/pulls/tab_menu.tmpl @@ -15,7 +15,7 @@ {{ctx.Locale.Tr "repo.pulls.tab_files"}} {{if .NumFiles}}{{.NumFiles}}{{else}}-{{end}} - + {{if .Diff.TotalAddition}}+{{.Diff.TotalAddition}}{{end}} {{if .Diff.TotalDeletion}}-{{.Diff.TotalDeletion}}{{end}}
diff --git a/templates/repo/release/list.tmpl b/templates/repo/release/list.tmpl index 477b2ea8d7..8c64380d45 100644 --- a/templates/repo/release/list.tmpl +++ b/templates/repo/release/list.tmpl @@ -16,7 +16,7 @@ {{end}}
-
+

{{$release.Title}} {{template "repo/commit_statuses" dict "Status" $info.CommitStatus "Statuses" $info.CommitStatuses "AdditionalClasses" "tw-flex"}} diff --git a/templates/repo/release_tag_header.tmpl b/templates/repo/release_tag_header.tmpl index 1df1b5ba50..7a00cbe49c 100644 --- a/templates/repo/release_tag_header.tmpl +++ b/templates/repo/release_tag_header.tmpl @@ -3,7 +3,7 @@ {{if $canReadReleases}}
-
+

{{ctx.Locale.PrettyNumber .NumReleases}} {{ctx.Locale.TrN .NumReleases "repo.release" "repo.releases"}} {{if $canReadCode}} diff --git a/templates/repo/settings/branches.tmpl b/templates/repo/settings/branches.tmpl index 2610ae02fe..ee6bdfbf2f 100644 --- a/templates/repo/settings/branches.tmpl +++ b/templates/repo/settings/branches.tmpl @@ -41,7 +41,7 @@
{{range .ProtectedBranches}} -
+
{{.RuleName}}
diff --git a/templates/repo/settings/collaboration.tmpl b/templates/repo/settings/collaboration.tmpl index 8783de2544..2a4ec577e7 100644 --- a/templates/repo/settings/collaboration.tmpl +++ b/templates/repo/settings/collaboration.tmpl @@ -7,7 +7,7 @@
{{range .Collaborators}} -
+
{{ctx.AvatarUtils.Avatar . 32}}
diff --git a/templates/repo/settings/options.tmpl b/templates/repo/settings/options.tmpl index 4f505bdf02..a28d430f85 100644 --- a/templates/repo/settings/options.tmpl +++ b/templates/repo/settings/options.tmpl @@ -492,7 +492,7 @@
{{if not .Repository.IsMirror}} -
+
{{if .Repository.IsArchived}}
{{ctx.Locale.Tr "repo.settings.unarchive.header"}}
diff --git a/templates/repo/tag/list.tmpl b/templates/repo/tag/list.tmpl index 0348334623..06c02c5f75 100644 --- a/templates/repo/tag/list.tmpl +++ b/templates/repo/tag/list.tmpl @@ -5,7 +5,7 @@ {{template "base/alert" .}} {{template "repo/release_tag_header" .}}

-
+
{{svg "octicon-tag" 16 "gt-mr-2"}}{{ctx.Locale.Tr "repo.release.tags"}}

@@ -18,12 +18,12 @@

{{if $canReadReleases}} - {{.TagName}} + {{.TagName}} {{else}} - {{.TagName}} + {{.TagName}} {{end}}

-
+
{{if $.Permission.CanRead $.UnitTypeCode}} {{if .CreatedUnix}} {{svg "octicon-clock" 16 "gt-mr-2"}}{{TimeSinceUnix .CreatedUnix ctx.Locale}} diff --git a/templates/repo/view_file.tmpl b/templates/repo/view_file.tmpl index c99b193ef0..cbc3bdf675 100644 --- a/templates/repo/view_file.tmpl +++ b/templates/repo/view_file.tmpl @@ -25,8 +25,8 @@
{{end}} -

-
+

+
{{if .ReadmeInList}} {{svg "octicon-book" 16 "gt-mr-3"}} {{.FileName}} @@ -34,7 +34,7 @@ {{template "repo/file_info" .}} {{end}}
-
+
{{if .HasSourceRenderedToggle}}
{{svg "octicon-code" 15}} diff --git a/templates/repo/wiki/pages.tmpl b/templates/repo/wiki/pages.tmpl index 646c6a3d36..42c36a9f46 100644 --- a/templates/repo/wiki/pages.tmpl +++ b/templates/repo/wiki/pages.tmpl @@ -2,7 +2,7 @@
{{template "repo/header" .}}
-

+

{{ctx.Locale.Tr "repo.wiki.pages"}} {{if and .CanWriteWiki (not .Repository.IsMirror)}} diff --git a/templates/repo/wiki/view.tmpl b/templates/repo/wiki/view.tmpl index 7519a63461..ebd7f25130 100644 --- a/templates/repo/wiki/view.tmpl +++ b/templates/repo/wiki/view.tmpl @@ -4,7 +4,7 @@ {{$title := .title}}
-
+
diff --git a/templates/shared/repo_search.tmpl b/templates/shared/repo_search.tmpl index 25381b9ef8..d2fe2de143 100644 --- a/templates/shared/repo_search.tmpl +++ b/templates/shared/repo_search.tmpl @@ -1,5 +1,5 @@
-
+ {{if .Language}}{{end}} {{if .TopicOnly}}{{end}}
diff --git a/templates/shared/searchbottom.tmpl b/templates/shared/searchbottom.tmpl index b920e10bb2..43d6092e8d 100644 --- a/templates/shared/searchbottom.tmpl +++ b/templates/shared/searchbottom.tmpl @@ -1,5 +1,5 @@ -
-
+
+
{{if .result.Language}} {{.result.Language}} {{end}} diff --git a/templates/shared/secrets/add_list.tmpl b/templates/shared/secrets/add_list.tmpl index ea36d0cec2..c943a1944d 100644 --- a/templates/shared/secrets/add_list.tmpl +++ b/templates/shared/secrets/add_list.tmpl @@ -14,7 +14,7 @@ {{if .Secrets}}
{{range .Secrets}} -
+
{{svg "octicon-key" 32}}
diff --git a/templates/shared/user/org_profile_avatar.tmpl b/templates/shared/user/org_profile_avatar.tmpl index 07e7b8aed5..2ff1e40ca8 100644 --- a/templates/shared/user/org_profile_avatar.tmpl +++ b/templates/shared/user/org_profile_avatar.tmpl @@ -2,7 +2,7 @@
-
+
{{ctx.AvatarUtils.Avatar . 100}} {{.DisplayName}} diff --git a/templates/shared/variables/variable_list.tmpl b/templates/shared/variables/variable_list.tmpl index dc8c7d7a80..fc2ac98e29 100644 --- a/templates/shared/variables/variable_list.tmpl +++ b/templates/shared/variables/variable_list.tmpl @@ -16,7 +16,7 @@ {{if .Variables}}
{{range .Variables}} -
+
{{svg "octicon-pencil" 32}}
diff --git a/templates/user/auth/signin_inner.tmpl b/templates/user/auth/signin_inner.tmpl index f8eb81423c..1950f750ce 100644 --- a/templates/user/auth/signin_inner.tmpl +++ b/templates/user/auth/signin_inner.tmpl @@ -55,9 +55,9 @@
-
+
{{range $provider := .OAuth2Providers}} - diff --git a/templates/user/auth/signup_inner.tmpl b/templates/user/auth/signup_inner.tmpl index a911537996..b96e9bfb02 100644 --- a/templates/user/auth/signup_inner.tmpl +++ b/templates/user/auth/signup_inner.tmpl @@ -60,9 +60,9 @@
-
+
{{range $provider := .OAuth2Providers}} - diff --git a/templates/user/auth/webauthn.tmpl b/templates/user/auth/webauthn.tmpl index 375ebba9ae..7c543cb16d 100644 --- a/templates/user/auth/webauthn.tmpl +++ b/templates/user/auth/webauthn.tmpl @@ -10,7 +10,7 @@ {{template "base/alert" .}}

{{ctx.Locale.Tr "webauthn_sign_in"}}

-
+
{{ctx.Locale.Tr "webauthn_press_button"}}
diff --git a/templates/user/dashboard/milestones.tmpl b/templates/user/dashboard/milestones.tmpl index 05f2b30efb..3a260c3d10 100644 --- a/templates/user/dashboard/milestones.tmpl +++ b/templates/user/dashboard/milestones.tmpl @@ -79,7 +79,7 @@ {{svg "octicon-milestone" 16}} {{.Name}}

-
+
{{.Completeness}}%
diff --git a/templates/user/notification/notification_div.tmpl b/templates/user/notification/notification_div.tmpl index 9da9e16d93..371da129ce 100644 --- a/templates/user/notification/notification_div.tmpl +++ b/templates/user/notification/notification_div.tmpl @@ -1,7 +1,7 @@
{{$notificationUnreadCount := call .NotificationUnreadCount}} -
+
{{ctx.Locale.Tr "notification.unread"}} @@ -25,7 +25,7 @@
{{if not .Notifications}} -
+
{{svg "octicon-inbox" 56 "gt-mb-4"}} {{if eq .Status 1}} {{ctx.Locale.Tr "notification.no_unread"}} @@ -35,7 +35,7 @@
{{else}} {{range $notification := .Notifications}} -
+
{{if .Issue}} {{template "shared/issueicon" .Issue}} @@ -60,14 +60,14 @@
-
+
{{if .Issue}} {{TimeSinceUnix .Issue.UpdatedUnix ctx.Locale}} {{else}} {{TimeSinceUnix .UpdatedUnix ctx.Locale}} {{end}}
-
+
{{if ne .Status 3}} {{$.CsrfTokenHtml}} diff --git a/templates/user/settings/applications_oauth2_list.tmpl b/templates/user/settings/applications_oauth2_list.tmpl index 1125a66d47..bfbebb104d 100644 --- a/templates/user/settings/applications_oauth2_list.tmpl +++ b/templates/user/settings/applications_oauth2_list.tmpl @@ -4,7 +4,7 @@ {{ctx.Locale.Tr "settings.oauth2_application_create_description"}}
{{range .Applications}} -
+
{{svg "octicon-apps" 32}}
diff --git a/templates/user/settings/security/openid.tmpl b/templates/user/settings/security/openid.tmpl index 63bc56ba9b..b0473c9df5 100644 --- a/templates/user/settings/security/openid.tmpl +++ b/templates/user/settings/security/openid.tmpl @@ -7,7 +7,7 @@ {{ctx.Locale.Tr "settings.openid_desc"}}
{{range .OpenIDs}} -
+
{{svg "fontawesome-openid" 20}}
diff --git a/templates/webhook/new.tmpl b/templates/webhook/new.tmpl index b4126df341..0347455f2c 100644 --- a/templates/webhook/new.tmpl +++ b/templates/webhook/new.tmpl @@ -1,7 +1,7 @@

{{.CustomHeaderTitle}}
-
+
{{template "shared/webhook/icon" (dict "Size" 20 "HookType" .ctxData.HookType)}} {{ctx.Locale.Tr (print "repo.settings.web_hook_name_" .ctxData.HookType)}}
diff --git a/tests/integration/release_test.go b/tests/integration/release_test.go index b1b08129bd..acc8cb68c2 100644 --- a/tests/integration/release_test.go +++ b/tests/integration/release_test.go @@ -285,7 +285,7 @@ func TestViewTagsList(t *testing.T) { tagNames := make([]string, 0, 5) tags.Each(func(i int, s *goquery.Selection) { - tagNames = append(tagNames, s.Find(".tag a.tw-flex.tw-content-center").Text()) + tagNames = append(tagNames, s.Find(".tag a.tw-flex.tw-items-center").Text()) }) assert.EqualValues(t, []string{"v1.0", "delete-tag", "v1.1"}, tagNames) diff --git a/web_src/js/components/ActionRunStatus.vue b/web_src/js/components/ActionRunStatus.vue index 4eccddffdf..7ada543fea 100644 --- a/web_src/js/components/ActionRunStatus.vue +++ b/web_src/js/components/ActionRunStatus.vue @@ -28,7 +28,7 @@ export default { };