bjoernager/forgejo
bjoernager/forgejo
1
Fork 0
Code Activity

Fix incorrect tailwind migration (#30007)

Browse source 
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
This commit is contained in:
silverwind 2024-03-22 20:51:29 +01:00 • committed by Earl Warren
parent b96845ae01
commit 3ea7437fa6
No known key found for this signature in database
GPG key ID: 0579CB2928A78A00
79 changed files with 163 additions and 163 deletions
Download patch file Download diff file Expand all files Collapse all files

2
templates/shared/repo_search.tmpl
View file

@ -1,5 +1,5 @@
<div class="ui small secondary filter menu">
<form id="repo-search-form" class="ui form ignore-dirty tw-flex-1 tw-flex tw-flex-row tw-gap-x-2 tw-content-center">
<form id="repo-search-form" class="ui form ignore-dirty tw-flex-1 tw-flex tw-flex-row tw-gap-x-2 tw-items-center">
{{if .Language}}<input hidden name="language" value="{{.Language}}">{{end}}
{{if .TopicOnly}}<input hidden name="topic" value="{{.TopicOnly}}">{{end}}
<div class="ui small fluid action input tw-flex-1">

4
templates/shared/searchbottom.tmpl
View file

@ -1,5 +1,5 @@
<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">
<div class="ui bottom attached table segment tw-flex tw-items-center tw-justify-between">
<div class="tw-flex tw-items-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 tw-content-center">
<div class="flex-item tw-items-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 tw-flex tw-content-center gt-word-break">
<div class="ui header tw-flex tw-items-center gt-word-break">
{{ctx.AvatarUtils.Avatar . 100}}
<span class="text thin grey"><a href="{{.HomeLink}}">{{.DisplayName}}</a></span>
<span class="org-visibility">

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 tw-content-center">
<div class="flex-item tw-items-center">
<div class="flex-item-leading">
{{svg "octicon-pencil" 32}}
</div>