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

Use a default line height #14503

Open
wants to merge 2 commits into
base: next
Choose a base branch
from
+61 −80
Open

Use a default line height #14503

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
afdf457
Use a default line height
MartijnCuppens Sep 24, 2024
ea3d7fb
Reorder test results
MartijnCuppens Sep 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
17 changes: 3 additions & 14 deletions packages/@tailwindcss-postcss/src/__snapshots__/index.test.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ exports[`\`@import 'tailwindcss'\` is replaced with the generated CSS 1`] = `
--default-mono-font-family: var(--font-family-mono);
--default-mono-font-feature-settings: var(--font-family-mono--font-feature-settings);
--default-mono-font-variation-settings: var(--font-family-mono--font-variation-settings);
--default-line-height: round(max(min(2em - .5rem, 1em + .5rem, 2em / 3 + 1rem), 1em), 2px);
--breakpoint-sm: 40rem;
--breakpoint-md: 48rem;
--breakpoint-lg: 64rem;
Expand Down Expand Up @@ -350,31 +351,18 @@ exports[`\`@import 'tailwindcss'\` is replaced with the generated CSS 1`] = `
--font-family-serif: ui-serif, Georgia, Cambria, "Times New Roman", Times, serif;
--font-family-mono: ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace;
--font-size-xs: .75rem;
--font-size-xs--line-height: 1rem;
--font-size-sm: .875rem;
--font-size-sm--line-height: 1.25rem;
--font-size-base: 1rem;
--font-size-base--line-height: 1.5rem;
--font-size-lg: 1.125rem;
--font-size-lg--line-height: 1.75rem;
--font-size-xl: 1.25rem;
--font-size-xl--line-height: 1.75rem;
--font-size-2xl: 1.5rem;
--font-size-2xl--line-height: 2rem;
--font-size-3xl: 1.875rem;
--font-size-3xl--line-height: 2.25rem;
--font-size-4xl: 2.25rem;
--font-size-4xl--line-height: 2.5rem;
--font-size-5xl: 3rem;
--font-size-5xl--line-height: 1;
--font-size-6xl: 3.75rem;
--font-size-6xl--line-height: 1;
--font-size-7xl: 4.5rem;
--font-size-7xl--line-height: 1;
--font-size-8xl: 6rem;
--font-size-8xl--line-height: 1;
--font-size-9xl: 8rem;
--font-size-9xl--line-height: 1;
--letter-spacing-tighter: -.05em;
--letter-spacing-tight: -.025em;
--letter-spacing-normal: 0em;
Expand Down Expand Up @@ -472,6 +460,7 @@ exports[`\`@import 'tailwindcss'\` is replaced with the generated CSS 1`] = `

small {
font-size: 80%;
line-height: var(--default-line-height, 1.5);
}

sub, sup {
Expand Down Expand Up @@ -586,7 +575,7 @@ exports[`\`@import 'tailwindcss'\` is replaced with the generated CSS 1`] = `
@layer utilities {
.text-2xl {
font-size: var(--font-size-2xl, 1.5rem);
line-height: var(--tw-leading, var(--font-size-2xl--line-height, 2rem));
line-height: var(--tw-leading, var(--default-line-height));
}

.text-black\\/50 {
Expand Down
1 change: 1 addition & 0 deletions packages/tailwindcss/preflight.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,7 @@ pre {

small {
font-size: 80%;
line-height: var(--default-line-height, 1.5);
}

/*
Expand Down
14 changes: 1 addition & 13 deletions packages/tailwindcss/src/__snapshots__/index.test.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ exports[`compiling CSS > \`@tailwind utilities\` is replaced by utilities using
--default-mono-font-family: var(--font-family-mono);
--default-mono-font-feature-settings: var(--font-family-mono--font-feature-settings);
--default-mono-font-variation-settings: var(--font-family-mono--font-variation-settings);
--default-line-height: round(max(min(2em - .5rem, 1em + .5rem, 2em / 3 + 1rem), 1em), 2px);
--breakpoint-sm: 40rem;
--breakpoint-md: 48rem;
--breakpoint-lg: 64rem;
Expand Down Expand Up @@ -349,31 +350,18 @@ exports[`compiling CSS > \`@tailwind utilities\` is replaced by utilities using
--font-family-serif: ui-serif, Georgia, Cambria, "Times New Roman", Times, serif;
--font-family-mono: ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace;
--font-size-xs: .75rem;
--font-size-xs--line-height: 1rem;
--font-size-sm: .875rem;
--font-size-sm--line-height: 1.25rem;
--font-size-base: 1rem;
--font-size-base--line-height: 1.5rem;
--font-size-lg: 1.125rem;
--font-size-lg--line-height: 1.75rem;
--font-size-xl: 1.25rem;
--font-size-xl--line-height: 1.75rem;
--font-size-2xl: 1.5rem;
--font-size-2xl--line-height: 2rem;
--font-size-3xl: 1.875rem;
--font-size-3xl--line-height: 2.25rem;
--font-size-4xl: 2.25rem;
--font-size-4xl--line-height: 2.5rem;
--font-size-5xl: 3rem;
--font-size-5xl--line-height: 1;
--font-size-6xl: 3.75rem;
--font-size-6xl--line-height: 1;
--font-size-7xl: 4.5rem;
--font-size-7xl--line-height: 1;
--font-size-8xl: 6rem;
--font-size-8xl--line-height: 1;
--font-size-9xl: 8rem;
--font-size-9xl--line-height: 1;
--letter-spacing-tighter: -.05em;
--letter-spacing-tight: -.025em;
--letter-spacing-normal: 0em;
Expand Down
2 changes: 2 additions & 0 deletions packages/tailwindcss/src/index.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -905,6 +905,7 @@ describe('Parsing themes values from CSS', () => {

.text-lg {
font-size: var(--font-size-lg, 20px);
line-height: var(--tw-leading, var(--default-line-height));
}

.accent-red {
Expand Down Expand Up @@ -948,6 +949,7 @@ describe('Parsing themes values from CSS', () => {

.text-sm {
font-size: var(--font-size-sm, 13px);
line-height: var(--tw-leading, var(--default-line-height));
}

.accent-green {
Expand Down
72 changes: 40 additions & 32 deletions packages/tailwindcss/src/utilities.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14085,71 +14085,79 @@ test('text', async () => {
line-height: var(--tw-leading, var(--font-size-sm--line-height, 1.25rem));
}

.text-\\[12px\\]\\/6 {
.text-\\[12px\\] {
font-size: 12px;
line-height: var(--line-height-6, 1.5rem);
}

.text-\\[50\\%\\]\\/6 {
font-size: 50%;
line-height: var(--line-height-6, 1.5rem);
}

.text-\\[clamp\\(1rem\\,var\\(--size\\)\\,3rem\\)\\]\\/9 {
font-size: clamp(1rem, var(--size), 3rem);
line-height: var(--line-height-9, 2.25rem);
}

.text-\\[larger\\]\\/6 {
font-size: larger;
line-height: var(--line-height-6, 1.5rem);
}

.text-\\[xx-large\\]\\/6 {
font-size: xx-large;
line-height: var(--line-height-6, 1.5rem);
line-height: var(--tw-leading, var(--default-line-height));
}

.text-sm\\/6 {
font-size: var(--font-size-sm, .875rem);
.text-\\[12px\\]\\/6 {
font-size: 12px;
line-height: var(--line-height-6, 1.5rem);
}

.text-sm\\/\\[4px\\] {
font-size: var(--font-size-sm, .875rem);
line-height: 4px;
}

.text-\\[12px\\] {
font-size: 12px;
.text-\\[50\\%\\] {
font-size: 50%;
line-height: var(--tw-leading, var(--default-line-height));
}

.text-\\[50\\%\\] {
.text-\\[50\\%\\]\\/6 {
font-size: 50%;
line-height: var(--line-height-6, 1.5rem);
}

.text-\\[absolute-size\\:var\\(--my-size\\)\\] {
font-size: var(--my-size);
line-height: var(--tw-leading, var(--default-line-height));
}

.text-\\[clamp\\(1rem\\,2rem\\,3rem\\)\\] {
font-size: 2rem;
line-height: var(--tw-leading, var(--default-line-height));
}

.text-\\[clamp\\(1rem\\,var\\(--size\\)\\,3rem\\)\\] {
font-size: clamp(1rem, var(--size), 3rem);
line-height: var(--tw-leading, var(--default-line-height));
}

.text-\\[clamp\\(1rem\\,var\\(--size\\)\\,3rem\\)\\]\\/9 {
font-size: clamp(1rem, var(--size), 3rem);
line-height: var(--line-height-9, 2.25rem);
}

.text-\\[larger\\] {
font-size: larger;
line-height: var(--tw-leading, var(--default-line-height));
}

.text-\\[larger\\]\\/6 {
font-size: larger;
line-height: var(--line-height-6, 1.5rem);
}

.text-\\[length\\:var\\(--my-size\\)\\], .text-\\[percentage\\:var\\(--my-size\\)\\], .text-\\[relative-size\\:var\\(--my-size\\)\\] {
font-size: var(--my-size);
line-height: var(--tw-leading, var(--default-line-height));
}

.text-\\[xx-large\\] {
font-size: xx-large;
line-height: var(--tw-leading, var(--default-line-height));
}

.text-\\[xx-large\\]\\/6 {
font-size: xx-large;
line-height: var(--line-height-6, 1.5rem);
}

.text-sm\\/6 {
font-size: var(--font-size-sm, .875rem);
line-height: var(--line-height-6, 1.5rem);
}

.text-sm\\/\\[4px\\] {
font-size: var(--font-size-sm, .875rem);
line-height: 4px;
}

.text-\\[\\#0088cc\\] {
Expand Down
21 changes: 13 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 @@ -4183,12 +4183,16 @@ export function createUtilities(theme: Theme) {
? candidate.modifier.value
: theme.resolve(candidate.modifier.value, ['--line-height'])

if (modifier) {
return [decl('font-size', value), decl('line-height', modifier)]
}
return [
decl('font-size', value),
decl('line-height', modifier ?? 'var(--tw-leading, var(--default-line-height))'),
]
}

return [decl('font-size', value)]
return [
decl('font-size', value),
decl('line-height', 'var(--tw-leading, var(--default-line-height))'),
]
}
default: {
value = asColor(value, candidate.modifier)
Expand Down Expand Up @@ -4223,9 +4227,10 @@ export function createUtilities(theme: Theme) {
? candidate.modifier.value
: theme.resolve(candidate.modifier.value, ['--line-height'])

let declarations = [decl('font-size', fontSize)]
modifier && declarations.push(decl('line-height', modifier))
return declarations
return [
decl('font-size', fontSize),
decl('line-height', modifier ?? 'var(--tw-leading, var(--default-line-height))'),
]
}

if (typeof options === 'string') {
Expand All @@ -4236,7 +4241,7 @@ export function createUtilities(theme: Theme) {
decl('font-size', fontSize),
decl(
'line-height',
options['--line-height'] ? `var(--tw-leading, ${options['--line-height']})` : undefined,
`var(--tw-leading, ${options['--line-height'] ?? 'var(--default-line-height)'})`,
),
decl(
'letter-spacing',
Expand Down
14 changes: 1 addition & 13 deletions packages/tailwindcss/theme.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
--default-mono-font-family: var(--font-family-mono);
--default-mono-font-feature-settings: var(--font-family-mono--font-feature-settings);
--default-mono-font-variation-settings: var(--font-family-mono--font-variation-settings);
--default-line-height: round(max(min(2em - 0.5rem, 1em + 0.5rem, 2em / 3 + 1rem), 1em), 2px);

/* Breakpoints */
--breakpoint-sm: 40rem;
Expand Down Expand Up @@ -373,31 +374,18 @@

/* Type scale */
--font-size-xs: 0.75rem;
--font-size-xs--line-height: 1rem;
--font-size-sm: 0.875rem;
--font-size-sm--line-height: 1.25rem;
--font-size-base: 1rem;
--font-size-base--line-height: 1.5rem;
--font-size-lg: 1.125rem;
--font-size-lg--line-height: 1.75rem;
--font-size-xl: 1.25rem;
--font-size-xl--line-height: 1.75rem;
--font-size-2xl: 1.5rem;
--font-size-2xl--line-height: 2rem;
--font-size-3xl: 1.875rem;
--font-size-3xl--line-height: 2.25rem;
--font-size-4xl: 2.25rem;
--font-size-4xl--line-height: 2.5rem;
--font-size-5xl: 3rem;
--font-size-5xl--line-height: 1;
--font-size-6xl: 3.75rem;
--font-size-6xl--line-height: 1;
--font-size-7xl: 4.5rem;
--font-size-7xl--line-height: 1;
--font-size-8xl: 6rem;
--font-size-8xl--line-height: 1;
--font-size-9xl: 8rem;
--font-size-9xl--line-height: 1;

/* Letter spacing */
--letter-spacing-tighter: -0.05em;
Expand Down