archive-gh-me/tailwindcss
1
0
Fork 0
mirror of https://github.com/tailwindlabs/tailwindcss.git synced 2025-12-08 21:36:08 +00:00
Code Issues Projects Releases Wiki Activity

Add line-heights to font-size utilities by default

Browse Source
This commit is contained in:
Adam Wathan 2020-10-17 20:45:10 -04:00
parent b008d0c08a
commit 7d102598f9
7 changed files with 161 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
__tests__/fixtures/tailwind-output-important.css
View File

@ -9804,42 +9804,52 @@ video {
.text-xs {
font-size: 0.75rem !important;
line-height: 1rem !important;
}
.text-sm {
font-size: 0.875rem !important;
line-height: 1.25rem !important;
}
.text-base {
font-size: 1rem !important;
line-height: 1.5rem !important;
}
.text-lg {
font-size: 1.125rem !important;
line-height: 1.75rem !important;
}
.text-xl {
font-size: 1.25rem !important;
line-height: 1.75rem !important;
}
.text-2xl {
font-size: 1.5rem !important;
line-height: 2rem !important;
}
.text-3xl {
font-size: 1.875rem !important;
line-height: 2.25rem !important;
}
.text-4xl {
font-size: 2.25rem !important;
line-height: 2.5rem !important;
}
.text-5xl {
font-size: 3rem !important;
line-height: 1 !important;
}
.text-6xl {
font-size: 4rem !important;
line-height: 1 !important;
}
.leading-3 {
@ -27142,42 +27152,52 @@ video {
.sm\:text-xs {
font-size: 0.75rem !important;
line-height: 1rem !important;
}
.sm\:text-sm {
font-size: 0.875rem !important;
line-height: 1.25rem !important;
}
.sm\:text-base {
font-size: 1rem !important;
line-height: 1.5rem !important;
}
.sm\:text-lg {
font-size: 1.125rem !important;
line-height: 1.75rem !important;
}
.sm\:text-xl {
font-size: 1.25rem !important;
line-height: 1.75rem !important;
}
.sm\:text-2xl {
font-size: 1.5rem !important;
line-height: 2rem !important;
}
.sm\:text-3xl {
font-size: 1.875rem !important;
line-height: 2.25rem !important;
}
.sm\:text-4xl {
font-size: 2.25rem !important;
line-height: 2.5rem !important;
}
.sm\:text-5xl {
font-size: 3rem !important;
line-height: 1 !important;
}
.sm\:text-6xl {
font-size: 4rem !important;
line-height: 1 !important;
}
.sm\:leading-3 {
@ -44450,42 +44470,52 @@ video {
.md\:text-xs {
font-size: 0.75rem !important;
line-height: 1rem !important;
}
.md\:text-sm {
font-size: 0.875rem !important;
line-height: 1.25rem !important;
}
.md\:text-base {
font-size: 1rem !important;
line-height: 1.5rem !important;
}
.md\:text-lg {
font-size: 1.125rem !important;
line-height: 1.75rem !important;
}
.md\:text-xl {
font-size: 1.25rem !important;
line-height: 1.75rem !important;
}
.md\:text-2xl {
font-size: 1.5rem !important;
line-height: 2rem !important;
}
.md\:text-3xl {
font-size: 1.875rem !important;
line-height: 2.25rem !important;
}
.md\:text-4xl {
font-size: 2.25rem !important;
line-height: 2.5rem !important;
}
.md\:text-5xl {
font-size: 3rem !important;
line-height: 1 !important;
}
.md\:text-6xl {
font-size: 4rem !important;
line-height: 1 !important;
}
.md\:leading-3 {
@ -61758,42 +61788,52 @@ video {
.lg\:text-xs {
font-size: 0.75rem !important;
line-height: 1rem !important;
}
.lg\:text-sm {
font-size: 0.875rem !important;
line-height: 1.25rem !important;
}
.lg\:text-base {
font-size: 1rem !important;
line-height: 1.5rem !important;
}
.lg\:text-lg {
font-size: 1.125rem !important;
line-height: 1.75rem !important;
}
.lg\:text-xl {
font-size: 1.25rem !important;
line-height: 1.75rem !important;
}
.lg\:text-2xl {
font-size: 1.5rem !important;
line-height: 2rem !important;
}
.lg\:text-3xl {
font-size: 1.875rem !important;
line-height: 2.25rem !important;
}
.lg\:text-4xl {
font-size: 2.25rem !important;
line-height: 2.5rem !important;
}
.lg\:text-5xl {
font-size: 3rem !important;
line-height: 1 !important;
}
.lg\:text-6xl {
font-size: 4rem !important;
line-height: 1 !important;
}
.lg\:leading-3 {
@ -79066,42 +79106,52 @@ video {
.xl\:text-xs {
font-size: 0.75rem !important;
line-height: 1rem !important;
}
.xl\:text-sm {
font-size: 0.875rem !important;
line-height: 1.25rem !important;
}
.xl\:text-base {
font-size: 1rem !important;
line-height: 1.5rem !important;
}
.xl\:text-lg {
font-size: 1.125rem !important;
line-height: 1.75rem !important;
}
.xl\:text-xl {
font-size: 1.25rem !important;
line-height: 1.75rem !important;
}
.xl\:text-2xl {
font-size: 1.5rem !important;
line-height: 2rem !important;
}
.xl\:text-3xl {
font-size: 1.875rem !important;
line-height: 2.25rem !important;
}
.xl\:text-4xl {
font-size: 2.25rem !important;
line-height: 2.5rem !important;
}
.xl\:text-5xl {
font-size: 3rem !important;
line-height: 1 !important;
}
.xl\:text-6xl {
font-size: 4rem !important;
line-height: 1 !important;
}
.xl\:leading-3 {

50
__tests__/fixtures/tailwind-output-no-color-opacity.css
View File

@ -9020,42 +9020,52 @@ video {
.text-xs {
font-size: 0.75rem;
line-height: 1rem;
}
.text-sm {
font-size: 0.875rem;
line-height: 1.25rem;
}
.text-base {
font-size: 1rem;
line-height: 1.5rem;
}
.text-lg {
font-size: 1.125rem;
line-height: 1.75rem;
}
.text-xl {
font-size: 1.25rem;
line-height: 1.75rem;
}
.text-2xl {
font-size: 1.5rem;
line-height: 2rem;
}
.text-3xl {
font-size: 1.875rem;
line-height: 2.25rem;
}
.text-4xl {
font-size: 2.25rem;
line-height: 2.5rem;
}
.text-5xl {
font-size: 3rem;
line-height: 1;
}
.text-6xl {
font-size: 4rem;
line-height: 1;
}
.leading-3 {
@ -25014,42 +25024,52 @@ video {
.sm\:text-xs {
font-size: 0.75rem;
line-height: 1rem;
}
.sm\:text-sm {
font-size: 0.875rem;
line-height: 1.25rem;
}
.sm\:text-base {
font-size: 1rem;
line-height: 1.5rem;
}
.sm\:text-lg {
font-size: 1.125rem;
line-height: 1.75rem;
}
.sm\:text-xl {
font-size: 1.25rem;
line-height: 1.75rem;
}
.sm\:text-2xl {
font-size: 1.5rem;
line-height: 2rem;
}
.sm\:text-3xl {
font-size: 1.875rem;
line-height: 2.25rem;
}
.sm\:text-4xl {
font-size: 2.25rem;
line-height: 2.5rem;
}
.sm\:text-5xl {
font-size: 3rem;
line-height: 1;
}
.sm\:text-6xl {
font-size: 4rem;
line-height: 1;
}
.sm\:leading-3 {
@ -40978,42 +40998,52 @@ video {
.md\:text-xs {
font-size: 0.75rem;
line-height: 1rem;
}
.md\:text-sm {
font-size: 0.875rem;
line-height: 1.25rem;
}
.md\:text-base {
font-size: 1rem;
line-height: 1.5rem;
}
.md\:text-lg {
font-size: 1.125rem;
line-height: 1.75rem;
}
.md\:text-xl {
font-size: 1.25rem;
line-height: 1.75rem;
}
.md\:text-2xl {
font-size: 1.5rem;
line-height: 2rem;
}
.md\:text-3xl {
font-size: 1.875rem;
line-height: 2.25rem;
}
.md\:text-4xl {
font-size: 2.25rem;
line-height: 2.5rem;
}
.md\:text-5xl {
font-size: 3rem;
line-height: 1;
}
.md\:text-6xl {
font-size: 4rem;
line-height: 1;
}
.md\:leading-3 {
@ -56942,42 +56972,52 @@ video {
.lg\:text-xs {
font-size: 0.75rem;
line-height: 1rem;
}
.lg\:text-sm {
font-size: 0.875rem;
line-height: 1.25rem;
}
.lg\:text-base {
font-size: 1rem;
line-height: 1.5rem;
}
.lg\:text-lg {
font-size: 1.125rem;
line-height: 1.75rem;
}
.lg\:text-xl {
font-size: 1.25rem;
line-height: 1.75rem;
}
.lg\:text-2xl {
font-size: 1.5rem;
line-height: 2rem;
}
.lg\:text-3xl {
font-size: 1.875rem;
line-height: 2.25rem;
}
.lg\:text-4xl {
font-size: 2.25rem;
line-height: 2.5rem;
}
.lg\:text-5xl {
font-size: 3rem;
line-height: 1;
}
.lg\:text-6xl {
font-size: 4rem;
line-height: 1;
}
.lg\:leading-3 {
@ -72906,42 +72946,52 @@ video {
.xl\:text-xs {
font-size: 0.75rem;
line-height: 1rem;
}
.xl\:text-sm {
font-size: 0.875rem;
line-height: 1.25rem;
}
.xl\:text-base {
font-size: 1rem;
line-height: 1.5rem;
}
.xl\:text-lg {
font-size: 1.125rem;
line-height: 1.75rem;
}
.xl\:text-xl {
font-size: 1.25rem;
line-height: 1.75rem;
}
.xl\:text-2xl {
font-size: 1.5rem;
line-height: 2rem;
}
.xl\:text-3xl {
font-size: 1.875rem;
line-height: 2.25rem;
}
.xl\:text-4xl {
font-size: 2.25rem;
line-height: 2.5rem;
}
.xl\:text-5xl {
font-size: 3rem;
line-height: 1;
}
.xl\:text-6xl {
font-size: 4rem;
line-height: 1;
}
.xl\:leading-3 {

50
__tests__/fixtures/tailwind-output.css
View File

@ -9804,42 +9804,52 @@ video {
.text-xs {
font-size: 0.75rem;
line-height: 1rem;
}
.text-sm {
font-size: 0.875rem;
line-height: 1.25rem;
}
.text-base {
font-size: 1rem;
line-height: 1.5rem;
}
.text-lg {
font-size: 1.125rem;
line-height: 1.75rem;
}
.text-xl {
font-size: 1.25rem;
line-height: 1.75rem;
}
.text-2xl {
font-size: 1.5rem;
line-height: 2rem;
}
.text-3xl {
font-size: 1.875rem;
line-height: 2.25rem;
}
.text-4xl {
font-size: 2.25rem;
line-height: 2.5rem;
}
.text-5xl {
font-size: 3rem;
line-height: 1;
}
.text-6xl {
font-size: 4rem;
line-height: 1;
}
.leading-3 {
@ -27142,42 +27152,52 @@ video {
.sm\:text-xs {
font-size: 0.75rem;
line-height: 1rem;
}
.sm\:text-sm {
font-size: 0.875rem;
line-height: 1.25rem;
}
.sm\:text-base {
font-size: 1rem;
line-height: 1.5rem;
}
.sm\:text-lg {
font-size: 1.125rem;
line-height: 1.75rem;
}
.sm\:text-xl {
font-size: 1.25rem;
line-height: 1.75rem;
}
.sm\:text-2xl {
font-size: 1.5rem;
line-height: 2rem;
}
.sm\:text-3xl {
font-size: 1.875rem;
line-height: 2.25rem;
}
.sm\:text-4xl {
font-size: 2.25rem;
line-height: 2.5rem;
}
.sm\:text-5xl {
font-size: 3rem;
line-height: 1;
}
.sm\:text-6xl {
font-size: 4rem;
line-height: 1;
}
.sm\:leading-3 {
@ -44450,42 +44470,52 @@ video {
.md\:text-xs {
font-size: 0.75rem;
line-height: 1rem;
}
.md\:text-sm {
font-size: 0.875rem;
line-height: 1.25rem;
}
.md\:text-base {
font-size: 1rem;
line-height: 1.5rem;
}
.md\:text-lg {
font-size: 1.125rem;
line-height: 1.75rem;
}
.md\:text-xl {
font-size: 1.25rem;
line-height: 1.75rem;
}
.md\:text-2xl {
font-size: 1.5rem;
line-height: 2rem;
}
.md\:text-3xl {
font-size: 1.875rem;
line-height: 2.25rem;
}
.md\:text-4xl {
font-size: 2.25rem;
line-height: 2.5rem;
}
.md\:text-5xl {
font-size: 3rem;
line-height: 1;
}
.md\:text-6xl {
font-size: 4rem;
line-height: 1;
}
.md\:leading-3 {
@ -61758,42 +61788,52 @@ video {
.lg\:text-xs {
font-size: 0.75rem;
line-height: 1rem;
}
.lg\:text-sm {
font-size: 0.875rem;
line-height: 1.25rem;
}
.lg\:text-base {
font-size: 1rem;
line-height: 1.5rem;
}
.lg\:text-lg {
font-size: 1.125rem;
line-height: 1.75rem;
}
.lg\:text-xl {
font-size: 1.25rem;
line-height: 1.75rem;
}
.lg\:text-2xl {
font-size: 1.5rem;
line-height: 2rem;
}
.lg\:text-3xl {
font-size: 1.875rem;
line-height: 2.25rem;
}
.lg\:text-4xl {
font-size: 2.25rem;
line-height: 2.5rem;
}
.lg\:text-5xl {
font-size: 3rem;
line-height: 1;
}
.lg\:text-6xl {
font-size: 4rem;
line-height: 1;
}
.lg\:leading-3 {
@ -79066,42 +79106,52 @@ video {
.xl\:text-xs {
font-size: 0.75rem;
line-height: 1rem;
}
.xl\:text-sm {
font-size: 0.875rem;
line-height: 1.25rem;
}
.xl\:text-base {
font-size: 1rem;
line-height: 1.5rem;
}
.xl\:text-lg {
font-size: 1.125rem;
line-height: 1.75rem;
}
.xl\:text-xl {
font-size: 1.25rem;
line-height: 1.75rem;
}
.xl\:text-2xl {
font-size: 1.5rem;
line-height: 2rem;
}
.xl\:text-3xl {
font-size: 1.875rem;
line-height: 2.25rem;
}
.xl\:text-4xl {
font-size: 2.25rem;
line-height: 2.5rem;
}
.xl\:text-5xl {
font-size: 3rem;
line-height: 1;
}
.xl\:text-6xl {
font-size: 4rem;
line-height: 1;
}
.xl\:leading-3 {

2
src/featureFlags.js
View File

@ -3,7 +3,7 @@ import chalk from 'chalk'
import log from './util/log'
const featureFlags = {
future: ['defaultLineHeights', 'standardFontWeights', 'moveTruncateToTextOverflow'],
future: ['standardFontWeights', 'moveTruncateToTextOverflow'],
experimental: [
'uniformColorPalette',
'extendedSpacingScale',

16
src/flagged/defaultLineHeights.js
View File

@ -1,16 +0,0 @@
export default {
theme: {
fontSize: {
xs: ['0.75rem', { lineHeight: '1rem' }],
sm: ['0.875rem', { lineHeight: '1.25rem' }],
base: ['1rem', { lineHeight: '1.5rem' }],
lg: ['1.125rem', { lineHeight: '1.75rem' }],
xl: ['1.25rem', { lineHeight: '1.75rem' }],
'2xl': ['1.5rem', { lineHeight: '2rem' }],
'3xl': ['1.875rem', { lineHeight: '2.25rem' }],
'4xl': ['2.25rem', { lineHeight: '2.5rem' }],
'5xl': ['3rem', { lineHeight: '1' }],
'6xl': ['4rem', { lineHeight: '1' }],
},
},
}

2
src/util/getAllConfigs.js
View File

@ -2,7 +2,6 @@ import defaultConfig from '../../stubs/defaultConfig.stub.js'
import { flagEnabled } from '../featureFlags'
import uniformColorPalette from '../flagged/uniformColorPalette.js'
import extendedSpacingScale from '../flagged/extendedSpacingScale.js'
import defaultLineHeights from '../flagged/defaultLineHeights.js'
import extendedFontSizeScale from '../flagged/extendedFontSizeScale.js'
import darkModeVariant from '../flagged/darkModeVariant.js'
import standardFontWeights from '../flagged/standardFontWeights'
@ -17,7 +16,6 @@ export default function getAllConfigs(config, defaultPresets = [defaultConfig])
const features = {
uniformColorPalette,
extendedSpacingScale,
defaultLineHeights,
extendedFontSizeScale,
standardFontWeights,
darkModeVariant,

20
stubs/defaultConfig.stub.js
View File

@ -263,16 +263,16 @@ module.exports = {
mono: ['ui-monospace', 'SFMono-Regular', 'Menlo', 'Monaco', 'Consolas', '"Liberation Mono"', '"Courier New"', 'monospace'],
},
fontSize: {
xs: '0.75rem',
sm: '0.875rem',
base: '1rem',
lg: '1.125rem',
xl: '1.25rem',
'2xl': '1.5rem',
'3xl': '1.875rem',
'4xl': '2.25rem',
'5xl': '3rem',
'6xl': '4rem',
xs: ['0.75rem', { lineHeight: '1rem' }],
sm: ['0.875rem', { lineHeight: '1.25rem' }],
base: ['1rem', { lineHeight: '1.5rem' }],
lg: ['1.125rem', { lineHeight: '1.75rem' }],
xl: ['1.25rem', { lineHeight: '1.75rem' }],
'2xl': ['1.5rem', { lineHeight: '2rem' }],
'3xl': ['1.875rem', { lineHeight: '2.25rem' }],
'4xl': ['2.25rem', { lineHeight: '2.5rem' }],
'5xl': ['3rem', { lineHeight: '1' }],
'6xl': ['4rem', { lineHeight: '1' }],
},
fontWeight: {
hairline: '100',