diff --git a/apps/web/src/components/affine/operation-menu-items/Export.tsx b/apps/web/src/components/affine/operation-menu-items/Export.tsx index ecfd17ed90..4460d391d3 100644 --- a/apps/web/src/components/affine/operation-menu-items/Export.tsx +++ b/apps/web/src/components/affine/operation-menu-items/Export.tsx @@ -20,7 +20,7 @@ export const Export = ({ return ( diff --git a/apps/web/src/components/affine/operation-menu-items/MoveTo.tsx b/apps/web/src/components/affine/operation-menu-items/MoveTo.tsx index 5e71c070f1..495352af7c 100644 --- a/apps/web/src/components/affine/operation-menu-items/MoveTo.tsx +++ b/apps/web/src/components/affine/operation-menu-items/MoveTo.tsx @@ -49,7 +49,7 @@ export const MoveTo = ({ } - placement="bottom-end" + // placement="bottom-end" disablePortal={true} trigger="click" > diff --git a/apps/web/src/components/blocksuite/block-suite-page-list/page-list/OperationCell.tsx b/apps/web/src/components/blocksuite/block-suite-page-list/page-list/OperationCell.tsx index 4946587160..54c97a4c8a 100644 --- a/apps/web/src/components/blocksuite/block-suite-page-list/page-list/OperationCell.tsx +++ b/apps/web/src/components/blocksuite/block-suite-page-list/page-list/OperationCell.tsx @@ -69,7 +69,13 @@ export const OperationCell: React.FC = ({ favorite ? t('Removed from Favorites') : t('Added to Favorites') ); }} - icon={favorite ? : } + icon={ + favorite ? ( + + ) : ( + + ) + } > {favorite ? t('Remove from favorites') : t('Add to Favorites')} @@ -98,7 +104,7 @@ export const OperationCell: React.FC = ({ diff --git a/apps/web/src/components/blocksuite/workspace-header/header-right-items/EditorOptionMenu.tsx b/apps/web/src/components/blocksuite/workspace-header/header-right-items/EditorOptionMenu.tsx index a3733aed04..73a42dd1ff 100644 --- a/apps/web/src/components/blocksuite/workspace-header/header-right-items/EditorOptionMenu.tsx +++ b/apps/web/src/components/blocksuite/workspace-header/header-right-items/EditorOptionMenu.tsx @@ -93,7 +93,7 @@ export const EditorOptionMenu = () => { diff --git a/apps/web/src/components/blocksuite/workspace-header/header-right-items/UserAvatar.tsx b/apps/web/src/components/blocksuite/workspace-header/header-right-items/UserAvatar.tsx index 742bccd06f..3bd6b22aa3 100644 --- a/apps/web/src/components/blocksuite/workspace-header/header-right-items/UserAvatar.tsx +++ b/apps/web/src/components/blocksuite/workspace-header/header-right-items/UserAvatar.tsx @@ -16,7 +16,7 @@ export const UserAvatar = () => { diff --git a/apps/web/src/components/pure/help-island/index.tsx b/apps/web/src/components/pure/help-island/index.tsx index 51fb0ebca5..39f6669270 100644 --- a/apps/web/src/components/pure/help-island/index.tsx +++ b/apps/web/src/components/pure/help-island/index.tsx @@ -108,7 +108,7 @@ export const HelpIsland = ({ - + diff --git a/apps/web/src/components/pure/help-island/style.ts b/apps/web/src/components/pure/help-island/style.ts index 0e530d89ea..d8a52d58a2 100644 --- a/apps/web/src/components/pure/help-island/style.ts +++ b/apps/web/src/components/pure/help-island/style.ts @@ -7,17 +7,14 @@ export const StyledIsland = styled('div')<{ transition: 'box-shadow 0.2s', width: '44px', position: 'relative', - boxShadow: spread - ? '4px 4px 7px rgba(58, 76, 92, 0.04), -4px -4px 13px rgba(58, 76, 92, 0.02), 6px 6px 36px rgba(58, 76, 92, 0.06)' - : 'unset', + boxShadow: spread ? 'var(--affine-menu-shadow)' : 'unset', padding: '0 4px 44px', borderRadius: '10px', background: spread ? 'var(--affine-background-overlay-panel-color)' - : 'transparent', + : 'var(--affine-background-primary-color)', ':hover': { - boxShadow: - '4px 4px 7px rgba(58, 76, 92, 0.04), -4px -4px 13px rgba(58, 76, 92, 0.02), 6px 6px 36px rgba(58, 76, 92, 0.06)', + background: spread ? null : 'var(--affine-white)', }, '::after': { content: '""', @@ -58,7 +55,9 @@ export const StyledAnimateWrapper = styled('div')(() => ({ overflow: 'hidden', })); -export const StyledTriggerWrapper = styled('div')(({ theme }) => { +export const StyledTriggerWrapper = styled('div')<{ + spread?: boolean; +}>(({ theme, spread }) => { return { width: '36px', height: '36px', @@ -70,6 +69,7 @@ export const StyledTriggerWrapper = styled('div')(({ theme }) => { ...positionAbsolute({ left: '4px', bottom: '4px' }), ':hover': { color: 'var(--affine-primary-color)', + backgroundColor: spread ? 'var(--affine-hover-color)' : null, }, }; }); diff --git a/apps/web/src/components/pure/shortcuts-modal/style.ts b/apps/web/src/components/pure/shortcuts-modal/style.ts index e73ac3c282..168e9d3dd4 100644 --- a/apps/web/src/components/pure/shortcuts-modal/style.ts +++ b/apps/web/src/components/pure/shortcuts-modal/style.ts @@ -6,7 +6,7 @@ export const StyledShortcutsModal = styled('div')(({ theme }) => ({ paddingBottom: '28px', backgroundColor: 'var(--affine-white)', boxShadow: 'var(--affine-popover-shadow)', - borderRadius: `var(--affine-popover-radius) 0 var(--affine-popover-radius) var(--affine-popover-radius)`, + borderRadius: `var(--affine-popover-radius)`, overflow: 'auto', boxRadius: '10px', position: 'fixed', diff --git a/packages/component/src/components/share-menu/ShareMenu.tsx b/packages/component/src/components/share-menu/ShareMenu.tsx index 61bc83d127..81d1b26e75 100644 --- a/packages/component/src/components/share-menu/ShareMenu.tsx +++ b/packages/component/src/components/share-menu/ShareMenu.tsx @@ -123,7 +123,7 @@ export const ShareMenu: FC = props => {