diff --git a/packages/frontend/component/src/components/page-list/view/collection-list.tsx b/packages/frontend/component/src/components/page-list/view/collection-list.tsx index 0c6f949ab..563bef041 100644 --- a/packages/frontend/component/src/components/page-list/view/collection-list.tsx +++ b/packages/frontend/component/src/components/page-list/view/collection-list.tsx @@ -5,7 +5,7 @@ import type { } from '@affine/env/filter'; import type { PropertiesMeta } from '@affine/env/filter'; import { useAFFiNEI18N } from '@affine/i18n/hooks'; -import { FilteredIcon } from '@blocksuite/icons'; +import { FilterIcon } from '@blocksuite/icons'; import { Button } from '@toeverything/components/button'; import { Menu } from '@toeverything/components/menu'; import { useCallback, useState } from 'react'; @@ -75,7 +75,7 @@ export const CollectionList = ({ } + icon={} data-testid="create-first-filter" > {t['com.affine.filter']()} @@ -99,7 +99,7 @@ export const CollectionList = ({ } + icon={} data-testid="create-first-filter" > {t['com.affine.filter']()} diff --git a/packages/frontend/component/src/ui/button/styles.css.ts b/packages/frontend/component/src/ui/button/styles.css.ts index 4d9643b99..20e732ade 100644 --- a/packages/frontend/component/src/ui/button/styles.css.ts +++ b/packages/frontend/component/src/ui/button/styles.css.ts @@ -61,6 +61,7 @@ export const dropdownIcon = style({ export const radioButton = style({ flexGrow: 1, + flex: 1, selectors: { '&:not(:last-of-type)': { marginRight: '4px', @@ -72,7 +73,8 @@ export const radioButtonContent = style({ display: 'flex', justifyContent: 'center', alignItems: 'center', - height: '24px', + height: '28px', + padding: '4px 8px', borderRadius: '8px', filter: 'drop-shadow(0px 0px 4px rgba(0, 0, 0, 0.1))', whiteSpace: 'nowrap', diff --git a/packages/frontend/core/src/components/affine/language-menu/index.tsx b/packages/frontend/core/src/components/affine/language-menu/index.tsx index f27e7fcdc..8856057dc 100644 --- a/packages/frontend/core/src/components/affine/language-menu/index.tsx +++ b/packages/frontend/core/src/components/affine/language-menu/index.tsx @@ -33,13 +33,14 @@ export const LanguageMenu = () => { contentOptions={{ style: { background: 'var(--affine-white)', + width: '250px', }, align: 'end', }} > {currentLanguage?.originalName || ''} diff --git a/packages/frontend/core/src/components/affine/new-workspace-setting-detail/profile.tsx b/packages/frontend/core/src/components/affine/new-workspace-setting-detail/profile.tsx index 80eacda92..ef9722ab5 100644 --- a/packages/frontend/core/src/components/affine/new-workspace-setting-detail/profile.tsx +++ b/packages/frontend/core/src/components/affine/new-workspace-setting-detail/profile.tsx @@ -96,6 +96,8 @@ export const ProfilePanel = ({ workspace, isOwner }: ProfilePanelProps) => { [pushNotification, update] ); + const canAdjustAvatar = workspaceAvatar && isOwner; + return ( { name={name} colorfulFallback hoverIcon={isOwner ? : undefined} - onRemove={ - workspaceAvatar && isOwner ? handleRemoveUserAvatar : undefined + onRemove={canAdjustAvatar ? handleRemoveUserAvatar : undefined} + avatarTooltipOptions={ + canAdjustAvatar + ? { content: t['Click to replace photo']() } + : undefined + } + removeTooltipOptions={ + canAdjustAvatar ? { content: t['Remove photo']() } : undefined } - avatarTooltipOptions={{ content: t['Click to replace photo']() }} - removeTooltipOptions={{ content: t['Remove photo']() }} data-testid="workspace-setting-avatar" removeButtonProps={{ ['data-testid' as string]: 'workspace-setting-remove-avatar-button', diff --git a/packages/frontend/core/src/components/affine/setting-modal/setting-sidebar/index.tsx b/packages/frontend/core/src/components/affine/setting-modal/setting-sidebar/index.tsx index 337439b45..030b08fcc 100644 --- a/packages/frontend/core/src/components/affine/setting-modal/setting-sidebar/index.tsx +++ b/packages/frontend/core/src/components/affine/setting-modal/setting-sidebar/index.tsx @@ -38,16 +38,20 @@ import { export type UserInfoProps = { onAccountSettingClick: () => void; + active?: boolean; }; export const UserInfo = ({ onAccountSettingClick, + active, }: UserInfoProps): ReactElement => { const user = useCurrentUser(); return ( @@ -163,7 +167,10 @@ export const SettingSidebar = ({ {runtimeConfig.enableCloud && loginStatus === 'authenticated' ? ( - + ) : null} diff --git a/packages/frontend/core/src/components/affine/setting-modal/setting-sidebar/style.css.ts b/packages/frontend/core/src/components/affine/setting-modal/setting-sidebar/style.css.ts index 7b812e8f4..08abd856a 100644 --- a/packages/frontend/core/src/components/affine/setting-modal/setting-sidebar/style.css.ts +++ b/packages/frontend/core/src/components/affine/setting-modal/setting-sidebar/style.css.ts @@ -105,6 +105,11 @@ export const accountButton = style({ ':hover': { background: 'var(--affine-hover-color)', }, + selectors: { + '&.active': { + background: 'var(--affine-hover-color)', + }, + }, }); globalStyle(`${accountButton} .avatar`, { diff --git a/packages/frontend/core/src/components/affine/share-page-modal/share-menu/index.css.ts b/packages/frontend/core/src/components/affine/share-page-modal/share-menu/index.css.ts index 4cf8ffb4f..e8d56153e 100644 --- a/packages/frontend/core/src/components/affine/share-page-modal/share-menu/index.css.ts +++ b/packages/frontend/core/src/components/affine/share-page-modal/share-menu/index.css.ts @@ -112,9 +112,6 @@ export const radioButton = style({ }, }, }); -export const spanStyle = style({ - padding: '4px 20px', -}); export const disableSharePage = style({ color: 'var(--affine-error-color)', diff --git a/packages/frontend/core/src/components/affine/share-page-modal/share-menu/share-page.tsx b/packages/frontend/core/src/components/affine/share-page-modal/share-menu/share-page.tsx index d68479460..250bd718c 100644 --- a/packages/frontend/core/src/components/affine/share-page-modal/share-menu/share-page.tsx +++ b/packages/frontend/core/src/components/affine/share-page-modal/share-menu/share-page.tsx @@ -174,18 +174,10 @@ export const AffineSharePage = (props: ShareMenuProps) => { value={mode} onValueChange={onShareModeChange} > - + {t['com.affine.pageMode.page']()} - + {t['com.affine.pageMode.edgeless']()} diff --git a/packages/frontend/core/src/components/blocksuite/block-suite-header-title/styles.css.ts b/packages/frontend/core/src/components/blocksuite/block-suite-header-title/styles.css.ts index f59ac8413..d92135036 100644 --- a/packages/frontend/core/src/components/blocksuite/block-suite-header-title/styles.css.ts +++ b/packages/frontend/core/src/components/blocksuite/block-suite-header-title/styles.css.ts @@ -32,6 +32,8 @@ export const titleInput = style({ borderRadius: '8px', height: '32px', padding: '6px 8px', + borderColor: 'var(--affine-primary-color)', + boxShadow: 'var(--affine-active-shadow)', }, }, }); diff --git a/packages/frontend/core/src/components/pure/workspace-mode-filter-tab/index.css.ts b/packages/frontend/core/src/components/pure/workspace-mode-filter-tab/index.css.ts new file mode 100644 index 000000000..9a6505aa3 --- /dev/null +++ b/packages/frontend/core/src/components/pure/workspace-mode-filter-tab/index.css.ts @@ -0,0 +1,8 @@ +import { style } from '@vanilla-extract/css'; + +export const filterTab = style({ + fontSize: 'var(--affine-font-xs)', + fontWeight: 600, + textTransform: 'capitalize', + minWidth: '91px', +}); diff --git a/packages/frontend/core/src/components/pure/workspace-mode-filter-tab/index.tsx b/packages/frontend/core/src/components/pure/workspace-mode-filter-tab/index.tsx index c546fc270..61b8078c6 100644 --- a/packages/frontend/core/src/components/pure/workspace-mode-filter-tab/index.tsx +++ b/packages/frontend/core/src/components/pure/workspace-mode-filter-tab/index.tsx @@ -3,6 +3,7 @@ import { useAFFiNEI18N } from '@affine/i18n/hooks'; import { useAtom } from 'jotai'; import { allPageModeSelectAtom } from '../../../atoms'; +import * as styles from './index.css'; export const WorkspaceModeFilterTab = () => { const t = useAFFiNEI18N(); @@ -15,16 +16,14 @@ export const WorkspaceModeFilterTab = () => { }; return ( - - + + {t['com.affine.pageMode.all']()} - {t['com.affine.pageMode.page']()} - + + {t['com.affine.pageMode.page']()} + + {t['com.affine.pageMode.edgeless']()} diff --git a/packages/frontend/core/src/pages/workspace/collection.tsx b/packages/frontend/core/src/pages/workspace/collection.tsx index ef2f330d6..f66bb5fe7 100644 --- a/packages/frontend/core/src/pages/workspace/collection.tsx +++ b/packages/frontend/core/src/pages/workspace/collection.tsx @@ -118,6 +118,7 @@ const Placeholder = ({ collection }: { collection: Collection }) => { alignItems: 'center', gap: 8, padding: '12px 24px', + fontSize: 'var(--affine-font-xs)', }} > { color: 'var(--affine-text-secondary-color)', }} > - + {t['com.affine.collection.allCollections']()} /