Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Replace 10 more gt- classes with tw- #29945

Merged
merged 5 commits into from Mar 22, 2024
Merged

Replace 10 more gt- classes with tw- #29945

merged 5 commits into from Mar 22, 2024

Conversation

silverwind
Copy link
Member

@silverwind silverwind commented Mar 20, 2024 •
edited

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:

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-items-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/**/*

edit: corrected gt-ac replacement for future reference

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Mar 20, 2024
@github-actions github-actions bot added modifies/go Pull requests that update Go code modifies/frontend modifies/templates This PR modifies the template files modifies/docs modifies/js labels Mar 20, 2024
@pull-request-size pull-request-size bot added the size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. label Mar 20, 2024
@silverwind silverwind added type/refactoring Existing code has been cleaned up. There should be no new functionality. skip-changelog This PR is irrelevant for the (next) changelog, for example bug fixes for unreleased features. and removed size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. modifies/go Pull requests that update Go code modifies/frontend modifies/templates This PR modifies the template files modifies/docs modifies/js labels Mar 20, 2024
@pull-request-size pull-request-size bot added the size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. label Mar 21, 2024
@github-actions github-actions bot added modifies/go Pull requests that update Go code modifies/frontend modifies/templates This PR modifies the template files modifies/docs modifies/js labels Mar 21, 2024
wxiaoguang
wxiaoguang approved these changes Mar 21, 2024
View reviewed changes
Copy link
Contributor

@wxiaoguang wxiaoguang left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The proper prefix really helps the maintainability a lot, the names could be easily searched & replaced.

@GiteaBot GiteaBot added lgtm/need 1 This PR needs approval from one additional maintainer to be merged. and removed lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. labels Mar 21, 2024
@silverwind
Copy link
Member Author

Yes, in hindsight it's good we have the prefixes, it makes the migration easy and there is zero risk of false replacements.

@silverwind silverwind requested a review from delvh March 22, 2024 12:24
@GiteaBot GiteaBot added lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. and removed lgtm/need 1 This PR needs approval from one additional maintainer to be merged. labels Mar 22, 2024
@silverwind silverwind added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Mar 22, 2024
@silverwind silverwind enabled auto-merge (squash) March 22, 2024 12:56
@silverwind silverwind merged commit f88ad54 into go-gitea:main Mar 22, 2024
26 checks passed
@GiteaBot GiteaBot added this to the 1.23.0 milestone Mar 22, 2024
@GiteaBot GiteaBot removed the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Mar 22, 2024
@silverwind silverwind deleted the tw5 branch March 22, 2024 13:58
This was referenced Mar 22, 2024
Closed
Merged
silverwind added a commit that referenced this pull request Mar 22, 2024
@silverwind
Fix incorrect tailwind migration (#30007)
04f9ad0 
Fixes #30005. Regression from
#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/**/*
```
@6543 6543 modified the milestones: 1.23.0, 1.22.0 Mar 24, 2024
DennisRasey pushed a commit to DennisRasey/forgejo that referenced this pull request Mar 26, 2024
@silverwind @earl-warren
Fix incorrect tailwind migration (#30007)
3ea7437 
Fixes go-gitea/gitea#30005. Regression from
go-gitea/gitea#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
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@wxiaoguang wxiaoguang wxiaoguang approved these changes

@6543 6543 6543 approved these changes

@delvh delvh delvh approved these changes

Assignees
No one assigned
Labels
lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. modifies/docs modifies/go Pull requests that update Go code modifies/js modifies/templates This PR modifies the template files size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. skip-changelog This PR is irrelevant for the (next) changelog, for example bug fixes for unreleased features. type/refactoring Existing code has been cleaned up. There should be no new functionality.
Projects
None yet
Milestone
1.22.0
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@silverwind @wxiaoguang @6543 @delvh @GiteaBot