diff --git a/src/assets/styles/layout/menu.less b/src/assets/styles/layout/menu.less index d5d15e8f..d52c538e 100644 --- a/src/assets/styles/layout/menu.less +++ b/src/assets/styles/layout/menu.less @@ -76,3 +76,20 @@ max-width: 0; opacity: 0; } + +.ant-pro-layout .ant-pro-sider .ant-layout-sider-children, +.ant-pro-layout .ant-pro-sider .ant-layout-sider-children > div, +.ant-pro-layout .ant-pro-sider .ant-pro-sider-menu, +.ant-pro-layout .ant-pro-sider .ant-menu { + -ms-overflow-style: none; + scrollbar-width: none; +} + +.ant-pro-layout .ant-pro-sider .ant-layout-sider-children::-webkit-scrollbar, +.ant-pro-layout .ant-pro-sider .ant-layout-sider-children > div::-webkit-scrollbar, +.ant-pro-layout .ant-pro-sider .ant-pro-sider-menu::-webkit-scrollbar, +.ant-pro-layout .ant-pro-sider .ant-menu::-webkit-scrollbar { + display: none; + width: 0; + height: 0; +} diff --git a/src/assets/styles/layout/pro-layout.less b/src/assets/styles/layout/pro-layout.less index cf367e80..d25d95e7 100644 --- a/src/assets/styles/layout/pro-layout.less +++ b/src/assets/styles/layout/pro-layout.less @@ -36,13 +36,13 @@ .ant-pro-layout .ant-pro-sider-collapsed-button, .ant-pro-layout .ant-pro-global-header-collapsed-button { color: var(--layout-nav-text-react) !important; - background: var(--app-surface-react) !important; + background: var(--layout-collapsed-button-bg-react, var(--app-surface-react)) !important; } .ant-pro-layout .ant-pro-sider-collapsed-button:hover, .ant-pro-layout .ant-pro-global-header-collapsed-button:hover { color: var(--layout-nav-title-react) !important; - background: var(--layout-nav-action-hover-bg-react) !important; + background: var(--layout-collapsed-button-hover-bg-react, var(--layout-nav-action-hover-bg-react)) !important; } .ant-pro-layout .ant-pro-card, diff --git a/src/layouts/BasicLayout.tsx b/src/layouts/BasicLayout.tsx index 480ed2f8..b01e950d 100644 --- a/src/layouts/BasicLayout.tsx +++ b/src/layouts/BasicLayout.tsx @@ -196,6 +196,8 @@ export default function BasicLayout() { '--layout-nav-menu-hover-bg-react': navColors.menuHoverBg, '--layout-nav-menu-selected-bg-react': navColors.menuSelectedBg, '--layout-nav-badge-shadow-react': navColors.badgeShadow, + '--layout-collapsed-button-bg-react': effectiveNavDark ? navColors.bg : appColors.surface, + '--layout-collapsed-button-hover-bg-react': effectiveNavDark ? '#1f2937' : navColors.actionHoverBg, backgroundColor: appColors.bg } as CSSProperties; const proLayoutContentStyle = {