diff --git a/apps/core/src/components/affine/setting-modal/index.tsx b/apps/core/src/components/affine/setting-modal/index.tsx index 8a37faee1a..c34ee751c7 100644 --- a/apps/core/src/components/affine/setting-modal/index.tsx +++ b/apps/core/src/components/affine/setting-modal/index.tsx @@ -12,7 +12,7 @@ import { useGeneralSettingList, } from './general-setting'; import { SettingSidebar } from './setting-sidebar'; -import { footerIconWrapper, settingContent } from './style.css'; +import * as style from './style.css'; import { WorkspaceSetting } from './workspace-setting'; type ActiveTab = GeneralSettingKeys | 'workspace' | 'account'; @@ -84,33 +84,32 @@ export const SettingModal = ({ onAccountSettingClick={onAccountSettingClick} /> -
-
-
- {activeTab === 'workspace' && workspaceId ? ( - }> - - - ) : null} - {generalSettingList.find(v => v.key === activeTab) ? ( - - ) : null} - {activeTab === 'account' && loginStatus === 'authenticated' ? ( - - ) : null} -
-
-
+
+
+ {activeTab === 'workspace' && workspaceId ? ( + }> + + + ) : null} + {generalSettingList.find(v => v.key === activeTab) ? ( + + ) : null} + {activeTab === 'account' && loginStatus === 'authenticated' ? ( + + ) : null} +
+ - - {t['com.affine.settings.suggestion']()} - -
+ + {t['com.affine.settings.suggestion']()} +
diff --git a/apps/core/src/components/affine/setting-modal/style.css.ts b/apps/core/src/components/affine/setting-modal/style.css.ts index a732d28d63..527c59ba04 100644 --- a/apps/core/src/components/affine/setting-modal/style.css.ts +++ b/apps/core/src/components/affine/setting-modal/style.css.ts @@ -1,45 +1,38 @@ -import { globalStyle, style } from '@vanilla-extract/css'; +import { style } from '@vanilla-extract/css'; -export const settingContent = style({ +export const wrapper = style({ flexGrow: '1', height: '100%', - padding: '40px 15px', - overflow: 'hidden', -}); - -globalStyle(`${settingContent} .wrapper`, { - padding: '0 15px', - height: '100%', maxWidth: '560px', margin: '0 auto', - overflowY: 'auto', -}); + padding: '40px 15px 20px 15px', + overflow: 'hidden auto', -globalStyle(`${settingContent} .wrapper::-webkit-scrollbar`, { - display: 'none', -}); -globalStyle(`${settingContent} .content`, { - minHeight: '100%', - paddingBottom: '80px', -}); -globalStyle(`${settingContent} .footer`, { - cursor: 'pointer', - paddingTop: '40px', - marginTop: '-80px', - fontSize: 'var(--affine-font-sm)', + // children display: 'flex', - minHeight: '100px', + flexDirection: 'column', + justifyContent: 'space-between', + alignItems: 'center', + + '::-webkit-scrollbar': { + display: 'none', + }, }); -globalStyle(`${settingContent} .footer a`, { - color: 'var(--affine-text-primary-color)', - lineHeight: 'normal', +export const content = style({ + width: '100%', + marginBottom: '24px', }); -export const footerIconWrapper = style({ - fontSize: 'var(--affine-font-base)', - color: 'var(--affine-icon-color)', - marginRight: '12px', - height: '19px', + +export const suggestionLink = style({ + fontSize: 'var(--affine-font-sm)', + color: 'var(--affine-text-primary-color)', display: 'flex', alignItems: 'center', }); + +export const suggestionLinkIcon = style({ + color: 'var(--affine-icon-color)', + marginRight: '12px', + display: 'flex', +});