feat(collapse): [collapse] updata collapse xdesign

opentiny · Feb 26, 2024 · 8068075 · 8068075
1 parent eec945e
commit 8068075
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 4 deletions.
diff --git a/packages/theme/src/collapse-item/index.less b/packages/theme/src/collapse-item/index.less
@@ -94,12 +94,16 @@
 
     .@{collapse-item-prefix-cls}__title__right {
       margin-left: auto;
+      color: var(--ti-collapse-item-title-right-color);
+      fill: var(--ti-collapse-item-title-right-fill);
     }
+
     &.is-active {
       border-bottom-color: transparent;
 
       .@{collapse-item-prefix-cls}__arrow {
         transform: var(--ti-collapse-item-is-active-arrow-transform);
+
         svg {
           fill: var(--ti-collapse-item-is-active-arrow-text-color);
         }
@@ -124,9 +128,9 @@
 
   &__content {
     padding-top: var(--ti-collapse-item-content-padding-top);
+    padding-left: var(--ti-collapse-item-content-padding-left);
     padding-right: var(--ti-collapse-item-content-padding-right);
     padding-bottom: var(--ti-collapse-item-content-padding-bottom);
-    padding-left: var(--ti-collapse-item-content-padding-left);
     font-size: var(--ti-collapse-item-content-font-size);
     color: var(--ti-collapse-item-text-color);
     border: 1px solid var(--ti-collapse-item-content-border-color);

diff --git a/packages/theme/src/collapse-item/smb-theme.js b/packages/theme/src/collapse-item/smb-theme.js
@@ -1,6 +1,6 @@
 export const tinyCollapseItemSmbTheme = {
   'ti-collapse-item-border-radius': '0',
-  'ti-collapse-item-header-padding-vertical': '9px',
+  'ti-collapse-item-header-padding-vertical': 'var(--ti-common-size-3x)',
   'ti-collapse-item-header-padding-horizontal': 'var(--ti-common-space-5x)',
   'ti-collapse-item-header-min-height': 'var(--ti-common-size-height-medium)',
   'ti-collapse-item-icon-color': '#808080',
@@ -11,6 +11,9 @@ export const tinyCollapseItemSmbTheme = {
   'ti-collapse-item-content-padding-right': 'var(--ti-common-space-5x)',
   'ti-collapse-item-content-padding-bottom': 'var(--ti-common-space-6x)',
   'ti-collapse-item-content-padding-left': 'var(--ti-common-space-5x)',
-  'ti-collapse-item-arrow-hover-text-color': '#191919',
-  'ti-collapse-item-arrow-margin-right': 'var(--ti-common-space-2x)'
+  'ti-collapse-item-arrow-hover-text-color': 'var(--ti-base-color-brand)',
+  'ti-collapse-item-header-border-color': 'var(--ti-base-color-common-5)',
+  'ti-collapse-item-title-right-color': '#1476ff',
+  'ti-collapse-item-title-right-fill': '#1476ff',
+  'ti-collapse-item-arrow-margin-right': 'var(--ti-common-space-3x)'
 }
diff --git a/packages/theme/src/collapse-item/vars.less b/packages/theme/src/collapse-item/vars.less
@@ -93,4 +93,8 @@
   --ti-collapse-item-content-padding-bottom: var(--ti-common-space-3x, 12px);
   // 面板内容字号
   --ti-collapse-item-content-font-size: var(--ti-common-font-size-base, 12px);
+  // 面板右侧标题颜色
+  --ti-collapse-item-title-right-color: var(--ti-common-color-text-primary, #252b3a);
+  // 面板右侧图标颜色
+  --ti-collapse-item-title-right-fill: var(--ti-common-color-text-primary, #252b3a);
 }