From 5016bc5d5c8df7f9ac6d59545d2aa8751ef7e370 Mon Sep 17 00:00:00 2001 From: silverwind Date: Sun, 24 Mar 2024 19:23:38 +0100 Subject: [PATCH] Migrate `gt-hidden` to `tw-hidden` (#30046) We have to define this one in helpers.css because tailwind only generates a single class but certain things rely on this being double-class. Command ran: ```sh perl -p -i -e 's#gt-hidden#tw-hidden#g' web_src/js/**/* templates/**/* models/**/* web_src/css/**/* --------- Co-authored-by: wxiaoguang (cherry picked from commit ec3d467f15a683b305ac165c3eba6683628dcb25) Conflicts: templates/install.tmpl templates/repo/diff/conversation.tmpl templates/repo/issue/view_content/conversation.tmpl templates/repo/issue/view_content/sidebar.tmpl templates/repo/issue/view_title.tmpl resolved by prefering Forgejo version and applying the commands to all files --- .../contributing/guidelines-frontend.en-us.md | 2 +- .../contributing/guidelines-frontend.zh-cn.md | 2 +- tailwind.config.js | 2 ++ templates/admin/auth/edit.tmpl | 8 +++--- templates/admin/auth/new.tmpl | 6 ++-- templates/admin/auth/source/ldap.tmpl | 14 +++++----- templates/admin/auth/source/oauth.tmpl | 2 +- templates/admin/auth/source/smtp.tmpl | 2 +- templates/admin/auth/source/sspi.tmpl | 2 +- templates/admin/user/edit.tmpl | 8 +++--- templates/admin/user/new.tmpl | 6 ++-- templates/base/head_navbar.tmpl | 6 ++-- templates/install.tmpl | 8 +++--- templates/org/settings/options.tmpl | 2 +- templates/org/team/new.tmpl | 2 +- templates/repo/blame.tmpl | 2 +- .../repo/commit_load_branches_and_tags.tmpl | 2 +- templates/repo/commits_list.tmpl | 2 +- templates/repo/commits_list_small.tmpl | 2 +- templates/repo/create.tmpl | 2 +- templates/repo/diff/box.tmpl | 14 +++++----- templates/repo/diff/comment_form.tmpl | 2 +- templates/repo/diff/comments.tmpl | 4 +-- templates/repo/diff/compare.tmpl | 12 ++++---- templates/repo/diff/conversation.tmpl | 4 +-- templates/repo/editor/commit_form.tmpl | 2 +- templates/repo/editor/edit.tmpl | 2 +- templates/repo/editor/patch.tmpl | 2 +- templates/repo/find/files.tmpl | 2 +- templates/repo/graph.tmpl | 2 +- templates/repo/home.tmpl | 2 +- .../repo/issue/branch_selector_field.tmpl | 2 +- templates/repo/issue/fields/checkboxes.tmpl | 4 +-- templates/repo/issue/fields/dropdown.tmpl | 2 +- templates/repo/issue/fields/input.tmpl | 2 +- templates/repo/issue/fields/markdown.tmpl | 2 +- templates/repo/issue/fields/textarea.tmpl | 6 ++-- .../repo/issue/labels/edit_delete_label.tmpl | 2 +- templates/repo/issue/labels/label.tmpl | 2 +- .../repo/issue/labels/labels_sidebar.tmpl | 2 +- templates/repo/issue/list.tmpl | 2 +- templates/repo/issue/new_form.tmpl | 8 +++--- templates/repo/issue/search.tmpl | 2 +- templates/repo/issue/view_content.tmpl | 6 ++-- .../repo/issue/view_content/comments.tmpl | 8 +++--- .../repo/issue/view_content/conversation.tmpl | 12 ++++---- .../view_content/pull_merge_instruction.tmpl | 12 ++++---- .../repo/issue/view_content/sidebar.tmpl | 12 ++++---- templates/repo/issue/view_title.tmpl | 8 +++--- templates/repo/latest_commit.tmpl | 2 +- templates/repo/migrate/migrating.tmpl | 6 ++-- templates/repo/migrate/options.tmpl | 4 +-- templates/repo/settings/deploy_keys.tmpl | 2 +- templates/repo/settings/githook_edit.tmpl | 2 +- templates/repo/settings/lfs_file.tmpl | 2 +- templates/repo/settings/protected_branch.tmpl | 2 +- templates/repo/settings/webhook/history.tmpl | 2 +- templates/repo/settings/webhook/settings.tmpl | 2 +- templates/repo/sub_menu.tmpl | 2 +- templates/repo/view_file.tmpl | 4 +-- templates/repo/wiki/view.tmpl | 2 +- templates/user/auth/webauthn_error.tmpl | 4 +-- templates/user/dashboard/issues.tmpl | 2 +- .../user/notification/notification_div.tmpl | 4 +-- templates/user/settings/applications.tmpl | 2 +- templates/user/settings/keys_gpg.tmpl | 2 +- templates/user/settings/keys_principal.tmpl | 2 +- templates/user/settings/keys_ssh.tmpl | 2 +- templates/user/settings/profile.tmpl | 4 +-- web_src/css/helpers.css | 6 ++-- web_src/css/modules/button.css | 5 ++-- web_src/css/shared/flex-list.css | 2 +- web_src/js/features/comp/LabelEdit.js | 6 ++-- web_src/js/features/notification.js | 6 ++-- web_src/js/features/repo-diff.js | 8 +++--- web_src/js/features/repo-graph.js | 12 ++++---- web_src/js/features/repo-issue-content.js | 4 +-- web_src/js/features/repo-issue.js | 28 +++++++++---------- web_src/js/features/repo-legacy.js | 18 ++++++------ web_src/js/markup/mermaid.js | 4 +-- web_src/js/svg.js | 2 +- web_src/js/utils/dom.js | 8 +++--- 82 files changed, 195 insertions(+), 192 deletions(-) diff --git a/docs/content/contributing/guidelines-frontend.en-us.md b/docs/content/contributing/guidelines-frontend.en-us.md index b19101dd47..8813634f93 100644 --- a/docs/content/contributing/guidelines-frontend.en-us.md +++ b/docs/content/contributing/guidelines-frontend.en-us.md @@ -118,7 +118,7 @@ However, there are still some special cases, so the current guideline is: ### Show/Hide Elements * Vue components are recommended to use `v-if` and `v-show` to show/hide elements. -* Go template code should use Gitea's `.gt-hidden` and `showElem()/hideElem()/toggleElem()`, see more details in `.gt-hidden`'s comment. +* Go template code should use `.tw-hidden` and `showElem()/hideElem()/toggleElem()`, see more details in `.tw-hidden`'s comment. ### Styles and Attributes in Go HTML Template diff --git a/docs/content/contributing/guidelines-frontend.zh-cn.md b/docs/content/contributing/guidelines-frontend.zh-cn.md index 961a331ac2..2b502434a4 100644 --- a/docs/content/contributing/guidelines-frontend.zh-cn.md +++ b/docs/content/contributing/guidelines-frontend.zh-cn.md @@ -117,7 +117,7 @@ Gitea使用一些补丁使Fomantic UI更具可访问性（参见`aria.js`和`ari ### 显示/隐藏元素 * 推荐在Vue组件中使用`v-if`和`v-show`来显示/隐藏元素。 -* Go 模板代码应使用 Gitea 的 `.gt-hidden` 和 `showElem()/hideElem()/toggleElem()` 来显示/隐藏元素，请参阅`.gt-hidden`的注释以获取更多详细信息。 +* Go 模板代码应使用 `.tw-hidden` 和 `showElem()/hideElem()/toggleElem()` 来显示/隐藏元素，请参阅`.tw-hidden`的注释以获取更多详细信息。 ### Go HTML 模板中的样式和属性 diff --git a/tailwind.config.js b/tailwind.config.js index 0754ab3631..5bce37e023 100644 --- a/tailwind.config.js +++ b/tailwind.config.js @@ -41,6 +41,8 @@ export default { // classes that don't work without CSS variables from "@tailwind base" which we don't use 'transform', 'shadow', 'ring', 'blur', 'grayscale', 'invert', '!invert', 'filter', '!filter', 'backdrop-filter', + // we use double-class tw-hidden defined in web_src/css/helpers.css for increased specificity + 'hidden', // unneeded classes '[-a-zA-Z:0-9_.]', ], diff --git a/templates/admin/auth/edit.tmpl b/templates/admin/auth/edit.tmpl index 2187761828..687a277a84 100644 --- a/templates/admin/auth/edit.tmpl +++ b/templates/admin/auth/edit.tmpl @@ -42,7 +42,7 @@ -
+
@@ -113,7 +113,7 @@
-
+
@@ -148,7 +148,7 @@
-
+
@@ -205,7 +205,7 @@

{{ctx.Locale.Tr "admin.auths.force_smtps_helper"}}

-
+
diff --git a/templates/admin/auth/new.tmpl b/templates/admin/auth/new.tmpl index 255eac202c..f6a14e1f7d 100644 --- a/templates/admin/auth/new.tmpl +++ b/templates/admin/auth/new.tmpl @@ -33,13 +33,13 @@ {{template "admin/auth/source/smtp" .}} -
+
-
+
@@ -59,7 +59,7 @@
-
+
diff --git a/templates/admin/auth/source/ldap.tmpl b/templates/admin/auth/source/ldap.tmpl index b945a1ab1c..680849c8ea 100644 --- a/templates/admin/auth/source/ldap.tmpl +++ b/templates/admin/auth/source/ldap.tmpl @@ -1,4 +1,4 @@ -
+
@@ -20,17 +20,17 @@
-
+
-
+
-
+
@@ -38,7 +38,7 @@
-
+
@@ -115,13 +115,13 @@
-
+
-
+
diff --git a/templates/admin/auth/source/oauth.tmpl b/templates/admin/auth/source/oauth.tmpl index da3a4f913a..0560cc8256 100644 --- a/templates/admin/auth/source/oauth.tmpl +++ b/templates/admin/auth/source/oauth.tmpl @@ -1,4 +1,4 @@ -
+
diff --git a/templates/admin/auth/source/smtp.tmpl b/templates/admin/auth/source/smtp.tmpl index c4b0b0e7e4..31195acf65 100644 --- a/templates/admin/auth/source/smtp.tmpl +++ b/templates/admin/auth/source/smtp.tmpl @@ -1,4 +1,4 @@ -
+
diff --git a/templates/admin/auth/source/sspi.tmpl b/templates/admin/auth/source/sspi.tmpl index f835e89bdf..6a3f00f9a8 100644 --- a/templates/admin/auth/source/sspi.tmpl +++ b/templates/admin/auth/source/sspi.tmpl @@ -1,4 +1,4 @@ -
+
diff --git a/templates/admin/user/edit.tmpl b/templates/admin/user/edit.tmpl index 751eb6d83f..41b00defb4 100644 --- a/templates/admin/user/edit.tmpl +++ b/templates/admin/user/edit.tmpl @@ -53,7 +53,7 @@
-
+
@@ -65,7 +65,7 @@
-
+

{{ctx.Locale.Tr "admin.users.password_helper"}}

@@ -128,13 +128,13 @@
-
+
-
+
diff --git a/templates/admin/user/new.tmpl b/templates/admin/user/new.tmpl index bcb53d8131..b04ebc4b60 100644 --- a/templates/admin/user/new.tmpl +++ b/templates/admin/user/new.tmpl @@ -47,7 +47,7 @@
-
+
@@ -59,12 +59,12 @@
-
+
-
+
diff --git a/templates/base/head_navbar.tmpl b/templates/base/head_navbar.tmpl index 01eeec3c4a..068271bbe9 100644 --- a/templates/base/head_navbar.tmpl +++ b/templates/base/head_navbar.tmpl @@ -16,7 +16,7 @@
{{svg "octicon-bell"}} - {{$notificationUnreadCount}} + {{$notificationUnreadCount}}
{{end}} @@ -75,7 +75,7 @@
{{else if .IsSigned}} {{if EnableTimetracking}} - +
{{svg "octicon-stopwatch"}} @@ -114,7 +114,7 @@
{{svg "octicon-bell"}} - {{$notificationUnreadCount}} + {{$notificationUnreadCount}}
diff --git a/templates/install.tmpl b/templates/install.tmpl index 49ab1a2193..6bb37d0a0c 100644 --- a/templates/install.tmpl +++ b/templates/install.tmpl @@ -28,7 +28,7 @@
-
+
@@ -47,7 +47,7 @@
-
+
@@ -68,7 +68,7 @@
-
+
@@ -347,5 +347,5 @@
- + {{template "base/footer" .}} diff --git a/templates/org/settings/options.tmpl b/templates/org/settings/options.tmpl index 31c0d85d89..62debfc0ae 100644 --- a/templates/org/settings/options.tmpl +++ b/templates/org/settings/options.tmpl @@ -8,7 +8,7 @@ {{.CsrfTokenHtml}}
diff --git a/templates/org/team/new.tmpl b/templates/org/team/new.tmpl index 0de70296fd..9608eac154 100644 --- a/templates/org/team/new.tmpl +++ b/templates/org/team/new.tmpl @@ -71,7 +71,7 @@
-
+
diff --git a/templates/repo/blame.tmpl b/templates/repo/blame.tmpl index 0d6fd7b6e1..45cf841748 100644 --- a/templates/repo/blame.tmpl +++ b/templates/repo/blame.tmpl @@ -24,7 +24,7 @@ {{ctx.Locale.Tr "repo.normal_view"}}{{ctx.Locale.Tr "repo.file_history"}} - + diff --git a/templates/repo/commit_load_branches_and_tags.tmpl b/templates/repo/commit_load_branches_and_tags.tmpl index 9ab1e2fe05..ffa0e530e8 100644 --- a/templates/repo/commit_load_branches_and_tags.tmpl +++ b/templates/repo/commit_load_branches_and_tags.tmpl @@ -4,7 +4,7 @@ data-fetch-url="{{.RepoLink}}/commit/{{.CommitID}}/load-branches-and-tags" data-tooltip-content="{{ctx.Locale.Tr "repo.commit.load_referencing_branches_and_tags"}}" >... -
+
{{ctx.Locale.Tr "repo.commit.contained_in"}}
diff --git a/templates/repo/commits_list.tmpl b/templates/repo/commits_list.tmpl index 99787f715f..aa7ca88931 100644 --- a/templates/repo/commits_list.tmpl +++ b/templates/repo/commits_list.tmpl @@ -68,7 +68,7 @@ {{end}} {{template "repo/commit_statuses" dict "Status" .Status "Statuses" .Statuses}} {{if IsMultilineCommitMessage .Message}} - 
{{RenderCommitBody $.Context .Message ($.Repository.ComposeMetas ctx)}}
+ 
{{RenderCommitBody $.Context .Message ($.Repository.ComposeMetas ctx)}}
{{end}} {{if .Committer}} diff --git a/templates/repo/commits_list_small.tmpl b/templates/repo/commits_list_small.tmpl index cb867df65a..0af29291d8 100644 --- a/templates/repo/commits_list_small.tmpl +++ b/templates/repo/commits_list_small.tmpl @@ -43,7 +43,7 @@ {{end}} {{if IsMultilineCommitMessage .Message}} - 
{{RenderCommitBody $.root.Context .Message ($.comment.Issue.PullRequest.BaseRepo.ComposeMetas ctx)}}
+ 
{{RenderCommitBody $.root.Context .Message ($.comment.Issue.PullRequest.BaseRepo.ComposeMetas ctx)}}
{{end}}
{{end}} diff --git a/templates/repo/create.tmpl b/templates/repo/create.tmpl index 73c9ca6a1f..bcd3c16b6a 100644 --- a/templates/repo/create.tmpl +++ b/templates/repo/create.tmpl @@ -73,7 +73,7 @@
-
+
diff --git a/templates/repo/diff/box.tmpl b/templates/repo/diff/box.tmpl index 1dcca2b907..e35c0be3e5 100644 --- a/templates/repo/diff/box.tmpl +++ b/templates/repo/diff/box.tmpl @@ -5,15 +5,15 @@ {{if $showFileTree}} {{end}} @@ -89,9 +89,9 @@ {{end}}
{{if $showFileTree}} -
+
{{end}} {{if .DiffNotAvailable}} @@ -159,7 +159,7 @@ {{end}} {{if not (or $file.IsIncomplete $file.IsBin $file.IsSubmodule)}} - + {{end}} {{if and (not $file.IsSubmodule) (not $.PageIsWiki)}} {{if $file.IsDeleted}} @@ -179,7 +179,7 @@
-
+
{{if or $file.IsIncomplete $file.IsBin}}
{{if $file.IsIncomplete}} diff --git a/templates/repo/diff/comment_form.tmpl b/templates/repo/diff/comment_form.tmpl index d797e89444..6a5dec6c48 100644 --- a/templates/repo/diff/comment_form.tmpl +++ b/templates/repo/diff/comment_form.tmpl @@ -1,5 +1,5 @@ {{if and $.root.SignedUserID (not $.Repository.IsArchived)}} -
+ {{$.root.CsrfTokenHtml}} diff --git a/templates/repo/diff/comments.tmpl b/templates/repo/diff/comments.tmpl index 02da9783be..e84b952364 100644 --- a/templates/repo/diff/comments.tmpl +++ b/templates/repo/diff/comments.tmpl @@ -60,8 +60,8 @@ {{ctx.Locale.Tr "repo.issues.no_content"}} {{end}}
-
{{.Content}}
-
+
{{.Content}}
+
{{if .Attachments}} {{template "repo/issue/view_content/attachments" dict "Attachments" .Attachments "RenderedContent" .RenderedContent}} {{end}} diff --git a/templates/repo/diff/compare.tmpl b/templates/repo/diff/compare.tmpl index b4453d4308..110f8ac60b 100644 --- a/templates/repo/diff/compare.tmpl +++ b/templates/repo/diff/compare.tmpl @@ -75,7 +75,7 @@ {{end}} {{end}}
-
+
{{range .Tags}}
{{$BaseCompareName}}:{{.}}
{{end}} @@ -144,7 +144,7 @@ {{end}} {{end}}
-
+
{{range .HeadTags}}
{{$HeadCompareName}}:{{.}}
{{end}} @@ -171,10 +171,10 @@ {{if .IsNothingToCompare}} {{if and $.IsSigned $.AllowEmptyPr (not .Repository.IsArchived) .PageIsComparePull}}
{{ctx.Locale.Tr "repo.pulls.nothing_to_compare_and_allow_empty_pr"}}
-
+
-
+
{{template "repo/issue/new_form" .}}
{{else if and .HeadIsBranch .BaseIsBranch}} @@ -204,7 +204,7 @@
{{else}} {{if and $.IsSigned (not .Repository.IsArchived)}} -
+
{{else if .Repository.IsArchived}} @@ -217,7 +217,7 @@
{{end}} {{if $.IsSigned}} -
+
{{template "repo/issue/new_form" .}}
{{end}} diff --git a/templates/repo/diff/conversation.tmpl b/templates/repo/diff/conversation.tmpl index cf506db8b9..ef92f3bdfc 100644 --- a/templates/repo/diff/conversation.tmpl +++ b/templates/repo/diff/conversation.tmpl @@ -24,14 +24,14 @@ {{svg "octicon-unfold" 16 "tw-mr-2"}} {{ctx.Locale.Tr "repo.issues.review.show_resolved"}} -
{{end}} -
+
{{template "repo/diff/comments" dict "root" $ "comments" .comments}} diff --git a/templates/repo/editor/commit_form.tmpl b/templates/repo/editor/commit_form.tmpl index 6e80295c79..b2fe5b1cfb 100644 --- a/templates/repo/editor/commit_form.tmpl +++ b/templates/repo/editor/commit_form.tmpl @@ -57,7 +57,7 @@
-
+
{{svg "octicon-git-branch"}} diff --git a/templates/repo/editor/edit.tmpl b/templates/repo/editor/edit.tmpl index 05a8d96681..1f5652f6b5 100644 --- a/templates/repo/editor/edit.tmpl +++ b/templates/repo/editor/edit.tmpl @@ -34,7 +34,7 @@ {{end}}
- diff --git a/templates/repo/find/files.tmpl b/templates/repo/find/files.tmpl index 703f2eee2f..548ce2f0e8 100644 --- a/templates/repo/find/files.tmpl +++ b/templates/repo/find/files.tmpl @@ -13,7 +13,7 @@
-
+

{{ctx.Locale.Tr "repo.find_file.no_matching"}}

diff --git a/templates/repo/graph.tmpl b/templates/repo/graph.tmpl index 4b40233ac9..9eb4bd4ecb 100644 --- a/templates/repo/graph.tmpl +++ b/templates/repo/graph.tmpl @@ -50,7 +50,7 @@
-
+
{{template "repo/graph/svgcontainer" .}} {{template "repo/graph/commits" .}}
diff --git a/templates/repo/home.tmpl b/templates/repo/home.tmpl index 2cb18bf8e7..8a8664f147 100644 --- a/templates/repo/home.tmpl +++ b/templates/repo/home.tmpl @@ -24,7 +24,7 @@
{{end}} {{if and .Permission.IsAdmin (not .Repository.IsArchived)}} -
+
diff --git a/templates/repo/issue/branch_selector_field.tmpl b/templates/repo/issue/branch_selector_field.tmpl index 9b77c68490..dd8df57a4c 100644 --- a/templates/repo/issue/branch_selector_field.tmpl +++ b/templates/repo/issue/branch_selector_field.tmpl @@ -42,7 +42,7 @@
{{ctx.Locale.Tr "repo.pulls.no_results"}}
{{end}}
-