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

Sort text wrapping utilities with typography utilities #14787

Merged
merged 3 commits into from
Oct 24, 2024
Merged

Sort text wrapping utilities with typography utilities #14787

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
58ef530
Sort text wrapping utilities with typography utilities
adamwathan Oct 24, 2024
0a34aaa
Sort text-overflow, hyphens, and white-space properties with after te…
adamwathan Oct 24, 2024
188bf0f
Update changelog
adamwathan Oct 24, 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
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Changed

- Don't convert underscores in the first argument to `var()` and `theme()` to spaces ([#14776](https://github.com/tailwindlabs/tailwindcss/pull/14776), [#14781](https://github.com/tailwindlabs/tailwindcss/pull/14781))
- Sort text alignment and wrapping utilities with typography utilities ([#14787](https://github.com/tailwindlabs/tailwindcss/pull/14787))
- Sort line height and letter spacing utilities before text color utilities ([#14787](https://github.com/tailwindlabs/tailwindcss/pull/14787))

## [4.0.0-alpha.29] - 2024-10-23

Expand Down
30 changes: 11 additions & 19 deletions packages/tailwindcss/src/property-order.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,6 @@ export default [
'--tw-divide-y-reverse',
'divide-style',
'divide-color',
'--tw-divide-opacity',

'place-self',
'align-self',
Expand All @@ -171,14 +170,6 @@ export default [

'scroll-behavior',

'text-overflow',
'hyphens',
'white-space',

'text-wrap',
'overflow-wrap',
'work-break',

'border-radius',
'border-start-radius', // Not real
'border-end-radius', // Not real
Expand Down Expand Up @@ -215,10 +206,7 @@ export default [
'border-bottom-color',
'border-left-color',

'--tw-border-opacity',

'background-color',
'--tw-bg-opacity',

'background-image',
'--tw-gradient-position',
Expand Down Expand Up @@ -263,24 +251,29 @@ export default [

'font-family',
'font-size',
'line-height',
'font-weight',
'letter-spacing',
'text-wrap',
'overflow-wrap',
'word-break',
'text-overflow',
'hyphens',
'white-space',

'color',
'text-transform',
'font-style',
'font-stretch',
'font-variant-numeric',
'line-height',
'letter-spacing',
'color',
'--tw-text-opacity',
'text-decoration-line',
'text-decoration-color',
'text-decoration-style',
'text-decoration-thickness',
'text-underline-offset',
'-webkit-font-smoothing',

'placeholder-color', // Not real
'--tw-placeholder-opacity',
'placeholder-color',

'caret-color',
'accent-color',
Expand All @@ -301,7 +294,6 @@ export default [
'--tw-inset-shadow-color',
'--tw-inset-ring-shadow',
'--tw-inset-ring-color',
'--tw-ring-opacity',
'--tw-ring-offset-width',
'--tw-ring-offset-color',

Expand Down