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}})
-