diff --git a/.storybook/style.css b/.storybook/style.css index 916c6e10..c5f9f034 100644 --- a/.storybook/style.css +++ b/.storybook/style.css @@ -1056,30 +1056,6 @@ input[type='number'] { letter-spacing: -0.5px; } -.description-1 { - font-size: 1.875rem; - line-height: 2.625rem; - letter-spacing: -0.5px; -} - -.description-2 { - font-size: 1.75rem; - line-height: 2.625rem; - letter-spacing: -0.5px; -} - -.description-3 { - font-size: 1.625rem; - line-height: 2.5rem; - letter-spacing: -0.5px; -} - -.description-4 { - font-size: 1.5rem; - line-height: 2.25rem; - letter-spacing: -0.5px; -} - .body-1 { font-size: 1.375rem; line-height: 1.875rem; diff --git a/app/components/CodePreview.tsx b/app/components/CodePreview.tsx index a26c9944..cdc8cf59 100644 --- a/app/components/CodePreview.tsx +++ b/app/components/CodePreview.tsx @@ -23,7 +23,7 @@ const CodePreview = ({ children, code, github }: CodePreviewProps) => { + className="group h-min w-fit justify-center rounded-md border border-metal-900 bg-metal-900 px-4 py-2.5 text-center text-body-4 font-medium capitalize text-white transition-all duration-75 ease-in hover:bg-metal-800 focus:ring-4 focus:ring-metal-800 active:bg-metal-900"> Get Started @@ -68,7 +68,7 @@ const ComponentUI = () => {
-

+

Design Excellence with Our React Component Library

@@ -135,7 +135,7 @@ const Community = () => { {contributors?.map((user) => )} ) : null} -

+

Join the community

@@ -198,7 +198,7 @@ const Faq = () => { return (

-

+

Frequently Asked Questions

diff --git a/app/src/Keep/KeepTheme.ts b/app/src/Keep/KeepTheme.ts index 8cf4d120..a28774d7 100644 --- a/app/src/Keep/KeepTheme.ts +++ b/app/src/Keep/KeepTheme.ts @@ -94,10 +94,6 @@ export interface KeepGradientDuoToneColors { tealToLime: string } -export type KeepTypography = - | `heading-${1 | 2 | 3 | 4 | 5 | 6}` - | `body-${1 | 2 | 3 | 4 | 5 | 6}` - | `display-${1 | 2 | 3 | 4}` - | `description-${1 | 2 | 3 | 4}` +export type KeepTypography = `heading-${1 | 2 | 3 | 4 | 5 | 6}` | `body-${1 | 2 | 3 | 4 | 5}` | `display` export type KeepHeadingLevel = 'h1' | 'h2' | 'h3' | 'h4' | 'h5' | 'h6' diff --git a/app/src/components/Badge/theme.ts b/app/src/components/Badge/theme.ts index d4d23420..d10c19f4 100644 --- a/app/src/components/Badge/theme.ts +++ b/app/src/components/Badge/theme.ts @@ -45,7 +45,7 @@ interface BadgeTheme { } export const badgeTheme: BadgeTheme = { - base: 'inline-flex w-fit items-center font-inherit rounded-full text-body-6 font-medium cursor-pointer', + base: 'inline-flex w-fit items-center font-inherit rounded-full text-body-5 font-medium cursor-pointer', size: { sm: 'px-1 h-4', md: 'px-2 h-5', diff --git a/app/src/components/Card/Card.stories.tsx b/app/src/components/Card/Card.stories.tsx index 484266b4..68589642 100644 --- a/app/src/components/Card/Card.stories.tsx +++ b/app/src/components/Card/Card.stories.tsx @@ -195,7 +195,7 @@ export const CardWithAvatar: Story = { Khairul Islam Ridoy - UI/UX Designer + UI/UX Designer Khairul Islam - UI/UX Designer + UI/UX Designer @@ -441,8 +441,8 @@ export const PodcastCard: Story = { By Static Mania - 4:05 - 10:05 + 4:05 + 10:05 @@ -486,7 +486,7 @@ export const PricingCard: Story = { Business - $79 + $79 / mth diff --git a/app/src/components/Card/CardLink.tsx b/app/src/components/Card/CardLink.tsx index 6ea8595f..e4e0d4b8 100644 --- a/app/src/components/Card/CardLink.tsx +++ b/app/src/components/Card/CardLink.tsx @@ -46,7 +46,7 @@ export const CardLink: FC = ({ children, className, href = '/', i return ( + className={cn('flex items-center gap-1 text-body-5 font-medium text-primary-500 md:text-body-4', className)}> {icon && iconPosition === 'right' && icon} {children} {icon && iconPosition === 'left' && icon} diff --git a/app/src/components/Card/theme.ts b/app/src/components/Card/theme.ts index 72f03714..ffb88bd7 100644 --- a/app/src/components/Card/theme.ts +++ b/app/src/components/Card/theme.ts @@ -67,5 +67,5 @@ export const cardTheme: KeepCardTheme = { }, }, }, - description: 'text-metal-500 text-body-6 font-normal md:text-body-4', + description: 'text-metal-500 text-body-5 font-normal md:text-body-4', } diff --git a/app/src/components/Chart/CustomLegend.tsx b/app/src/components/Chart/CustomLegend.tsx index 563912bb..bafe26e8 100644 --- a/app/src/components/Chart/CustomLegend.tsx +++ b/app/src/components/Chart/CustomLegend.tsx @@ -17,7 +17,7 @@ const CustomLegend = (props: propsType) => { return (
    {props.payload.map(({ value }, index) => ( -
  • +
  • {value}
  • diff --git a/app/src/components/CheckboxGroup/theme.ts b/app/src/components/CheckboxGroup/theme.ts index fbd21297..a06400c2 100644 --- a/app/src/components/CheckboxGroup/theme.ts +++ b/app/src/components/CheckboxGroup/theme.ts @@ -107,7 +107,7 @@ export const checkboxGroupTheme: keepCheckboxGroupTheme = { }, }, description: { - base: 'mt-1 text-body-6 md:text-body-4 font-normal', + base: 'mt-1 text-body-5 md:text-body-4 font-normal', selected: { on: 'text-primary-400', off: 'text-metal-400', diff --git a/app/src/components/FormControls/theme.ts b/app/src/components/FormControls/theme.ts index 41e253f2..90f89473 100644 --- a/app/src/components/FormControls/theme.ts +++ b/app/src/components/FormControls/theme.ts @@ -239,7 +239,7 @@ export const formControlsTheme: keepFormControlTheme = { base: 'block text-center border border-metal-200 rounded-md text-metal-600 focus:outline-none focus:ring-0 focus:border-metal-500', disabled: 'cursor-not-allowed opacity-50', sizes: { - sm: 'max-w-[120px] py-2 px-8 sm:text-body-6', + sm: 'max-w-[120px] py-2 px-8 sm:text-body-5', md: 'max-w-[134px] py-2.5 px-10 text-body-5', lg: 'max-w-[140px] py-3 px-12 sm:', }, @@ -290,7 +290,7 @@ export const formControlsTheme: keepFormControlTheme = { base: 'block w-full focus:outline-none focus:ring-0', disabled: 'cursor-not-allowed opacity-50', sizes: { - sm: 'p-2 sm:text-body-6', + sm: 'p-2 sm:text-body-5', md: 'p-2.5 text-body-5', lg: 'sm: p-4', }, @@ -348,7 +348,7 @@ export const formControlsTheme: keepFormControlTheme = { input: { base: 'rounded-lg block w-full border disabled:cursor-not-allowed disabled:opacity-50', sizes: { - sm: 'sm:text-body-6', + sm: 'sm:text-body-5', md: 'text-body-5', lg: 'sm:', }, diff --git a/app/src/components/Modal/Modal.stories.tsx b/app/src/components/Modal/Modal.stories.tsx index 05a796ce..5efd3a95 100644 --- a/app/src/components/Modal/Modal.stories.tsx +++ b/app/src/components/Modal/Modal.stories.tsx @@ -196,7 +196,7 @@ const HistoryModalComponent = () => {

    Albert Flores

    -

    keep@designsystem.com

    +

    keep@designsystem.com

diff --git a/app/src/components/Modal/theme.ts b/app/src/components/Modal/theme.ts index cb17178d..bac7cda7 100644 --- a/app/src/components/Modal/theme.ts +++ b/app/src/components/Modal/theme.ts @@ -54,7 +54,7 @@ export const modalTheme: keepModalTheme = { header: { base: 'rounded-t pb-2', iconSection: 'flex items-start justify-between', - title: 'pt-2 text-body-3 md:text-description-4 font-semibold text-metal-800', + title: 'pt-2 text-body-3 md:text-heading-6 font-semibold text-metal-800', headerIcon: { base: 'w-10 h-10 flex items-center justify-center rounded-md bg-primary-25', icon: '', diff --git a/app/src/components/Progress/theme.ts b/app/src/components/Progress/theme.ts index c1c85c3c..c6bc48ed 100644 --- a/app/src/components/Progress/theme.ts +++ b/app/src/components/Progress/theme.ts @@ -63,11 +63,11 @@ export const progressTheme: ProgressThemeInterface = { text: { base: 'absolute start-1/2 top-1/2 -translate-x-1/2 -translate-y-1/2 transform', content: { - sm: 'text-body-6 font-normal text-primary-500', + sm: 'text-body-5 font-normal text-primary-500', md: 'text-body-4 font-normal text-primary-500', lg: 'text-body-3 font-medium text-primary-500', xl: 'text-body-2 font-semibold text-primary-500', - '2xl': 'text-description-2 font-semibold text-primary-500', + '2xl': 'text-heading-6 font-semibold text-primary-500', }, }, size: { @@ -87,11 +87,11 @@ export const progressTheme: ProgressThemeInterface = { text: { base: 'w-10 text-end', content: { - sm: 'text-body-6 font-normal text-primary-500', + sm: 'text-body-5 font-normal text-primary-500', md: 'text-body-4 font-normal text-primary-500', lg: 'text-body-3 font-medium text-primary-500', xl: 'text-body-2 font-semibold text-primary-500', - '2xl': 'text-description-2 font-semibold text-primary-500', + '2xl': 'text-heading-6 font-semibold text-primary-500', }, }, size: { diff --git a/app/src/components/Table/Table.stories.tsx b/app/src/components/Table/Table.stories.tsx index 0336d916..518636b7 100644 --- a/app/src/components/Table/Table.stories.tsx +++ b/app/src/components/Table/Table.stories.tsx @@ -116,7 +116,7 @@ export const DefaultTable: Story = { -

Type

+

Type

Status Role @@ -428,7 +428,7 @@ export const CashOutTransitionTable: Story = { -

Type

+

Type

}> Date @@ -454,7 +454,7 @@ export const CashOutTransitionTable: Story = {

Paypal

- Withdraw + Withdraw
@@ -462,7 +462,7 @@ export const CashOutTransitionTable: Story = {

Jan 19, 2022

-

3:45 pm

+

3:45 pm

$652.00

@@ -476,7 +476,7 @@ export const CashOutTransitionTable: Story = {

Jan 19, 2022

-

3:45 pm

+

3:45 pm