From f745fe9f6f60618c17b3471219a49f4faf9b1277 Mon Sep 17 00:00:00 2001 From: devin Date: Thu, 9 Mar 2023 10:00:40 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E5=AF=BC=E5=87=BAround=E5=85=A8=E5=B1=80?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=20=E4=BF=AE=E5=A4=8D=E6=8C=89=E9=92=AE?= =?UTF-8?q?=E5=9C=86=E8=A7=92=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/opendesign/src/components/_shared/export.ts | 2 +- packages/opendesign/src/components/_shared/global.ts | 6 +++--- packages/opendesign/src/components/button/style/var.scss | 7 ++++--- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/packages/opendesign/src/components/_shared/export.ts b/packages/opendesign/src/components/_shared/export.ts index 28edaec1..71cb527f 100644 --- a/packages/opendesign/src/components/_shared/export.ts +++ b/packages/opendesign/src/components/_shared/export.ts @@ -1,3 +1,3 @@ -export { initSize, initShape } from './global'; +export { initSize, initShape, initRound } from './global'; export * from './init-icons'; \ No newline at end of file diff --git a/packages/opendesign/src/components/_shared/global.ts b/packages/opendesign/src/components/_shared/global.ts index d6f0fe37..c1c457c6 100644 --- a/packages/opendesign/src/components/_shared/global.ts +++ b/packages/opendesign/src/components/_shared/global.ts @@ -8,10 +8,10 @@ export function initSize(val: SizeT) { } // 圆角 -export type RoundT = 'pill' | string; -export const defaultRound = ref<'pill' | 'default'>('default'); +export type RoundT = 'pill' | 'normal' | string; +export const defaultRound = ref<'pill' | 'normal'>('normal'); -export function initRound(type: 'pill' | 'default') { +export function initRound(type: 'pill' | 'normal') { defaultRound.value = type; } // TODO 全局变量增加 o-radius-control-s o-radius-control-m o-radius-control-l diff --git a/packages/opendesign/src/components/button/style/var.scss b/packages/opendesign/src/components/button/style/var.scss index 92a6bd76..6e442ede 100644 --- a/packages/opendesign/src/components/button/style/var.scss +++ b/packages/opendesign/src/components/button/style/var.scss @@ -160,9 +160,6 @@ } } -.o-btn-round-pill { - --btn-radius: var(--o-size-l); -} .o-btn-small { --btn-radius: var(--o-radius-control-s); } @@ -172,3 +169,7 @@ .o-btn-large { --btn-radius: var(--o-radius-control-l); } + +.o-btn-round-pill { + --btn-radius: var(--o-size-l); +} -- Gitee From c630b99fa94d337ae1d33bf1a83e7cd771193e81 Mon Sep 17 00:00:00 2001 From: devin Date: Thu, 9 Mar 2023 15:09:21 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AD=97=E4=BD=93?= =?UTF-8?q?=E6=AD=A3=E6=96=87-=E5=A4=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .vscode/opendesign.token.code-snippets | 28 +++++++++++++++---- .../src/components/breadcrumb/style/var.scss | 4 +-- .../src/components/button/style/index.scss | 8 +++--- .../src/components/checkbox/style/var.scss | 4 +-- .../src/components/divider/style/var.scss | 4 +-- .../src/components/dropdown/style/var.scss | 8 +++--- .../components/input-number/style/index.scss | 2 +- .../src/components/input/style/var.scss | 8 +++--- .../src/components/menu/style/var.scss | 8 +++--- .../src/components/option/style/var.scss | 8 +++--- .../src/components/radio/style/var.scss | 4 +-- .../src/components/rate/style/var.scss | 2 +- .../src/components/select/style/var.scss | 16 +++++------ .../src/components/style/dark.token.css | 18 ++++++++++-- .../components/style/default-light.token.css | 18 ++++++++++-- .../src/components/switch/style/var.scss | 4 +-- .../src/components/table/style/var.scss | 4 +-- .../src/components/tabs/style/var.scss | 4 +-- .../src/components/tag/style/var.scss | 4 +-- .../src/components/textarea/style/var.scss | 8 +++--- .../src/tokens/opendesign-token.json | 22 +++++++++++++-- 21 files changed, 124 insertions(+), 62 deletions(-) diff --git a/.vscode/opendesign.token.code-snippets b/.vscode/opendesign.token.code-snippets index c0ab64b1..971aa642 100644 --- a/.vscode/opendesign.token.code-snippets +++ b/.vscode/opendesign.token.code-snippets @@ -1223,14 +1223,22 @@ "description": "四级标题[light: 16px, dark: 16px]", "scope": "css,scss,less" }, - "--o-font_size-text": { + "--o-font_size-text1": { "prefix": [ - "var(--o-font_size-text)" + "var(--o-font_size-text1)" ], - "body": "var(--o-font_size-text)", + "body": "var(--o-font_size-text1)", "description": "正文[light: 14px, dark: 14px]", "scope": "css,scss,less" }, + "--o-font_size-text2": { + "prefix": [ + "var(--o-font_size-text2)" + ], + "body": "var(--o-font_size-text2)", + "description": "正文-大[light: 16px, dark: 16px]", + "scope": "css,scss,less" + }, "--o-font_size-tip1": { "prefix": [ "var(--o-font_size-tip1)" @@ -1311,14 +1319,22 @@ "description": "四级标题[light: 24px, dark: 24px]", "scope": "css,scss,less" }, - "--o-line_height-text": { + "--o-line_height-text1": { "prefix": [ - "var(--o-line_height-text)" + "var(--o-line_height-text1)" ], - "body": "var(--o-line_height-text)", + "body": "var(--o-line_height-text1)", "description": "正文[light: 22px, dark: 22px]", "scope": "css,scss,less" }, + "--o-line_height-text2": { + "prefix": [ + "var(--o-line_height-text2)" + ], + "body": "var(--o-line_height-text2)", + "description": "正文-大[light: 24px, dark: 24px]", + "scope": "css,scss,less" + }, "--o-line_height-tip1": { "prefix": [ "var(--o-line_height-tip1)" diff --git a/packages/opendesign/src/components/breadcrumb/style/var.scss b/packages/opendesign/src/components/breadcrumb/style/var.scss index f235992a..9da8ad6f 100644 --- a/packages/opendesign/src/components/breadcrumb/style/var.scss +++ b/packages/opendesign/src/components/breadcrumb/style/var.scss @@ -2,8 +2,8 @@ --breadcrumb-color: var(--o-color-info3); --breadcrumb-color-active: var(--o-color-info1); - --breadcrumb-text-size: var(--o-font_size-text); - --breadcrumb-text-height: var(--o-line_height-text); + --breadcrumb-text-size: var(--o-font_size-text1); + --breadcrumb-text-height: var(--o-line_height-text1); --breadcrumb-gap: var(--o-gap-1); } diff --git a/packages/opendesign/src/components/button/style/index.scss b/packages/opendesign/src/components/button/style/index.scss index d31d993a..21a3d82a 100644 --- a/packages/opendesign/src/components/button/style/index.scss +++ b/packages/opendesign/src/components/button/style/index.scss @@ -99,8 +99,8 @@ .o-btn-medium { padding: 0 15px; height: var(--o-size-m); - font-size: var(--o-font_size-text); - line-height: var(--o-line_height-text); + font-size: var(--o-font_size-text1); + line-height: var(--o-line_height-text1); &.o-btn-icon-only { width: var(--o-size-m); @@ -110,8 +110,8 @@ .o-btn-large { padding: 0 19px; height: var(--o-size-l); - font-size: var(--o-font_size-h4); - line-height: var(--o-line_height-h4); + font-size: var(--o-font_size-text2); + line-height: var(--o-line_height-text2); &.o-btn-icon-only { width: var(--o-size-l); diff --git a/packages/opendesign/src/components/checkbox/style/var.scss b/packages/opendesign/src/components/checkbox/style/var.scss index a0c07b50..2d1f8a4c 100644 --- a/packages/opendesign/src/components/checkbox/style/var.scss +++ b/packages/opendesign/src/components/checkbox/style/var.scss @@ -2,8 +2,8 @@ --checkbox-color: var(--o-color-info1); --checkbox-color-disabled: var(--o-color-info4); - --checkbox-text-size: var(--o-font_size-text); - --checkbox-text-height: var(--o-line_height-text); + --checkbox-text-size: var(--o-font_size-text1); + --checkbox-text-height: var(--o-line_height-text1); --checkbox-input-color: var(--o-color-fill1); diff --git a/packages/opendesign/src/components/divider/style/var.scss b/packages/opendesign/src/components/divider/style/var.scss index af9e6c3c..a5c57156 100644 --- a/packages/opendesign/src/components/divider/style/var.scss +++ b/packages/opendesign/src/components/divider/style/var.scss @@ -3,8 +3,8 @@ --o-divider-bd-color: var(--o-color-control1); - --o-divider-text-size: var(--o-font_size-text); - --o-divider-text-height: var(--o-line_height-text); + --o-divider-text-size: var(--o-font_size-text1); + --o-divider-text-height: var(--o-line_height-text1); } .o-divider-horizontal { diff --git a/packages/opendesign/src/components/dropdown/style/var.scss b/packages/opendesign/src/components/dropdown/style/var.scss index fb57ac28..4a5272d3 100644 --- a/packages/opendesign/src/components/dropdown/style/var.scss +++ b/packages/opendesign/src/components/dropdown/style/var.scss @@ -16,10 +16,10 @@ --dropdown-item-bg-color-active: var(--o-color-primary2-light); --dropdown-item-bg-color-disabled: var(--o-color-control4-light); - --dropdown-item-text-size: var(--o-font_size-text); - --dropdown-item-text-height: var(--o-line_height-text); + --dropdown-item-text-size: var(--o-font_size-text1); + --dropdown-item-text-height: var(--o-line_height-text1); --dropdown-item-padding: 5px 12px; - --dropdown-item-text-size: var(--o-font_size-text); - --dropdown-item-text-height: var(--o-line_height-text); + --dropdown-item-text-size: var(--o-font_size-text1); + --dropdown-item-text-height: var(--o-line_height-text1); } diff --git a/packages/opendesign/src/components/input-number/style/index.scss b/packages/opendesign/src/components/input-number/style/index.scss index dfaa0ad7..6f1cedf9 100644 --- a/packages/opendesign/src/components/input-number/style/index.scss +++ b/packages/opendesign/src/components/input-number/style/index.scss @@ -3,7 +3,7 @@ .o-input-number { .o-input-prepend, .o-input-append { - font-size: var(--o-font_size-text); + font-size: var(--o-font_size-text1); padding: 0; align-items: stretch; overflow: hidden; diff --git a/packages/opendesign/src/components/input/style/var.scss b/packages/opendesign/src/components/input/style/var.scss index fdf7d299..2c36b6da 100644 --- a/packages/opendesign/src/components/input/style/var.scss +++ b/packages/opendesign/src/components/input/style/var.scss @@ -108,8 +108,8 @@ .o-input-size-medium { --input-height: var(--o-size-m); - --input-text-size: var(--o-font_size-text); - --input-text-height: var(--o-line_height-text); + --input-text-size: var(--o-font_size-text1); + --input-text-height: var(--o-line_height-text1); --input-padding: 0 12px; --input-append-padding: 0 8px; @@ -124,8 +124,8 @@ .o-input-size-large { --input-height: var(--o-size-l); - --input-text-size: var(--o-font_size-h4); - --input-text-height: var(--o-font_size-h4); + --input-text-size: var(--o-font_size-text2); + --input-text-height: var(--o-font_size-text2); --input-padding: 0 16px; --input-append-padding: 0 12px; diff --git a/packages/opendesign/src/components/menu/style/var.scss b/packages/opendesign/src/components/menu/style/var.scss index 04468256..ffbcc98b 100644 --- a/packages/opendesign/src/components/menu/style/var.scss +++ b/packages/opendesign/src/components/menu/style/var.scss @@ -6,14 +6,14 @@ .o-sub-menu { --sub-menu-bg-hover: var(--o-color-control2-light); - --sub-menu-text-size: var(--o-font_size-h4); - --sub-menu-text-height: var(--o-line_height-h4); + --sub-menu-text-size: var(--o-font_size-text2); + --sub-menu-text-height: var(--o-line_height-text2); --sub-menu-icon-height: var(--o-font_size-h1); } .o-menu-item { - --menu-item-text-size: var(--o-font_size-text); - --menu-item-text-height: var(--o-line_height-text); + --menu-item-text-size: var(--o-font_size-text1); + --menu-item-text-height: var(--o-line_height-text1); --menu-item-bg-active: var(--o-color-control2); --menu-item-bg-hover: var(--o-color-control2-light); --menu-item-color-disabled: var(--o-color-info4); diff --git a/packages/opendesign/src/components/option/style/var.scss b/packages/opendesign/src/components/option/style/var.scss index 6def4083..46cb4216 100644 --- a/packages/opendesign/src/components/option/style/var.scss +++ b/packages/opendesign/src/components/option/style/var.scss @@ -9,10 +9,10 @@ --option-bg-color-active: var(--o-color-primary2-light); --option-bg-color-disabled: var(--o-color-control4-light); - --option-text-size: var(--o-font_size-text); - --option-text-height: var(--o-line_height-text); + --option-text-size: var(--o-font_size-text1); + --option-text-height: var(--o-line_height-text1); --option-padding: 5px 12px; - --option-text-size: var(--o-font_size-text); - --option-text-height: var(--o-line_height-text); + --option-text-size: var(--o-font_size-text1); + --option-text-height: var(--o-line_height-text1); } diff --git a/packages/opendesign/src/components/radio/style/var.scss b/packages/opendesign/src/components/radio/style/var.scss index 0aa09208..c5725a55 100644 --- a/packages/opendesign/src/components/radio/style/var.scss +++ b/packages/opendesign/src/components/radio/style/var.scss @@ -1,6 +1,6 @@ .o-radio { - --radio-text-size: var(--o-font_size-text); - --radio-text-height: var(--o-line_height-text); + --radio-text-size: var(--o-font_size-text1); + --radio-text-height: var(--o-line_height-text1); --radio-input-size: 18px; --radio-input-inner-size: 12px; diff --git a/packages/opendesign/src/components/rate/style/var.scss b/packages/opendesign/src/components/rate/style/var.scss index cb369f90..a3019b1e 100644 --- a/packages/opendesign/src/components/rate/style/var.scss +++ b/packages/opendesign/src/components/rate/style/var.scss @@ -14,7 +14,7 @@ } .o-rate-size-small { - --rate-height: var(--o-font_size-h4); + --rate-height: var(--o-font_size-text2); } .o-rate-primary { diff --git a/packages/opendesign/src/components/select/style/var.scss b/packages/opendesign/src/components/select/style/var.scss index 3099018b..525e513e 100644 --- a/packages/opendesign/src/components/select/style/var.scss +++ b/packages/opendesign/src/components/select/style/var.scss @@ -1,6 +1,6 @@ .o-select { - --select-text-size: var(--o-font_size-text); - --select-text-height: var(--o-line_height-text); + --select-text-size: var(--o-font_size-text1); + --select-text-height: var(--o-line_height-text1); --select-color: var(--o-color-info2); --select-color-disabled: var(--o-color-info4); @@ -94,15 +94,15 @@ } .o-select-size-medium { --select-height: var(--o-size-m); - --select-text-size: var(--o-font_size-text); - --select-text-height: var(--o-line_height-text); + --select-text-size: var(--o-font_size-text1); + --select-text-height: var(--o-line_height-text1); --select-padding: 4px 8px 4px 12px; --select-radius: var(--o-radius-control-m); } .o-select-size-large { --select-height: var(--o-size-l); - --select-text-size: var(--o-font_size-h4); - --select-text-height: var(--o-line_height-h4); + --select-text-size: var(--o-font_size-text2); + --select-text-height: var(--o-line_height-text2); --select-padding: 4px 12px 4px 16px; --select-radius: var(--o-radius-control-l); } @@ -119,7 +119,7 @@ .o-select-options-size-large & { --option-padding: 7px 16px; - --option-text-size: var(--o-font_size-h4); - --option-text-height: var(--o-line_height-h4); + --option-text-size: var(--o-font_size-text2); + --option-text-height: var(--o-line_height-text2); } } diff --git a/packages/opendesign/src/components/style/dark.token.css b/packages/opendesign/src/components/style/dark.token.css index 64377f1d..d78f5ef6 100644 --- a/packages/opendesign/src/components/style/dark.token.css +++ b/packages/opendesign/src/components/style/dark.token.css @@ -1077,7 +1077,14 @@ * @group font_size * @description 正文 */ - --o-font_size-text: 14px; + --o-font_size-text1: 14px; + /** + * @name 正文-大 + * @type font + * @group font_size + * @description 正文-大 + */ + --o-font_size-text2: 16px; /** * @name 提示文本1 * @type font @@ -1154,7 +1161,14 @@ * @group line_height * @description 正文 */ - --o-line_height-text: 22px; + --o-line_height-text1: 22px; + /** + * @name 正文-大 + * @type font + * @group line_height + * @description 正文-大 + */ + --o-line_height-text2: 24px; /** * @name 提示文本1 * @type font diff --git a/packages/opendesign/src/components/style/default-light.token.css b/packages/opendesign/src/components/style/default-light.token.css index ab0d9759..8be75e62 100644 --- a/packages/opendesign/src/components/style/default-light.token.css +++ b/packages/opendesign/src/components/style/default-light.token.css @@ -1078,7 +1078,14 @@ * @group font_size * @description 正文 */ - --o-font_size-text: 14px; + --o-font_size-text1: 14px; + /** + * @name 正文-大 + * @type font + * @group font_size + * @description 正文-大 + */ + --o-font_size-text2: 16px; /** * @name 提示文本1 * @type font @@ -1155,7 +1162,14 @@ * @group line_height * @description 正文 */ - --o-line_height-text: 22px; + --o-line_height-text1: 22px; + /** + * @name 正文-大 + * @type font + * @group line_height + * @description 正文-大 + */ + --o-line_height-text2: 24px; /** * @name 提示文本1 * @type font diff --git a/packages/opendesign/src/components/switch/style/var.scss b/packages/opendesign/src/components/switch/style/var.scss index 0dd36036..ef704d93 100644 --- a/packages/opendesign/src/components/switch/style/var.scss +++ b/packages/opendesign/src/components/switch/style/var.scss @@ -12,8 +12,8 @@ .o-switch-large { --switch-height: 28px; --switch-radius: 2px; - --switch-text-size: var(--o-font_size-h4); - --switch-text-height: var(--o-line_height-h4); + --switch-text-size: var(--o-font_size-text2); + --switch-text-height: var(--o-line_height-text2); --switch-handler-size: 20px; --switch-handler-radius: 2px; } diff --git a/packages/opendesign/src/components/table/style/var.scss b/packages/opendesign/src/components/table/style/var.scss index 1c227e0a..af5fd509 100644 --- a/packages/opendesign/src/components/table/style/var.scss +++ b/packages/opendesign/src/components/table/style/var.scss @@ -1,6 +1,6 @@ .o-table { - --table-text-size: var(--o-font_size-text); - --table-text-height: var(--o-line_height-text); + --table-text-size: var(--o-font_size-text1); + --table-text-height: var(--o-line_height-text1); --table-color: var(--o-color-info2); --table-tip-text-size: var(--o-font_size-tip1); diff --git a/packages/opendesign/src/components/tabs/style/var.scss b/packages/opendesign/src/components/tabs/style/var.scss index 34669e6d..1e2ccd89 100644 --- a/packages/opendesign/src/components/tabs/style/var.scss +++ b/packages/opendesign/src/components/tabs/style/var.scss @@ -1,6 +1,6 @@ .o-tabs { - --tabs-nav-text-size: var(--o-font_size-text); - --tabs-nav-text-height: var(--o-line_height-text); + --tabs-nav-text-size: var(--o-font_size-text1); + --tabs-nav-text-height: var(--o-line_height-text1); --tabs-nav-color: var(--o-color-info2); --tabs-nav-color-disabled: var(--o-color-info4); diff --git a/packages/opendesign/src/components/tag/style/var.scss b/packages/opendesign/src/components/tag/style/var.scss index 5601dc93..d521ce1f 100644 --- a/packages/opendesign/src/components/tag/style/var.scss +++ b/packages/opendesign/src/components/tag/style/var.scss @@ -14,8 +14,8 @@ --tag-border-warning: var(--o-color-warning1); --tag-border-danger: var(--o-color-danger1); - --tag-text-size: var(--o-font_size-text); - --tag-text-height: var(--o-line_height-text); + --tag-text-size: var(--o-font_size-text1); + --tag-text-height: var(--o-line_height-text1); --tag-height-s: var(--o-size-s); --tag-height-m: var(--o-size-m); diff --git a/packages/opendesign/src/components/textarea/style/var.scss b/packages/opendesign/src/components/textarea/style/var.scss index aff01d8d..607acd4b 100644 --- a/packages/opendesign/src/components/textarea/style/var.scss +++ b/packages/opendesign/src/components/textarea/style/var.scss @@ -86,16 +86,16 @@ --textarea-radius-pill: 12px; } .o-textarea-size-medium { - --textarea-text-size: var(--o-font_size-text); - --textarea-text-height: var(--o-line_height-text); + --textarea-text-size: var(--o-font_size-text1); + --textarea-text-height: var(--o-line_height-text1); --textarea-padding-v: 4px; --textarea-padding-h: 12px; --textarea-radius: var(--o-radius-control-m); --textarea-radius-pill: 16px; } .o-textarea-size-large { - --textarea-text-size: var(--o-font_size-h4); - --textarea-text-height: var(--o-line_height-h4); + --textarea-text-size: var(--o-font_size-text2); + --textarea-text-height: var(--o-line_height-text2); --textarea-padding-v: 6px; --textarea-padding-h: 12px; --textarea-radius: var(--o-radius-control-l); diff --git a/packages/opendesign/src/tokens/opendesign-token.json b/packages/opendesign/src/tokens/opendesign-token.json index d9908f25..72fe3263 100644 --- a/packages/opendesign/src/tokens/opendesign-token.json +++ b/packages/opendesign/src/tokens/opendesign-token.json @@ -1323,7 +1323,7 @@ } }, { - "key": "font_size-text", + "key": "font_size-text1", "name": "正文", "description": "正文", "value": { @@ -1331,6 +1331,15 @@ "dark": "14px" } }, + { + "key": "font_size-text2", + "name": "正文-大", + "description": "正文-大", + "value": { + "light": "16px", + "dark": "16px" + } + }, { "key": "font_size-tip1", "name": "提示文本1", @@ -1429,7 +1438,7 @@ } }, { - "key": "line_height-text", + "key": "line_height-text1", "name": "正文", "description": "正文", "value": { @@ -1437,6 +1446,15 @@ "dark": "22px" } }, + { + "key": "line_height-text2", + "name": "正文-大", + "description": "正文-大", + "value": { + "light": "24px", + "dark": "24px" + } + }, { "key": "line_height-tip1", "name": "提示文本1", -- Gitee From 2c81a1c7725ef014eede4032e9ce85fbda07117c Mon Sep 17 00:00:00 2001 From: devin Date: Thu, 9 Mar 2023 22:13:17 +0800 Subject: [PATCH 3/6] up --- .../opendesign/src/tokens/ascend-token.json | 664 +++++++----------- packages/scripts/src/gen-tokens/index.ts | 5 +- 2 files changed, 256 insertions(+), 413 deletions(-) diff --git a/packages/opendesign/src/tokens/ascend-token.json b/packages/opendesign/src/tokens/ascend-token.json index 86fe86ee..72fe3263 100644 --- a/packages/opendesign/src/tokens/ascend-token.json +++ b/packages/opendesign/src/tokens/ascend-token.json @@ -28,70 +28,70 @@ { "key": "blue-1", "value": { - "light": "232, 240, 255", + "light": "232, 243, 255", "dark": "0, 13, 77" } }, { "key": "blue-2", "value": { - "light": "194, 213, 254", + "light": "190, 218, 255", "dark": "4, 27, 121" } }, { "key": "blue-3", "value": { - "light": "157, 184, 253", + "light": "148, 191, 255", "dark": "14, 50, 166" } }, { "key": "blue-4", "value": { - "light": "120, 153, 252", + "light": "106, 161, 255", "dark": "29, 77, 210" } }, { "key": "blue-5", "value": { - "light": "83, 119, 251", + "light": "64, 128, 255", "dark": "48, 111, 255" } }, { "key": "blue-6", "value": { - "light": "46, 83, 250", + "light": "22, 93, 255", "dark": "60, 126, 255" } }, { "key": "blue-7", "value": { - "light": "29, 55, 207", + "light": "14, 66, 210", "dark": "104, 159, 255" } }, { "key": "blue-8", "value": { - "light": "15, 32, 163", + "light": "7, 44, 166", "dark": "147, 190, 255" } }, { "key": "blue-9", "value": { - "light": "6, 15, 120", + "light": "3, 26, 121", "dark": "190, 218, 255" } }, { "key": "blue-10", "value": { - "light": "0, 4, 47", + "light": "0, 13, 77", "dark": "234, 244, 255" } } @@ -105,70 +105,70 @@ { "key": "yellow-1", "value": { - "light": "255, 255, 232", + "light": "254, 255, 232", "dark": "77, 56, 0" } }, { "key": "yellow-2", "value": { - "light": "253, 251, 185", + "light": "254, 254, 190", "dark": "120, 94, 7" } }, { "key": "yellow-3", "value": { - "light": "251, 244, 139", + "light": "253, 250, 148", "dark": "163, 134, 20" } }, { "key": "yellow-4", "value": { - "light": "249, 233, 94", + "light": "252, 242, 107", "dark": "207, 179, 37" } }, { "key": "yellow-5", "value": { - "light": "247, 221, 49", + "light": "251, 232, 66", "dark": "250, 225, 60" } }, { "key": "yellow-6", "value": { - "light": "245, 205, 5", + "light": "250, 220, 25", "dark": "251, 233, 75" } }, { "key": "yellow-7", "value": { - "light": "203, 163, 3", + "light": "207, 175, 15", "dark": "252, 243, 116" } }, { "key": "yellow-8", "value": { - "light": "161, 124, 2", + "light": "163, 132, 8", "dark": "253, 250, 157" } }, { "key": "yellow-9", "value": { - "light": "119, 87, 1", + "light": "120, 93, 3", "dark": "254, 254, 198" } }, { "key": "yellow-10", "value": { - "light": "77, 54, 0", + "light": "77, 56, 0", "dark": "254, 255, 240" } } @@ -182,70 +182,70 @@ { "key": "green-1", "value": { - "light": "232, 255, 238", + "light": "232, 255, 234", "dark": "0, 77, 28" } }, { "key": "green-2", "value": { - "light": "177, 239, 195", + "light": "175, 240, 181", "dark": "4, 102, 37" } }, { "key": "green-3", "value": { - "light": "128, 224, 158", + "light": "123, 225, 136", "dark": "10, 128, 45" } }, { "key": "green-4", "value": { - "light": "84, 208, 127", + "light": "76, 210, 99", "dark": "18, 154, 55" } }, { "key": "green-5", "value": { - "light": "45, 193, 101", + "light": "35, 195, 67", "dark": "29, 180, 64" } }, { "key": "green-6", "value": { - "light": "11, 177, 81", + "light": "0, 180, 42", "dark": "39, 195, 70" } }, { "key": "green-7", "value": { - "light": "7, 152, 72", + "light": "0, 154, 41", "dark": "80, 210, 102" } }, { "key": "green-8", "value": { - "light": "4, 127, 63", + "light": "0, 128, 38", "dark": "126, 225, 139" } }, { "key": "green-9", "value": { - "light": "2, 102, 53", + "light": "0, 102, 34", "dark": "178, 240, 183" } }, { "key": "green-10", "value": { - "light": "0, 77, 42", + "light": "0, 77, 28", "dark": "235, 255, 236" } } @@ -259,70 +259,70 @@ { "key": "orange-1", "value": { - "light": "255, 246, 232", + "light": "255, 247, 232", "dark": "77, 27, 0" } }, { "key": "orange-2", "value": { - "light": "254, 226, 186", + "light": "255, 228, 186", "dark": "121, 48, 4" } }, { "key": "orange-3", "value": { - "light": "253, 202, 140", + "light": "255, 207, 139", "dark": "166, 75, 10" } }, { "key": "orange-4", "value": { - "light": "252, 176, 95", + "light": "255, 182, 93", "dark": "210, 105, 19" } }, { "key": "orange-5", "value": { - "light": "251, 147, 50", + "light": "255, 154, 46", "dark": "255, 141, 31" } }, { "key": "orange-6", "value": { - "light": "250, 115, 5", + "light": "255, 125, 0", "dark": "255, 150, 38" } }, { "key": "orange-7", "value": { - "light": "207, 88, 3", + "light": "210, 95, 0", "dark": "255, 179, 87" } }, { "key": "orange-8", "value": { - "light": "163, 64, 2", + "light": "166, 69, 0", "dark": "255, 205, 135" } }, { "key": "orange-9", "value": { - "light": "120, 42, 1", + "light": "121, 46, 0", "dark": "255, 227, 184" } }, { "key": "orange-10", "value": { - "light": "77, 24, 0", + "light": "77, 27, 0", "dark": "255, 247, 232" } } @@ -336,70 +336,70 @@ { "key": "red-1", "value": { - "light": "255, 234, 232", + "light": "255, 236, 232", "dark": "77, 0, 10" } }, { "key": "red-2", "value": { - "light": "250, 185, 182", + "light": "253, 205, 197", "dark": "119, 6, 17" } }, { "key": "red-3", "value": { - "light": "245, 136, 134", + "light": "251, 172, 163", "dark": "161, 22, 31" } }, { "key": "red-4", "value": { - "light": "240, 87, 90", + "light": "249, 137, 129", "dark": "203, 46, 52" } }, { "key": "red-5", "value": { - "light": "235, 43, 52", + "light": "247, 101, 96", "dark": "245, 78, 78" } }, { "key": "red-6", "value": { - "light": "230, 0, 18", + "light": "245, 63, 63", "dark": "247, 105, 101" } }, { "key": "red-7", "value": { - "light": "192, 0, 45", + "light": "203, 39, 45", "dark": "249, 141, 134" } }, { "key": "red-8", "value": { - "light": "153, 0, 23", + "light": "161, 21, 30", "dark": "251, 176, 167" } }, { "key": "red-9", "value": { - "light": "115, 0, 21", + "light": "119, 8, 19", "dark": "253, 209, 202" } }, { "key": "red-10", "value": { - "light": "77, 0, 17", + "light": "77, 0, 10", "dark": "255, 240, 236" } } @@ -420,89 +420,61 @@ { "key": "gray-2", "value": { - "light": "250, 250, 250", + "light": "238, 238, 238", "dark": "36, 36, 36" } }, { "key": "gray-3", "value": { - "light": "247, 247, 247", + "light": "221, 221, 221", "dark": "57, 57, 57" } }, { "key": "gray-4", "value": { - "light": "242, 242, 242", + "light": "198, 198, 198", "dark": "94, 94, 94" } }, { "key": "gray-5", "value": { - "light": "235, 235, 235", + "light": "139, 139, 139", "dark": "119, 119, 122" } }, { "key": "gray-6", "value": { - "light": "219, 219, 219", + "light": "119, 119, 119", "dark": "166, 166, 166" } }, { "key": "gray-7", "value": { - "light": "189, 189, 189", + "light": "94, 94, 94", "dark": "221, 221, 221" } }, { "key": "gray-8", "value": { - "light": "148, 148, 148", + "light": "75, 75, 75", "dark": "238, 238, 238" } }, { "key": "gray-9", "value": { - "light": "110, 110, 110", + "light": "44, 44, 44", "dark": "243, 243, 243" } }, { "key": "gray-10", - "value": { - "light": "79, 79, 79", - "dark": "255, 255, 255" - } - }, - { - "key": "gray-11", - "value": { - "light": "48, 48, 48", - "dark": "255, 255, 255" - } - }, - { - "key": "gray-12", - "value": { - "light": "36, 36, 36", - "dark": "255, 255, 255" - } - }, - { - "key": "gray-13", - "value": { - "light": "18, 18, 18", - "dark": "255, 255, 255" - } - }, - { - "key": "gray-14", "value": { "light": "0, 0, 0", "dark": "255, 255, 255" @@ -518,99 +490,71 @@ { "key": "mixedgray-1", "value": { - "light": "255, 255, 255", - "dark": "0, 0, 0" + "light": "247, 248, 250", + "dark": "23, 23, 26" } }, { "key": "mixedgray-2", "value": { - "light": "244, 245, 247", - "dark": "16, 18, 20" + "light": "242, 243, 245", + "dark": "46, 46, 48" } }, { "key": "mixedgray-3", "value": { - "light": "237, 239, 242", - "dark": "23, 25, 28" + "light": "229, 230, 235", + "dark": "72, 72, 73" } }, { "key": "mixedgray-4", "value": { - "light": "232, 234, 237", - "dark": "33, 35, 39" + "light": "201, 205, 212", + "dark": "95, 95, 96" } }, { "key": "mixedgray-5", "value": { - "light": "224, 226, 230", - "dark": "40, 42, 47" + "light": "169, 174, 184", + "dark": "120, 120, 122" } }, { "key": "mixedgray-6", "value": { - "light": "209, 214, 219", - "dark": "50, 53, 57" + "light": "134, 144, 156", + "dark": "146, 146, 147" } }, { "key": "mixedgray-7", "value": { - "light": "179, 185, 191", - "dark": "61, 63, 67" + "light": "107, 119, 133", + "dark": "171, 171, 172" } }, { "key": "mixedgray-8", "value": { - "light": "144, 150, 158", - "dark": "80, 84, 88" + "light": "78, 89, 105", + "dark": "197, 197, 197" } }, { "key": "mixedgray-9", "value": { - "light": "104, 109, 117", - "dark": "113, 117, 122" + "light": "39, 46, 59", + "dark": "223, 223, 223" } }, { "key": "mixedgray-10", "value": { - "light": "79, 84, 92", - "dark": "147, 152, 159" - } - }, - { - "key": "mixedgray-11", - "value": { - "light": "55, 59, 66", - "dark": "172, 177, 185" - } - }, - { - "key": "mixedgray-12", - "value": { - "light": "32, 35, 41", - "dark": "198, 202, 210" - } - }, - { - "key": "mixedgray-13", - "value": { - "light": "18, 20, 23", - "dark": "231, 234, 238" - } - }, - { - "key": "mixedgray-14", - "value": { - "light": "0, 0, 0", - "dark": "255, 255, 255" + "light": "29, 33, 41", + "dark": "246, 246, 246" } } ] @@ -624,64 +568,64 @@ "key": "color-info1", "description": "一级/强调/标题", "value": { - "light": "rgb(var(--o-mixedgray-14))", - "dark": "rgb(var(--o-mixedgray-14))" + "light": "rgb(var(--o-gray-10))", + "dark": "rgb(var(--o-gray-10))" } }, { "key": "color-info2", "description": "二级/次强调/正文", "value": { - "light": "rgb(var(--o-mixedgray-11))", - "dark": "rgb(var(--o-mixedgray-11))" + "light": "rgb(var(--o-gray-8))", + "dark": "rgb(var(--o-gray-8))" } }, { "key": "color-info3", "description": "三级/辅助信息", "value": { - "light": "rgb(var(--o-mixedgray-9))", - "dark": "rgb(var(--o-mixedgray-9))" + "light": "rgb(var(--o-gray-6))", + "dark": "rgb(var(--o-gray-6))" } }, { "key": "color-info4", "description": "置灰/禁用", "value": { - "light": "rgb(var(--o-mixedgray-7))", - "dark": "rgb(var(--o-mixedgray-7))" + "light": "rgb(var(--o-gray-4))", + "dark": "rgb(var(--o-gray-4))" } }, { "key": "color-info1-inverse", "description": "一级/次强调/正文反色", "value": { - "light": "rgb(var(--o-mixedgray-1))", - "dark": "rgb(var(--o-mixedgray-1))" + "light": "rgb(var(--o-gray-1))", + "dark": "rgb(var(--o-gray-1))" } }, { "key": "color-info2-inverse", "description": "二级/辅助信息反色", "value": { - "light": "rgb(var(--o-mixedgray-1))", - "dark": "rgb(var(--o-mixedgray-1))" + "light": "rgb(var(--o-gray-3))", + "dark": "rgb(var(--o-gray-3))" } }, { "key": "color-info3-inverse", "description": "三级/辅助信息反色", "value": { - "light": "rgb(var(--o-mixedgray-1))", - "dark": "rgb(var(--o-mixedgray-1))" + "light": "rgb(var(--o-gray-5))", + "dark": "rgb(var(--o-gray-5))" } }, { "key": "color-info4-inverse", "description": "置灰/禁用反色", "value": { - "light": "rgb(var(--o-mixedgray-7))", - "dark": "rgb(var(--o-mixedgray-7))" + "light": "rgb(var(--o-gray-7))", + "dark": "rgb(var(--o-gray-7))" } } ] @@ -695,16 +639,16 @@ "key": "color-mask1", "description": "全局遮罩", "value": { - "light": "rgba(var(--o-mixedgray-13), .6)", - "dark": "rgba(var(--o-mixedgray-13), .6)" + "light": "rgba(var(--o-gray-10), .2)", + "dark": "rgba(var(--o-gray-10), .2)" } }, { "key": "color-mask2", "description": "局部遮罩", "value": { - "light": "rgba(var(--o-mixedgray-13), .2)", - "dark": "rgba(var(--o-mixedgray-13), .2)" + "light": "rgba(var(--o-gray-10), .1)", + "dark": "rgba(var(--o-gray-10), .1)" } } ] @@ -718,16 +662,16 @@ "key": "color-fill1", "description": "一级填充/页面背景", "value": { - "light": "rgb(var(--o-mixedgray-2))", - "dark": "rgb(var(--o-mixedgray-2))" + "light": "rgb(var(--o-mixedgray-1))", + "dark": "rgb(var(--o-mixedgray-1))" } }, { "key": "color-fill2", "description": "二级填充/区块、卡片", "value": { - "light": "rgb(var(--o-mixedgray-1))", - "dark": "rgb(var(--o-mixedgray-1))" + "light": "rgb(var(--o-gray-1))", + "dark": "rgb(var(--o-gray-1))" } }, { @@ -737,6 +681,14 @@ "light": "rgb(var(--o-mixedgray-3))", "dark": "rgb(var(--o-mixedgray-3))" } + }, + { + "key": "color-fill4", + "description": "四级填充/禁用", + "value": { + "light": "rgb(var(--o-mixedgray-4))", + "dark": "rgb(var(--o-mixedgray-4))" + } } ] }, @@ -747,76 +699,74 @@ "value": [ { "key": "color-control-light", - "description": "很浅背景/表格背景色", + "description": "很浅背景", "value": { - "light": "rgb(var(--o-mixedgray-1))", - "dark": "rgb(var(--o-mixedgray-1))" + "light": "rgb(var(--o-gray-1))", + "dark": "rgb(var(--o-gray-1))" } }, { "key": "color-control1", "description": "常规，常用于边框", "value": { - "light": "rgb(var(--o-mixedgray-7))", - "dark": "rgb(var(--o-mixedgray-7))" + "light": "rgb(var(--o-mixedgray-3))", + "dark": "rgb(var(--o-mixedgray-3))" } }, - { "key": "color-control2", - "description": "hover，常用于边框", + "description": "悬浮", "value": { - "light": "rgb(var(--o-mixedgray-9))", - "dark": "rgb(var(--o-mixedgray-9))" + "light": "rgb(var(--o-mixedgray-4))", + "dark": "rgb(var(--o-mixedgray-4))" } }, - { "key": "color-control3", - "description": "激活，常用于边框", - "value": { - "light": "rgb(var(--o-mixedgray-12))", - "dark": "rgb(var(--o-mixedgray-12))" - } - }, - { - "key": "color-control4", - "description": "边框禁用/深色背景分割线", + "description": "激活", "value": { "light": "rgb(var(--o-mixedgray-6))", "dark": "rgb(var(--o-mixedgray-6))" } }, { - "key": "color-control1-light", - "description": "浅色背景分割线/表格线/表格描边", + "key": "color-control4", + "description": "禁用", "value": { "light": "rgb(var(--o-mixedgray-5))", "dark": "rgb(var(--o-mixedgray-5))" } }, { - "key": "color-control2-light", - "description": "表格行hover、激活/手风琴hover/下拉菜单hover", + "key": "color-control1-light", + "description": "常规-浅，常用于背景", "value": { "light": "rgb(var(--o-mixedgray-3))", "dark": "rgb(var(--o-mixedgray-3))" } }, { - "key": "color-control3-light", - "description": "表头背景色/手风琴激活/下拉菜单激活", + "key": "color-control2-light", + "description": "悬浮-浅", "value": { "light": "rgb(var(--o-mixedgray-4))", "dark": "rgb(var(--o-mixedgray-4))" } }, + { + "key": "color-control3-light", + "description": "激活-浅", + "value": { + "light": "rgb(var(--o-mixedgray-5))", + "dark": "rgb(var(--o-mixedgray-5))" + } + }, { "key": "color-control4-light", - "description": "禁用背景", + "description": "禁用-浅", "value": { - "light": "rgb(var(--o-mixedgray-3))", - "dark": "rgb(var(--o-mixedgray-3))" + "light": "rgb(var(--o-mixedgray-2))", + "dark": "rgb(var(--o-mixedgray-2))" } } ] @@ -830,64 +780,64 @@ "key": "color-primary1", "description": "常规", "value": { - "light": "rgb(var(--o-mixedgray-12))", - "dark": "rgb(var(--o-mixedgray-12))" + "light": "rgb(var(--o-blue-6))", + "dark": "rgb(var(--o-blue-6))" } }, { "key": "color-primary2", "description": "悬浮", "value": { - "light": "rgb(var(--o-mixedgray-11))", - "dark": "rgb(var(--o-mixedgray-11))" + "light": "rgb(var(--o-blue-5))", + "dark": "rgb(var(--o-blue-5))" } }, { "key": "color-primary3", "description": "激活", "value": { - "light": "rgb(var(--o-mixedgray-13))", - "dark": "rgb(var(--o-mixedgray-13))" + "light": "rgb(var(--o-blue-7))", + "dark": "rgb(var(--o-blue-7))" } }, { "key": "color-primary4", "description": "禁用", "value": { - "light": "rgb(var(--o-mixedgray-6))", - "dark": "rgb(var(--o-mixedgray-6))" + "light": "rgb(var(--o-blue-3))", + "dark": "rgb(var(--o-blue-3))" } }, { "key": "color-primary1-light", "description": "浅/常规", "value": { - "light": "rgb(var(--o-mixedgray-12))", - "dark": "rgb(var(--o-mixedgray-12))" + "light": "rgb(var(--o-blue-2))", + "dark": "rgb(var(--o-blue-2))" } }, { "key": "color-primary2-light", "description": "浅/悬浮", "value": { - "light": "rgb(var(--o-mixedgray-11))", - "dark": "rgb(var(--o-mixedgray-11))" + "light": "rgb(var(--o-blue-3))", + "dark": "rgb(var(--o-blue-3))" } }, { "key": "color-primary3-light", "description": "浅/激活", "value": { - "light": "rgb(var(--o-mixedgray-13))", - "dark": "rgb(var(--o-mixedgray-13))" + "light": "rgb(var(--o-blue-4))", + "dark": "rgb(var(--o-blue-4))" } }, { "key": "color-primary4-light", "description": "浅/禁用", "value": { - "light": "rgb(var(--o-mixedgray-6))", - "dark": "rgb(var(--o-mixedgray-6))" + "light": "rgb(var(--o-blue-1))", + "dark": "rgb(var(--o-blue-1))" } } ] @@ -909,8 +859,8 @@ "key": "color-success2", "description": "悬浮", "value": { - "light": "rgb(var(--o-green-4))", - "dark": "rgb(var(--o-green-4))" + "light": "rgb(var(--o-green-5))", + "dark": "rgb(var(--o-green-5))" } }, { @@ -980,8 +930,8 @@ "key": "color-warning2", "description": "悬浮", "value": { - "light": "rgb(var(--o-orange-4))", - "dark": "rgb(var(--o-orange-4))" + "light": "rgb(var(--o-orange-5))", + "dark": "rgb(var(--o-orange-5))" } }, { @@ -1051,8 +1001,8 @@ "key": "color-danger2", "description": "悬浮", "value": { - "light": "rgb(var(--o-red-4))", - "dark": "rgb(var(--o-red-4))" + "light": "rgb(var(--o-red-5))", + "dark": "rgb(var(--o-red-5))" } }, { @@ -1115,8 +1065,8 @@ "name": "阴影1", "description": "用于卡片、小弹窗、楼层阴影", "value": { - "light": "0 3px 8px rgba(var(--o-mixedgray-13), 0.08)", - "dark": "0 3px 8px rgba(var(--o-mixedgray-13), 0.08)" + "light": "0 1px 5px rgba(var(--o-gray-10), 0.1)", + "dark": "0 1px 7px rgba(var(--o-gray-10), 0.3)" } }, { @@ -1124,8 +1074,8 @@ "name": "阴影2", "description": "用于卡片悬浮阴影", "value": { - "light": "0 6px 24px rgba(var(--o-mixedgray-13), 0.08)", - "dark": "0 6px 24px rgba(var(--o-mixedgray-13), 0.08)" + "light": "0 6px 18px rgba(var(--o-gray-10), 0.14)", + "dark": "0 6px 18px rgba(var(--o-gray-10), 0.42)" } }, { @@ -1133,8 +1083,8 @@ "name": "阴影3", "description": "用于提示阴影", "value": { - "light": "0 10px 40px rgba(var(--o-mixedgray-13), 0.08)", - "dark": "0 10px 40px rgba(var(--o-mixedgray-13), 0.08)" + "light": "0 10px 32px rgba(var(--o-gray-10), 0.18)", + "dark": "0 10px 32px rgba(var(--o-gray-10), 0.54)" } } ] @@ -1211,28 +1161,10 @@ "key": "gap-8", "name": "间距8", "description": "用于组件之间的间距8", - "value": { - "light": "48px", - "dark": "48px" - } - }, - { - "key": "gap-9", - "name": "间距9", - "description": "用于组件之间的间距9", "value": { "light": "64px", "dark": "64px" } - }, - { - "key": "gap-10", - "name": "间距10", - "description": "用于组件之间的间距10", - "value": { - "light": "72px", - "dark": "72px" - } } ] }, @@ -1241,33 +1173,6 @@ "type": "size", "typeName": "尺寸", "value": [ - { - "key": "size-xs", - "name": "小尺寸", - "description": "小尺寸", - "value": { - "light": "16px", - "dark": "16px" - } - }, - { - "key": "size-s", - "name": "小尺寸", - "description": "小尺寸", - "value": { - "light": "24px", - "dark": "24px" - } - }, - { - "key": "size-m", - "name": "中尺寸", - "description": "尺寸", - "value": { - "light": "32px", - "dark": "32px" - } - }, { "key": "size-l", "name": "大尺寸", @@ -1278,21 +1183,21 @@ } }, { - "key": "size-xl", - "name": "大尺寸", + "key": "size-m", + "name": "中尺寸", "description": "尺寸", "value": { - "light": "48px", - "dark": "48px" + "light": "32px", + "dark": "32px" } }, { - "key": "size-xxl", - "name": "大尺寸", - "description": "尺寸", + "key": "size-s", + "name": "小尺寸", + "description": "小尺寸", "value": { - "light": "56px", - "dark": "56px" + "light": "24px", + "dark": "24px" } } ] @@ -1302,76 +1207,40 @@ "type": "size", "typeName": "尺寸", "value": [ - { - "key": "icon_size-xs", - "name": "超小尺寸图标", - "description": "小尺寸", - "value": { - "light": "16px", - "dark": "16px" - } - }, - { - "key": "icon_size-s", - "name": "小尺寸图标", - "description": "小尺寸", - "value": { - "light": "24px", - "dark": "24px" - } - }, - { - "key": "icon_size-m", - "name": "中尺寸图标", - "description": "尺寸", - "value": { - "light": "32px", - "dark": "32px" - } - }, { "key": "icon_size-l", "name": "大尺寸图标", "description": "尺寸", - "value": { - "light": "40px", - "dark": "40px" - } - }, - { - "key": "icon_size-xl", - "name": "大尺寸图标", - "description": "尺寸", "value": { "light": "48px", "dark": "48px" } }, { - "key": "icon_size-xxl", - "name": "大尺寸图标", + "key": "icon_size-m", + "name": "中尺寸图标", "description": "尺寸", "value": { - "light": "64px", - "dark": "64px" + "light": "32px", + "dark": "32px" } }, { - "key": "icon_size-xxxl", - "name": "大尺寸图标", - "description": "尺寸", + "key": "icon_size-s", + "name": "小尺寸图标", + "description": "小尺寸", "value": { - "light": "72px", - "dark": "72px" + "light": "24px", + "dark": "24px" } }, { - "key": "icon_size-xxxxl", - "name": "大尺寸图标", - "description": "尺寸", + "key": "icon_size-xs", + "name": "超小尺寸图标", + "description": "小尺寸", "value": { - "light": "96px", - "dark": "96px" + "light": "16px", + "dark": "16px" } } ] @@ -1395,8 +1264,8 @@ "name": "二级数据展示", "description": "二级数据展示", "value": { - "light": "56px", - "dark": "56px" + "light": "54px", + "dark": "54px" } }, { @@ -1404,8 +1273,8 @@ "name": "三级数据展示", "description": "三级数据展示", "value": { - "light": "48px", - "dark": "48px" + "light": "36px", + "dark": "36px" } }, { @@ -1413,17 +1282,8 @@ "name": "四级数据展示", "description": "四级数据展示", "value": { - "light": "40px", - "dark": "40px" - } - }, - { - "key": "font_size-display5", - "name": "五级数据展示", - "description": "五级数据展示", - "value": { - "light": "36px", - "dark": "36px" + "light": "28px", + "dark": "28px" } }, { @@ -1431,8 +1291,8 @@ "name": "一级标题", "description": "一级标题", "value": { - "light": "32px", - "dark": "32px" + "light": "24px", + "dark": "24px" } }, { @@ -1440,8 +1300,8 @@ "name": "二级标题", "description": "二级标题", "value": { - "light": "28px", - "dark": "28px" + "light": "20px", + "dark": "20px" } }, { @@ -1449,8 +1309,8 @@ "name": "三级标题", "description": "三级标题", "value": { - "light": "24px", - "dark": "24px" + "light": "18px", + "dark": "18px" } }, { @@ -1458,23 +1318,23 @@ "name": "四级标题", "description": "四级标题", "value": { - "light": "20px", - "dark": "20px" + "light": "16px", + "dark": "16px" } }, { - "key": "font_size-h5", - "name": "五级标题", - "description": "五级标题", + "key": "font_size-text1", + "name": "正文", + "description": "正文", "value": { - "light": "18px", - "dark": "18px" + "light": "14px", + "dark": "14px" } }, { - "key": "font_size-text", - "name": "正文", - "description": "正文", + "key": "font_size-text2", + "name": "正文-大", + "description": "正文-大", "value": { "light": "16px", "dark": "16px" @@ -1485,8 +1345,8 @@ "name": "提示文本1", "description": "提示文本1", "value": { - "light": "14px", - "dark": "14px" + "light": "12px", + "dark": "12px" } }, { @@ -1494,8 +1354,8 @@ "name": "提示文本2", "description": "提示文本2", "value": { - "light": "12px", - "dark": "12px" + "light": "10px", + "dark": "10px" } } ] @@ -1510,8 +1370,8 @@ "name": "一级数据展示", "description": "一级数据展示", "value": { - "light": "90px", - "dark": "90px" + "light": "84px", + "dark": "84px" } }, { @@ -1519,8 +1379,8 @@ "name": "二级数据展示", "description": "二级数据展示", "value": { - "light": "80px", - "dark": "80px" + "light": "76px", + "dark": "76px" } }, { @@ -1528,8 +1388,8 @@ "name": "三级数据展示", "description": "三级数据展示", "value": { - "light": "64px", - "dark": "64px" + "light": "48px", + "dark": "48px" } }, { @@ -1537,17 +1397,8 @@ "name": "四级数据展示", "description": "四级数据展示", "value": { - "light": "56px", - "dark": "56px" - } - }, - { - "key": "line_height-display5", - "name": "五级数据展示", - "description": "五级数据展示", - "value": { - "light": "48px", - "dark": "48px" + "light": "36px", + "dark": "36px" } }, { @@ -1555,8 +1406,8 @@ "name": "一级标题", "description": "一级标题", "value": { - "light": "44px", - "dark": "44px" + "light": "32px", + "dark": "32px" } }, { @@ -1564,8 +1415,8 @@ "name": "二级标题", "description": "二级标题", "value": { - "light": "40px", - "dark": "40px" + "light": "28px", + "dark": "28px" } }, { @@ -1573,8 +1424,8 @@ "name": "三级标题", "description": "三级标题", "value": { - "light": "32px", - "dark": "32px" + "light": "26px", + "dark": "26px" } }, { @@ -1582,23 +1433,23 @@ "name": "四级标题", "description": "四级标题", "value": { - "light": "28px", - "dark": "28px" + "light": "24px", + "dark": "24px" } }, { - "key": "line_height-h5", - "name": "五级标题", - "description": "五级标题", + "key": "line_height-text1", + "name": "正文", + "description": "正文", "value": { - "light": "28px", - "dark": "28px" + "light": "22px", + "dark": "22px" } }, { - "key": "line_height-text", - "name": "正文", - "description": "正文", + "key": "line_height-text2", + "name": "正文-大", + "description": "正文-大", "value": { "light": "24px", "dark": "24px" @@ -1609,8 +1460,8 @@ "name": "提示文本1", "description": "提示文本1", "value": { - "light": "22px", - "dark": "22px" + "light": "18px", + "dark": "18px" } }, { @@ -1618,8 +1469,8 @@ "name": "提示文本2", "description": "提示文本2", "value": { - "light": "18px", - "dark": "18px" + "light": "14px", + "dark": "14px" } } ] @@ -1630,12 +1481,12 @@ "typeName": "尺寸", "value": [ { - "key": "radius-s", - "name": "小尺寸圆角", - "description": "小尺寸圆角", + "key": "radius-l", + "name": "大尺寸圆角", + "description": "大尺寸圆角", "value": { - "light": "4px", - "dark": "4px" + "light": "8px", + "dark": "8px" } }, { @@ -1643,26 +1494,17 @@ "name": "中尺寸圆角", "description": "中尺寸圆角", "value": { - "light": "8px", - "dark": "8px" - } - }, - { - "key": "radius-l", - "name": "大尺寸圆角", - "description": "大尺寸圆角", - "value": { - "light": "16px", - "dark": "16px" + "light": "4px", + "dark": "4px" } }, { - "key": "radius-xl", - "name": "大尺寸圆角", - "description": "大尺寸圆角", + "key": "radius-s", + "name": "小尺寸圆角", + "description": "小尺寸圆角", "value": { - "light": "24px", - "dark": "24px" + "light": "2px", + "dark": "2px" } }, { diff --git a/packages/scripts/src/gen-tokens/index.ts b/packages/scripts/src/gen-tokens/index.ts index 416431bd..b6138c8f 100644 --- a/packages/scripts/src/gen-tokens/index.ts +++ b/packages/scripts/src/gen-tokens/index.ts @@ -192,10 +192,11 @@ function generateCodeSnippets(tokens: Record, outFile: strin const { value, tokenKey, description } = token; const themes = Object.keys(value).map(theme => `${theme}: ${value[theme]}`); const desc = `${description || ''}[${themes.join(', ')}]`; + const code = `var(${tokenKey})`; snippets[tokenKey] = { - prefix: [`var(${tokenKey})`], - body: `var(${tokenKey})`, + prefix: [code], + body: code, description: desc, scope: 'css,scss,less' }; -- Gitee From 693e32e8e292ff6415efa374c6653057a32a46fa Mon Sep 17 00:00:00 2001 From: devin Date: Tue, 14 Mar 2023 10:50:06 +0800 Subject: [PATCH 4/6] up --- .../opendesign/src/tokens/ascend-token.json | 1389 ++++++++++++----- 1 file changed, 1015 insertions(+), 374 deletions(-) diff --git a/packages/opendesign/src/tokens/ascend-token.json b/packages/opendesign/src/tokens/ascend-token.json index 72fe3263..526031d0 100644 --- a/packages/opendesign/src/tokens/ascend-token.json +++ b/packages/opendesign/src/tokens/ascend-token.json @@ -20,156 +20,79 @@ } ] }, - "blue": { - "name": "蓝色", + "deepblue": { + "name": "深蓝色", "type": "palette", "typeName": "色盘", "value": [ { - "key": "blue-1", + "key": "deepblue-1", "value": { - "light": "232, 243, 255", - "dark": "0, 13, 77" + "light": "232, 240, 255", + "dark": "232, 240, 255" } }, { - "key": "blue-2", + "key": "deepblue-2", "value": { - "light": "190, 218, 255", - "dark": "4, 27, 121" + "light": "194, 213, 254", + "dark": "194, 213, 254" } }, { - "key": "blue-3", + "key": "deepblue-3", "value": { - "light": "148, 191, 255", - "dark": "14, 50, 166" + "light": "157, 184, 253", + "dark": "157, 184, 253" } }, { - "key": "blue-4", + "key": "deepblue-4", "value": { - "light": "106, 161, 255", - "dark": "29, 77, 210" + "light": "120, 153, 252", + "dark": "120, 153, 252" } }, { - "key": "blue-5", + "key": "deepblue-5", "value": { - "light": "64, 128, 255", - "dark": "48, 111, 255" + "light": "83, 119, 251", + "dark": "83, 119, 251" } }, { - "key": "blue-6", + "key": "deepblue-6", "value": { - "light": "22, 93, 255", - "dark": "60, 126, 255" + "light": "46, 83, 250", + "dark": "46, 83, 250" } }, { - "key": "blue-7", + "key": "deepblue-7", "value": { - "light": "14, 66, 210", - "dark": "104, 159, 255" + "light": "29, 55, 207", + "dark": "29, 55, 207" } }, { - "key": "blue-8", + "key": "deepblue-8", "value": { - "light": "7, 44, 166", - "dark": "147, 190, 255" + "light": "15, 32, 163", + "dark": "15, 32, 163" } }, { - "key": "blue-9", + "key": "deepblue-9", "value": { - "light": "3, 26, 121", - "dark": "190, 218, 255" + "light": "6, 15, 120", + "dark": "6, 15, 120" } }, { - "key": "blue-10", + "key": "deepblue-10", "value": { - "light": "0, 13, 77", - "dark": "234, 244, 255" - } - } - ] - }, - "yellow": { - "name": "黄色", - "type": "palette", - "typeName": "色盘", - "value": [ - { - "key": "yellow-1", - "value": { - "light": "254, 255, 232", - "dark": "77, 56, 0" - } - }, - { - "key": "yellow-2", - "value": { - "light": "254, 254, 190", - "dark": "120, 94, 7" - } - }, - { - "key": "yellow-3", - "value": { - "light": "253, 250, 148", - "dark": "163, 134, 20" - } - }, - { - "key": "yellow-4", - "value": { - "light": "252, 242, 107", - "dark": "207, 179, 37" - } - }, - { - "key": "yellow-5", - "value": { - "light": "251, 232, 66", - "dark": "250, 225, 60" - } - }, - { - "key": "yellow-6", - "value": { - "light": "250, 220, 25", - "dark": "251, 233, 75" - } - }, - { - "key": "yellow-7", - "value": { - "light": "207, 175, 15", - "dark": "252, 243, 116" - } - }, - { - "key": "yellow-8", - "value": { - "light": "163, 132, 8", - "dark": "253, 250, 157" - } - }, - { - "key": "yellow-9", - "value": { - "light": "120, 93, 3", - "dark": "254, 254, 198" - } - }, - { - "key": "yellow-10", - "value": { - "light": "77, 56, 0", - "dark": "254, 255, 240" + "light": "0, 4, 47", + "dark": "0, 4, 47" } } ] @@ -182,71 +105,71 @@ { "key": "green-1", "value": { - "light": "232, 255, 234", - "dark": "0, 77, 28" + "light": "232, 255, 238", + "dark": "232, 255, 238" } }, { "key": "green-2", "value": { - "light": "175, 240, 181", - "dark": "4, 102, 37" + "light": "177, 239, 195", + "dark": "177, 239, 195" } }, { "key": "green-3", "value": { - "light": "123, 225, 136", - "dark": "10, 128, 45" + "light": "128, 224, 158", + "dark": "128, 224, 158" } }, { "key": "green-4", "value": { - "light": "76, 210, 99", - "dark": "18, 154, 55" + "light": "84, 208, 127", + "dark": "84, 208, 127" } }, { "key": "green-5", "value": { - "light": "35, 195, 67", - "dark": "29, 180, 64" + "light": "45, 193, 101", + "dark": "45, 193, 101" } }, { "key": "green-6", "value": { - "light": "0, 180, 42", - "dark": "39, 195, 70" + "light": "11, 177, 81", + "dark": "11, 177, 81" } }, { "key": "green-7", "value": { - "light": "0, 154, 41", - "dark": "80, 210, 102" + "light": "7, 152, 72", + "dark": "7, 152, 72" } }, { "key": "green-8", "value": { - "light": "0, 128, 38", - "dark": "126, 225, 139" + "light": "4, 127, 63", + "dark": "4, 127, 63" } }, { "key": "green-9", "value": { - "light": "0, 102, 34", - "dark": "178, 240, 183" + "light": "2, 102, 53", + "dark": "2, 102, 53" } }, { "key": "green-10", "value": { - "light": "0, 77, 28", - "dark": "235, 255, 236" + "light": "0, 77, 42", + "dark": "0, 77, 42" } } ] @@ -259,71 +182,71 @@ { "key": "orange-1", "value": { - "light": "255, 247, 232", - "dark": "77, 27, 0" + "light": "255, 246, 232", + "dark": "255, 246, 232" } }, { "key": "orange-2", "value": { - "light": "255, 228, 186", - "dark": "121, 48, 4" + "light": "254, 226, 186", + "dark": "254, 226, 186" } }, { "key": "orange-3", "value": { - "light": "255, 207, 139", - "dark": "166, 75, 10" + "light": "253, 202, 140", + "dark": "253, 202, 140" } }, { "key": "orange-4", "value": { - "light": "255, 182, 93", - "dark": "210, 105, 19" + "light": "252, 176, 95", + "dark": "252, 176, 95" } }, { "key": "orange-5", "value": { - "light": "255, 154, 46", - "dark": "255, 141, 31" + "light": "251, 147, 50", + "dark": "251, 147, 50" } }, { "key": "orange-6", "value": { - "light": "255, 125, 0", - "dark": "255, 150, 38" + "light": "250, 115, 5", + "dark": "250, 115, 5" } }, { "key": "orange-7", "value": { - "light": "210, 95, 0", - "dark": "255, 179, 87" + "light": "207, 88, 3", + "dark": "207, 88, 3" } }, { "key": "orange-8", "value": { - "light": "166, 69, 0", - "dark": "255, 205, 135" + "light": "163, 64, 2", + "dark": "163, 64, 2" } }, { "key": "orange-9", "value": { - "light": "121, 46, 0", - "dark": "255, 227, 184" + "light": "120, 42, 1", + "dark": "120, 42, 1" } }, { "key": "orange-10", "value": { - "light": "77, 27, 0", - "dark": "255, 247, 232" + "light": "77, 24, 0", + "dark": "77, 24, 0" } } ] @@ -336,71 +259,85 @@ { "key": "red-1", "value": { - "light": "255, 236, 232", - "dark": "77, 0, 10" + "light": "255, 234, 232", + "dark": "255, 234, 232" } }, { "key": "red-2", "value": { - "light": "253, 205, 197", - "dark": "119, 6, 17" + "light": "250, 185, 182", + "dark": "250, 185, 182" } }, { "key": "red-3", "value": { - "light": "251, 172, 163", - "dark": "161, 22, 31" + "light": "245, 136, 134", + "dark": "245, 136, 134" } }, { "key": "red-4", "value": { - "light": "249, 137, 129", - "dark": "203, 46, 52" + "light": "240, 87, 90", + "dark": "240, 87, 90" } }, { "key": "red-5", "value": { - "light": "247, 101, 96", - "dark": "245, 78, 78" + "light": "235, 43, 52", + "dark": "235, 43, 52" } }, { "key": "red-6", "value": { - "light": "245, 63, 63", - "dark": "247, 105, 101" + "light": "230, 0, 18", + "dark": "230, 0, 18" } }, { "key": "red-7", "value": { - "light": "203, 39, 45", - "dark": "249, 141, 134" + "light": "192, 0, 45", + "dark": "192, 0, 45" } }, { "key": "red-8", "value": { - "light": "161, 21, 30", - "dark": "251, 176, 167" + "light": "153, 0, 23", + "dark": "153, 0, 23" } }, { "key": "red-9", "value": { - "light": "119, 8, 19", - "dark": "253, 209, 202" + "light": "115, 0, 21", + "dark": "115, 0, 21" } }, { "key": "red-10", "value": { - "light": "77, 0, 10", - "dark": "255, 240, 236" + "light": "77, 0, 17", + "dark": "77, 0, 17" + } + } + ] + }, + "huaweired": { + "name": "华为红", + "type": "palette", + "typeName": "色盘", + "value": [ + { + "key": "red-huawei", + "value": { + "light": "199, 0, 11", + "dark": "199, 0, 11" } } ] @@ -414,70 +351,98 @@ "key": "gray-1", "value": { "light": "255, 255, 255", - "dark": "0, 0, 0" + "dark": "255, 255, 255" } }, { "key": "gray-2", "value": { - "light": "238, 238, 238", - "dark": "36, 36, 36" + "light": "250, 250, 250", + "dark": "250, 250, 250" } }, { "key": "gray-3", "value": { - "light": "221, 221, 221", - "dark": "57, 57, 57" + "light": "247, 247, 247", + "dark": "247, 247, 247" } }, { "key": "gray-4", "value": { - "light": "198, 198, 198", - "dark": "94, 94, 94" + "light": "242, 242, 242", + "dark": "242, 242, 242" } }, { "key": "gray-5", "value": { - "light": "139, 139, 139", - "dark": "119, 119, 122" + "light": "235, 235, 235", + "dark": "235, 235, 235" } }, { "key": "gray-6", "value": { - "light": "119, 119, 119", - "dark": "166, 166, 166" + "light": "219, 219, 219", + "dark": "219, 219, 219" } }, { "key": "gray-7", "value": { - "light": "94, 94, 94", - "dark": "221, 221, 221" + "light": "189, 189, 189", + "dark": "189, 189, 189" } }, { "key": "gray-8", "value": { - "light": "75, 75, 75", - "dark": "238, 238, 238" + "light": "148, 148, 148", + "dark": "148, 148, 148" } }, { "key": "gray-9", "value": { - "light": "44, 44, 44", - "dark": "243, 243, 243" + "light": "110, 110, 110", + "dark": "110, 110, 110" } }, { "key": "gray-10", + "value": { + "light": "79, 79, 79", + "dark": "79, 79, 79" + } + }, + { + "key": "gray-11", + "value": { + "light": "48, 48, 48", + "dark": "48, 48, 48" + } + }, + { + "key": "gray-12", + "value": { + "light": "36, 36, 36", + "dark": "36, 36, 36" + } + }, + { + "key": "gray-13", + "value": { + "light": "18, 18, 18", + "dark": "18, 18, 18" + } + }, + { + "key": "gray-14", "value": { "light": "0, 0, 0", - "dark": "255, 255, 255" + "dark": "0, 0, 0" } } ] @@ -490,71 +455,638 @@ { "key": "mixedgray-1", "value": { - "light": "247, 248, 250", - "dark": "23, 23, 26" + "light": "255, 255, 255", + "dark": "255, 255, 255" } }, { "key": "mixedgray-2", "value": { - "light": "242, 243, 245", - "dark": "46, 46, 48" + "light": "244, 245, 247", + "dark": "244, 245, 247" } }, { "key": "mixedgray-3", "value": { - "light": "229, 230, 235", - "dark": "72, 72, 73" + "light": "237, 239, 242", + "dark": "237, 239, 242" } }, { "key": "mixedgray-4", "value": { - "light": "201, 205, 212", - "dark": "95, 95, 96" + "light": "232, 234, 237", + "dark": "232, 234, 237" } }, { "key": "mixedgray-5", "value": { - "light": "169, 174, 184", - "dark": "120, 120, 122" + "light": "224, 226, 230", + "dark": "224, 226, 230" } }, { "key": "mixedgray-6", "value": { - "light": "134, 144, 156", - "dark": "146, 146, 147" + "light": "209, 214, 219", + "dark": "209, 214, 219" } }, { "key": "mixedgray-7", "value": { - "light": "107, 119, 133", - "dark": "171, 171, 172" + "light": "179, 185, 191", + "dark": "179, 185, 191" } }, { "key": "mixedgray-8", "value": { - "light": "78, 89, 105", - "dark": "197, 197, 197" + "light": "144, 150, 158", + "dark": "144, 150, 158" } }, { "key": "mixedgray-9", "value": { - "light": "39, 46, 59", - "dark": "223, 223, 223" + "light": "104, 109, 117", + "dark": "104, 109, 117" } }, { "key": "mixedgray-10", "value": { - "light": "29, 33, 41", - "dark": "246, 246, 246" + "light": "79, 84, 92", + "dark": "79, 84, 92" + } + }, + { + "key": "mixedgray-11", + "value": { + "light": "55, 59, 66", + "dark": "55, 59, 66" + } + }, + { + "key": "mixedgray-12", + "value": { + "light": "32, 35, 41", + "dark": "32, 35, 41" + } + }, + { + "key": "mixedgray-13", + "value": { + "light": "18, 20, 23", + "dark": "18, 20, 23" + } + }, + { + "key": "mixedgray-14", + "value": { + "light": "0, 0, 0", + "dark": "0, 0, 0" + } + } + ] + }, + "yellow": { + "name": "黄色", + "type": "palette", + "typeName": "色盘", + "value": [ + { + "key": "yellow-1", + "value": { + "light": "255, 255, 232", + "dark": "255, 255, 232" + } + }, + { + "key": "yellow-2", + "value": { + "light": "253, 251, 185", + "dark": "253, 251, 185" + } + }, + { + "key": "yellow-3", + "value": { + "light": "251, 244, 139", + "dark": "251, 244, 139" + } + }, + { + "key": "yellow-4", + "value": { + "light": "249, 233, 94", + "dark": "249, 233, 94" + } + }, + { + "key": "yellow-5", + "value": { + "light": "247, 221, 49", + "dark": "247, 221, 49" + } + }, + { + "key": "yellow-6", + "value": { + "light": "245, 205, 5", + "dark": "245, 205, 5" + } + }, + { + "key": "yellow-7", + "value": { + "light": "203, 163, 3", + "dark": "203, 163, 3" + } + }, + { + "key": "yellow-8", + "value": { + "light": "161, 124, 2", + "dark": "161, 124, 2" + } + }, + { + "key": "yellow-9", + "value": { + "light": "119, 87, 1", + "dark": "119, 87, 1" + } + }, + { + "key": "yellow-10", + "value": { + "light": "77, 54, 0", + "dark": "77, 54, 0" + } + } + ] + }, + "lime": { + "name": "黄绿色", + "type": "palette", + "typeName": "色盘", + "value": [ + { + "key": "lime-1", + "value": { + "light": "251, 255, 232", + "dark": "251, 255, 232" + } + }, + { + "key": "lime-2", + "value": { + "light": "233, 245, 184", + "dark": "233, 245, 184" + } + }, + { + "key": "lime-3", + "value": { + "light": "213, 236, 139", + "dark": "213, 236, 139" + } + }, + { + "key": "lime-4", + "value": { + "light": "192, 226, 97", + "dark": "192, 226, 97" + } + }, + { + "key": "lime-5", + "value": { + "light": "169, 217, 59", + "dark": "169, 217, 59" + } + }, + { + "key": "lime-6", + "value": { + "light": "146, 207, 23", + "dark": "146, 207, 23" + } + }, + { + "key": "lime-7", + "value": { + "light": "116, 174, 15", + "dark": "116, 174, 15" + } + }, + { + "key": "lime-8", + "value": { + "light": "88, 142, 8", + "dark": "88, 142, 8" + } + }, + { + "key": "lime-9", + "value": { + "light": "63, 109, 3", + "dark": "63, 109, 3" + } + }, + { + "key": "lime-10", + "value": { + "light": "41, 77, 0", + "dark": "41, 77, 0" + } + } + ] + }, + "cyan": { + "name": "青色", + "type": "palette", + "typeName": "色盘", + "value": [ + { + "key": "cyan-1", + "value": { + "light": "232, 255, 249", + "dark": "232, 255, 249" + } + }, + { + "key": "cyan-2", + "value": { + "light": "176, 240, 226", + "dark": "176, 240, 226" + } + }, + { + "key": "cyan-3", + "value": { + "light": "125, 225, 207", + "dark": "125, 225, 207" + } + }, + { + "key": "cyan-4", + "value": { + "light": "79, 221, 191", + "dark": "79, 221, 191" + } + }, + { + "key": "cyan-5", + "value": { + "light": "38, 196, 177", + "dark": "38, 196, 177" + } + }, + { + "key": "cyan-6", + "value": { + "light": "3, 181, 165", + "dark": "3, 181, 165" + } + }, + { + "key": "cyan-7", + "value": { + "light": "2, 155, 147", + "dark": "2, 155, 147" + } + }, + { + "key": "cyan-8", + "value": { + "light": "1, 129, 127", + "dark": "1, 129, 127" + } + }, + { + "key": "cyan-9", + "value": { + "light": "0, 101, 103", + "dark": "0, 101, 103" + } + }, + { + "key": "cyan-10", + "value": { + "light": "0, 73, 77", + "dark": "0, 73, 77" + } + } + ] + }, + "blue": { + "name": "蓝色", + "type": "palette", + "typeName": "色盘", + "value": [ + { + "key": "blue-1", + "value": { + "light": "232, 249, 255", + "dark": "232, 249, 255" + } + }, + { + "key": "blue-2", + "value": { + "light": "185, 233, 252", + "dark": "185, 233, 252" + } + }, + { + "key": "blue-3", + "value": { + "light": "138, 214, 249", + "dark": "138, 214, 249" + } + }, + { + "key": "blue-4", + "value": { + "light": "93, 192, 246", + "dark": "93, 192, 246" + } + }, + { + "key": "blue-5", + "value": { + "light": "48, 168, 243", + "dark": "48, 168, 243" + } + }, + { + "key": "blue-6", + "value": { + "light": "5, 142, 240", + "dark": "5, 142, 240" + } + }, + { + "key": "blue-7", + "value": { + "light": "3, 111, 199", + "dark": "3, 111, 199" + } + }, + { + "key": "blue-8", + "value": { + "light": "2, 83, 158", + "dark": "2, 83, 158" + } + }, + { + "key": "blue-9", + "value": { + "light": "1, 57, 117", + "dark": "1, 57, 117" + } + }, + { + "key": "blue-10", + "value": { + "light": "0, 34, 77", + "dark": "0, 34, 77" + } + } + ] + }, + "purple": { + "name": "紫色", + "type": "palette", + "typeName": "色盘", + "value": [ + { + "key": "purple-1", + "value": { + "light": "245, 232, 255", + "dark": "245, 232, 255" + } + }, + { + "key": "purple-2", + "value": { + "light": "225, 192, 253", + "dark": "225, 192, 253" + } + }, + { + "key": "purple-3", + "value": { + "light": "203, 152, 251", + "dark": "203, 152, 251" + } + }, + { + "key": "purple-4", + "value": { + "light": "178, 113, 248", + "dark": "178, 113, 248" + } + }, + { + "key": "purple-5", + "value": { + "light": "152, 75, 246", + "dark": "152, 75, 246" + } + }, + { + "key": "purple-6", + "value": { + "light": "123, 37, 244", + "dark": "123, 37, 244" + } + }, + { + "key": "purple-7", + "value": { + "light": "92, 23, 202", + "dark": "92, 23, 202" + } + }, + { + "key": "purple-8", + "value": { + "light": "64, 12, 160", + "dark": "64, 12, 160" + } + }, + { + "key": "purple-9", + "value": { + "light": "41, 4, 118", + "dark": "41, 4, 118" + } + }, + { + "key": "purple-10", + "value": { + "light": "22, 0, 77", + "dark": "22, 0, 77" + } + } + ] + }, + "pink": { + "name": "粉色", + "type": "palette", + "typeName": "色盘", + "value": [ + { + "key": "pink-1", + "value": { + "light": "255, 232, 253", + "dark": "255, 232, 253" + } + }, + { + "key": "pink-2", + "value": { + "light": "246, 188, 243", + "dark": "246, 188, 243" + } + }, + { + "key": "pink-3", + "value": { + "light": "238, 146, 235", + "dark": "238, 146, 235" + } + }, + { + "key": "pink-4", + "value": { + "light": "229, 107, 229", + "dark": "229, 107, 229" + } + }, + { + "key": "pink-5", + "value": { + "light": "216, 71, 221", + "dark": "216, 71, 221" + } + }, + { + "key": "pink-6", + "value": { + "light": "199, 37, 212", + "dark": "199, 37, 212" + } + }, + { + "key": "pink-7", + "value": { + "light": "163, 23, 178", + "dark": "163, 23, 178" + } + }, + { + "key": "pink-8", + "value": { + "light": "127, 13, 144", + "dark": "127, 13, 144" + } + }, + { + "key": "pink-9", + "value": { + "light": "93, 5, 110", + "dark": "93, 5, 110" + } + }, + { + "key": "pink-10", + "value": { + "light": "61, 0, 77", + "dark": "61, 0, 77" + } + } + ] + }, + "rosyred": { + "name": "玫红色", + "type": "palette", + "typeName": "色盘", + "value": [ + { + "key": "rosyred-1", + "value": { + "light": "255, 232, 240", + "dark": "255, 232, 240" + } + }, + { + "key": "rosyred-2", + "value": { + "light": "249, 185, 209", + "dark": "249, 185, 209" + } + }, + { + "key": "rosyred-3", + "value": { + "light": "243, 141, 182", + "dark": "243, 141, 182" + } + }, + { + "key": "rosyred-4", + "value": { + "light": "238, 98, 158", + "dark": "238, 98, 158" + } + }, + { + "key": "rosyred-5", + "value": { + "light": "232, 57, 139", + "dark": "232, 57, 139" + } + }, + { + "key": "rosyred-6", + "value": { + "light": "226, 18, 122", + "dark": "226, 18, 122" + } + }, + { + "key": "rosyred-7", + "value": { + "light": "189, 11, 106", + "dark": "189, 11, 106" + } + }, + { + "key": "rosyred-8", + "value": { + "light": "151, 6, 88", + "dark": "151, 6, 88" + } + }, + { + "key": "rosyred-9", + "value": { + "light": "114, 2, 69", + "dark": "114, 2, 69" + } + }, + { + "key": "rosyred-10", + "value": { + "light": "77, 0, 48", + "dark": "77, 0, 48" } } ] @@ -568,64 +1100,64 @@ "key": "color-info1", "description": "一级/强调/标题", "value": { - "light": "rgb(var(--o-gray-10))", - "dark": "rgb(var(--o-gray-10))" + "light": "rgb(var(--o-mixedgray-14))", + "dark": "rgb(var(--o-mixedgray-14))" } }, { "key": "color-info2", "description": "二级/次强调/正文", "value": { - "light": "rgb(var(--o-gray-8))", - "dark": "rgb(var(--o-gray-8))" + "light": "rgb(var(--o-mixedgray-11))", + "dark": "rgb(var(--o-mixedgray-11))" } }, { "key": "color-info3", "description": "三级/辅助信息", "value": { - "light": "rgb(var(--o-gray-6))", - "dark": "rgb(var(--o-gray-6))" + "light": "rgb(var(--o-mixedgray-9))", + "dark": "rgb(var(--o-mixedgray-9))" } }, { "key": "color-info4", "description": "置灰/禁用", "value": { - "light": "rgb(var(--o-gray-4))", - "dark": "rgb(var(--o-gray-4))" + "light": "rgb(var(--o-mixedgray-7))", + "dark": "rgb(var(--o-mixedgray-7))" } }, { "key": "color-info1-inverse", "description": "一级/次强调/正文反色", "value": { - "light": "rgb(var(--o-gray-1))", - "dark": "rgb(var(--o-gray-1))" + "light": "rgb(var(--o-mixedgray-1))", + "dark": "rgb(var(--o-mixedgray-1))" } }, { "key": "color-info2-inverse", "description": "二级/辅助信息反色", "value": { - "light": "rgb(var(--o-gray-3))", - "dark": "rgb(var(--o-gray-3))" + "light": "rgb(var(--o-mixedgray-1))", + "dark": "rgb(var(--o-mixedgray-1))" } }, { "key": "color-info3-inverse", "description": "三级/辅助信息反色", "value": { - "light": "rgb(var(--o-gray-5))", - "dark": "rgb(var(--o-gray-5))" + "light": "rgb(var(--o-mixedgray-1))", + "dark": "rgb(var(--o-mixedgray-1))" } }, { "key": "color-info4-inverse", "description": "置灰/禁用反色", "value": { - "light": "rgb(var(--o-gray-7))", - "dark": "rgb(var(--o-gray-7))" + "light": "rgb(var(--o-mixedgray-7))", + "dark": "rgb(var(--o-mixedgray-7))" } } ] @@ -639,16 +1171,16 @@ "key": "color-mask1", "description": "全局遮罩", "value": { - "light": "rgba(var(--o-gray-10), .2)", - "dark": "rgba(var(--o-gray-10), .2)" + "light": "rgba(var(--o-mixedgray-13), .6)", + "dark": "rgba(var(--o-mixedgray-13), .6)" } }, { "key": "color-mask2", "description": "局部遮罩", "value": { - "light": "rgba(var(--o-gray-10), .1)", - "dark": "rgba(var(--o-gray-10), .1)" + "light": "rgba(var(--o-mixedgray-13), .2)", + "dark": "rgba(var(--o-mixedgray-13), .2)" } } ] @@ -662,16 +1194,16 @@ "key": "color-fill1", "description": "一级填充/页面背景", "value": { - "light": "rgb(var(--o-mixedgray-1))", - "dark": "rgb(var(--o-mixedgray-1))" + "light": "rgb(var(--o-mixedgray-2))", + "dark": "rgb(var(--o-mixedgray-2))" } }, { "key": "color-fill2", "description": "二级填充/区块、卡片", "value": { - "light": "rgb(var(--o-gray-1))", - "dark": "rgb(var(--o-gray-1))" + "light": "rgb(var(--o-mixedgray-1))", + "dark": "rgb(var(--o-mixedgray-1))" } }, { @@ -681,14 +1213,6 @@ "light": "rgb(var(--o-mixedgray-3))", "dark": "rgb(var(--o-mixedgray-3))" } - }, - { - "key": "color-fill4", - "description": "四级填充/禁用", - "value": { - "light": "rgb(var(--o-mixedgray-4))", - "dark": "rgb(var(--o-mixedgray-4))" - } } ] }, @@ -699,74 +1223,74 @@ "value": [ { "key": "color-control-light", - "description": "很浅背景", + "description": "很浅背景/表格背景色", "value": { - "light": "rgb(var(--o-gray-1))", - "dark": "rgb(var(--o-gray-1))" + "light": "rgb(var(--o-mixedgray-1))", + "dark": "rgb(var(--o-mixedgray-1))" } }, { "key": "color-control1", "description": "常规，常用于边框", "value": { - "light": "rgb(var(--o-mixedgray-3))", - "dark": "rgb(var(--o-mixedgray-3))" + "light": "rgb(var(--o-mixedgray-7))", + "dark": "rgb(var(--o-mixedgray-7))" } }, { "key": "color-control2", - "description": "悬浮", + "description": "hover，常用于边框", "value": { - "light": "rgb(var(--o-mixedgray-4))", - "dark": "rgb(var(--o-mixedgray-4))" + "light": "rgb(var(--o-mixedgray-9))", + "dark": "rgb(var(--o-mixedgray-9))" } }, { "key": "color-control3", - "description": "激活", + "description": "激活，常用于边框", "value": { - "light": "rgb(var(--o-mixedgray-6))", - "dark": "rgb(var(--o-mixedgray-6))" + "light": "rgb(var(--o-mixedgray-12))", + "dark": "rgb(var(--o-mixedgray-12))" } }, { "key": "color-control4", - "description": "禁用", + "description": "边框禁用/深色背景分割线", "value": { - "light": "rgb(var(--o-mixedgray-5))", - "dark": "rgb(var(--o-mixedgray-5))" + "light": "rgb(var(--o-mixedgray-6))", + "dark": "rgb(var(--o-mixedgray-6))" } }, { "key": "color-control1-light", - "description": "常规-浅，常用于背景", + "description": "浅色背景分割线/表格线/表格描边", "value": { - "light": "rgb(var(--o-mixedgray-3))", - "dark": "rgb(var(--o-mixedgray-3))" + "light": "rgb(var(--o-mixedgray-5))", + "dark": "rgb(var(--o-mixedgray-5))" } }, { "key": "color-control2-light", - "description": "悬浮-浅", + "description": "表格行hover、激活/手风琴hover/下拉菜单hover", "value": { - "light": "rgb(var(--o-mixedgray-4))", - "dark": "rgb(var(--o-mixedgray-4))" + "light": "rgb(var(--o-mixedgray-3))", + "dark": "rgb(var(--o-mixedgray-3))" } }, { "key": "color-control3-light", - "description": "激活-浅", + "description": "表头背景色/手风琴激活/下拉菜单激活", "value": { - "light": "rgb(var(--o-mixedgray-5))", - "dark": "rgb(var(--o-mixedgray-5))" + "light": "rgb(var(--o-mixedgray-4))", + "dark": "rgb(var(--o-mixedgray-4))" } }, { "key": "color-control4-light", - "description": "禁用-浅", + "description": "禁用背景", "value": { - "light": "rgb(var(--o-mixedgray-2))", - "dark": "rgb(var(--o-mixedgray-2))" + "light": "rgb(var(--o-mixedgray-3))", + "dark": "rgb(var(--o-mixedgray-3))" } } ] @@ -780,64 +1304,64 @@ "key": "color-primary1", "description": "常规", "value": { - "light": "rgb(var(--o-blue-6))", - "dark": "rgb(var(--o-blue-6))" + "light": "rgb(var(--o-mixedgray-12))", + "dark": "rgb(var(--o-mixedgray-12))" } }, { "key": "color-primary2", "description": "悬浮", "value": { - "light": "rgb(var(--o-blue-5))", - "dark": "rgb(var(--o-blue-5))" + "light": "rgb(var(--o-mixedgray-11))", + "dark": "rgb(var(--o-mixedgray-11))" } }, { "key": "color-primary3", "description": "激活", "value": { - "light": "rgb(var(--o-blue-7))", - "dark": "rgb(var(--o-blue-7))" + "light": "rgb(var(--o-mixedgray-13))", + "dark": "rgb(var(--o-mixedgray-13))" } }, { "key": "color-primary4", "description": "禁用", "value": { - "light": "rgb(var(--o-blue-3))", - "dark": "rgb(var(--o-blue-3))" + "light": "rgb(var(--o-mixedgray-6))", + "dark": "rgb(var(--o-mixedgray-6))" } }, { "key": "color-primary1-light", "description": "浅/常规", "value": { - "light": "rgb(var(--o-blue-2))", - "dark": "rgb(var(--o-blue-2))" + "light": "rgb(var(--o-mixedgray-12))", + "dark": "rgb(var(--o-mixedgray-12))" } }, { "key": "color-primary2-light", "description": "浅/悬浮", "value": { - "light": "rgb(var(--o-blue-3))", - "dark": "rgb(var(--o-blue-3))" + "light": "rgb(var(--o-mixedgray-11))", + "dark": "rgb(var(--o-mixedgray-11))" } }, { "key": "color-primary3-light", "description": "浅/激活", "value": { - "light": "rgb(var(--o-blue-4))", - "dark": "rgb(var(--o-blue-4))" + "light": "rgb(var(--o-mixedgray-13))", + "dark": "rgb(var(--o-mixedgray-13))" } }, { "key": "color-primary4-light", "description": "浅/禁用", "value": { - "light": "rgb(var(--o-blue-1))", - "dark": "rgb(var(--o-blue-1))" + "light": "rgb(var(--o-mixedgray-6))", + "dark": "rgb(var(--o-mixedgray-6))" } } ] @@ -859,8 +1383,8 @@ "key": "color-success2", "description": "悬浮", "value": { - "light": "rgb(var(--o-green-5))", - "dark": "rgb(var(--o-green-5))" + "light": "rgb(var(--o-green-4))", + "dark": "rgb(var(--o-green-4))" } }, { @@ -930,8 +1454,8 @@ "key": "color-warning2", "description": "悬浮", "value": { - "light": "rgb(var(--o-orange-5))", - "dark": "rgb(var(--o-orange-5))" + "light": "rgb(var(--o-orange-4))", + "dark": "rgb(var(--o-orange-4))" } }, { @@ -1001,8 +1525,8 @@ "key": "color-danger2", "description": "悬浮", "value": { - "light": "rgb(var(--o-red-5))", - "dark": "rgb(var(--o-red-5))" + "light": "rgb(var(--o-red-4))", + "dark": "rgb(var(--o-red-4))" } }, { @@ -1065,8 +1589,8 @@ "name": "阴影1", "description": "用于卡片、小弹窗、楼层阴影", "value": { - "light": "0 1px 5px rgba(var(--o-gray-10), 0.1)", - "dark": "0 1px 7px rgba(var(--o-gray-10), 0.3)" + "light": "0 3px 8px rgba(var(--o-mixedgray-13), 0.08)", + "dark": "0 3px 8px rgba(var(--o-mixedgray-13), 0.08)" } }, { @@ -1074,8 +1598,8 @@ "name": "阴影2", "description": "用于卡片悬浮阴影", "value": { - "light": "0 6px 18px rgba(var(--o-gray-10), 0.14)", - "dark": "0 6px 18px rgba(var(--o-gray-10), 0.42)" + "light": "0 6px 24px rgba(var(--o-mixedgray-13), 0.08)", + "dark": "0 6px 24px rgba(var(--o-mixedgray-13), 0.08)" } }, { @@ -1083,8 +1607,8 @@ "name": "阴影3", "description": "用于提示阴影", "value": { - "light": "0 10px 32px rgba(var(--o-gray-10), 0.18)", - "dark": "0 10px 32px rgba(var(--o-gray-10), 0.54)" + "light": "0 10px 40px rgba(var(--o-mixedgray-13), 0.08)", + "dark": "0 10px 40px rgba(var(--o-mixedgray-13), 0.08)" } } ] @@ -1161,10 +1685,28 @@ "key": "gap-8", "name": "间距8", "description": "用于组件之间的间距8", + "value": { + "light": "48px", + "dark": "48px" + } + }, + { + "key": "gap-9", + "name": "间距9", + "description": "用于组件之间的间距9", "value": { "light": "64px", "dark": "64px" } + }, + { + "key": "gap-10", + "name": "间距10", + "description": "用于组件之间的间距10", + "value": { + "light": "72px", + "dark": "72px" + } } ] }, @@ -1173,6 +1715,33 @@ "type": "size", "typeName": "尺寸", "value": [ + { + "key": "size-xs", + "name": "小尺寸", + "description": "小尺寸", + "value": { + "light": "16px", + "dark": "16px" + } + }, + { + "key": "size-s", + "name": "小尺寸", + "description": "小尺寸", + "value": { + "light": "24px", + "dark": "24px" + } + }, + { + "key": "size-m", + "name": "中尺寸", + "description": "尺寸", + "value": { + "light": "32px", + "dark": "32px" + } + }, { "key": "size-l", "name": "大尺寸", @@ -1183,21 +1752,21 @@ } }, { - "key": "size-m", - "name": "中尺寸", + "key": "size-xl", + "name": "大尺寸", "description": "尺寸", "value": { - "light": "32px", - "dark": "32px" + "light": "48px", + "dark": "48px" } }, { - "key": "size-s", - "name": "小尺寸", - "description": "小尺寸", + "key": "size-xxl", + "name": "大尺寸", + "description": "尺寸", "value": { - "light": "24px", - "dark": "24px" + "light": "56px", + "dark": "56px" } } ] @@ -1207,40 +1776,76 @@ "type": "size", "typeName": "尺寸", "value": [ + { + "key": "icon_size-xs", + "name": "超小尺寸图标", + "description": "小尺寸", + "value": { + "light": "16px", + "dark": "16px" + } + }, + { + "key": "icon_size-s", + "name": "小尺寸图标", + "description": "小尺寸", + "value": { + "light": "24px", + "dark": "24px" + } + }, + { + "key": "icon_size-m", + "name": "中尺寸图标", + "description": "尺寸", + "value": { + "light": "32px", + "dark": "32px" + } + }, { "key": "icon_size-l", "name": "大尺寸图标", "description": "尺寸", + "value": { + "light": "40px", + "dark": "40px" + } + }, + { + "key": "icon_size-xl", + "name": "大尺寸图标", + "description": "尺寸", "value": { "light": "48px", "dark": "48px" } }, { - "key": "icon_size-m", - "name": "中尺寸图标", + "key": "icon_size-xxl", + "name": "大尺寸图标", "description": "尺寸", "value": { - "light": "32px", - "dark": "32px" + "light": "64px", + "dark": "64px" } }, { - "key": "icon_size-s", - "name": "小尺寸图标", - "description": "小尺寸", + "key": "icon_size-xxxl", + "name": "大尺寸图标", + "description": "尺寸", "value": { - "light": "24px", - "dark": "24px" + "light": "72px", + "dark": "72px" } }, { - "key": "icon_size-xs", - "name": "超小尺寸图标", - "description": "小尺寸", + "key": "icon_size-xxxxl", + "name": "大尺寸图标", + "description": "尺寸", "value": { - "light": "16px", - "dark": "16px" + "light": "96px", + "dark": "96px" } } ] @@ -1264,8 +1869,8 @@ "name": "二级数据展示", "description": "二级数据展示", "value": { - "light": "54px", - "dark": "54px" + "light": "56px", + "dark": "56px" } }, { @@ -1273,8 +1878,8 @@ "name": "三级数据展示", "description": "三级数据展示", "value": { - "light": "36px", - "dark": "36px" + "light": "48px", + "dark": "48px" } }, { @@ -1282,8 +1887,17 @@ "name": "四级数据展示", "description": "四级数据展示", "value": { - "light": "28px", - "dark": "28px" + "light": "40px", + "dark": "40px" + } + }, + { + "key": "font_size-display5", + "name": "五级数据展示", + "description": "五级数据展示", + "value": { + "light": "36px", + "dark": "36px" } }, { @@ -1291,8 +1905,8 @@ "name": "一级标题", "description": "一级标题", "value": { - "light": "24px", - "dark": "24px" + "light": "32px", + "dark": "32px" } }, { @@ -1300,8 +1914,8 @@ "name": "二级标题", "description": "二级标题", "value": { - "light": "20px", - "dark": "20px" + "light": "28px", + "dark": "28px" } }, { @@ -1309,8 +1923,8 @@ "name": "三级标题", "description": "三级标题", "value": { - "light": "18px", - "dark": "18px" + "light": "24px", + "dark": "24px" } }, { @@ -1318,26 +1932,26 @@ "name": "四级标题", "description": "四级标题", "value": { - "light": "16px", - "dark": "16px" + "light": "20px", + "dark": "20px" } }, { "key": "font_size-text1", - "name": "正文", - "description": "正文", + "name": "常规正文", + "description": "常规正文", "value": { - "light": "14px", - "dark": "14px" + "light": "16px", + "dark": "16px" } }, { "key": "font_size-text2", - "name": "正文-大", - "description": "正文-大", + "name": "大号正文", + "description": "大号正文", "value": { - "light": "16px", - "dark": "16px" + "light": "18px", + "dark": "18px" } }, { @@ -1345,8 +1959,8 @@ "name": "提示文本1", "description": "提示文本1", "value": { - "light": "12px", - "dark": "12px" + "light": "14px", + "dark": "14px" } }, { @@ -1354,8 +1968,8 @@ "name": "提示文本2", "description": "提示文本2", "value": { - "light": "10px", - "dark": "10px" + "light": "12px", + "dark": "12px" } } ] @@ -1370,8 +1984,8 @@ "name": "一级数据展示", "description": "一级数据展示", "value": { - "light": "84px", - "dark": "84px" + "light": "90px", + "dark": "90px" } }, { @@ -1379,8 +1993,8 @@ "name": "二级数据展示", "description": "二级数据展示", "value": { - "light": "76px", - "dark": "76px" + "light": "80px", + "dark": "80px" } }, { @@ -1388,8 +2002,8 @@ "name": "三级数据展示", "description": "三级数据展示", "value": { - "light": "48px", - "dark": "48px" + "light": "64px", + "dark": "64px" } }, { @@ -1397,8 +2011,17 @@ "name": "四级数据展示", "description": "四级数据展示", "value": { - "light": "36px", - "dark": "36px" + "light": "56px", + "dark": "56px" + } + }, + { + "key": "line_height-display5", + "name": "五级数据展示", + "description": "五级数据展示", + "value": { + "light": "48px", + "dark": "48px" } }, { @@ -1406,8 +2029,8 @@ "name": "一级标题", "description": "一级标题", "value": { - "light": "32px", - "dark": "32px" + "light": "44px", + "dark": "44px" } }, { @@ -1415,8 +2038,8 @@ "name": "二级标题", "description": "二级标题", "value": { - "light": "28px", - "dark": "28px" + "light": "40px", + "dark": "40px" } }, { @@ -1424,8 +2047,8 @@ "name": "三级标题", "description": "三级标题", "value": { - "light": "26px", - "dark": "26px" + "light": "32px", + "dark": "32px" } }, { @@ -1433,8 +2056,17 @@ "name": "四级标题", "description": "四级标题", "value": { - "light": "24px", - "dark": "24px" + "light": "28px", + "dark": "28px" + } + }, + { + "key": "line_height-h5", + "name": "五级标题", + "description": "五级标题", + "value": { + "light": "28px", + "dark": "28px" } }, { @@ -1460,8 +2092,8 @@ "name": "提示文本1", "description": "提示文本1", "value": { - "light": "18px", - "dark": "18px" + "light": "22px", + "dark": "22px" } }, { @@ -1469,8 +2101,8 @@ "name": "提示文本2", "description": "提示文本2", "value": { - "light": "14px", - "dark": "14px" + "light": "18px", + "dark": "18px" } } ] @@ -1481,12 +2113,12 @@ "typeName": "尺寸", "value": [ { - "key": "radius-l", - "name": "大尺寸圆角", - "description": "大尺寸圆角", + "key": "radius-s", + "name": "小尺寸圆角", + "description": "小尺寸圆角", "value": { - "light": "8px", - "dark": "8px" + "light": "4px", + "dark": "4px" } }, { @@ -1494,17 +2126,26 @@ "name": "中尺寸圆角", "description": "中尺寸圆角", "value": { - "light": "4px", - "dark": "4px" + "light": "8px", + "dark": "8px" } }, { - "key": "radius-s", - "name": "小尺寸圆角", - "description": "小尺寸圆角", + "key": "radius-l", + "name": "大尺寸圆角", + "description": "大尺寸圆角", + "value": { + "light": "16px", + "dark": "16px" + } + }, + { + "key": "radius-xl", + "name": "大尺寸圆角", + "description": "大尺寸圆角", "value": { - "light": "2px", - "dark": "2px" + "light": "24px", + "dark": "24px" } }, { -- Gitee From 934b14217a73a17fefc7ebf7b9d3d7894e360e34 Mon Sep 17 00:00:00 2001 From: devin Date: Tue, 14 Mar 2023 14:36:48 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=8F=98=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .vscode/opendesign.token.code-snippets | 126 ++++++++------ .../components/button/__demo__/BtnBasic.vue | 31 +++- .../components/button/__demo__/BtnIcon.vue | 24 ++- .../src/components/button/style/index.scss | 13 ++ .../opendesign/src/components/button/types.ts | 2 +- .../src/components/style/dark.token.css | 110 ++++++------ .../components/style/default-light.token.css | 110 ++++++------ .../src/tokens/opendesign-token.json | 160 ++++++++++-------- 8 files changed, 340 insertions(+), 236 deletions(-) diff --git a/.vscode/opendesign.token.code-snippets b/.vscode/opendesign.token.code-snippets index 971aa642..9f671d72 100644 --- a/.vscode/opendesign.token.code-snippets +++ b/.vscode/opendesign.token.code-snippets @@ -1103,20 +1103,20 @@ "description": "用于组件之间的间距8[light: 64px, dark: 64px]", "scope": "css,scss,less" }, - "--o-size-l": { + "--o-size-xxs": { "prefix": [ - "var(--o-size-l)" + "var(--o-size-xxs)" ], - "body": "var(--o-size-l)", - "description": "尺寸[light: 40px, dark: 40px]", + "body": "var(--o-size-xxs)", + "description": "小尺寸[light: 12px, dark: 12px]", "scope": "css,scss,less" }, - "--o-size-m": { + "--o-size-xs": { "prefix": [ - "var(--o-size-m)" + "var(--o-size-xs)" ], - "body": "var(--o-size-m)", - "description": "尺寸[light: 32px, dark: 32px]", + "body": "var(--o-size-xs)", + "description": "小尺寸[light: 18px, dark: 18px]", "scope": "css,scss,less" }, "--o-size-s": { @@ -1127,20 +1127,44 @@ "description": "小尺寸[light: 24px, dark: 24px]", "scope": "css,scss,less" }, - "--o-icon_size-l": { + "--o-size-m": { "prefix": [ - "var(--o-icon_size-l)" + "var(--o-size-m)" ], - "body": "var(--o-icon_size-l)", + "body": "var(--o-size-m)", + "description": "尺寸[light: 32px, dark: 32px]", + "scope": "css,scss,less" + }, + "--o-size-l": { + "prefix": [ + "var(--o-size-l)" + ], + "body": "var(--o-size-l)", + "description": "尺寸[light: 40px, dark: 40px]", + "scope": "css,scss,less" + }, + "--o-size-xl": { + "prefix": [ + "var(--o-size-xl)" + ], + "body": "var(--o-size-xl)", "description": "尺寸[light: 48px, dark: 48px]", "scope": "css,scss,less" }, - "--o-icon_size-m": { + "--o-icon_size-xxs": { "prefix": [ - "var(--o-icon_size-m)" + "var(--o-icon_size-xxs)" ], - "body": "var(--o-icon_size-m)", - "description": "尺寸[light: 32px, dark: 32px]", + "body": "var(--o-icon_size-xxs)", + "description": "小尺寸[light: 12px, dark: 12px]", + "scope": "css,scss,less" + }, + "--o-icon_size-xs": { + "prefix": [ + "var(--o-icon_size-xs)" + ], + "body": "var(--o-icon_size-xs)", + "description": "小尺寸[light: 16px, dark: 16px]", "scope": "css,scss,less" }, "--o-icon_size-s": { @@ -1151,12 +1175,20 @@ "description": "小尺寸[light: 24px, dark: 24px]", "scope": "css,scss,less" }, - "--o-icon_size-xs": { + "--o-icon_size-m": { "prefix": [ - "var(--o-icon_size-xs)" + "var(--o-icon_size-m)" ], - "body": "var(--o-icon_size-xs)", - "description": "小尺寸[light: 16px, dark: 16px]", + "body": "var(--o-icon_size-m)", + "description": "尺寸[light: 32px, dark: 32px]", + "scope": "css,scss,less" + }, + "--o-icon_size-l": { + "prefix": [ + "var(--o-icon_size-l)" + ], + "body": "var(--o-icon_size-l)", + "description": "尺寸[light: 48px, dark: 48px]", "scope": "css,scss,less" }, "--o-font_size-display1": { @@ -1215,20 +1247,12 @@ "description": "三级标题[light: 18px, dark: 18px]", "scope": "css,scss,less" }, - "--o-font_size-h4": { - "prefix": [ - "var(--o-font_size-h4)" - ], - "body": "var(--o-font_size-h4)", - "description": "四级标题[light: 16px, dark: 16px]", - "scope": "css,scss,less" - }, "--o-font_size-text1": { "prefix": [ "var(--o-font_size-text1)" ], "body": "var(--o-font_size-text1)", - "description": "正文[light: 14px, dark: 14px]", + "description": "常规正文[light: 14px, dark: 14px]", "scope": "css,scss,less" }, "--o-font_size-text2": { @@ -1236,7 +1260,7 @@ "var(--o-font_size-text2)" ], "body": "var(--o-font_size-text2)", - "description": "正文-大[light: 16px, dark: 16px]", + "description": "大号正文[light: 16px, dark: 16px]", "scope": "css,scss,less" }, "--o-font_size-tip1": { @@ -1311,20 +1335,12 @@ "description": "三级标题[light: 26px, dark: 26px]", "scope": "css,scss,less" }, - "--o-line_height-h4": { - "prefix": [ - "var(--o-line_height-h4)" - ], - "body": "var(--o-line_height-h4)", - "description": "四级标题[light: 24px, dark: 24px]", - "scope": "css,scss,less" - }, "--o-line_height-text1": { "prefix": [ "var(--o-line_height-text1)" ], "body": "var(--o-line_height-text1)", - "description": "正文[light: 22px, dark: 22px]", + "description": "常规正文[light: 22px, dark: 22px]", "scope": "css,scss,less" }, "--o-line_height-text2": { @@ -1332,7 +1348,7 @@ "var(--o-line_height-text2)" ], "body": "var(--o-line_height-text2)", - "description": "正文-大[light: 24px, dark: 24px]", + "description": "大号正文[light: 24px, dark: 24px]", "scope": "css,scss,less" }, "--o-line_height-tip1": { @@ -1351,12 +1367,12 @@ "description": "提示文本2[light: 14px, dark: 14px]", "scope": "css,scss,less" }, - "--o-radius-l": { + "--o-radius-s": { "prefix": [ - "var(--o-radius-l)" + "var(--o-radius-s)" ], - "body": "var(--o-radius-l)", - "description": "大尺寸圆角[light: 8px, dark: 8px]", + "body": "var(--o-radius-s)", + "description": "小尺寸圆角[light: 2px, dark: 2px]", "scope": "css,scss,less" }, "--o-radius-m": { @@ -1367,20 +1383,20 @@ "description": "中尺寸圆角[light: 4px, dark: 4px]", "scope": "css,scss,less" }, - "--o-radius-s": { + "--o-radius-l": { "prefix": [ - "var(--o-radius-s)" + "var(--o-radius-l)" ], - "body": "var(--o-radius-s)", - "description": "小尺寸圆角[light: 2px, dark: 2px]", + "body": "var(--o-radius-l)", + "description": "大尺寸圆角[light: 8px, dark: 8px]", "scope": "css,scss,less" }, - "--o-radius-control-l": { + "--o-radius-control-s": { "prefix": [ - "var(--o-radius-control-l)" + "var(--o-radius-control-s)" ], - "body": "var(--o-radius-control-l)", - "description": "大尺寸控件圆角[light: var(--o-radius-l), dark: var(--o-radius-l)]", + "body": "var(--o-radius-control-s)", + "description": "小尺寸控件圆角[light: var(--o-radius-s), dark: var(--o-radius-s)]", "scope": "css,scss,less" }, "--o-radius-control-m": { @@ -1391,12 +1407,12 @@ "description": "中尺寸控件圆角[light: var(--o-radius-m), dark: var(--o-radius-m)]", "scope": "css,scss,less" }, - "--o-radius-control-s": { + "--o-radius-control-l": { "prefix": [ - "var(--o-radius-control-s)" + "var(--o-radius-control-l)" ], - "body": "var(--o-radius-control-s)", - "description": "小尺寸控件圆角[light: var(--o-radius-s), dark: var(--o-radius-s)]", + "body": "var(--o-radius-control-l)", + "description": "大尺寸控件圆角[light: var(--o-radius-l), dark: var(--o-radius-l)]", "scope": "css,scss,less" }, "--o-duration-s": { diff --git a/packages/opendesign/src/components/button/__demo__/BtnBasic.vue b/packages/opendesign/src/components/button/__demo__/BtnBasic.vue index e2c34eb2..3e89d0ae 100644 --- a/packages/opendesign/src/components/button/__demo__/BtnBasic.vue +++ b/packages/opendesign/src/components/button/__demo__/BtnBasic.vue @@ -1,5 +1,6 @@ diff --git a/packages/opendesign/src/components/button/__demo__/BtnIcon.vue b/packages/opendesign/src/components/button/__demo__/BtnIcon.vue index 583110f5..5424bead 100644 --- a/packages/opendesign/src/components/button/__demo__/BtnIcon.vue +++ b/packages/opendesign/src/components/button/__demo__/BtnIcon.vue @@ -5,13 +5,16 @@ import { IconAdd } from '../../icons'; diff --git a/packages/opendesign/src/components/button/__demo__/BtnIcon.vue b/packages/opendesign/src/components/button/__demo__/BtnIcon.vue deleted file mode 100644 index 5424bead..00000000 --- a/packages/opendesign/src/components/button/__demo__/BtnIcon.vue +++ /dev/null @@ -1,57 +0,0 @@ - - - diff --git a/packages/opendesign/src/components/button/__demo__/BtnIconSize.vue b/packages/opendesign/src/components/button/__demo__/BtnIconSize.vue new file mode 100644 index 00000000..2e769dab --- /dev/null +++ b/packages/opendesign/src/components/button/__demo__/BtnIconSize.vue @@ -0,0 +1,76 @@ + + + diff --git a/packages/opendesign/src/components/button/__demo__/BtnRound.vue b/packages/opendesign/src/components/button/__demo__/BtnRound.vue index 5b6fd47c..2af78a5f 100644 --- a/packages/opendesign/src/components/button/__demo__/BtnRound.vue +++ b/packages/opendesign/src/components/button/__demo__/BtnRound.vue @@ -43,7 +43,7 @@ const onClick = () => {

round="{{ r }}px"

- Round Button + Click To Change Round Round Button diff --git a/packages/opendesign/src/components/button/__demo__/IndexBtn.vue b/packages/opendesign/src/components/button/__demo__/IndexBtn.vue index f2bccf9e..47f889de 100644 --- a/packages/opendesign/src/components/button/__demo__/IndexBtn.vue +++ b/packages/opendesign/src/components/button/__demo__/IndexBtn.vue @@ -2,15 +2,15 @@ import '../style'; import BtnBasic from './BtnBasic.vue'; -import BtnIcon from './BtnIcon.vue'; +import BtnIconSize from './BtnIconSize.vue'; import BtnRound from './BtnRound.vue'; import BtnLoading from './BtnLoading.vue'; diff --git a/packages/opendesign/src/components/button/style/index.scss b/packages/opendesign/src/components/button/style/index.scss index f20fc9ef..478de982 100644 --- a/packages/opendesign/src/components/button/style/index.scss +++ b/packages/opendesign/src/components/button/style/index.scss @@ -89,7 +89,7 @@ line-height: var(--o-line_height-tip2); &.o-btn-icon-only { - width: var(--o-icon_size-xs); + width: var(--o-size-xs); } .o-btn-icon { margin-right: 2px; diff --git a/packages/opendesign/src/components/button/types.ts b/packages/opendesign/src/components/button/types.ts index 6e8b8486..9aec18fe 100644 --- a/packages/opendesign/src/components/button/types.ts +++ b/packages/opendesign/src/components/button/types.ts @@ -1,5 +1,5 @@ import { ExtractPropTypes, PropType } from 'vue'; -import { SizeT, RoundT, ColorT, VariantT } from '../_shared/global'; +import { RoundT, ColorT, VariantT } from '../_shared/global'; export type ButtonTypeT = 'primary' | 'outline' | 'text' | 'link' diff --git a/packages/opendesign/src/components/tag/__demo__/TagCheckable.vue b/packages/opendesign/src/components/tag/__demo__/TagCheckable.vue index 6e47fd73..5083ec41 100644 --- a/packages/opendesign/src/components/tag/__demo__/TagCheckable.vue +++ b/packages/opendesign/src/components/tag/__demo__/TagCheckable.vue @@ -15,6 +15,7 @@ const handleChange = (val: boolean) => {

可选中标签

Tag1 + Tag2 Tag2 Tag3 Tag4 -- Gitee