diff --git a/CHANGELOG.md b/CHANGELOG.md index 2b4016ac3639..073cec990802 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -28,6 +28,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Upgrade to PostCSS 8.0 - Use logical properties for `space` and `divide` utilities ([#1883](https://github.com/tailwindlabs/tailwindcss/pull/1883)) - Support defining theme keys as arrays wherever it makes sense, and make accessing using `theme` retrieve the expected resolved value ([e13f083c4](https://github.com/tailwindlabs/tailwindcss/commit/e13f083c4bc48bf9870d27c966136a9584943127)) +- Adjust default font-size scale to include 60px and 72px instead of 64px and 80px ([#2619](https://github.com/tailwindlabs/tailwindcss/pull/2619)) ## [1.9.5] diff --git a/__tests__/fixtures/tailwind-output-flagged.css b/__tests__/fixtures/tailwind-output-flagged.css index 4a3ae9ef00b6..b603ae86a899 100644 --- a/__tests__/fixtures/tailwind-output-flagged.css +++ b/__tests__/fixtures/tailwind-output-flagged.css @@ -15682,12 +15682,12 @@ video { } .text-6xl { - font-size: 4rem; + font-size: 3.75rem; line-height: 1; } .text-7xl { - font-size: 5rem; + font-size: 4.5rem; line-height: 1; } @@ -54999,12 +54999,12 @@ video { } .sm\:text-6xl { - font-size: 4rem; + font-size: 3.75rem; line-height: 1; } .sm\:text-7xl { - font-size: 5rem; + font-size: 4.5rem; line-height: 1; } @@ -94286,12 +94286,12 @@ video { } .md\:text-6xl { - font-size: 4rem; + font-size: 3.75rem; line-height: 1; } .md\:text-7xl { - font-size: 5rem; + font-size: 4.5rem; line-height: 1; } @@ -133573,12 +133573,12 @@ video { } .lg\:text-6xl { - font-size: 4rem; + font-size: 3.75rem; line-height: 1; } .lg\:text-7xl { - font-size: 5rem; + font-size: 4.5rem; line-height: 1; } @@ -172860,12 +172860,12 @@ video { } .xl\:text-6xl { - font-size: 4rem; + font-size: 3.75rem; line-height: 1; } .xl\:text-7xl { - font-size: 5rem; + font-size: 4.5rem; line-height: 1; } @@ -212147,12 +212147,12 @@ video { } .\32xl\:text-6xl { - font-size: 4rem; + font-size: 3.75rem; line-height: 1; } .\32xl\:text-7xl { - font-size: 5rem; + font-size: 4.5rem; line-height: 1; } diff --git a/__tests__/fixtures/tailwind-output-important.css b/__tests__/fixtures/tailwind-output-important.css index 692f6a1702a7..ec653cbfe8e2 100644 --- a/__tests__/fixtures/tailwind-output-important.css +++ b/__tests__/fixtures/tailwind-output-important.css @@ -15682,12 +15682,12 @@ video { } .text-6xl { - font-size: 4rem !important; + font-size: 3.75rem !important; line-height: 1 !important; } .text-7xl { - font-size: 5rem !important; + font-size: 4.5rem !important; line-height: 1 !important; } @@ -54999,12 +54999,12 @@ video { } .sm\:text-6xl { - font-size: 4rem !important; + font-size: 3.75rem !important; line-height: 1 !important; } .sm\:text-7xl { - font-size: 5rem !important; + font-size: 4.5rem !important; line-height: 1 !important; } @@ -94286,12 +94286,12 @@ video { } .md\:text-6xl { - font-size: 4rem !important; + font-size: 3.75rem !important; line-height: 1 !important; } .md\:text-7xl { - font-size: 5rem !important; + font-size: 4.5rem !important; line-height: 1 !important; } @@ -133573,12 +133573,12 @@ video { } .lg\:text-6xl { - font-size: 4rem !important; + font-size: 3.75rem !important; line-height: 1 !important; } .lg\:text-7xl { - font-size: 5rem !important; + font-size: 4.5rem !important; line-height: 1 !important; } @@ -172860,12 +172860,12 @@ video { } .xl\:text-6xl { - font-size: 4rem !important; + font-size: 3.75rem !important; line-height: 1 !important; } .xl\:text-7xl { - font-size: 5rem !important; + font-size: 4.5rem !important; line-height: 1 !important; } @@ -212147,12 +212147,12 @@ video { } .\32xl\:text-6xl { - font-size: 4rem !important; + font-size: 3.75rem !important; line-height: 1 !important; } .\32xl\:text-7xl { - font-size: 5rem !important; + font-size: 4.5rem !important; line-height: 1 !important; } diff --git a/__tests__/fixtures/tailwind-output-no-color-opacity.css b/__tests__/fixtures/tailwind-output-no-color-opacity.css index afb22163df15..82e72e5c3b14 100644 --- a/__tests__/fixtures/tailwind-output-no-color-opacity.css +++ b/__tests__/fixtures/tailwind-output-no-color-opacity.css @@ -14534,12 +14534,12 @@ video { } .text-6xl { - font-size: 4rem; + font-size: 3.75rem; line-height: 1; } .text-7xl { - font-size: 5rem; + font-size: 4.5rem; line-height: 1; } @@ -51883,12 +51883,12 @@ video { } .sm\:text-6xl { - font-size: 4rem; + font-size: 3.75rem; line-height: 1; } .sm\:text-7xl { - font-size: 5rem; + font-size: 4.5rem; line-height: 1; } @@ -89202,12 +89202,12 @@ video { } .md\:text-6xl { - font-size: 4rem; + font-size: 3.75rem; line-height: 1; } .md\:text-7xl { - font-size: 5rem; + font-size: 4.5rem; line-height: 1; } @@ -126521,12 +126521,12 @@ video { } .lg\:text-6xl { - font-size: 4rem; + font-size: 3.75rem; line-height: 1; } .lg\:text-7xl { - font-size: 5rem; + font-size: 4.5rem; line-height: 1; } @@ -163840,12 +163840,12 @@ video { } .xl\:text-6xl { - font-size: 4rem; + font-size: 3.75rem; line-height: 1; } .xl\:text-7xl { - font-size: 5rem; + font-size: 4.5rem; line-height: 1; } @@ -201159,12 +201159,12 @@ video { } .\32xl\:text-6xl { - font-size: 4rem; + font-size: 3.75rem; line-height: 1; } .\32xl\:text-7xl { - font-size: 5rem; + font-size: 4.5rem; line-height: 1; } diff --git a/__tests__/fixtures/tailwind-output.css b/__tests__/fixtures/tailwind-output.css index 4a3ae9ef00b6..b603ae86a899 100644 --- a/__tests__/fixtures/tailwind-output.css +++ b/__tests__/fixtures/tailwind-output.css @@ -15682,12 +15682,12 @@ video { } .text-6xl { - font-size: 4rem; + font-size: 3.75rem; line-height: 1; } .text-7xl { - font-size: 5rem; + font-size: 4.5rem; line-height: 1; } @@ -54999,12 +54999,12 @@ video { } .sm\:text-6xl { - font-size: 4rem; + font-size: 3.75rem; line-height: 1; } .sm\:text-7xl { - font-size: 5rem; + font-size: 4.5rem; line-height: 1; } @@ -94286,12 +94286,12 @@ video { } .md\:text-6xl { - font-size: 4rem; + font-size: 3.75rem; line-height: 1; } .md\:text-7xl { - font-size: 5rem; + font-size: 4.5rem; line-height: 1; } @@ -133573,12 +133573,12 @@ video { } .lg\:text-6xl { - font-size: 4rem; + font-size: 3.75rem; line-height: 1; } .lg\:text-7xl { - font-size: 5rem; + font-size: 4.5rem; line-height: 1; } @@ -172860,12 +172860,12 @@ video { } .xl\:text-6xl { - font-size: 4rem; + font-size: 3.75rem; line-height: 1; } .xl\:text-7xl { - font-size: 5rem; + font-size: 4.5rem; line-height: 1; } @@ -212147,12 +212147,12 @@ video { } .\32xl\:text-6xl { - font-size: 4rem; + font-size: 3.75rem; line-height: 1; } .\32xl\:text-7xl { - font-size: 5rem; + font-size: 4.5rem; line-height: 1; } diff --git a/stubs/defaultConfig.stub.js b/stubs/defaultConfig.stub.js index d0da4be98ce1..43a287b7cf75 100644 --- a/stubs/defaultConfig.stub.js +++ b/stubs/defaultConfig.stub.js @@ -241,8 +241,8 @@ module.exports = { '3xl': ['1.875rem', { lineHeight: '2.25rem' }], '4xl': ['2.25rem', { lineHeight: '2.5rem' }], '5xl': ['3rem', { lineHeight: '1' }], - '6xl': ['4rem', { lineHeight: '1' }], - '7xl': ['5rem', { lineHeight: '1' }], + '6xl': ['3.75rem', { lineHeight: '1' }], + '7xl': ['4.5rem', { lineHeight: '1' }], '8xl': ['6rem', { lineHeight: '1' }], '9xl': ['8rem', { lineHeight: '1' }], },