From 2512499bbbf79cf030bbfa42b965ec2d162dd0cf Mon Sep 17 00:00:00 2001 From: Ash Joseph Date: Mon, 30 Sep 2024 21:59:48 +0100 Subject: [PATCH 1/5] Added font size px descriptions --- Definitions/3.0.0/includes/scales.js | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/Definitions/3.0.0/includes/scales.js b/Definitions/3.0.0/includes/scales.js index 7645da3..be98227 100644 --- a/Definitions/3.0.0/includes/scales.js +++ b/Definitions/3.0.0/includes/scales.js @@ -161,19 +161,19 @@ const COLUMN_WIDTHS = [ ] const FONT_SIZES = [ - { name:'xs', size:'0.75rem', lineHeight:'1rem' }, - { name:'sm', size:'0.875rem', lineHeight:'1.25rem' }, - { name:'base', size:'1rem', lineHeight:'1.5rem' }, - { name:'lg', size:'1.125rem', lineHeight:'1.75rem' }, - { name:'xl', size:'1.25rem', lineHeight:'1.75rem' }, - { name:'2xl', size:'1.5rem', lineHeight:'2rem' }, - { name:'3xl', size:'1.875rem', lineHeight:'2.25rem' }, - { name:'4xl', size:'2.25rem', lineHeight:'2.5rem' }, - { name:'5xl', size:'3rem', lineHeight:'1' }, - { name:'6xl', size:'3.75rem', lineHeight:'1' }, - { name:'7xl', size:'4.5rem', lineHeight:'1' }, - { name:'8xl', size:'6rem', lineHeight:'1' }, - { name:'9xl', size:'8rem', lineHeight:'1' } + { name: 'xs', size: '0.75rem (12px)', lineHeight: '1rem (16px)' }, + { name: 'sm', size: '0.875rem (14px)', lineHeight: '1.25rem (20px)' }, + { name: 'base', size: '1rem (16px)', lineHeight: '1.5rem (24px)' }, + { name: 'lg', size: '1.125rem (18px)', lineHeight: '1.75rem (28px)' }, + { name: 'xl', size: '1.25rem (20px)', lineHeight: '1.75rem (28px)' }, + { name: '2xl', size: '1.5rem (24px)', lineHeight: '2rem (32px)' }, + { name: '3xl', size: '1.875rem (30px)', lineHeight: '2.25rem (36px)' }, + { name: '4xl', size: '2.25rem (36px)', lineHeight: '2.5rem (40px)' }, + { name: '5xl', size: '3rem (48px)', lineHeight: '1' }, + { name: '6xl', size: '3.75rem (60px)', lineHeight: '1' }, + { name: '7xl', size: '4.5rem (72px)', lineHeight: '1' }, + { name: '8xl', size: '6rem (96px)', lineHeight: '1' }, + { name: '9xl', size: '8rem (128px)', lineHeight: '1' } ] const FONT_WEIGHTS = [ From 2f5dbda9d3f5b38c1e38cdfa97d6e843333f34fb Mon Sep 17 00:00:00 2001 From: Ash Joseph Date: Mon, 30 Sep 2024 22:06:57 +0100 Subject: [PATCH 2/5] Add spacing px values --- Definitions/3.0.0/includes/scales.js | 70 ++++++++++++++-------------- 1 file changed, 35 insertions(+), 35 deletions(-) diff --git a/Definitions/3.0.0/includes/scales.js b/Definitions/3.0.0/includes/scales.js index be98227..1c907e8 100644 --- a/Definitions/3.0.0/includes/scales.js +++ b/Definitions/3.0.0/includes/scales.js @@ -9,41 +9,41 @@ const SCREENS = [ ] const DEFAULT_SPACING_SCALE = [ - { name:'0', value:'0px' }, - { name:'px', value:'1px' }, - { name:'0.5', value:'0.125rem' }, - { name:'1', value:'0.25rem' }, - { name:'1.5', value:'0.375rem' }, - { name:'2', value:'0.5rem' }, - { name:'2.5', value:'0.625rem' }, - { name:'3', value:'0.75rem' }, - { name:'3.5', value:'0.875rem' }, - { name:'4', value:'1rem' }, - { name:'5', value:'1.25rem' }, - { name:'6', value:'1.5rem' }, - { name:'7', value:'1.75rem' }, - { name:'8', value:'2rem' }, - { name:'9', value:'2.25rem' }, - { name:'10', value:'2.5rem' }, - { name:'11', value:'2.75rem' }, - { name:'12', value:'3rem' }, - { name:'14', value:'3.5rem' }, - { name:'16', value:'4rem' }, - { name:'20', value:'5rem' }, - { name:'24', value:'6rem' }, - { name:'28', value:'7rem' }, - { name:'32', value:'8rem' }, - { name:'36', value:'9rem' }, - { name:'40', value:'10rem' }, - { name:'44', value:'11rem' }, - { name:'48', value:'12rem' }, - { name:'52', value:'13rem' }, - { name:'56', value:'14rem' }, - { name:'60', value:'15rem' }, - { name:'64', value:'16rem' }, - { name:'72', value:'18rem' }, - { name:'80', value:'20rem' }, - { name:'96', value:'24rem' } + { name: '0', value: '0px' }, + { name: 'px', value: '1px' }, + { name: '0.5', value: '0.125rem (2px)' }, + { name: '1', value: '0.25rem (4px)' }, + { name: '1.5', value: '0.375rem (6px)' }, + { name: '2', value: '0.5rem (8px)' }, + { name: '2.5', value: '0.625rem (10px)' }, + { name: '3', value: '0.75rem (12px)' }, + { name: '3.5', value: '0.875rem (14px)' }, + { name: '4', value: '1rem (16px)' }, + { name: '5', value: '1.25rem (20px)' }, + { name: '6', value: '1.5rem (24px)' }, + { name: '7', value: '1.75rem (28px)' }, + { name: '8', value: '2rem (32px)' }, + { name: '9', value: '2.25rem (36px)' }, + { name: '10', value: '2.5rem (40px)' }, + { name: '11', value: '2.75rem (44px)' }, + { name: '12', value: '3rem (48px)' }, + { name: '14', value: '3.5rem (56px)' }, + { name: '16', value: '4rem (64px)' }, + { name: '20', value: '5rem (80px)' }, + { name: '24', value: '6rem (96px)' }, + { name: '28', value: '7rem (112px)' }, + { name: '32', value: '8rem (128px)' }, + { name: '36', value: '9rem (144px)' }, + { name: '40', value: '10rem (160px)' }, + { name: '44', value: '11rem (176px)' }, + { name: '48', value: '12rem (192px)' }, + { name: '52', value: '13rem (208px)' }, + { name: '56', value: '14rem (224px)' }, + { name: '60', value: '15rem (240px)' }, + { name: '64', value: '16rem (256px)' }, + { name: '72', value: '18rem (288px)' }, + { name: '80', value: '20rem (320px)' }, + { name: '96', value: '24rem (384px)' } ] const CORE_DEFAULT_FRACTIONAL_SCALE = [ From 4f8673c10b8e496abf44fa58383545cc3f85b718 Mon Sep 17 00:00:00 2001 From: Ash Joseph Date: Mon, 30 Sep 2024 22:09:56 +0100 Subject: [PATCH 3/5] Added border-radius px scale --- Definitions/3.0.0/includes/scales.js | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Definitions/3.0.0/includes/scales.js b/Definitions/3.0.0/includes/scales.js index 1c907e8..6821ffb 100644 --- a/Definitions/3.0.0/includes/scales.js +++ b/Definitions/3.0.0/includes/scales.js @@ -235,13 +235,13 @@ const TEXT_UNDERLINE_OFFSETS = [ const BORDER_RADIUS_SCALE = [ { name:'-none', value:'0px' }, - { name:'-sm', value:'0.125rem' }, - { name:'', value:'0.25rem' }, - { name:'-md', value:'0.375rem' }, - { name:'-lg', value:'0.5rem' }, - { name:'-xl', value:'0.75rem' }, - { name:'-2xl', value:'1rem' }, - { name:'-3xl', value:'1.5rem' }, + { name: '-sm', value: '0.125rem (2px)' }, + { name: '', value: '0.25rem (4px)' }, + { name: '-md', value: '0.375rem (6px)' }, + { name: '-lg', value: '0.5rem (8px)' }, + { name: '-xl', value: '0.75rem (12px)' }, + { name: '-2xl', value: '1rem (16px)' }, + { name: '-3xl', value: '1.5rem (24px)' } { name:'-full', value:'9999px' }, ] From 0677d781cadae560c9afed80b6d2a0dd755dd63b Mon Sep 17 00:00:00 2001 From: Ash Joseph Date: Mon, 30 Sep 2024 22:13:11 +0100 Subject: [PATCH 4/5] Added column width px scale --- Definitions/3.0.0/includes/scales.js | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/Definitions/3.0.0/includes/scales.js b/Definitions/3.0.0/includes/scales.js index 6821ffb..cb499b2 100644 --- a/Definitions/3.0.0/includes/scales.js +++ b/Definitions/3.0.0/includes/scales.js @@ -145,19 +145,19 @@ const COLUMN_COUNTS = [ ] const COLUMN_WIDTHS = [ - { name:'3xs', value:'16rem' }, - { name:'2xs', value:'18rem' }, - { name:'xs', value:'20rem' }, - { name:'sm', value:'24rem' }, - { name:'md', value:'28rem' }, - { name:'lg', value:'32rem' }, - { name:'xl', value:'36rem' }, - { name:'2xl', value:'42rem' }, - { name:'3xl', value:'48rem' }, - { name:'4xl', value:'56rem' }, - { name:'5xl', value:'64rem' }, - { name:'6xl', value:'72rem' }, - { name:'7xl', value:'80rem' } + { name: '3xs', value: '16rem (256px)' }, +{ name: '2xs', value: '18rem (288px)' }, +{ name: 'xs', value: '20rem (320px)' }, +{ name: 'sm', value: '24rem (384px)' }, +{ name: 'md', value: '28rem (448px)' }, +{ name: 'lg', value: '32rem (512px)' }, +{ name: 'xl', value: '36rem (576px)' }, +{ name: '2xl', value: '42rem (672px)' }, +{ name: '3xl', value: '48rem (768px)' }, +{ name: '4xl', value: '56rem (896px)' }, +{ name: '5xl', value: '64rem (1024px)' }, +{ name: '6xl', value: '72rem (1152px)' }, +{ name: '7xl', value: '80rem (1280px)' } ] const FONT_SIZES = [ From 53b26ebf79f6a11ec8fe108c2897cc6e6f30846f Mon Sep 17 00:00:00 2001 From: Ash Joseph Date: Mon, 30 Sep 2024 22:24:19 +0100 Subject: [PATCH 5/5] Typo --- Definitions/3.0.0/typography.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Definitions/3.0.0/typography.js b/Definitions/3.0.0/typography.js index a327067..d092e36 100644 --- a/Definitions/3.0.0/typography.js +++ b/Definitions/3.0.0/typography.js @@ -43,7 +43,7 @@ exports.twClasses = function twClasses(config) { { label: 'antialiased', detail:' -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale;', - documentation:'R ender text using grayscale antialiasing.' + documentation:'Render text using grayscale antialiasing.' }, { label:'subpixel-antialiased',