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.

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

Migrate margin and padding helpers to tailwind #30043

Merged
merged 2 commits into from
Mar 24, 2024
Merged

Conversation

silverwind
Copy link
Member

@silverwind silverwind commented Mar 24, 2024

This will conclude the refactor of 1:1 class replacements to tailwind, except gt-hidden. Commands ran:

perl -p -i -e 's#gt-(p|m)([lrtbxy])?-0#tw-$1$2-0#g'   {web_src/js,templates,routers,services}/**/*
perl -p -i -e 's#gt-(p|m)([lrtbxy])?-1#tw-$1$2-0.5#g' {web_src/js,templates,routers,services}/**/*
perl -p -i -e 's#gt-(p|m)([lrtbxy])?-2#tw-$1$2-1#g'   {web_src/js,templates,routers,services}/**/*
perl -p -i -e 's#gt-(p|m)([lrtbxy])?-3#tw-$1$2-2#g'   {web_src/js,templates,routers,services}/**/*
perl -p -i -e 's#gt-(p|m)([lrtbxy])?-4#tw-$1$2-4#g'   {web_src/js,templates,routers,services}/**/*
perl -p -i -e 's#gt-(p|m)([lrtbxy])?-5#tw-$1$2-8#g'   {web_src/js,templates,routers,services}/**/*

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Mar 24, 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/js labels Mar 24, 2024
@pull-request-size pull-request-size bot added the size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. label Mar 24, 2024
@silverwind silverwind added skip-changelog This PR is irrelevant for the (next) changelog, for example bug fixes for unreleased features. and removed size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Mar 24, 2024
@pull-request-size pull-request-size bot added the size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. label Mar 24, 2024
@delvh delvh added the type/refactoring Existing code has been cleaned up. There should be no new functionality. label Mar 24, 2024
@delvh
Copy link
Member

delvh commented Mar 24, 2024

This will conclude the refactor of 1:1 class replacements to tailwind

What do we do about gt-hidden?
Do we keep that, or do we migrate it as well?
If we migrate it, where do we put the docs telling the user to always use it?

Copy link
Member

@delvh delvh left a comment

Choose a reason for hiding this comment

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

There's a small regression currently
ag 'gt-(p|m)([lrtbxy])?-\d' --ignore-dir routers/ --ignore-dir web_src/ --ignore-dir templates/ --ignore-dir services/
modules/markup/markdown/goldmark.go
219:                    v.SetAttributeString("class", []byte("gt-py-3 attention attention-"+attentionType))
367:            _, _ = w.WriteString(`<span class="gt-mr-2 gt-vm attention-`)

modules/markup/sanitizer.go
67:     policy.AllowAttrs("class").Matching(regexp.MustCompile(`^gt-py-3 attention attention-\w+$`)).OnElements("blockquote")
69:     policy.AllowAttrs("class").Matching(regexp.MustCompile(`^gt-mr-2 gt-vm attention-\w+$`)).OnElements("span", "strong")

Edit: My bad, tested on the wrong branch locally. No regression present

@silverwind
Copy link
Member Author

silverwind commented Mar 24, 2024

This will conclude the refactor of 1:1 class replacements to tailwind

What do we do about gt-hidden? Do we keep that, or do we migrate it as well? If we migrate it, where do we put the docs telling the user to always use it?

Not sure yet what to do about it. Likely move to tw-hidden.

@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 24, 2024
@silverwind
Copy link
Member Author

silverwind commented Mar 24, 2024

There's a small regression currently:

Are you on main branch? I see zero matches for gt- in modules.

@delvh
Copy link
Member

delvh commented Mar 24, 2024

Reload this page

Copy link
Member

@denyskon denyskon left a comment

Choose a reason for hiding this comment

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

🚀

@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 24, 2024
@denyskon denyskon added this to the 1.22.0 milestone Mar 24, 2024
@denyskon denyskon added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Mar 24, 2024
@silverwind silverwind merged commit 68ec9b4 into go-gitea:main Mar 24, 2024
26 checks passed
@silverwind silverwind deleted the tw6 branch March 24, 2024 16:42
@GiteaBot GiteaBot removed the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Mar 24, 2024
silverwind added a commit to silverwind/gitea that referenced this pull request Mar 25, 2024
* origin/main:
  Remove fomantic table module (go-gitea#30047)
  Fix menu buttons in issues and release (go-gitea#30056)
  Fix git grep search limit, add test (go-gitea#30071)
  Fix button hover border (go-gitea#30048)
  Fix Add/Remove WIP on pull request title failure (go-gitea#29999)
  Fix misuse of `TxContext` (go-gitea#30061)
  Remove jQuery `.attr` from the reaction selector (go-gitea#30052)
  Remove jQuery `.attr` from the ComboMarkdownEditor (go-gitea#30051)
  Remove jQuery `.attr` from the label edit exclusive checkbox (go-gitea#30053)
  Remove jQuery `.attr` from the repository topic bar (go-gitea#30050)
  Use db.ListOptions directly instead of Paginator interface to make it easier to use and fix performance of /pulls and /issues (go-gitea#29990)
  Migrate `gt-hidden` to `tw-hidden` (go-gitea#30046)
  Forbid jQuery `is` and fix issues (go-gitea#30016)
  Remove fomantic segment module (go-gitea#30042)
  Migrate margin and padding helpers to tailwind (go-gitea#30043)
@go-gitea go-gitea locked as resolved and limited conversation to collaborators Jun 23, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. modifies/go Pull requests that update Go code modifies/js modifies/templates This PR modifies the template files size/XXL Denotes a PR that changes 1000+ 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
Development

Successfully merging this pull request may close these issues.

4 participants