bjoernager/forgejo
bjoernager/forgejo
1
Fork 0
Code Activity

Replace 10 more gt- classes with tw- (#29945)

Browse source 
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 <wxiaoguang@gmail.com>
(cherry picked from commit f88ad5424f381bf2a45fd863b551c5a72891bb68)

Conflicts:
	templates/repo/diff/conversation.tmpl
	templates/repo/header.tmpl
	templates/repo/issue/filter_actions.tmpl
	templates/repo/issue/filter_list.tmpl
	templates/repo/issue/view_content/conversation.tmpl
	templates/repo/release/list.tmpl
	templates/repo/wiki/view.tmpl
	web_src/js/components/DashboardRepoList.vue
	discard the proposed changes and prefer Forgejo. A followup
	commit will apply the same commands.
This commit is contained in:
silverwind 2024-03-22 14:45:10 +01:00 • committed by Earl Warren
parent 44bc7b9954
commit 2befd9a3cf
No known key found for this signature in database
GPG key ID: 0579CB2928A78A00
115 changed files with 276 additions and 290 deletions
Download patch file Download diff file Expand all files Collapse all files

8
templates/shared/actions/runner_edit.tmpl
View file

@ -7,15 +7,15 @@
{{template "base/disable_form_autofill"}}
{{.CsrfTokenHtml}}
<div class="runner-basic-info">
<div class="field gt-dib gt-mr-4">
<div class="field tw-inline-block gt-mr-4">
<label>{{ctx.Locale.Tr "actions.runners.status"}}</label>
<span class="ui {{if .Runner.IsOnline}}green{{else}}basic{{end}} label">{{.Runner.StatusLocaleName ctx.Locale}}</span>
</div>
<div class="field gt-dib gt-mr-4">
<div class="field tw-inline-block gt-mr-4">
<label>{{ctx.Locale.Tr "actions.runners.last_online"}}</label>
<span>{{if .Runner.LastOnline}}{{TimeSinceUnix .Runner.LastOnline ctx.Locale}}{{else}}{{ctx.Locale.Tr "never"}}{{end}}</span>
</div>
<div class="field gt-dib gt-mr-4">
<div class="field tw-inline-block gt-mr-4">
<label>{{ctx.Locale.Tr "actions.runners.labels"}}</label>
<span>
{{range .Runner.AgentLabels}}
@ -23,7 +23,7 @@
{{end}}
</span>
</div>
<div class="field gt-dib gt-mr-4">
<div class="field tw-inline-block gt-mr-4">
<label>{{ctx.Locale.Tr "actions.runners.owner_type"}}</label>
<span data-tooltip-content="{{.Runner.BelongsToOwnerName}}">{{.Runner.BelongsToOwnerType.LocaleString ctx.Locale}}</span>
</div>

8
templates/shared/search/code/results.tmpl
View file

@ -1,4 +1,4 @@
<div class="flex-text-block gt-fw">
<div class="flex-text-block tw-flex-wrap">
{{range $term := .SearchResultLanguages}}
<a class="ui {{if eq $.Language $term.Language}}primary{{end}} basic label gt-m-0"
href="?q={{$.Keyword}}{{if ne $.Language $term.Language}}&l={{$term.Language}}{{end}}&fuzzy={{$.IsFuzzy}}">
@ -12,9 +12,9 @@
{{range $result := .SearchResults}}
{{$repo := or $.Repo (index $.RepoMaps .RepoID)}}
<div class="diff-file-box diff-box file-content non-diff-file-content repo-search-result">
<h4 class="ui top attached normal header gt-df gt-fw">
<h4 class="ui top attached normal header tw-flex tw-flex-wrap">
{{if not $.Repo}}
<span class="file gt-f1">
<span class="file tw-flex-1">
<a rel="nofollow" href="{{$repo.Link}}">{{$repo.FullName}}</a>
{{if $repo.IsArchived}}
<span class="ui basic label">{{ctx.Locale.Tr "repo.desc.archived"}}</span>
@ -22,7 +22,7 @@
- {{.Filename}}
</span>
{{else}}
<span class="file gt-f1">{{.Filename}}</span>
<span class="file tw-flex-1">{{.Filename}}</span>
{{end}}
<a role="button" class="ui basic tiny button" rel="nofollow" href="{{$repo.Link}}/src/{{if $.CodeIndexerDisabled}}branch{{else}}commit{{end}}/{{$result.CommitID | PathEscape}}/{{.Filename | PathEscapeSegments}}">{{ctx.Locale.Tr "repo.diff.view_file"}}</a>
</h4>

4
templates/shared/searchbottom.tmpl
View file

@ -1,5 +1,5 @@
<div class="ui bottom attached table segment gt-df gt-ac gt-sb">
<div class="gt-df gt-ac gt-ml-4">
<div class="ui bottom attached table segment tw-flex tw-content-center tw-justify-between">
<div class="tw-flex tw-content-center gt-ml-4">
{{if .result.Language}}
<i class="color-icon gt-mr-3" style="background-color: {{.result.Color}}"></i>{{.result.Language}}
{{end}}

2
templates/shared/secrets/add_list.tmpl
View file

@ -14,7 +14,7 @@
{{if .Secrets}}
<div class="flex-list">
{{range .Secrets}}
<div class="flex-item gt-ac">
<div class="flex-item tw-content-center">
<div class="flex-item-leading">
{{svg "octicon-key" 32}}
</div>

2
templates/shared/user/org_profile_avatar.tmpl
View file

@ -2,7 +2,7 @@
<div class="ui container">
<div class="ui vertically grid head">
<div class="column">
<div class="ui header gt-df gt-ac gt-word-break">
<div class="ui header tw-flex tw-content-center gt-word-break">
{{ctx.AvatarUtils.Avatar . 100}}
<span class="text thin grey"><a href="{{.HomeLink}}">{{.DisplayName}}</a></span>
<span class="org-visibility">

6
templates/shared/user/profile_big_avatar.tmpl
View file

@ -1,5 +1,5 @@
<div id="profile-avatar-card" class="ui card">
<div id="profile-avatar" class="content gt-df">
<div id="profile-avatar" class="content tw-flex">
{{if eq .SignedUserID .ContextUser.ID}}
<a class="image" href="{{AppSubUrl}}/user/settings" data-tooltip-content="{{ctx.Locale.Tr "user.change_avatar"}}">
{{/* the size doesn't take affect (and no need to take affect), image size(width) should be controlled by the parent container since this is not a flex layout*/}}
@ -30,7 +30,7 @@
{{if .ContextUser.Location}}
<li>
{{svg "octicon-location"}}
<span class="gt-f1">{{.ContextUser.Location}}</span>
<span class="tw-flex-1">{{.ContextUser.Location}}</span>
{{if .ContextUserLocationMapURL}}
<a href="{{.ContextUserLocationMapURL}}" rel="nofollow noreferrer" data-tooltip-content="{{ctx.Locale.Tr "user.show_on_map"}}">
{{svg "octicon-link-external"}}
@ -41,7 +41,7 @@
{{if (eq .SignedUserID .ContextUser.ID)}}
<li>
{{svg "octicon-mail"}}
<a class="gt-f1" href="mailto:{{.ContextUser.Email}}" rel="nofollow">{{.ContextUser.Email}}</a>
<a class="tw-flex-1" href="mailto:{{.ContextUser.Email}}" rel="nofollow">{{.ContextUser.Email}}</a>
<a href="{{AppSubUrl}}/user/settings#privacy-user-settings">
{{if .ShowUserEmail}}
<i data-tooltip-content="{{ctx.Locale.Tr "user.email_visibility.limited"}}">

2
templates/shared/variables/variable_list.tmpl
View file

@ -16,7 +16,7 @@
{{if .Variables}}
<div class="flex-list">
{{range .Variables}}
<div class="flex-item gt-ac">
<div class="flex-item tw-content-center">
<div class="flex-item-leading">
{{svg "octicon-pencil" 32}}
</div>