From 9c9f40f6d355ecc08c01854a712a7b9c2aaced1b Mon Sep 17 00:00:00 2001 From: Earl Warren Date: Sun, 24 Mar 2024 21:27:48 +0100 Subject: [PATCH] Replace 10 more gt- classes with tw- (#29945) (step 2) Same operation ran to cover all Forgejo specific files as well. --- Likely the biggest change of the tailwind refactors. Only thing of note is that `tw-flex-1` resolves to `flex: 1 1 0%` while our `gt-f1` was `flex: 1 1 0`, I don't think it will make any difference. Commands I've ran: ```sh perl -p -i -e 's#gt-vm#tw-align-middle#g' web_src/js/**/* templates/**/* models/**/* perl -p -i -e 's#gt-fw#tw-flex-wrap#g' web_src/js/**/* templates/**/* models/**/* perl -p -i -e 's#gt-f1#tw-flex-1#g' web_src/js/**/* templates/**/* models/**/* perl -p -i -e 's#gt-fc#tw-flex-col#g' web_src/js/**/* templates/**/* models/**/* perl -p -i -e 's#gt-sb#tw-justify-between#g' web_src/js/**/* templates/**/* models/**/* perl -p -i -e 's#gt-je#tw-justify-end#g' web_src/js/**/* templates/**/* models/**/* perl -p -i -e 's#gt-jc#tw-justify-center#g' web_src/js/**/* templates/**/* models/**/* perl -p -i -e 's#gt-ac#tw-content-center#g' web_src/js/**/* templates/**/* models/**/* tests/**/* perl -p -i -e 's#gt-df#tw-flex#g' web_src/js/**/* templates/**/* models/**/* tests/**/* perl -p -i -e 's#gt-dib#tw-inline-block#g' web_src/js/**/* templates/**/* models/**/* tests/**/* Co-authored-by: wxiaoguang (cherry picked from commit f88ad5424f381bf2a45fd863b551c5a72891bb68) --- templates/org/settings/blocked_users.tmpl | 2 +- templates/repo/diff/conversation.tmpl | 12 ++++++------ templates/repo/header.tmpl | 2 +- templates/repo/issue/filter_actions.tmpl | 2 +- templates/repo/issue/filter_list.tmpl | 6 +++--- .../repo/issue/view_content/conversation.tmpl | 16 ++++++++-------- templates/repo/release/list.tmpl | 4 ++-- templates/repo/wiki/view.tmpl | 2 +- templates/shared/repo_search.tmpl | 2 +- web_src/js/components/DashboardRepoList.vue | 12 ++++++------ 10 files changed, 30 insertions(+), 30 deletions(-) diff --git a/templates/org/settings/blocked_users.tmpl b/templates/org/settings/blocked_users.tmpl index 7608ebb435..4701e696ad 100644 --- a/templates/org/settings/blocked_users.tmpl +++ b/templates/org/settings/blocked_users.tmpl @@ -1,7 +1,7 @@ {{template "org/settings/layout_head" (dict "ctxData" . "pageClass" "organization settings blocked-users")}}
-
+ {{.CsrfTokenHtml}}
diff --git a/templates/repo/diff/conversation.tmpl b/templates/repo/diff/conversation.tmpl index feca7b6c0b..e2e87646aa 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}}
-
+
-