Merge branch 'main' into main

ant-design · Dec 18, 2024 · c50d28f · c50d28f
2 parents 05a7d6b + 4e5e828
commit c50d28f
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 18 deletions.
diff --git a/.dumi/theme/slots/Footer/index.tsx b/.dumi/theme/slots/Footer/index.tsx
@@ -171,7 +171,7 @@ const Footer: React.FC = () => {
         },
         {
           title: <FormattedMessage id="app.footer.chinamirror" />,
-          url: 'https://ant-design.antgroup.com',
+          url: 'https://ant-design-x.antgroup.com',
         },
       ],
     };

diff --git 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;

diff --git 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,
-Original file line number
+Diff line change
@@ Expand Up / @@ -171,7 +171,7 @@ const Footer: React.FC = () => { @@
             },
             {
               title: <FormattedMessage id="app.footer.chinamirror" />,
-              url: 'https://ant-design.antgroup.com',
+              url: 'https://ant-design-x.antgroup.com',
             },
           ],
         };
@@ Expand Down @@