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

Adjust font size scale: move 64px to 60px, 80px to 72px #2619

Merged
merged 2 commits into from Oct 20, 2020
Merged

Adjust font size scale: move 64px to 60px, 80px to 72px #2619

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
b7c3a6e
Move 64px to 60px, 80px to 72px
adamwathan Oct 19, 2020
477bd13
Update changelog
adamwathan Oct 19, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Expand Up @@ -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]

Expand Down
24 changes: 12 additions & 12 deletions __tests__/fixtures/tailwind-output-flagged.css
View file
Open in desktop
Expand Up @@ -18762,12 +18762,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;
}

Expand Down Expand Up @@ -62159,12 +62159,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;
}

Expand Down Expand Up @@ -105526,12 +105526,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;
}

Expand Down Expand Up @@ -148893,12 +148893,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;
}

Expand Down Expand Up @@ -192260,12 +192260,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;
}

Expand Down Expand Up @@ -235627,12 +235627,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;
}

Expand Down
24 changes: 12 additions & 12 deletions __tests__/fixtures/tailwind-output-important.css
View file
Open in desktop
Expand Up @@ -18762,12 +18762,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;
}

Expand Down Expand Up @@ -62159,12 +62159,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;
}

Expand Down Expand Up @@ -105526,12 +105526,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;
}

Expand Down Expand Up @@ -148893,12 +148893,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;
}

Expand Down Expand Up @@ -192260,12 +192260,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;
}

Expand Down Expand Up @@ -235627,12 +235627,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;
}

Expand Down
24 changes: 12 additions & 12 deletions __tests__/fixtures/tailwind-output-no-color-opacity.css
View file
Open in desktop
Expand Up @@ -17334,12 +17334,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;
}

Expand Down Expand Up @@ -58283,12 +58283,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;
}

Expand Down Expand Up @@ -99202,12 +99202,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;
}

Expand Down Expand Up @@ -140121,12 +140121,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;
}

Expand Down Expand Up @@ -181040,12 +181040,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;
}

Expand Down Expand Up @@ -221959,12 +221959,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;
}

Expand Down
24 changes: 12 additions & 12 deletions __tests__/fixtures/tailwind-output.css
View file
Open in desktop
Expand Up @@ -18762,12 +18762,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;
}

Expand Down Expand Up @@ -62159,12 +62159,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;
}

Expand Down Expand Up @@ -105526,12 +105526,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;
}

Expand Down Expand Up @@ -148893,12 +148893,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;
}

Expand Down Expand Up @@ -192260,12 +192260,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;
}

Expand Down Expand Up @@ -235627,12 +235627,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;
}

Expand Down
4 changes: 2 additions & 2 deletions stubs/defaultConfig.stub.js
View file
Open in desktop
Expand Up @@ -342,8 +342,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' }],
},
Expand Down