From 6ab2f83e1358f5a2e6a8b62f296d0318b1f51e3c Mon Sep 17 00:00:00 2001 From: Qi <474021214@qq.com> Date: Thu, 16 Mar 2023 00:41:57 +0800 Subject: [PATCH] fix: error icon color in sidebar (#1550) --- .../pure/quick-search-modal/style.ts | 2 +- .../pure/workspace-slider-bar/icons/Icons.tsx | 27 ------------------- .../pure/workspace-slider-bar/style.ts | 6 +++-- pnpm-lock.yaml | 2 +- 4 files changed, 6 insertions(+), 31 deletions(-) delete mode 100644 apps/web/src/components/pure/workspace-slider-bar/icons/Icons.tsx diff --git a/apps/web/src/components/pure/quick-search-modal/style.ts b/apps/web/src/components/pure/quick-search-modal/style.ts index 66e7c610ff..6255acea62 100644 --- a/apps/web/src/components/pure/quick-search-modal/style.ts +++ b/apps/web/src/components/pure/quick-search-modal/style.ts @@ -175,7 +175,7 @@ export const StyledListItem = styled('button')(({ theme }) => { span: { ...textEllipsis(1), }, - '>svg': { + '> svg': { fontSize: '20px', marginRight: '12px', }, diff --git a/apps/web/src/components/pure/workspace-slider-bar/icons/Icons.tsx b/apps/web/src/components/pure/workspace-slider-bar/icons/Icons.tsx deleted file mode 100644 index a4dd37aedd..0000000000 --- a/apps/web/src/components/pure/workspace-slider-bar/icons/Icons.tsx +++ /dev/null @@ -1,27 +0,0 @@ -export const AffineIcon = () => { - return ( - - - - - ); -}; diff --git a/apps/web/src/components/pure/workspace-slider-bar/style.ts b/apps/web/src/components/pure/workspace-slider-bar/style.ts index 5756751dc4..fd733d4de9 100644 --- a/apps/web/src/components/pure/workspace-slider-bar/style.ts +++ b/apps/web/src/components/pure/workspace-slider-bar/style.ts @@ -54,9 +54,10 @@ export const StyledListItem = styled('div')<{ } : {}), - '>svg': { + '> svg': { fontSize: '20px', marginRight: '12px', + color: active ? theme.colors.primaryColor : theme.colors.iconColor, }, ':hover:not([disabled])': { color: theme.colors.primaryColor, @@ -65,7 +66,7 @@ export const StyledListItem = styled('div')<{ }; }); -export const StyledLink = styled(Link)(() => { +export const StyledLink = styled(Link)(({ theme }) => { return { flexGrow: 1, textAlign: 'left', @@ -77,6 +78,7 @@ export const StyledLink = styled(Link)(() => { '>svg': { fontSize: '20px', marginRight: '12px', + color: theme.colors.iconColor, }, }; }); diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index bb9194424c..af82c3cd9c 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -5930,7 +5930,7 @@ packages: '@babel/plugin-transform-react-jsx-source': 7.19.6_@babel+core@7.21.0 magic-string: 0.27.0 react-refresh: 0.14.0 - vite: 4.1.4 + vite: 4.1.4_@types+node@18.14.4 transitivePeerDependencies: - supports-color dev: true