From 7eaa36c76e3eb4f1e6bdcf663ba7b60bb01103d6 Mon Sep 17 00:00:00 2001 From: dengfuping Date: Sat, 14 Sep 2024 17:50:04 +0800 Subject: [PATCH] improve(design): Update fontSizeHeading and lineHeightHeading token --- packages/design/src/theme/default.ts | 10 +++++ packages/design/src/typography/demo/inner.tsx | 39 ++++++------------- packages/design/src/typography/demo/title.tsx | 16 ++++++++ packages/design/src/typography/index.md | 4 +- 4 files changed, 40 insertions(+), 29 deletions(-) create mode 100644 packages/design/src/typography/demo/title.tsx diff --git a/packages/design/src/theme/default.ts b/packages/design/src/theme/default.ts index 851580ac7..957b1aecc 100644 --- a/packages/design/src/theme/default.ts +++ b/packages/design/src/theme/default.ts @@ -10,6 +10,16 @@ const defaultTheme: ThemeConfig = { token: { fontFamily: `-apple-system, 'Noto Sans', BlinkMacSystemFont, 'Segoe UI', Roboto, 'Helvetica Neue', Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol', 'Noto Color Emoji'`, fontFamilyCode: `Consolas, Monaco, 'Andale Mono', 'Ubuntu Mono', monospace`, + fontSizeHeading1: 32, + fontSizeHeading2: 24, + fontSizeHeading3: 20, + fontSizeHeading4: 16, + fontSizeHeading5: 14, + lineHeightHeading1: 40 / 32, + lineHeightHeading2: 32 / 24, + lineHeightHeading3: 28 / 20, + lineHeightHeading4: 24 / 16, + lineHeightHeading5: 22 / 14, colorPrimaryBg: '#EAF1FF', colorPrimary: '#006AFF', colorPrimaryBgHover: '#EAF1FF', diff --git a/packages/design/src/typography/demo/inner.tsx b/packages/design/src/typography/demo/inner.tsx index 066f31043..7563b4861 100644 --- a/packages/design/src/typography/demo/inner.tsx +++ b/packages/design/src/typography/demo/inner.tsx @@ -2,34 +2,17 @@ import React from 'react'; import { Button, Space, Tooltip, Typography } from '@oceanbase/design'; const App: React.FC = () => ( - - - Typography Text - - - This is Typography Text}> - Tooltip - - - - Typography Paragraph - - - This is Typography Paragraph} - > - Tooltip - - + + Typography Text + + + This is Typography Text}> + Tooltip + ); diff --git a/packages/design/src/typography/demo/title.tsx b/packages/design/src/typography/demo/title.tsx new file mode 100644 index 000000000..951410254 --- /dev/null +++ b/packages/design/src/typography/demo/title.tsx @@ -0,0 +1,16 @@ +import React from 'react'; +import { Typography } from '@oceanbase/design'; + +const { Title } = Typography; + +const App: React.FC = () => ( + <> + h1. Ant Design + h2. Ant Design + h3. Ant Design + h4. Ant Design + h5. Ant Design + +); + +export default App; diff --git a/packages/design/src/typography/index.md b/packages/design/src/typography/index.md index cf87494e7..41785f889 100644 --- a/packages/design/src/typography/index.md +++ b/packages/design/src/typography/index.md @@ -11,9 +11,11 @@ nav: ## 代码演示 + + - + ## API