diff --git a/packages/opendesign/src/dialog/style/theme-ascend.index.ts b/packages/opendesign/src/dialog/style/theme-ascend.index.ts index 435d94825f9c72fbd1beebfa8ddc1b85e3e7f6fd..4e4890e8379784ce7a22a7245b910fc2e082868e 100644 --- a/packages/opendesign/src/dialog/style/theme-ascend.index.ts +++ b/packages/opendesign/src/dialog/style/theme-ascend.index.ts @@ -1,4 +1,3 @@ -import '../../theme/common.scss'; import '../../_styles'; import '../../layer/style/theme-ascend.index'; import '../../button/style/theme-ascend.index'; diff --git a/packages/opendesign/src/dialog/style/theme-ascend.scss b/packages/opendesign/src/dialog/style/theme-ascend.scss index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..1b06a18850e19fa0d717e29d66eeda32ee0cff7b 100644 --- a/packages/opendesign/src/dialog/style/theme-ascend.scss +++ b/packages/opendesign/src/dialog/style/theme-ascend.scss @@ -0,0 +1 @@ +@use '../../theme/grid.scss' as *; diff --git a/packages/opendesign/src/dialog/style/theme-kunpeng.index.ts b/packages/opendesign/src/dialog/style/theme-kunpeng.index.ts index 542bc71419df493175c13e2dc458dbb6c91e9bd5..35984c6f783961035bad73c70065d2d493c52a96 100644 --- a/packages/opendesign/src/dialog/style/theme-kunpeng.index.ts +++ b/packages/opendesign/src/dialog/style/theme-kunpeng.index.ts @@ -1,4 +1,3 @@ -import '../../theme/common.scss'; import '../../_styles'; import '../../layer/style/theme-kunpeng.index'; import '../../button/style/theme-kunpeng.index'; diff --git a/packages/opendesign/src/dialog/style/theme-kunpeng.scss b/packages/opendesign/src/dialog/style/theme-kunpeng.scss index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..6fa102fff8a09a8f08f206b0957a0a97bc515674 100644 --- a/packages/opendesign/src/dialog/style/theme-kunpeng.scss +++ b/packages/opendesign/src/dialog/style/theme-kunpeng.scss @@ -0,0 +1 @@ +@use '../../theme/grid.scss' as *; \ No newline at end of file diff --git a/packages/opendesign/src/dialog/style/theme-openeuler.index.ts b/packages/opendesign/src/dialog/style/theme-openeuler.index.ts index c0cef23b08324e2684f903807edd9cc95f316a40..f178446edb61d751cbca75fc3240118107e2b37b 100644 --- a/packages/opendesign/src/dialog/style/theme-openeuler.index.ts +++ b/packages/opendesign/src/dialog/style/theme-openeuler.index.ts @@ -1,4 +1,3 @@ -import '../../theme/common.scss'; import '../../_styles'; import '../../layer/style/theme-openeuler.index'; import '../../button/style/theme-openeuler.index'; diff --git a/packages/opendesign/src/dialog/style/theme-openeuler.scss b/packages/opendesign/src/dialog/style/theme-openeuler.scss index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..6fa102fff8a09a8f08f206b0957a0a97bc515674 100644 --- a/packages/opendesign/src/dialog/style/theme-openeuler.scss +++ b/packages/opendesign/src/dialog/style/theme-openeuler.scss @@ -0,0 +1 @@ +@use '../../theme/grid.scss' as *; \ No newline at end of file diff --git a/packages/opendesign/src/theme/ascend/a.dark.token.css b/packages/opendesign/src/theme/ascend/common/a.dark.token.css similarity index 100% rename from packages/opendesign/src/theme/ascend/a.dark.token.css rename to packages/opendesign/src/theme/ascend/common/a.dark.token.css diff --git a/packages/opendesign/src/theme/ascend/a.light.token.css b/packages/opendesign/src/theme/ascend/common/a.light.token.css similarity index 100% rename from packages/opendesign/src/theme/ascend/a.light.token.css rename to packages/opendesign/src/theme/ascend/common/a.light.token.css diff --git a/packages/opendesign/src/theme/ascend/base.scss b/packages/opendesign/src/theme/ascend/common/base.scss similarity index 100% rename from packages/opendesign/src/theme/ascend/base.scss rename to packages/opendesign/src/theme/ascend/common/base.scss diff --git a/packages/opendesign/src/theme/ascend/common/index.scss b/packages/opendesign/src/theme/ascend/common/index.scss new file mode 100644 index 0000000000000000000000000000000000000000..ad42fcf6d105cb2227ed7a11c72589cd73eb0e23 --- /dev/null +++ b/packages/opendesign/src/theme/ascend/common/index.scss @@ -0,0 +1,3 @@ +@use './a.light.token.css' as *; +@use './a.dark.token.css' as *; +@use './base.scss' as *; diff --git a/packages/opendesign/src/theme/ascend/index.scss b/packages/opendesign/src/theme/ascend/index.scss index 90e2972d8788cda308de9f0634b7964bc6f4c474..f9e1c2175d3ae5106af6ebf050433943845474c0 100644 --- a/packages/opendesign/src/theme/ascend/index.scss +++ b/packages/opendesign/src/theme/ascend/index.scss @@ -1,9 +1,6 @@ -// 变量 -@use './a.dark.token.css' as *; -@use './a.light.token.css' as *; -@use '../common.scss' as *; +// Token 及公共样式 +@use './common/index.scss' as *; // 样式 -@use './base.scss' as *; @use '../../index.scss' as *; // 皮肤 diff --git a/packages/opendesign/src/theme/ascend/token.config.ts b/packages/opendesign/src/theme/ascend/token.config.ts index 1a6a6e56b88fb1a6c7f3c087bf9ea840e16fd719..22063ad7c88e4fbf3e66744e3e7a7c5126b7bf0c 100644 --- a/packages/opendesign/src/theme/ascend/token.config.ts +++ b/packages/opendesign/src/theme/ascend/token.config.ts @@ -1,5 +1,6 @@ module.exports = { prefix: '--o-', + output: './common', themeMap: [ { key: 'light', diff --git a/packages/opendesign/src/theme/common.scss b/packages/opendesign/src/theme/grid.scss similarity index 100% rename from packages/opendesign/src/theme/common.scss rename to packages/opendesign/src/theme/grid.scss diff --git a/packages/opendesign/src/theme/kunpeng/base.scss b/packages/opendesign/src/theme/kunpeng/common/base.scss similarity index 100% rename from packages/opendesign/src/theme/kunpeng/base.scss rename to packages/opendesign/src/theme/kunpeng/common/base.scss diff --git a/packages/opendesign/src/theme/kunpeng/common/index.scss b/packages/opendesign/src/theme/kunpeng/common/index.scss new file mode 100644 index 0000000000000000000000000000000000000000..34eda5bd215b4ac114c17faf0bb3c04ba9806cfe --- /dev/null +++ b/packages/opendesign/src/theme/kunpeng/common/index.scss @@ -0,0 +1,3 @@ +@use './k.light.token.css' as *; +@use './k.dark.token.css' as *; +@use './base.scss' as *; diff --git a/packages/opendesign/src/theme/kunpeng/k.dark.token.css b/packages/opendesign/src/theme/kunpeng/common/k.dark.token.css similarity index 100% rename from packages/opendesign/src/theme/kunpeng/k.dark.token.css rename to packages/opendesign/src/theme/kunpeng/common/k.dark.token.css diff --git a/packages/opendesign/src/theme/kunpeng/k.light.token.css b/packages/opendesign/src/theme/kunpeng/common/k.light.token.css similarity index 100% rename from packages/opendesign/src/theme/kunpeng/k.light.token.css rename to packages/opendesign/src/theme/kunpeng/common/k.light.token.css diff --git a/packages/opendesign/src/theme/kunpeng/index.scss b/packages/opendesign/src/theme/kunpeng/index.scss index ee8780ea4409bf12c7c742eaf7ef1d9c261bfcc9..576c428d681f06eaef8ed856f6bfd4df9d1cea89 100644 --- a/packages/opendesign/src/theme/kunpeng/index.scss +++ b/packages/opendesign/src/theme/kunpeng/index.scss @@ -1,9 +1,6 @@ -// 变量 -@use './k.dark.token.css' as *; -@use './k.light.token.css' as *; -@use '../common.scss' as *; +// Token 及公共样式 +@use './common/index.scss' as *; // 样式 -@use './base.scss' as *; @use '../../index.scss' as *; // 皮肤 diff --git a/packages/opendesign/src/theme/kunpeng/token.config.ts b/packages/opendesign/src/theme/kunpeng/token.config.ts index d0138f03e3b79c613a3c222d9be6a32c0c8fc2b8..48c5991ba0a3562a8f0f55de850395fc336d3df1 100644 --- a/packages/opendesign/src/theme/kunpeng/token.config.ts +++ b/packages/opendesign/src/theme/kunpeng/token.config.ts @@ -1,5 +1,6 @@ module.exports = { prefix: '--o-', + output: './common', themeMap: [ { key: 'light', diff --git a/packages/opendesign/src/theme/opendesign/dark.token.css b/packages/opendesign/src/theme/opendesign/common/dark.token.css similarity index 100% rename from packages/opendesign/src/theme/opendesign/dark.token.css rename to packages/opendesign/src/theme/opendesign/common/dark.token.css diff --git a/packages/opendesign/src/theme/opendesign/common/index.scss b/packages/opendesign/src/theme/opendesign/common/index.scss new file mode 100644 index 0000000000000000000000000000000000000000..e3a438cabeeba8a787539ce6461ed9dd86f44f6a --- /dev/null +++ b/packages/opendesign/src/theme/opendesign/common/index.scss @@ -0,0 +1,2 @@ +@use './dark.token.css' as *; +@use './light.token.css' as *; diff --git a/packages/opendesign/src/theme/opendesign/light.token.css b/packages/opendesign/src/theme/opendesign/common/light.token.css similarity index 100% rename from packages/opendesign/src/theme/opendesign/light.token.css rename to packages/opendesign/src/theme/opendesign/common/light.token.css diff --git a/packages/opendesign/src/theme/opendesign/index.scss b/packages/opendesign/src/theme/opendesign/index.scss index bef847d6f8ddc2c945e95ac2dec05e0a8e01e234..e663debded23c041527d56bb0cdb9b195de59527 100644 --- a/packages/opendesign/src/theme/opendesign/index.scss +++ b/packages/opendesign/src/theme/opendesign/index.scss @@ -1,6 +1,5 @@ -// 变量 -@use './dark.token.css' as *; -@use './light.token.css' as *; +// Token 及公共样式 +@use './common/index.scss' as *; // 样式 @use '../../index.scss'; diff --git a/packages/opendesign/src/theme/opendesign/token.config.ts b/packages/opendesign/src/theme/opendesign/token.config.ts index 0434f9bfc769ca4b1b316cea96ef1651b1b1a56f..4b025b29b04a6498aaad74cd30ffb165b924478b 100644 --- a/packages/opendesign/src/theme/opendesign/token.config.ts +++ b/packages/opendesign/src/theme/opendesign/token.config.ts @@ -1,5 +1,6 @@ module.exports = { prefix: '--o-', + output: './common', themeMap: [ { key: 'light', diff --git a/packages/opendesign/src/theme/openeuler/e.dark.token.css b/packages/opendesign/src/theme/openeuler/common/e.dark.token.css similarity index 100% rename from packages/opendesign/src/theme/openeuler/e.dark.token.css rename to packages/opendesign/src/theme/openeuler/common/e.dark.token.css diff --git a/packages/opendesign/src/theme/openeuler/e.light.token.css b/packages/opendesign/src/theme/openeuler/common/e.light.token.css similarity index 100% rename from packages/opendesign/src/theme/openeuler/e.light.token.css rename to packages/opendesign/src/theme/openeuler/common/e.light.token.css diff --git a/packages/opendesign/src/theme/openeuler/common/index.scss b/packages/opendesign/src/theme/openeuler/common/index.scss new file mode 100644 index 0000000000000000000000000000000000000000..b515d24d45e830b25873b7b4e5804cb9eba9e023 --- /dev/null +++ b/packages/opendesign/src/theme/openeuler/common/index.scss @@ -0,0 +1,2 @@ +@use './e.light.token.css' as *; +@use './e.dark.token.css' as *; diff --git a/packages/opendesign/src/theme/openeuler/index.scss b/packages/opendesign/src/theme/openeuler/index.scss index 5fcff8d7cac882f3a50d6ae1f2756ce8aeb7dabb..47848503199977eec43d2e9aaee612551129c11c 100644 --- a/packages/opendesign/src/theme/openeuler/index.scss +++ b/packages/opendesign/src/theme/openeuler/index.scss @@ -1,7 +1,5 @@ -// 变量 -@use './e.dark.token.css' as *; -@use './e.light.token.css' as *; -@use '../common.scss' as *; +// Token 及公共样式 +@use './common/index.scss' as *; // 样式 @use '../../index.scss' as *; diff --git a/packages/opendesign/src/theme/openeuler/token.config.ts b/packages/opendesign/src/theme/openeuler/token.config.ts index b5b4f86195e3220b685e982d04b3f89bee30d463..381a450fb384b956d0a888d450628a1583eda393 100644 --- a/packages/opendesign/src/theme/openeuler/token.config.ts +++ b/packages/opendesign/src/theme/openeuler/token.config.ts @@ -1,5 +1,6 @@ module.exports = { prefix: '--o-', + output: './common', themeMap: [ { key: 'light',