diff --git a/CHANGELOG.md b/CHANGELOG.md index f0d5b25d93fe..7416e6dc11b7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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 diff --git a/packages/tailwindcss/src/property-order.ts b/packages/tailwindcss/src/property-order.ts index 0305f173ca98..a19858217146 100644 --- a/packages/tailwindcss/src/property-order.ts +++ b/packages/tailwindcss/src/property-order.ts @@ -155,7 +155,6 @@ export default [ '--tw-divide-y-reverse', 'divide-style', 'divide-color', - '--tw-divide-opacity', 'place-self', 'align-self', @@ -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 @@ -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', @@ -263,15 +251,21 @@ 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', @@ -279,8 +273,7 @@ export default [ 'text-underline-offset', '-webkit-font-smoothing', - 'placeholder-color', // Not real - '--tw-placeholder-opacity', + 'placeholder-color', 'caret-color', 'accent-color', @@ -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',