diff --git a/packages/app-elements/src/locales/en.ts b/packages/app-elements/src/locales/en.ts index 9ab23c5c5..0a0995051 100644 --- a/packages/app-elements/src/locales/en.ts +++ b/packages/app-elements/src/locales/en.ts @@ -217,12 +217,11 @@ const resources = { } } -type IsStringLiteral = - "I am a literal type" extends NonNullable - ? false // Handle `string` specifically - : NonNullable extends Exclude - ? false // Handle `Primitive` specifically - : true // It's a string literal +type IsStringLiteral = "I am a literal type" extends NonNullable + ? false // Handle `string` specifically + : NonNullable extends Exclude + ? false // Handle `Primitive` specifically + : true // It's a string literal const en = { common: { diff --git a/packages/app-elements/src/styles/global.css b/packages/app-elements/src/styles/global.css index a904d2e37..ca0f123d7 100644 --- a/packages/app-elements/src/styles/global.css +++ b/packages/app-elements/src/styles/global.css @@ -130,13 +130,13 @@ --color-pink: #fe84ba; --font-*: initial; - --font-sans: Manrope, ui-sans-serif, sans-serif; - --font-mono: Roboto Mono, ui-monospace, Menlo, monospace; + --font-sans: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", sans-serif; + --font-mono: "Roboto Mono", system-ui; --text-*: initial; --text-2xs: 0.688rem; - --text-xs: 0.75rem; - --text-sm: 0.875rem; + --text-xs: 0.813rem; + --text-sm: 0.938rem; --text-base: 1rem; --text-lg: 1.125rem; --text-xl: 1.25rem; @@ -148,7 +148,7 @@ --text-6xl: 4rem; --text-8xl: 6rem; --text-10xl: 8rem; - --text-title: 2rem; + --text-title: 1.75rem; --shadow-hover: 0 0 0 1px #101111; --shadow-focus: 0 0 0 2px #101111; @@ -160,6 +160,7 @@ --object-position-out-of-bounds: -99999px 99999px; + --font-weight-semibold: 550; --font-weight-inherit: inherit; --animate-slide-in-right: slide-in-right 0.2s cubic-bezier(0.4, 0, 0.2, 1) both; @@ -219,7 +220,7 @@ } body { - @apply text-gray-800 antialiased font-medium; + @apply text-gray-800 antialiased; } input, diff --git a/packages/app-elements/src/ui/atoms/Badge/Badge.tsx b/packages/app-elements/src/ui/atoms/Badge/Badge.tsx index 2dbe4c229..bff7cda8c 100644 --- a/packages/app-elements/src/ui/atoms/Badge/Badge.tsx +++ b/packages/app-elements/src/ui/atoms/Badge/Badge.tsx @@ -24,7 +24,7 @@ export const Badge: React.FC = ({ {...rest} className={cn([ className, - "text-xs font-bold py-[3px] px-2 rounded inline-block", + "text-xs font-semibold py-[3px] px-2 rounded inline-block", variantCss[variant], ])} > diff --git a/packages/app-elements/src/ui/atoms/ButtonFilter.tsx b/packages/app-elements/src/ui/atoms/ButtonFilter.tsx index fa64ab032..fcf6f825f 100644 --- a/packages/app-elements/src/ui/atoms/ButtonFilter.tsx +++ b/packages/app-elements/src/ui/atoms/ButtonFilter.tsx @@ -21,7 +21,7 @@ function ButtonFilter({ return (
) : null} diff --git a/packages/app-elements/src/ui/atoms/Card.tsx b/packages/app-elements/src/ui/atoms/Card.tsx index f222ccb5a..0935b212e 100644 --- a/packages/app-elements/src/ui/atoms/Card.tsx +++ b/packages/app-elements/src/ui/atoms/Card.tsx @@ -63,7 +63,7 @@ export const Card = withSkeletonTemplate( className, "border border-solid rounded-md", "text-left", // reset {toolbar != null ? : null}
diff --git a/packages/app-elements/src/ui/atoms/Pagination.tsx b/packages/app-elements/src/ui/atoms/Pagination.tsx index 851cbc803..38416ae6a 100644 --- a/packages/app-elements/src/ui/atoms/Pagination.tsx +++ b/packages/app-elements/src/ui/atoms/Pagination.tsx @@ -141,9 +141,10 @@ function PaginationButton({ diff --git a/packages/app-elements/src/ui/composite/Dropdown/DropdownItem.tsx b/packages/app-elements/src/ui/composite/Dropdown/DropdownItem.tsx index 4215a5db3..fe6eb6d13 100644 --- a/packages/app-elements/src/ui/composite/Dropdown/DropdownItem.tsx +++ b/packages/app-elements/src/ui/composite/Dropdown/DropdownItem.tsx @@ -61,7 +61,7 @@ export const DropdownItem = withSkeletonTemplate( }} href={href} className={cn( - "w-full bg-black text-white! py-1.5 pl-4 text-[15px] font-semibold flex items-center focus:outline-hidden!", + "w-full bg-black text-white! py-1.5 pl-4 text-sm font-medium flex items-center focus:outline-hidden!", { "pr-8": info == null, "min-w-[250px] pr-6": info != null, diff --git a/packages/app-elements/src/ui/composite/Dropdown/__snapshots__/Dropdown.test.tsx.snap b/packages/app-elements/src/ui/composite/Dropdown/__snapshots__/Dropdown.test.tsx.snap index 00befb8cb..28a0c33cf 100644 --- a/packages/app-elements/src/ui/composite/Dropdown/__snapshots__/Dropdown.test.tsx.snap +++ b/packages/app-elements/src/ui/composite/Dropdown/__snapshots__/Dropdown.test.tsx.snap @@ -8,7 +8,7 @@ exports[`Dropdown > Should be rendering bottom-left 1`] = ` diff --git a/packages/app-elements/src/ui/forms/InputResourceGroup/FullList.tsx b/packages/app-elements/src/ui/forms/InputResourceGroup/FullList.tsx index bae3bc5a1..bb3d0b722 100644 --- a/packages/app-elements/src/ui/forms/InputResourceGroup/FullList.tsx +++ b/packages/app-elements/src/ui/forms/InputResourceGroup/FullList.tsx @@ -145,7 +145,7 @@ export function FullList({ history.back() } }} - className="text-primary font-bold rounded px-1 shadow-none outline-0! border-0! ring-0! focus:shadow-focus" + className="text-primary font-semibold rounded px-1 shadow-none outline-0! border-0! ring-0! focus:shadow-focus" > {t("common.cancel")} diff --git a/packages/app-elements/src/ui/forms/InputTextArea/InputTextArea.tsx b/packages/app-elements/src/ui/forms/InputTextArea/InputTextArea.tsx index 197b95a7b..ec7bf1326 100644 --- a/packages/app-elements/src/ui/forms/InputTextArea/InputTextArea.tsx +++ b/packages/app-elements/src/ui/forms/InputTextArea/InputTextArea.tsx @@ -27,7 +27,7 @@ export const InputTextArea = forwardRef< id={rest.id ?? rest.name} className={cn( className, - "px-4 py-3 w-full bg-white rounded outline-0 text-sm leading-5", + "px-4 py-2.5 w-full bg-white rounded outline-0 font-normal", { "h-52": rest.rows == null, }, diff --git a/packages/app-elements/src/ui/forms/InputToggleButton/InputToggleButton.tsx b/packages/app-elements/src/ui/forms/InputToggleButton/InputToggleButton.tsx index 4f0fa0459..984e59c3d 100644 --- a/packages/app-elements/src/ui/forms/InputToggleButton/InputToggleButton.tsx +++ b/packages/app-elements/src/ui/forms/InputToggleButton/InputToggleButton.tsx @@ -22,7 +22,7 @@ function ToggleItem({ return (