Merge pull request #813 from oceanbase/dengfuping-dev

fix(design): Remove custom token of fontSizeHeading and lineHeightHea…
oceanbase · Nov 8, 2024 · 8f964dc · 8f964dc
2 parents 1e40c88 + 9ac6852
commit 8f964dc
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 22 deletions.
diff --git a/packages/design/src/theme/default.ts b/packages/design/src/theme/default.ts
@@ -10,16 +10,6 @@ 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/theme/style/compact.less b/packages/design/src/theme/style/compact.less
@@ -377,7 +377,7 @@
 @fontSizeLG: 14;
 @fontSizeXL: 16;
 @fontSizeHeading1: 32;
-@fontSizeHeading2: 24;
+@fontSizeHeading2: 26;
 @fontSizeHeading3: 20;
 @fontSizeHeading4: 16;
 @fontSizeHeading5: 14;
@@ -388,7 +388,7 @@
 @fontHeightLG: 22;
 @fontHeightSM: 18;
 @lineHeightHeading1: 1.25;
-@lineHeightHeading2: 1.3333333333333333;
+@lineHeightHeading2: 1.3076923076923077;
 @lineHeightHeading3: 1.4;
 @lineHeightHeading4: 1.5;
 @lineHeightHeading5: 1.5714285714285714;

diff --git a/packages/design/src/theme/style/default.less b/packages/design/src/theme/style/default.less
@@ -376,22 +376,22 @@
 @fontSizeSM: 12;
 @fontSizeLG: 16;
 @fontSizeXL: 20;
-@fontSizeHeading1: 32;
-@fontSizeHeading2: 24;
-@fontSizeHeading3: 20;
-@fontSizeHeading4: 16;
-@fontSizeHeading5: 14;
+@fontSizeHeading1: 38;
+@fontSizeHeading2: 30;
+@fontSizeHeading3: 24;
+@fontSizeHeading4: 20;
+@fontSizeHeading5: 16;
 @lineHeight: 1.5714285714285714;
 @lineHeightLG: 1.5;
 @lineHeightSM: 1.6666666666666667;
 @fontHeight: 22;
 @fontHeightLG: 24;
 @fontHeightSM: 20;
-@lineHeightHeading1: 1.25;
-@lineHeightHeading2: 1.3333333333333333;
-@lineHeightHeading3: 1.4;
-@lineHeightHeading4: 1.5;
-@lineHeightHeading5: 1.5714285714285714;
+@lineHeightHeading1: 1.2105263157894737;
+@lineHeightHeading2: 1.2666666666666666;
+@lineHeightHeading3: 1.3333333333333333;
+@lineHeightHeading4: 1.4;
+@lineHeightHeading5: 1.5;
 @sizeXXL: 48;
 @sizeXL: 32;
 @sizeLG: 24;