From 76521195b23da075327ab08c03024a0c9b38af13 Mon Sep 17 00:00:00 2001 From: sakurayinfei <970412446@qq.com> Date: Fri, 12 Sep 2025 11:24:00 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E6=9B=B4=E6=96=B0collapse=E7=BB=84?= =?UTF-8?q?=E4=BB=B6=E5=8F=98=E9=87=8F=E6=98=A0=E5=B0=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../opendesign/src/collapse/style/index.scss | 2 +- .../opendesign/src/collapse/style/media.scss | 22 +++++++++++-------- .../opendesign/src/collapse/style/var.scss | 2 +- 3 files changed, 15 insertions(+), 11 deletions(-) diff --git a/packages/opendesign/src/collapse/style/index.scss b/packages/opendesign/src/collapse/style/index.scss index e6b6f59b..8bb47c58 100644 --- a/packages/opendesign/src/collapse/style/index.scss +++ b/packages/opendesign/src/collapse/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/collapse/style/media.scss b/packages/opendesign/src/collapse/style/media.scss index b12f6acf..c3c40731 100644 --- a/packages/opendesign/src/collapse/style/media.scss +++ b/packages/opendesign/src/collapse/style/media.scss @@ -1,27 +1,33 @@ @use '../../_styles/mixin.scss' as *; -@include respond-to('laptop') { +@include respond-to('<=pc_s') { .o-collapse { --collapse-padding: 8px 24px; } - + .o-collapse-item { --collapse-item-header-padding: 17px 0px; - + --collapse-item-title-text-size: var(--o-font_size-text2); --collapse-item-title-text-height: var(--o-line_height-text2); - + --collapse-item-body-text-size: var(--o-font_size-tip1); --collapse-item-body-text-height: var(--o-line_height-tip1); - + --collapse-item-icon-color: var(--o-color-info1); --collapse-item-icon-size: var(--o-icon_size_control-m); - - --collapse-item-gap: 12px; + + --collapse-item-gap: var(--o-gap-4); } } @include respond-to('<=pad') { + .o-collapse-item { + --collapse-item-gap: var(--o-gap-3); + } +} + +@include respond-to('<=pad_v') { .o-collapse { --collapse-radius: var(--o-radius_control-s); --collapse-padding: 0px 16px; @@ -38,7 +44,5 @@ --collapse-item-icon-color: var(--o-color-info1); --collapse-item-icon-size: var(--o-icon_size_control-m); - - --collapse-item-gap: 12px; } } diff --git a/packages/opendesign/src/collapse/style/var.scss b/packages/opendesign/src/collapse/style/var.scss index a70a68fc..710a145f 100644 --- a/packages/opendesign/src/collapse/style/var.scss +++ b/packages/opendesign/src/collapse/style/var.scss @@ -18,5 +18,5 @@ --collapse-item-icon-color: var(--o-color-info1); --collapse-item-icon-size: var(--o-icon_size_control-m); - --collapse-item-gap: 16px; + --collapse-item-gap: var(--o-gap-5); } -- Gitee From fcb38f068b01e0e1b71703ea524053499ca3b60c Mon Sep 17 00:00:00 2001 From: sakurayinfei <970412446@qq.com> Date: Fri, 12 Sep 2025 11:25:50 +0800 Subject: [PATCH 2/2] =?UTF-8?q?feat:=20collapse=E6=96=B0=E5=A2=9E=E7=9A=AE?= =?UTF-8?q?=E8=82=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/collapse/style/theme-ascend.scss | 17 +++++++++++++++++ .../src/collapse/style/theme-kunpeng.scss | 11 +++++++++++ .../src/collapse/style/theme-openeuler.scss | 9 +++++++++ 3 files changed, 37 insertions(+) diff --git a/packages/opendesign/src/collapse/style/theme-ascend.scss b/packages/opendesign/src/collapse/style/theme-ascend.scss index e69de29b..8d980e4c 100644 --- a/packages/opendesign/src/collapse/style/theme-ascend.scss +++ b/packages/opendesign/src/collapse/style/theme-ascend.scss @@ -0,0 +1,17 @@ +@use '../../_styles/mixin.scss' as *; + +.o-collapse { + --collapse-radius: var(--o-radius-l); +} + +@include respond-to('pad_v-pc_s') { + .o-collapse { + --collapse-radius: var(--o-radius-m); + } +} + +@include respond-to('<=pad_v') { + .o-collapse { + --collapse-radius: var(--o-radius-s); + } +} diff --git a/packages/opendesign/src/collapse/style/theme-kunpeng.scss b/packages/opendesign/src/collapse/style/theme-kunpeng.scss index e69de29b..bebb73c6 100644 --- a/packages/opendesign/src/collapse/style/theme-kunpeng.scss +++ b/packages/opendesign/src/collapse/style/theme-kunpeng.scss @@ -0,0 +1,11 @@ +@use '../../_styles/mixin.scss' as *; + +.o-collapse { + --collapse-radius: 0px; +} + +@include respond-to('<=pad_v') { + .o-collapse { + --collapse-radius: var(--o-radius-s); + } +} diff --git a/packages/opendesign/src/collapse/style/theme-openeuler.scss b/packages/opendesign/src/collapse/style/theme-openeuler.scss index e69de29b..291b9b72 100644 --- a/packages/opendesign/src/collapse/style/theme-openeuler.scss +++ b/packages/opendesign/src/collapse/style/theme-openeuler.scss @@ -0,0 +1,9 @@ +.o-collapse { + --collapse-radius: var(--o-radius-xs); +} + +.o-collapse-item-expanded { + .o-collapse-item-title { + color: var(--o-color-primary1); + } +} -- Gitee