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

Migrate border and margin classes to Tailwind #29828

Merged
merged 12 commits into from
Mar 18, 2024
Merged

Migrate border and margin classes to Tailwind #29828

merged 12 commits into from
Mar 18, 2024

Conversation

silverwind
Copy link
Member

Used all existing css vars, other migrations are 1:1.

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Mar 15, 2024
@pull-request-size pull-request-size bot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Mar 15, 2024
@silverwind silverwind added the skip-changelog This PR is irrelevant for the (next) changelog, for example bug fixes for unreleased features. label Mar 15, 2024
@github-actions github-actions bot added modifies/frontend modifies/templates This PR modifies the template files modifies/js labels Mar 15, 2024
@silverwind silverwind changed the title Add borderRadius config to tailwind and migrate a few classes Migrate border-radius and misc classes to Tailwind Mar 15, 2024
@silverwind silverwind changed the title Migrate border-radius and misc classes to Tailwind Migrate border-radius and margin classes to Tailwind Mar 15, 2024
silverwind
silverwind commented Mar 16, 2024
View reviewed changes
tailwind.config.js Outdated Show resolved Hide resolved
@silverwind silverwind changed the title Migrate border-radius and margin classes to Tailwind Migrate border and margin classes to Tailwind Mar 16, 2024
@silverwind
Copy link
Member Author

Also includes migration of gt-border-secondary-* now.

@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 16, 2024
wxiaoguang
wxiaoguang reviewed Mar 17, 2024
View reviewed changes
tailwind.config.js Outdated Show resolved Hide resolved
templates/repo/settings/options.tmpl Outdated Show resolved Hide resolved
@pull-request-size pull-request-size bot added size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Mar 17, 2024
@github-actions github-actions bot added modifies/go Pull requests that update Go code modifies/internal labels Mar 17, 2024
@pull-request-size pull-request-size bot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. labels Mar 17, 2024
@wxiaoguang
Copy link
Contributor

wxiaoguang commented Mar 18, 2024 •
edited
Loading

Fix more problems in code:

  • 500.tmpl: use divider instead of bottom border
  • DiffCommitSelector.vue: use well-defined CSS classes, remove all CSS helpers
  • repo-diff-commit.js: separate the CSS class names for add method
  • repo/settings/options.tmpl
    • The old "bottom border" is not right, so it could be just removed.
    • The old code {{if}}{{end}} block doesn't match the HTML, so fix the {{end}} lines

@silverwind
Copy link
Member Author

repo-diff-commit.js: separate the CSS class names for add method

Good catch, this would have raised a DOMException: DOMTokenList.add: The token can not contain whitespace. error.

@wxiaoguang
Copy link
Contributor

And one more fix for DashboardRepoList.vue:

  • remove the "top border", use "divider" instead.

image

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

remove the "top border", use "divider" instead.

Divider will introduce margin, is it not an issue?

@wxiaoguang
Copy link
Contributor

remove the "top border", use "divider" instead.

Divider will introduce margin, is it not an issue?

I added "gt-my-0" when it is necessary 😁

@silverwind
Copy link
Member Author

lgtm

@silverwind silverwind added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Mar 18, 2024
@silverwind silverwind enabled auto-merge (squash) March 18, 2024 13:23
@silverwind silverwind merged commit 34290a0 into go-gitea:main Mar 18, 2024
26 checks passed
@GiteaBot GiteaBot added this to the 1.23.0 milestone Mar 18, 2024
@GiteaBot GiteaBot removed the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Mar 18, 2024
zjjhot added a commit to zjjhot/gitea that referenced this pull request Mar 19, 2024
@zjjhot
Merge remote-tracking branch 'giteaofficial/main'
ea2609e 
* giteaofficial/main:
  Fix missing error check of bufio.Scanner (go-gitea#29882)
  Remove unused error in graceful manager (go-gitea#29871)
  Migrate border and margin classes to Tailwind (go-gitea#29828)
  Only do counting when count_only=true for repo dashboard (go-gitea#29884)
  Editor error message misleading due to re-used key. (go-gitea#29859)
  [skip ci] Updated licenses and gitignores
  move some scripts from 'build' to 'tools' directory, misc refactors (go-gitea#29844)
  Fix missing code in the user profile (go-gitea#29865)
  Upgrade Go 1.22 and upgrade dependency (go-gitea#29869)
  Fix the wrong locale key of searching users (go-gitea#29868)
  fix telegram webhook (go-gitea#29864)
  Fix user id column case (go-gitea#29863)
  Avoid JS error on issue/pr list when logged out (go-gitea#29854)
  Refactor clone-panel styles (go-gitea#29861)
  Simplify README (go-gitea#29827)
  Load citation JS only when needed (go-gitea#29855)
  Fix semantic.json (go-gitea#29860)

# Conflicts:
#	templates/repo/wiki/revision.tmpl
#	templates/repo/wiki/view.tmpl
@lunny lunny modified the milestones: 1.23.0, 1.22.0 Mar 22, 2024
@go-gitea go-gitea locked as resolved and limited conversation to collaborators Jun 17, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@wxiaoguang wxiaoguang wxiaoguang approved these changes

@6543 6543 6543 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/js modifies/templates This PR modifies the template files size/M Denotes a PR that changes 30-99 lines, ignoring generated files. skip-changelog This PR is irrelevant for the (next) changelog, for example bug fixes for unreleased features.
Projects
None yet
Milestone
1.22.0
Development

Successfully merging this pull request may close these issues.

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