Skip to content

Replace default explicit spacing scale with multiplier system #14857

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
adamwathan merged 19 commits into from
Nov 5, 2024
Merged

Replace default explicit spacing scale with multiplier system #14857

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
cd4d8c0
WIP (actual spacing multiplier stuff)
adamwathan Nov 1, 2024
90f5755
Update codemod tests
adamwathan Nov 1, 2024
00c1e0c
Add explicit tests for --spacing: initial
adamwathan Nov 2, 2024
a8c6805
Ensure bare spacing values are a multiple of 0.25
adamwathan Nov 2, 2024
e345199
Handle px values
adamwathan Nov 2, 2024
71c3832
Remove duplicate translate-px utilities
adamwathan Nov 2, 2024
7c4d2ca
Test leading zero is required for fractional bare spacing values
adamwathan Nov 2, 2024
503f45d
Remove spacing scale
adamwathan Nov 2, 2024
c97a31e
Derive numeric line height utilities from spacing scale
adamwathan Nov 2, 2024
a95be45
Update PostCSS plugin test
adamwathan Nov 3, 2024
a313895
Update tests
adamwathan Nov 4, 2024
08f522c
Limit spacing utilities that support fractions
adamwathan Nov 4, 2024
59aae3e
Update changelog
adamwathan Nov 4, 2024
c82e4f2
Update test
adamwathan Nov 4, 2024
4e536cd
Update test
adamwathan Nov 4, 2024
4013c47
Suggest original spacing scale by default
adamwathan Nov 5, 2024
02b4f8d
Don't support negative scroll padding
adamwathan Nov 5, 2024
5ac40b7
Merge branch 'next' into feat/spacing-multiplier
adamwathan Nov 5, 2024
466e137
Update tests
adamwathan Nov 5, 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
Next Next commit
Derive numeric line height utilities from spacing scale
  • Loading branch information
@adamwathan
adamwathan committed Nov 5, 2024
commit c97a31eda9eee301a9d6e84e4eef169f465f79d5
5 changes: 5 additions & 0 deletions packages/tailwindcss/src/__snapshots__/intellisense.test.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2416,6 +2416,11 @@ exports[`getClassList 1`] = `
"justify-self-stretch",
"justify-start",
"justify-stretch",
"leading-0.5",
"leading-1",
"leading-3",
"leading-4",
"leading-px",
"left-0.5",
"left-1",
"left-3",
Expand Down
13 changes: 5 additions & 8 deletions packages/tailwindcss/src/utilities.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3607,14 +3607,11 @@ export function createUtilities(theme: Theme) {
staticUtility('forced-color-adjust-none', [['forced-color-adjust', 'none']])
staticUtility('forced-color-adjust-auto', [['forced-color-adjust', 'auto']])

functionalUtility('leading', {
themeKeys: ['--line-height'],
handle: (value) => [
atRoot([property('--tw-leading')]),
decl('--tw-leading', value),
decl('line-height', value),
],
})
spacingUtility('leading', ['--line-height'], (value) => [
atRoot([property('--tw-leading')]),
decl('--tw-leading', value),
decl('line-height', value),
])

functionalUtility('tracking', {
supportsNegative: true,
Expand Down
8 changes: 0 additions & 8 deletions packages/tailwindcss/theme.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -401,14 +401,6 @@
--line-height-normal: 1.5;
--line-height-relaxed: 1.625;
--line-height-loose: 2;
--line-height-3: 0.75rem;
--line-height-4: 1rem;
--line-height-5: 1.25rem;
--line-height-6: 1.5rem;
--line-height-7: 1.75rem;
--line-height-8: 2rem;
--line-height-9: 2.25rem;
--line-height-10: 2.5rem;

/* 3D perspectives */
--perspective-dramatic: 100px;
Expand Down