Skip to content

Reset default @theme values for non extend JS theme config #14672

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

Merged
philipp-spiess merged 9 commits into from
Oct 16, 2024
Merged

Reset default @theme values for non extend JS theme config #14672

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
67f9971
Reset `default` @theme values for non `extend` JS theme config
philipp-spiess Oct 15, 2024
7f55743
Move keyframes bookkeeping into `Theme`
philipp-spiess Oct 15, 2024
30538d8
Update keyframes compat code to also be resetable
philipp-spiess Oct 15, 2024
d294861
Fix test
philipp-spiess Oct 15, 2024
96ba930
Add changelog
philipp-spiess Oct 15, 2024
65a9f4c
Update snaps
philipp-spiess Oct 15, 2024
8f3dcc3
Don't overwrite `@keyframes` in theme
philipp-spiess Oct 16, 2024
3456edd
Rename to replacedThemeKeys
philipp-spiess Oct 16, 2024
21c13d5
Update change log
philipp-spiess Oct 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Update change log
  • Loading branch information
@philipp-spiess
philipp-spiess committed Oct 16, 2024
commit 21c13d59d59939f052118abc64571751853d8cb0
2 changes: 1 addition & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

### Fixed

- Ensure the `theme` object defined in `@config` and `@plugin` can overwrite default theme values ([#14672](https://github.com/tailwindlabs/tailwindcss/pull/14672))
- Ensure `theme` values defined outside of `extend` in JS configuration files overwrite all existing values for that namespace ([#14672](https://github.com/tailwindlabs/tailwindcss/pull/14672))
- _Upgrade (experimental)_: Speed up template migrations ([#14679](https://github.com/tailwindlabs/tailwindcss/pull/14679))

## [4.0.0-alpha.27] - 2024-10-15
Expand Down