From b632094ecfca10941a9fe3ec7a52f9b676761024 Mon Sep 17 00:00:00 2001 From: Muhammad Sammy Date: Tue, 5 Jan 2021 13:34:51 +0200 Subject: [PATCH] feat: add new config scales (closes #99, #111, #105, #106) (#114) --- src/cli/lib/defaultTailwindConfig.ts | 96 ++++++++++++++++++---------- 1 file changed, 63 insertions(+), 33 deletions(-) diff --git a/src/cli/lib/defaultTailwindConfig.ts b/src/cli/lib/defaultTailwindConfig.ts index 12b21ca9..f35310c5 100644 --- a/src/cli/lib/defaultTailwindConfig.ts +++ b/src/cli/lib/defaultTailwindConfig.ts @@ -16,6 +16,7 @@ export const defaultTailwindConfig = { md: '768px', lg: '1024px', xl: '1280px', + '2xl': '1536px', }, colors: { transparent: 'transparent', @@ -34,24 +35,40 @@ export const defaultTailwindConfig = { }, spacing: { px: '1px', - '0': '0', - '1': '0.25rem', - '2': '0.5rem', - '3': '0.75rem', - '4': '1rem', - '5': '1.25rem', - '6': '1.5rem', - '8': '2rem', - '10': '2.5rem', - '12': '3rem', - '16': '4rem', - '20': '5rem', - '24': '6rem', - '32': '8rem', - '40': '10rem', - '48': '12rem', - '56': '14rem', - '64': '16rem', + 0: '0px', + 0.5: '0.125rem', + 1: '0.25rem', + 1.5: '0.375rem', + 2: '0.5rem', + 2.5: '0.625rem', + 3: '0.75rem', + 3.5: '0.875rem', + 4: '1rem', + 5: '1.25rem', + 6: '1.5rem', + 7: '1.75rem', + 8: '2rem', + 9: '2.25rem', + 10: '2.5rem', + 11: '2.75rem', + 12: '3rem', + 14: '3.5rem', + 16: '4rem', + 20: '5rem', + 24: '6rem', + 28: '7rem', + 32: '8rem', + 36: '9rem', + 40: '10rem', + 44: '11rem', + 48: '12rem', + 52: '13rem', + 56: '14rem', + 60: '15rem', + 64: '16rem', + 72: '18rem', + 80: '20rem', + 96: '24rem', }, backgroundColor: theme => theme('colors'), backgroundImage: { @@ -166,16 +183,19 @@ export const defaultTailwindConfig = { mono: ['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': ['3.75rem', {lineHeight: '1'}], + '7xl': ['4.5rem', {lineHeight: '1'}], + '8xl': ['6rem', {lineHeight: '1'}], + '9xl': ['8rem', {lineHeight: '1'}], }, fontWeight: { hairline: '100', @@ -272,11 +292,21 @@ export const defaultTailwindConfig = { top: 'top', }, opacity: { - '0': '0', - '25': '0.25', - '50': '0.5', - '75': '0.75', - '100': '1', + 0: '0', + 5: '0.05', + 10: '0.1', + 20: '0.2', + 25: '0.25', + 30: '0.3', + 40: '0.4', + 50: '0.5', + 60: '0.6', + 70: '0.7', + 75: '0.75', + 80: '0.8', + 90: '0.9', + 95: '0.95', + 100: '1', }, order: { first: '-9999',