From f9c31435ec4cfb6987f24690e392bab0cb4dc7cf Mon Sep 17 00:00:00 2001 From: MadCcc <1075746765@qq.com> Date: Wed, 22 Mar 2023 11:24:13 +0800 Subject: [PATCH] fix: Tabs border should not overlay with other border (#41381) * fix: Tabs border should not overlay with other border * fix: more border --- components/tabs/style/index.ts | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/components/tabs/style/index.ts b/components/tabs/style/index.ts index 107325bd67..97577814b2 100644 --- a/components/tabs/style/index.ts +++ b/components/tabs/style/index.ts @@ -29,7 +29,7 @@ const genCardStyle: GenerateStyle = (token: TabsToken): CSSObject => tabsCardHorizontalPadding, tabsCardHeadBackground, tabsCardGutter, - colorSplit, + colorBorderSecondary, } = token; return { [`${componentCls}-card`]: { @@ -38,7 +38,7 @@ const genCardStyle: GenerateStyle = (token: TabsToken): CSSObject => margin: 0, padding: tabsCardHorizontalPadding, background: tabsCardHeadBackground, - border: `${token.lineWidth}px ${token.lineType} ${colorSplit}`, + border: `${token.lineWidth}px ${token.lineType} ${colorBorderSecondary}`, transition: `all ${token.motionDurationSlow} ${token.motionEaseInOut}`, }, @@ -226,7 +226,7 @@ const genDropdownStyle: GenerateStyle = (token: TabsToken): CSSObject }; const genPositionStyle: GenerateStyle = (token: TabsToken): CSSObject => { - const { componentCls, margin, colorSplit } = token; + const { componentCls, margin, colorBorderSecondary } = token; return { // ========================== Top & Bottom ========================== [`${componentCls}-top, ${componentCls}-bottom`]: { @@ -245,7 +245,7 @@ const genPositionStyle: GenerateStyle = (token: TabsToken): CSSObject _skip_check_: true, value: 0, }, - borderBottom: `${token.lineWidth}px ${token.lineType} ${colorSplit}`, + borderBottom: `${token.lineWidth}px ${token.lineType} ${colorBorderSecondary}`, content: "''", }, @@ -714,7 +714,7 @@ const genTabsStyle: GenerateStyle = (token: TabsToken): CSSObject => tabsCardGutter, tabsHoverColor, tabsActiveColor, - colorSplit, + colorBorderSecondary, } = token; return { @@ -799,7 +799,7 @@ const genTabsStyle: GenerateStyle = (token: TabsToken): CSSObject => }, padding: `0 ${token.paddingXS}px`, background: 'transparent', - border: `${token.lineWidth}px ${token.lineType} ${colorSplit}`, + border: `${token.lineWidth}px ${token.lineType} ${colorBorderSecondary}`, borderRadius: `${token.borderRadiusLG}px ${token.borderRadiusLG}px 0 0`, outline: 'none', cursor: 'pointer',