Jayden/AFFiNE-Mirror
1
0
Fork 0
mirror of https://github.com/toeverything/AFFiNE.git synced 2026-02-12 04:18:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: settings style update (#3161)

Browse Source
This commit is contained in:
Peng Xiao
2023-07-11 20:55:28 +08:00
committed by GitHub
parent 6ad2d106bc
commit d88a21d24a
9 changed files with 45 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
apps/web/src/atoms/settings.ts
View File

@@ -1,3 +1,4 @@
import { isDesktop } from '@affine/env/constant';
import { atom, useAtom } from 'jotai';
import { atomWithStorage } from 'jotai/utils';
@@ -49,7 +50,7 @@ export const fontStyleOptions = [
}[];
const appSettingBaseAtom = atomWithStorage<AppSetting>('affine-settings', {
clientBorder: false,
clientBorder: isDesktop,
fullWidthLayout: false,
windowFrameStyle: 'frameless',
fontStyle: 'Sans',

2
apps/web/src/components/affine/setting-modal/general-setting/appearance/index.tsx
View File

@@ -120,7 +120,7 @@ export const AppearanceSettings = () => {
<LanguageMenu triggerProps={{ size: 'small' }} />
</div>
</SettingRow>
{runtimeConfig.enableNewSettingUnstableApi && environment.isDesktop ? (
{environment.isDesktop ? (
<SettingRow
name={t['Client Border Style']()}
desc={t['Customize the appearance of the client.']()}

3
apps/web/src/components/affine/setting-modal/style.css.ts
View File

@@ -4,7 +4,7 @@ export const settingContent = style({
flexGrow: '1',
height: '100%',
padding: '40px 15px 20px',
overflowX: 'auto',
overflow: 'auto',
});
globalStyle(`${settingContent} .wrapper`, {
@@ -13,7 +13,6 @@ globalStyle(`${settingContent} .wrapper`, {
height: '100%',
maxWidth: '560px',
margin: '0 auto',
overflowY: 'auto',
});
globalStyle(`${settingContent} .content`, {
minHeight: '100%',

11
apps/web/src/components/blocksuite/workspace-header/styles.css.ts
View File

@@ -210,6 +210,7 @@ export const windowAppControlsWrapper = style({
display: 'flex',
gap: '2px',
transform: 'translateX(8px)',
height: '100%',
});
export const windowAppControl = style({
@@ -217,11 +218,17 @@ export const windowAppControl = style({
cursor: 'pointer',
display: 'inline-flex',
width: '42px',
height: '32px',
height: 'calc(100% - 10px)',
paddingTop: '10px',
alignItems: 'center',
justifyContent: 'center',
borderRadius: '4px',
borderRadius: '0',
selectors: {
'&[data-type="close"]': {
width: '56px',
paddingRight: '14px',
marginRight: '-14px',
},
'&[data-type="close"]:hover': {
background: 'var(--affine-error-color)',
color: '#FFFFFF',

5
apps/web/src/layouts/workspace-layout.tsx
View File

@@ -46,6 +46,7 @@ import {
openWorkspacesModalAtom,
} from '../atoms';
import { useTrackRouterHistoryEffect } from '../atoms/history';
import { useAppSetting } from '../atoms/settings';
import { AppContainer } from '../components/affine/app-container';
import type { IslandItemNames } from '../components/pure/help-island';
import { HelpIsland } from '../components/pure/help-island';
@@ -335,6 +336,8 @@ export const WorkspaceLayoutInner: FC<PropsWithChildren> = ({ children }) => {
[moveToTrash, t]
);
const [appSetting] = useAppSetting();
return (
<>
<Head>
@@ -364,7 +367,7 @@ export const WorkspaceLayoutInner: FC<PropsWithChildren> = ({ children }) => {
currentPath={router.asPath.split('?')[0]}
paths={isPublicWorkspace ? publicPathGenerator : pathGenerator}
/>
<MainContainer>
<MainContainer padding={appSetting.clientBorder}>
{children}
<ToolContainer>
<BlockHubWrapper blockHubAtom={rootBlockHubAtom} />