From a9cbf94c38223bb52d1c06cbfa73f1a3e1a6381f Mon Sep 17 00:00:00 2001 From: afc163 Date: Tue, 17 Dec 2024 10:48:20 +0800 Subject: [PATCH 1/3] docs: fix sider border issue of documentation (#364) --- .dumi/theme/slots/Sidebar/index.tsx | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/.dumi/theme/slots/Sidebar/index.tsx b/.dumi/theme/slots/Sidebar/index.tsx index e6f06085..c46fac61 100644 --- a/.dumi/theme/slots/Sidebar/index.tsx +++ b/.dumi/theme/slots/Sidebar/index.tsx @@ -9,13 +9,14 @@ import useMenu from '../../../hooks/useMenu'; import SiteContext from '../SiteContext'; const useStyle = createStyles(({ token, css }) => { - const { antCls, fontFamily, colorSplit } = token; + const { antCls, fontFamily, colorSplit, marginXXL, paddingXXS } = token; return { asideContainer: css` min-height: 100%; - padding-bottom: 48px; + padding-bottom: ${marginXXL}px !important; font-family: Avenir, ${fontFamily}, sans-serif; + padding: 0 ${paddingXXS}px; &${antCls}-menu-inline { ${antCls}-menu-submenu-title h4, @@ -92,18 +93,13 @@ const useStyle = createStyles(({ token, css }) => { `, mainMenu: css` z-index: 1; - position: sticky; - top: ${token.headerHeight}px; - width: 100%; - height: 100%; - max-height: calc(100vh - ${token.headerHeight}px); - overflow: hidden; - scrollbar-width: thin; - scrollbar-color: unset; - - .ant-menu { - padding: 0 4px; - } + position: sticky; + top: ${token.headerHeight + token.contentMarginTop}px; + width: 100%; + max-height: calc(100vh - ${token.headerHeight + token.contentMarginTop}px); + overflow: hidden; + scrollbar-width: thin; + scrollbar-gutter: stable; &:hover { overflow-y: auto; From 9d39102487bfea4e82fc6ba6571b49285f682ba0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=F0=9F=8F=8E=EF=B8=8F=20Imer?= <98121322+YumoImer@users.noreply.github.com> Date: Tue, 17 Dec 2024 01:50:49 -0800 Subject: [PATCH 2/3] docs: fix chinamirror link (#368) --- .dumi/theme/slots/Footer/index.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.dumi/theme/slots/Footer/index.tsx b/.dumi/theme/slots/Footer/index.tsx index 7d6c3418..3055d01d 100644 --- a/.dumi/theme/slots/Footer/index.tsx +++ b/.dumi/theme/slots/Footer/index.tsx @@ -171,7 +171,7 @@ const Footer: React.FC = () => { }, { title: , - url: 'https://ant-design.antgroup.com', + url: 'https://ant-design-x.antgroup.com', }, ], }; From 4e5e8287c3aec5758f9074d430d34d4133a62a33 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=F0=9F=8F=8E=EF=B8=8F=20Imer?= <98121322+YumoImer@users.noreply.github.com> Date: Tue, 17 Dec 2024 19:26:44 -0800 Subject: [PATCH 3/3] fix: ThoughtChain style (#373) --- components/thought-chain/style/index.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/components/thought-chain/style/index.ts b/components/thought-chain/style/index.ts index 0aaf0018..eb8740a7 100644 --- a/components/thought-chain/style/index.ts +++ b/components/thought-chain/style/index.ts @@ -118,7 +118,7 @@ const genThoughtChainItemBeforePseudoStyle: GenerateThoughtChainItemStyle = (tok position: 'relative', '&::before': { - bottom: `${token.calc(token.itemGap).mul(-1).equal()}`, + bottom: calc(token.itemGap).mul(-1).equal(), }, }, [`& ${itemCls}-header, & ${itemCls}-content`]: { @@ -131,7 +131,7 @@ const genThoughtChainItemBeforePseudoStyle: GenerateThoughtChainItemStyle = (tok }, [`& ${itemCls}-header::before`]: { top: token.itemSize, - bottom: `${token.calc(token.itemGap).mul(-2).equal()}`, + bottom: calc(token.itemGap).mul(-2).equal(), }, [`& ${itemCls}-content::before`]: { top: '100%', @@ -180,7 +180,7 @@ const genThoughtChainItemStyle: GenerateThoughtChainItemStyle = (token) => { [`& ${itemCls}-title`]: { height: token.itemSize, - lineHeight: token.itemSize, + lineHeight: `${unit(token.itemSize)}`, maxHeight: token.itemSize, fontSize: token.itemFontSize,