From 3d739d381b59956e7aa793e2f194e43c79715aad Mon Sep 17 00:00:00 2001 From: Bang <15622356989@163.com> Date: Tue, 21 Mar 2023 20:23:58 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/cascader/style/var.scss | 0 .../src/components/checkbox/style/index.scss | 7 ++++++ .../src/components/checkbox/style/var.scss | 1 + .../src/components/menu/style/index.scss | 2 +- .../src/components/radio/style/index.scss | 7 ++++++ .../src/components/radio/style/var.scss | 1 + .../src/components/rate/style/index.scss | 2 +- .../src/components/rate/style/var.scss | 9 ++++---- .../src/components/tag/__demo__/TagSize.vue | 2 +- .../src/components/tag/style/var.scss | 23 +++++++++++-------- 10 files changed, 37 insertions(+), 17 deletions(-) create mode 100644 packages/opendesign/src/components/cascader/style/var.scss diff --git a/packages/opendesign/src/components/cascader/style/var.scss b/packages/opendesign/src/components/cascader/style/var.scss new file mode 100644 index 00000000..e69de29b diff --git a/packages/opendesign/src/components/checkbox/style/index.scss b/packages/opendesign/src/components/checkbox/style/index.scss index 396b9535..44af42a1 100644 --- a/packages/opendesign/src/components/checkbox/style/index.scss +++ b/packages/opendesign/src/components/checkbox/style/index.scss @@ -16,6 +16,12 @@ bottom: 0; opacity: 0; } + + &:not(.o-checkbox-checked):not(.o-checkbox-disabled):hover { + .o-checkbox-input { + border-color: var(--checkbox-input-bd-color-hover); + } + } } .o-checkbox-wrap { @@ -36,6 +42,7 @@ color: var(--checkbox-input-color); border: 1px solid var(--checkbox-input-bd-color); border-radius: var(--checkbox-radius); + transition: border-color var(--o-duration-s) var(--o-easing-standard), border-color var(--o-duration-s) var(--o-easing-standard); } .o-checkbox-label { diff --git a/packages/opendesign/src/components/checkbox/style/var.scss b/packages/opendesign/src/components/checkbox/style/var.scss index 145ca801..36eb8355 100644 --- a/packages/opendesign/src/components/checkbox/style/var.scss +++ b/packages/opendesign/src/components/checkbox/style/var.scss @@ -12,6 +12,7 @@ --checkbox-input-color: rgb(var(--o-color-white)); --checkbox-input-bg-color: var(--o-color-control-light); + --checkbox-input-bd-color-hover: var(--o-color-primary1); --checkbox-input-bg-color-checked: var(--o-color-primary1); --checkbox-input-bg-color-disabled: var(--o-color-control4-light); --checkbox-input-bg-color-checked-disabled: var(--o-color-primary4); diff --git a/packages/opendesign/src/components/menu/style/index.scss b/packages/opendesign/src/components/menu/style/index.scss index 9182453b..adf56618 100644 --- a/packages/opendesign/src/components/menu/style/index.scss +++ b/packages/opendesign/src/components/menu/style/index.scss @@ -36,7 +36,7 @@ padding: 12px 48px 12px 24px; border-radius: var(--sub-menu-radius); cursor: pointer; - transition: background-color var(--o-duration-m2) var(--o-easing-standard); + transition: background-color var(--o-duration-s) var(--o-easing-standard); &:hover { background-color: var(--sub-menu-bg-color-hover); diff --git a/packages/opendesign/src/components/radio/style/index.scss b/packages/opendesign/src/components/radio/style/index.scss index fbc58de6..5a00a4c9 100644 --- a/packages/opendesign/src/components/radio/style/index.scss +++ b/packages/opendesign/src/components/radio/style/index.scss @@ -16,6 +16,12 @@ bottom: 0; opacity: 0; } + + &:not(.o-radio-checked):not(.o-radio-disabled):hover { + .o-radio-input { + border-color: var(--radio-input-bd-color-hover); + } + } } .o-radio-wrap { @@ -33,6 +39,7 @@ background-color: var(--radio-input-bg-color); border: 1px solid var(--radio-input-bd-color); border-radius: 50%; + transition: border-color var(--o-duration-s) var(--o-easing-standard); &::after { content: ''; diff --git a/packages/opendesign/src/components/radio/style/var.scss b/packages/opendesign/src/components/radio/style/var.scss index 0296f5bb..914ec4b5 100644 --- a/packages/opendesign/src/components/radio/style/var.scss +++ b/packages/opendesign/src/components/radio/style/var.scss @@ -14,6 +14,7 @@ --radio-input-bg-color-checked-disabled: var(--o-color-primary4); --radio-input-bd-color: var(--o-color-control1); + --radio-input-bd-color-hover: var(--o-color-primary1); --radio-input-bd-color-checked: var(--o-color-primary1); --radio-input-bd-color-disabled: var(--o-color-control4); --radio-input-bd-color-checked-disabled: var(--o-color-primary4); diff --git a/packages/opendesign/src/components/rate/style/index.scss b/packages/opendesign/src/components/rate/style/index.scss index b051ea26..7b2d06e3 100644 --- a/packages/opendesign/src/components/rate/style/index.scss +++ b/packages/opendesign/src/components/rate/style/index.scss @@ -5,7 +5,7 @@ align-items: center; gap: var(--rate-gap); user-select: none; - font-size: var(--rate-height); + font-size: var(--rate-size); cursor: pointer; } diff --git a/packages/opendesign/src/components/rate/style/var.scss b/packages/opendesign/src/components/rate/style/var.scss index a3019b1e..e520f5d9 100644 --- a/packages/opendesign/src/components/rate/style/var.scss +++ b/packages/opendesign/src/components/rate/style/var.scss @@ -1,20 +1,19 @@ .o-rate { --rate-color: var(--o-color-control1-light); --rate-color-active: var(--o-color-warning1); - - --rate-gap: var(--o-gap-2); + --rate-gap: 0; } .o-rate-medium { - --rate-height: var(--o-font_size-h1); + --rate-size: var(--o-icon_size-xs); } .o-rate-large { - --rate-height: var(--o-font_size-display3); + --rate-size: var(--o-icon_size-s); } .o-rate-size-small { - --rate-height: var(--o-font_size-text2); + --rate-size: var(--o-icon_size-xxs); } .o-rate-primary { diff --git a/packages/opendesign/src/components/tag/__demo__/TagSize.vue b/packages/opendesign/src/components/tag/__demo__/TagSize.vue index ea6b8552..524a99bf 100644 --- a/packages/opendesign/src/components/tag/__demo__/TagSize.vue +++ b/packages/opendesign/src/components/tag/__demo__/TagSize.vue @@ -6,7 +6,7 @@ import { OTag } from '../index';

Size

Large Tag - Normal Tag + Medium Tag Small Tag
diff --git a/packages/opendesign/src/components/tag/style/var.scss b/packages/opendesign/src/components/tag/style/var.scss index 58789c56..05fa8a47 100644 --- a/packages/opendesign/src/components/tag/style/var.scss +++ b/packages/opendesign/src/components/tag/style/var.scss @@ -29,22 +29,27 @@ } .o-tag-small { - --tag-padding: 0 7px; + --tag-padding: 0 6px; --tag-radius: var(--o-radius-control-s); - --tag-text-size: var(--o-font_size-tip1); - --tag-text-height: var(--o-line_height-tip1); + --tag-text-size: 10px; + --tag-text-height: 16px; + --tag-height: var(--o-size-xxs); } .o-tag-medium { - --tag-padding: 0 15px; - --tag-radius: var(--o-radius-control-m); - --tag-text-size: var(--o-font_size-text); - --tag-text-height: var(--o-line_height-text); + --tag-padding: 0 12px; + --tag-radius: var(--o-radius-control-s); + --tag-text-size: var(--o-font_size-tip2); + --tag-text-height: var(--o-line_height-tip2); + --tag-height: var(--o-size-xs); } .o-tag-large { - --tag-padding: 4px 19px; - --tag-radius: var(--o-radius-control-l); + --tag-padding: 0 14px; + --tag-radius: var(--o-radius-control-s); + --tag-text-size: var(--o-font_size-tip1); + --tag-text-height: var(--o-line_height-tip1); + --tag-height: var(--o-size-s); } .o-tag-round-pill { -- Gitee