From f34e8e8f4ff4087fab6ffd8d54435120068a262e Mon Sep 17 00:00:00 2001 From: sallerli1 Date: Mon, 29 Jan 2024 21:18:32 +0800 Subject: [PATCH] style(pro:transfer,tree): modify tree node horizontal padding --- packages/components/tree-select/theme/default.ts | 2 +- packages/pro/transfer/style/index.less | 1 + packages/pro/tree/demo/Basic.vue | 8 ++++---- packages/pro/tree/style/variables.less | 10 +++++----- 4 files changed, 11 insertions(+), 10 deletions(-) diff --git a/packages/components/tree-select/theme/default.ts b/packages/components/tree-select/theme/default.ts index 12fbc2bad..064a7dce7 100644 --- a/packages/components/tree-select/theme/default.ts +++ b/packages/components/tree-select/theme/default.ts @@ -15,7 +15,7 @@ export function getDefaultThemeTokens(tokens: GlobalThemeTokens): CertainThemeTo optionPadding: `${paddingSizeSm}px ${paddingSizeMd}px`, optionMarginLeft: marginSizeSm, optionContainerPadding: `${paddingSizeXs}px 0`, - optionContainerTreeNodePadding: `0 0 0 ${paddingSizeSm}px`, + optionContainerTreeNodePadding: `0 0 0 ${paddingSizeMd}px`, overlaySearchWrapperPadding: `${paddingSizeXs}px ${paddingSizeMd}px ${paddingSizeSm}px`, } diff --git a/packages/pro/transfer/style/index.less b/packages/pro/transfer/style/index.less index b5cc192f2..7092a2f79 100644 --- a/packages/pro/transfer/style/index.less +++ b/packages/pro/transfer/style/index.less @@ -75,6 +75,7 @@ &.@{tree-prefix}-blocked .@{tree-node-prefix} { transition: none; background-color: var(--ix-color-container-bg); + padding-left: var(--ix-padding-size-md); &:hover { background-color: var(--ix-color-container-bg-hover); &-content { diff --git a/packages/pro/tree/demo/Basic.vue b/packages/pro/tree/demo/Basic.vue index d383a3914..192d09b79 100644 --- a/packages/pro/tree/demo/Basic.vue +++ b/packages/pro/tree/demo/Basic.vue @@ -146,13 +146,13 @@ const onUpdateSelectedKeys = (keys: string[]) => { .demo-pro-tree { .add-btn { font-size: 12px; - color: #1c6eff; + color: var(--ix-color-primary); } .ix-tree-node { .ix-tree-node-content-suffix { position: sticky; - right: 12px; + right: 0; display: none; } @@ -169,9 +169,9 @@ const onUpdateSelectedKeys = (keys: string[]) => { } .operation-icon { - color: #5e6573; + color: var(--ix-color-icon); &:hover { - color: #1c6eff; + color: var(--ix-color-icon-hover); } } } diff --git a/packages/pro/tree/style/variables.less b/packages/pro/tree/style/variables.less index 887983533..62453252a 100644 --- a/packages/pro/tree/style/variables.less +++ b/packages/pro/tree/style/variables.less @@ -1,9 +1,9 @@ @pro-tree-border: var(--ix-line-width) var(--ix-line-type) var(--ix-color-border-secondary); @pro-tree-padding: 0; -@pro-tree-header-search-wrapper-gap: 4px; -@pro-tree-header-search-wrapper-horizontal-spacing: 12px; +@pro-tree-header-search-wrapper-gap: var(--ix-margin-size-xs); +@pro-tree-header-search-wrapper-horizontal-spacing: var(--ix-padding-size-md); @pro-tree-header-search-wrapper-vertical-spacing: 0; -@pro-tree-search-wrapper-margin-bottom: 8px; +@pro-tree-search-wrapper-margin-bottom: var(--ix-margin-size-sm); @pro-tree-search-input-suffix-color: var(--ix-color-icon-info); @pro-tree-header-wrapper-icon-font-size: var(--ix-font-size-icon); @pro-tree-header-wrapper-icon-hover-color: var(--ix-color-icon-hover); @@ -12,5 +12,5 @@ @pro-tree-content-vertical-spacing: 0; @pro-tree-divider-horizontal-spacing: @pro-tree-header-search-wrapper-horizontal-spacing; -@pro-tree-divider-vertical-spacing: 8px; -@pro-tree-node-padding: 0 0 0 8px; +@pro-tree-divider-vertical-spacing: var(--ix-margin-size-sm); +@pro-tree-node-padding: 0 0 0 var(--ix-padding-size-md);