diff --git a/scripts/generate_antd_dark_less.js b/scripts/generate_antd_dark_less.js index aa4468b34..a496fc89d 100644 --- a/scripts/generate_antd_dark_less.js +++ b/scripts/generate_antd_dark_less.js @@ -40,8 +40,8 @@ function saveLess(filePath, filename, callback) { 'border-color-split': 'rgb(57, 60, 77)', 'component-background': 'rgb(24 27 31)', //fc-fill-2 'table-header-bg': 'rgb(34 37 43)',//fc-fill-3 - 'table-row-hover-bg': '#303340', - 'table-header-sort-bg': '#303340', + 'table-row-hover-bg': 'rgba(204, 204, 220, 0.08)', + 'table-header-sort-bg': 'rgba(204, 204, 220, 0.08)', 'popover-background': 'rgb(24 27 31)', //fc-fill-2 'normal-color': 'rgb(79, 82, 99)', }, diff --git a/src/components/menu/SideMenu/MenuList.tsx b/src/components/menu/SideMenu/MenuList.tsx index 96312f296..d0ef286aa 100644 --- a/src/components/menu/SideMenu/MenuList.tsx +++ b/src/components/menu/SideMenu/MenuList.tsx @@ -73,10 +73,11 @@ function MenuItem(props: { item: IMenuItem; isSub?: boolean } & IMenuProps) { to={item.key} className={cn( 'group flex h-9 cursor-pointer items-center relative rounded px-3.5 transition-colors transition-spacing duration-75', - isActive ? (isCustomBg ? 'bg-gray-200/20' : 'bg-fc-200') : '', - isCustomBg ? 'hover:bg-gray-200/20' : 'hover:bg-fc-200', + isActive ? (isCustomBg ? '' : 'bg-fc-200') : '', + 'hover:bg-[rgba(204,204,220,0.12)]', isCustomBg ? 'text-[#fff]' : 'text-main', )} + style={{background: isActive && isCustomBg ?'rgba(204, 204, 220, 0.08)':undefined }} > {!isSub ? (
diff --git a/src/components/pageLayout/SideMenuColorSetting/index.tsx b/src/components/pageLayout/SideMenuColorSetting/index.tsx index fabbbd890..089e36d43 100644 --- a/src/components/pageLayout/SideMenuColorSetting/index.tsx +++ b/src/components/pageLayout/SideMenuColorSetting/index.tsx @@ -10,7 +10,7 @@ export const getSideMenuBgColor = (color: SideMenuColors) => { case 'light': return '#fff'; case 'dark': - return 'var(--fc-fill-2)'; + return 'rgb(24,27,31)'; case 'theme': return THEME_COLOR; default: diff --git a/src/theme/antd.dark.less b/src/theme/antd.dark.less index e17debac9..e25290846 100644 --- a/src/theme/antd.dark.less +++ b/src/theme/antd.dark.less @@ -21955,7 +21955,7 @@ span.ant-radio + * { } .ant-table-tbody > tr.ant-table-row:hover > td, .ant-table-tbody > tr > td.ant-table-cell-row-hover { - background: #303340; + background: rgba(204, 204, 220, 0.08); } .ant-table-tbody > tr.ant-table-row-selected > td { background: #1e1e30; @@ -22015,7 +22015,7 @@ div.ant-table-summary { background: #222; } .ant-table-thead th.ant-table-column-sort { - background: #303340; + background: rgba(204, 204, 220, 0.08); } .ant-table-thead th.ant-table-column-sort::before { background-color: transparent !important;