diff --git a/packages/docs/src/assets/style/index.ts b/packages/docs/src/assets/style/index.ts index 13a67601c01189ae02d0c4fe1a69077a10272cfd..ea24668d1dc9a65e418f117d3ed4ba24503a232d 100644 --- a/packages/docs/src/assets/style/index.ts +++ b/packages/docs/src/assets/style/index.ts @@ -1,4 +1,4 @@ -import '@opensig/opendesign/theme/common.scss'; +import '@opensig/opendesign/theme/grid.scss'; import './font-family.scss'; import './var-map.scss'; import './style.scss'; diff --git a/packages/opendesign/src/cascader/style/index.scss b/packages/opendesign/src/cascader/style/index.scss index e6b6f59b06731c7cec52d32669a01b1cb474daeb..8bb47c5840ef5591b0176e882570a9878c439b64 100644 --- a/packages/opendesign/src/cascader/style/index.scss +++ b/packages/opendesign/src/cascader/style/index.scss @@ -1,3 +1,3 @@ @use './style.scss' as *; -@use './media.scss' as *; @use './var.scss' as *; +@use './media.scss' as *; diff --git a/packages/opendesign/src/cascader/style/media.scss b/packages/opendesign/src/cascader/style/media.scss index 17937e85adb881ecbe5a879d6f23a084852fa6fd..790ed32e681c614711a1064581d941b56b73f649 100644 --- a/packages/opendesign/src/cascader/style/media.scss +++ b/packages/opendesign/src/cascader/style/media.scss @@ -1,11 +1,10 @@ @use '../../_styles/mixin.scss' as *; -// @include respond-to('laptop') { -// .o-cascader { -// } -// } - -// @include respond-to('<=pad') { -// .o-cascader { -// } -// } +@include respond-to('<=pc_s') { + .o-cascader-option { + --cascader-option-text-size: var(--o-font_size-tip1); + --cascader-option-text-height: var(--o-line_height-tip1); + --cascader-option-padding: 6px 12px; + --cascader-option-icon-size: var(--o-icon_size-s); + } +} diff --git a/packages/opendesign/src/cascader/style/style.scss b/packages/opendesign/src/cascader/style/style.scss index e74c2f956faac7bb563979bbf8d821752a630b42..e40f98a5eea9b19db74dba12b517a7af49044feb 100644 --- a/packages/opendesign/src/cascader/style/style.scss +++ b/packages/opendesign/src/cascader/style/style.scss @@ -20,7 +20,7 @@ overflow-y: auto; & + .o-cascader-options { - border-left: 1px solid var(--cascader-options-bd-clor); + border-left: 1px solid var(--cascader-options-bd-color); } &:first-child { diff --git a/packages/opendesign/src/cascader/style/var.scss b/packages/opendesign/src/cascader/style/var.scss index c4eabe54e7a5f518e155f78eedeb60be12148b74..ef17968a56c05e870e225859aeeb062c3fa94ccd 100644 --- a/packages/opendesign/src/cascader/style/var.scss +++ b/packages/opendesign/src/cascader/style/var.scss @@ -3,7 +3,7 @@ } .o-cascader-options { - --cascader-options-bd-clor: var(--o-color-control1-light); + --cascader-options-bd-color: var(--o-color-control1-light); --cascader-options-gap: 8px; } @@ -22,7 +22,7 @@ --cascader-option-bg-color-hover: var(--o-color-control2-light); --cascader-option-bg-color-selected: var(--o-color-control3-light); - --cascader-option-icon-size: var(--o-icon_size_control-xs); + --cascader-option-icon-size: var(--o-icon_size-m); --cascader-option-gap: 2px; } diff --git a/packages/opendesign/src/scrollbar/vScrollbar.ts b/packages/opendesign/src/scrollbar/vScrollbar.ts index 5036432051774ccde0bf773449115640ac719ffa..52f443a7969c73c8d9b87177ebd45e99d698f685 100644 --- a/packages/opendesign/src/scrollbar/vScrollbar.ts +++ b/packages/opendesign/src/scrollbar/vScrollbar.ts @@ -1,11 +1,11 @@ -import { DirectiveBinding, ObjectDirective } from 'vue'; +import { ObjectDirective } from 'vue'; import { useScrollbar } from './use-scrollebar'; import { BaseScrollerPropsT } from './types'; const scrollbarMap = new WeakMap(); -const vScrollbar: ObjectDirective = { - mounted(el: HTMLElement, binding: DirectiveBinding | undefined>) { +const vScrollbar: ObjectDirective | undefined> = { + mounted(el: HTMLElement, binding) { const value = binding.value; if (value === false) { diff --git a/packages/portal/src/main.ts b/packages/portal/src/main.ts index 2e202e70d861b3505d84bdc81cb6f6cdfd5c38cb..f5a2c3c7dd0629ba0aeb6c22c6d4bf56a96df82d 100644 --- a/packages/portal/src/main.ts +++ b/packages/portal/src/main.ts @@ -2,12 +2,12 @@ import { createApp } from 'vue'; import './assets/style/style.scss'; import 'normalize.css'; -import '@opendesign-src/theme/opendesign/light.token.css'; -import '@opendesign-src/theme/opendesign/dark.token.css'; -import '@opendesign-src/theme/ascend/a.dark.token.css'; -import '@opendesign-src/theme/ascend/a.light.token.css'; -import '@opendesign-src/theme/kunpeng/k.dark.token.css'; -import '@opendesign-src/theme/kunpeng/k.light.token.css'; +import '@opendesign-src/theme/opendesign/common/light.token.css'; +import '@opendesign-src/theme/opendesign/common/dark.token.css'; +import '@opendesign-src/theme/ascend/common/a.dark.token.css'; +import '@opendesign-src/theme/ascend/common/a.light.token.css'; +import '@opendesign-src/theme/kunpeng/common/k.dark.token.css'; +import '@opendesign-src/theme/kunpeng/common/k.light.token.css'; import './assets/style/media.token.scss'; import { router } from '@/router';