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

adamwathan · web-flow · commit 16fac7e57155 · 2020-10-20T08:31:50.000-04:00
* Move 64px to 60px, 80px to 72px

* Update changelog
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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' }],
     },

Original file line number	Diff line number	Diff line change
`@@ -15682,12 +15682,12 @@ video {`
`15682`	`15682`	`}`
`15683`	`15683`
`15684`	`15684`	`.text-6xl {`
`15685`		`- font-size: 4rem;`
	`15685`	`+ font-size: 3.75rem;`
`15686`	`15686`	`line-height: 1;`
`15687`	`15687`	`}`
`15688`	`15688`
`15689`	`15689`	`.text-7xl {`
`15690`		`- font-size: 5rem;`
	`15690`	`+ font-size: 4.5rem;`
`15691`	`15691`	`line-height: 1;`
`15692`	`15692`	`}`
`15693`	`15693`
`@@ -54999,12 +54999,12 @@ video {`
`54999`	`54999`	`}`
`55000`	`55000`
`55001`	`55001`	`.sm\:text-6xl {`
`55002`		`- font-size: 4rem;`
	`55002`	`+ font-size: 3.75rem;`
`55003`	`55003`	`line-height: 1;`
`55004`	`55004`	`}`
`55005`	`55005`
`55006`	`55006`	`.sm\:text-7xl {`
`55007`		`- font-size: 5rem;`
	`55007`	`+ font-size: 4.5rem;`
`55008`	`55008`	`line-height: 1;`
`55009`	`55009`	`}`
`55010`	`55010`
`@@ -94286,12 +94286,12 @@ video {`
`94286`	`94286`	`}`
`94287`	`94287`
`94288`	`94288`	`.md\:text-6xl {`
`94289`		`- font-size: 4rem;`
	`94289`	`+ font-size: 3.75rem;`
`94290`	`94290`	`line-height: 1;`
`94291`	`94291`	`}`
`94292`	`94292`
`94293`	`94293`	`.md\:text-7xl {`
`94294`		`- font-size: 5rem;`
	`94294`	`+ font-size: 4.5rem;`
`94295`	`94295`	`line-height: 1;`
`94296`	`94296`	`}`
`94297`	`94297`
`@@ -133573,12 +133573,12 @@ video {`
`133573`	`133573`	`}`
`133574`	`133574`
`133575`	`133575`	`.lg\:text-6xl {`
`133576`		`- font-size: 4rem;`
	`133576`	`+ font-size: 3.75rem;`
`133577`	`133577`	`line-height: 1;`
`133578`	`133578`	`}`
`133579`	`133579`
`133580`	`133580`	`.lg\:text-7xl {`
`133581`		`- font-size: 5rem;`
	`133581`	`+ font-size: 4.5rem;`
`133582`	`133582`	`line-height: 1;`
`133583`	`133583`	`}`
`133584`	`133584`
`@@ -172860,12 +172860,12 @@ video {`
`172860`	`172860`	`}`
`172861`	`172861`
`172862`	`172862`	`.xl\:text-6xl {`
`172863`		`- font-size: 4rem;`
	`172863`	`+ font-size: 3.75rem;`
`172864`	`172864`	`line-height: 1;`
`172865`	`172865`	`}`
`172866`	`172866`
`172867`	`172867`	`.xl\:text-7xl {`
`172868`		`- font-size: 5rem;`
	`172868`	`+ font-size: 4.5rem;`
`172869`	`172869`	`line-height: 1;`
`172870`	`172870`	`}`
`172871`	`172871`
`@@ -212147,12 +212147,12 @@ video {`
`212147`	`212147`	`}`
`212148`	`212148`
`212149`	`212149`	`.\32xl\:text-6xl {`
`212150`		`- font-size: 4rem;`
	`212150`	`+ font-size: 3.75rem;`
`212151`	`212151`	`line-height: 1;`
`212152`	`212152`	`}`
`212153`	`212153`
`212154`	`212154`	`.\32xl\:text-7xl {`
`212155`		`- font-size: 5rem;`
	`212155`	`+ font-size: 4.5rem;`
`212156`	`212156`	`line-height: 1;`
`212157`	`212157`	`}`
`212158`	`212158`
Original file line number	Diff line number	Diff line change
`@@ -14534,12 +14534,12 @@ video {`
`14534`	`14534`	`}`
`14535`	`14535`
`14536`	`14536`	`.text-6xl {`
`14537`		`- font-size: 4rem;`
	`14537`	`+ font-size: 3.75rem;`
`14538`	`14538`	`line-height: 1;`
`14539`	`14539`	`}`
`14540`	`14540`
`14541`	`14541`	`.text-7xl {`
`14542`		`- font-size: 5rem;`
	`14542`	`+ font-size: 4.5rem;`
`14543`	`14543`	`line-height: 1;`
`14544`	`14544`	`}`
`14545`	`14545`
`@@ -51883,12 +51883,12 @@ video {`
`51883`	`51883`	`}`
`51884`	`51884`
`51885`	`51885`	`.sm\:text-6xl {`
`51886`		`- font-size: 4rem;`
	`51886`	`+ font-size: 3.75rem;`
`51887`	`51887`	`line-height: 1;`
`51888`	`51888`	`}`
`51889`	`51889`
`51890`	`51890`	`.sm\:text-7xl {`
`51891`		`- font-size: 5rem;`
	`51891`	`+ font-size: 4.5rem;`
`51892`	`51892`	`line-height: 1;`
`51893`	`51893`	`}`
`51894`	`51894`
`@@ -89202,12 +89202,12 @@ video {`
`89202`	`89202`	`}`
`89203`	`89203`
`89204`	`89204`	`.md\:text-6xl {`
`89205`		`- font-size: 4rem;`
	`89205`	`+ font-size: 3.75rem;`
`89206`	`89206`	`line-height: 1;`
`89207`	`89207`	`}`
`89208`	`89208`
`89209`	`89209`	`.md\:text-7xl {`
`89210`		`- font-size: 5rem;`
	`89210`	`+ font-size: 4.5rem;`
`89211`	`89211`	`line-height: 1;`
`89212`	`89212`	`}`
`89213`	`89213`
`@@ -126521,12 +126521,12 @@ video {`
`126521`	`126521`	`}`
`126522`	`126522`
`126523`	`126523`	`.lg\:text-6xl {`
`126524`		`- font-size: 4rem;`
	`126524`	`+ font-size: 3.75rem;`
`126525`	`126525`	`line-height: 1;`
`126526`	`126526`	`}`
`126527`	`126527`
`126528`	`126528`	`.lg\:text-7xl {`
`126529`		`- font-size: 5rem;`
	`126529`	`+ font-size: 4.5rem;`
`126530`	`126530`	`line-height: 1;`
`126531`	`126531`	`}`
`126532`	`126532`
`@@ -163840,12 +163840,12 @@ video {`
`163840`	`163840`	`}`
`163841`	`163841`
`163842`	`163842`	`.xl\:text-6xl {`
`163843`		`- font-size: 4rem;`
	`163843`	`+ font-size: 3.75rem;`
`163844`	`163844`	`line-height: 1;`
`163845`	`163845`	`}`
`163846`	`163846`
`163847`	`163847`	`.xl\:text-7xl {`
`163848`		`- font-size: 5rem;`
	`163848`	`+ font-size: 4.5rem;`
`163849`	`163849`	`line-height: 1;`
`163850`	`163850`	`}`
`163851`	`163851`
`@@ -201159,12 +201159,12 @@ video {`
`201159`	`201159`	`}`
`201160`	`201160`
`201161`	`201161`	`.\32xl\:text-6xl {`
`201162`		`- font-size: 4rem;`
	`201162`	`+ font-size: 3.75rem;`
`201163`	`201163`	`line-height: 1;`
`201164`	`201164`	`}`
`201165`	`201165`
`201166`	`201166`	`.\32xl\:text-7xl {`
`201167`		`- font-size: 5rem;`
	`201167`	`+ font-size: 4.5rem;`
`201168`	`201168`	`line-height: 1;`
`201169`	`201169`	`}`
`201170`	`201170`