diff --git a/__tests__/fixtures/tailwind-output-important.css b/__tests__/fixtures/tailwind-output-important.css index 4bb12459d..3dae7f6eb 100644 --- a/__tests__/fixtures/tailwind-output-important.css +++ b/__tests__/fixtures/tailwind-output-important.css @@ -18760,6 +18760,21 @@ video { line-height: 1 !important; } +.text-7xl { + font-size: 5rem !important; + line-height: 1 !important; +} + +.text-8xl { + font-size: 6rem !important; + line-height: 1 !important; +} + +.text-9xl { + font-size: 8rem !important; + line-height: 1 !important; +} + .leading-3 { line-height: .75rem !important; } @@ -62116,6 +62131,21 @@ video { line-height: 1 !important; } + .sm\:text-7xl { + font-size: 5rem !important; + line-height: 1 !important; + } + + .sm\:text-8xl { + font-size: 6rem !important; + line-height: 1 !important; + } + + .sm\:text-9xl { + font-size: 8rem !important; + line-height: 1 !important; + } + .sm\:leading-3 { line-height: .75rem !important; } @@ -105442,6 +105472,21 @@ video { line-height: 1 !important; } + .md\:text-7xl { + font-size: 5rem !important; + line-height: 1 !important; + } + + .md\:text-8xl { + font-size: 6rem !important; + line-height: 1 !important; + } + + .md\:text-9xl { + font-size: 8rem !important; + line-height: 1 !important; + } + .md\:leading-3 { line-height: .75rem !important; } @@ -148768,6 +148813,21 @@ video { line-height: 1 !important; } + .lg\:text-7xl { + font-size: 5rem !important; + line-height: 1 !important; + } + + .lg\:text-8xl { + font-size: 6rem !important; + line-height: 1 !important; + } + + .lg\:text-9xl { + font-size: 8rem !important; + line-height: 1 !important; + } + .lg\:leading-3 { line-height: .75rem !important; } @@ -192094,6 +192154,21 @@ video { line-height: 1 !important; } + .xl\:text-7xl { + font-size: 5rem !important; + line-height: 1 !important; + } + + .xl\:text-8xl { + font-size: 6rem !important; + line-height: 1 !important; + } + + .xl\:text-9xl { + font-size: 8rem !important; + line-height: 1 !important; + } + .xl\:leading-3 { line-height: .75rem !important; } diff --git a/__tests__/fixtures/tailwind-output-no-color-opacity.css b/__tests__/fixtures/tailwind-output-no-color-opacity.css index fa394cf2f..9c7e9efcb 100644 --- a/__tests__/fixtures/tailwind-output-no-color-opacity.css +++ b/__tests__/fixtures/tailwind-output-no-color-opacity.css @@ -17332,6 +17332,21 @@ video { line-height: 1; } +.text-7xl { + font-size: 5rem; + line-height: 1; +} + +.text-8xl { + font-size: 6rem; + line-height: 1; +} + +.text-9xl { + font-size: 8rem; + line-height: 1; +} + .leading-3 { line-height: .75rem; } @@ -58240,6 +58255,21 @@ video { line-height: 1; } + .sm\:text-7xl { + font-size: 5rem; + line-height: 1; + } + + .sm\:text-8xl { + font-size: 6rem; + line-height: 1; + } + + .sm\:text-9xl { + font-size: 8rem; + line-height: 1; + } + .sm\:leading-3 { line-height: .75rem; } @@ -99118,6 +99148,21 @@ video { line-height: 1; } + .md\:text-7xl { + font-size: 5rem; + line-height: 1; + } + + .md\:text-8xl { + font-size: 6rem; + line-height: 1; + } + + .md\:text-9xl { + font-size: 8rem; + line-height: 1; + } + .md\:leading-3 { line-height: .75rem; } @@ -139996,6 +140041,21 @@ video { line-height: 1; } + .lg\:text-7xl { + font-size: 5rem; + line-height: 1; + } + + .lg\:text-8xl { + font-size: 6rem; + line-height: 1; + } + + .lg\:text-9xl { + font-size: 8rem; + line-height: 1; + } + .lg\:leading-3 { line-height: .75rem; } @@ -180874,6 +180934,21 @@ video { line-height: 1; } + .xl\:text-7xl { + font-size: 5rem; + line-height: 1; + } + + .xl\:text-8xl { + font-size: 6rem; + line-height: 1; + } + + .xl\:text-9xl { + font-size: 8rem; + line-height: 1; + } + .xl\:leading-3 { line-height: .75rem; } diff --git a/__tests__/fixtures/tailwind-output.css b/__tests__/fixtures/tailwind-output.css index cf10bcbc0..a67db6e97 100644 --- a/__tests__/fixtures/tailwind-output.css +++ b/__tests__/fixtures/tailwind-output.css @@ -18760,6 +18760,21 @@ video { line-height: 1; } +.text-7xl { + font-size: 5rem; + line-height: 1; +} + +.text-8xl { + font-size: 6rem; + line-height: 1; +} + +.text-9xl { + font-size: 8rem; + line-height: 1; +} + .leading-3 { line-height: .75rem; } @@ -62116,6 +62131,21 @@ video { line-height: 1; } + .sm\:text-7xl { + font-size: 5rem; + line-height: 1; + } + + .sm\:text-8xl { + font-size: 6rem; + line-height: 1; + } + + .sm\:text-9xl { + font-size: 8rem; + line-height: 1; + } + .sm\:leading-3 { line-height: .75rem; } @@ -105442,6 +105472,21 @@ video { line-height: 1; } + .md\:text-7xl { + font-size: 5rem; + line-height: 1; + } + + .md\:text-8xl { + font-size: 6rem; + line-height: 1; + } + + .md\:text-9xl { + font-size: 8rem; + line-height: 1; + } + .md\:leading-3 { line-height: .75rem; } @@ -148768,6 +148813,21 @@ video { line-height: 1; } + .lg\:text-7xl { + font-size: 5rem; + line-height: 1; + } + + .lg\:text-8xl { + font-size: 6rem; + line-height: 1; + } + + .lg\:text-9xl { + font-size: 8rem; + line-height: 1; + } + .lg\:leading-3 { line-height: .75rem; } @@ -192094,6 +192154,21 @@ video { line-height: 1; } + .xl\:text-7xl { + font-size: 5rem; + line-height: 1; + } + + .xl\:text-8xl { + font-size: 6rem; + line-height: 1; + } + + .xl\:text-9xl { + font-size: 8rem; + line-height: 1; + } + .xl\:leading-3 { line-height: .75rem; } diff --git a/src/featureFlags.js b/src/featureFlags.js index 7dd7c54d5..d8130942c 100644 --- a/src/featureFlags.js +++ b/src/featureFlags.js @@ -4,7 +4,7 @@ import log from './util/log' const featureFlags = { future: [], - experimental: ['extendedFontSizeScale', 'additionalBreakpoint'], + experimental: ['additionalBreakpoint'], } export function flagEnabled(config, flag) { diff --git a/src/flagged/extendedFontSizeScale.js b/src/flagged/extendedFontSizeScale.js deleted file mode 100644 index 5198cad73..000000000 --- a/src/flagged/extendedFontSizeScale.js +++ /dev/null @@ -1,11 +0,0 @@ -export default { - theme: { - extend: { - fontSize: { - '7xl': ['5rem', { lineHeight: '1' }], - '8xl': ['6rem', { lineHeight: '1' }], - '9xl': ['8rem', { lineHeight: '1' }], - }, - }, - }, -} diff --git a/src/util/getAllConfigs.js b/src/util/getAllConfigs.js index 949abc355..8db45fc1e 100644 --- a/src/util/getAllConfigs.js +++ b/src/util/getAllConfigs.js @@ -1,6 +1,5 @@ import defaultConfig from '../../stubs/defaultConfig.stub.js' import { flagEnabled } from '../featureFlags' -import extendedFontSizeScale from '../flagged/extendedFontSizeScale.js' import additionalBreakpoint from '../flagged/additionalBreakpoint' import { flatMap, get } from 'lodash' @@ -10,7 +9,6 @@ export default function getAllConfigs(config, defaultPresets = [defaultConfig]) }) const features = { - extendedFontSizeScale, additionalBreakpoint, } diff --git a/stubs/defaultConfig.stub.js b/stubs/defaultConfig.stub.js index 98da9fcc6..cf4a3edcb 100644 --- a/stubs/defaultConfig.stub.js +++ b/stubs/defaultConfig.stub.js @@ -342,6 +342,9 @@ module.exports = { '4xl': ['2.25rem', { lineHeight: '2.5rem' }], '5xl': ['3rem', { lineHeight: '1' }], '6xl': ['4rem', { lineHeight: '1' }], + '7xl': ['5rem', { lineHeight: '1' }], + '8xl': ['6rem', { lineHeight: '1' }], + '9xl': ['8rem', { lineHeight: '1' }], }, fontWeight: { thin: '100',