From 0627e3e679665e86aa9d2e1a2fc7df8166fc4e41 Mon Sep 17 00:00:00 2001 From: Oleg Isonen Date: Thu, 10 Nov 2022 14:54:53 +0100 Subject: [PATCH] migrate font-sizes --- .../features/style-panel/sections/spacing/spacing.tsx | 2 +- .../features/workspace/canvas-tools/outline/label.tsx | 2 +- .../app/designer/shared/inspector/component-info.tsx | 2 +- .../design-system/src/components/__DEPRECATED__/text.tsx | 8 ++++---- packages/design-system/src/components/avatar.tsx | 2 +- packages/design-system/src/components/badge.tsx | 4 ++-- packages/design-system/src/components/button.tsx | 8 ++++---- .../src/components/icon-button-with-menu.tsx | 2 +- packages/design-system/src/components/icon-button.tsx | 2 +- packages/design-system/src/components/kbd.tsx | 4 ++-- packages/design-system/src/components/menu.tsx | 2 +- packages/design-system/src/components/radio-grid.tsx | 2 +- packages/design-system/src/components/select.tsx | 4 ++-- packages/design-system/src/components/simple-toggle.tsx | 2 +- packages/design-system/src/components/tab-link.tsx | 2 +- packages/design-system/src/components/table.tsx | 8 ++++---- packages/design-system/src/components/tabs.tsx | 4 ++-- packages/design-system/src/components/text-area.tsx | 6 +++--- packages/design-system/src/components/text-field.tsx | 2 +- packages/design-system/src/components/text.tsx | 8 ++++---- packages/design-system/src/components/toast.tsx | 2 +- packages/icons/src/index.stories.tsx | 2 +- 22 files changed, 40 insertions(+), 40 deletions(-) diff --git a/apps/designer/app/designer/features/style-panel/sections/spacing/spacing.tsx b/apps/designer/app/designer/features/style-panel/sections/spacing/spacing.tsx index 14443e8e4e..cc734ae940 100644 --- a/apps/designer/app/designer/features/style-panel/sections/spacing/spacing.tsx +++ b/apps/designer/app/designer/features/style-panel/sections/spacing/spacing.tsx @@ -42,7 +42,7 @@ const grid = { const styles = { spacingEdit: { - fontSize: "$1", + fontSize: "$fontSize$1", // @todo use a color from design system color: "rgb(217, 217, 217)", display: "flex", diff --git a/apps/designer/app/designer/features/workspace/canvas-tools/outline/label.tsx b/apps/designer/app/designer/features/workspace/canvas-tools/outline/label.tsx index a7a6ad6de7..119eb4a7fe 100644 --- a/apps/designer/app/designer/features/workspace/canvas-tools/outline/label.tsx +++ b/apps/designer/app/designer/features/workspace/canvas-tools/outline/label.tsx @@ -43,7 +43,7 @@ const LabelContainer = styled( alignItems: "center", justifyContent: "center", gap: "$spacing$3", - fontSize: "$1", + fontSize: "$fontSize$1", fontFamily: "$sans", lineHeight: 1, minWidth: "$spacing$13", diff --git a/apps/designer/app/designer/shared/inspector/component-info.tsx b/apps/designer/app/designer/shared/inspector/component-info.tsx index 421168a928..42b6600ef8 100644 --- a/apps/designer/app/designer/shared/inspector/component-info.tsx +++ b/apps/designer/app/designer/shared/inspector/component-info.tsx @@ -11,7 +11,7 @@ export const ComponentInfo = ({ ${Text}`]: { color: "$gray9", - fontSize: "$fontSizes$1", + fontSize: "$fontSizes$fontSize$1", fontWeight: "500", }, "@hover": { diff --git a/packages/design-system/src/components/text-area.tsx b/packages/design-system/src/components/text-area.tsx index 2b49e23f8b..090781c2e5 100644 --- a/packages/design-system/src/components/text-area.tsx +++ b/packages/design-system/src/components/text-area.tsx @@ -47,19 +47,19 @@ export const TextArea = styled("textarea", { size: { "1": { borderRadius: "$1", - fontSize: "$1", + fontSize: "$fontSize$1", lineHeight: "16px", px: "$spacing$3", }, "2": { borderRadius: "$1", - fontSize: "$2", + fontSize: "$fontSize$3", lineHeight: "20px", px: "$spacing$3", }, "3": { borderRadius: "$2", - fontSize: "$3", + fontSize: "$fontSize$4", lineHeight: "23px", px: "$spacing$5", }, diff --git a/packages/design-system/src/components/text-field.tsx b/packages/design-system/src/components/text-field.tsx index c0951bdef7..14ce6f3074 100644 --- a/packages/design-system/src/components/text-field.tsx +++ b/packages/design-system/src/components/text-field.tsx @@ -138,7 +138,7 @@ const TextFieldBase = styled("div", { px: "$spacing$5", borderRadius: "$1", fontFamily: "$sans", - fontSize: "$1", + fontSize: "$fontSize$1", height: 28, // @todo waiting for the sizing scale lineHeight: 1, "&:focus-within": { diff --git a/packages/design-system/src/components/text.tsx b/packages/design-system/src/components/text.tsx index 0bf1ee98f0..c65d44d983 100644 --- a/packages/design-system/src/components/text.tsx +++ b/packages/design-system/src/components/text.tsx @@ -14,12 +14,12 @@ export const Text = styled("div", { variant: { regular: { fontWeight: 400, - fontSize: "$1", + fontSize: "$fontSize$1", letterSpacing: "0.005em", }, label: { fontWeight: 500, - fontSize: "$1", + fontSize: "$fontSize$1", letterSpacing: "0.005em", }, tiny: { @@ -29,13 +29,13 @@ export const Text = styled("div", { }, title: { fontWeight: 700, - fontSize: "$1", + fontSize: "$fontSize$1", letterSpacing: "0.01em", }, mono: { fontFamily: "$mono", fontWeight: 400, - fontSize: "$1", + fontSize: "$fontSize$1", textTransform: "uppercase", }, unit: { diff --git a/packages/design-system/src/components/toast.tsx b/packages/design-system/src/components/toast.tsx index 40f6d2a9af..fca2c5a9e8 100644 --- a/packages/design-system/src/components/toast.tsx +++ b/packages/design-system/src/components/toast.tsx @@ -52,7 +52,7 @@ const StyledToast = styled(ToastPrimitive.Root, { alignItems: "center", color: "$highContrast", fontWeight: 500, - fontSize: "$2", + fontSize: "$fontSize$3", background: "$loContrast", "@media (prefers-reduced-motion: no-preference)": { diff --git a/packages/icons/src/index.stories.tsx b/packages/icons/src/index.stories.tsx index d80133a6fe..cdf64063b6 100644 --- a/packages/icons/src/index.stories.tsx +++ b/packages/icons/src/index.stories.tsx @@ -47,7 +47,7 @@ export const Icons = () => { textAlign: "center", wordWrap: "break-word", width: "100%", - fontSize: "14px", + fontSize: "$fontSize$4", color: "#5a5a5a", }} >