pogmommy/feishin
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Style fixes

Browse source
This commit is contained in:
jeffvli 2023-03-31 06:22:04 -07:00
parent cf4f80c82b
commit 0d9224bc09
2 changed files with 25 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
src/renderer/features/settings/components/settings-header.tsx
View file

@ -22,27 +22,29 @@ export const SettingsHeader = () => {
}; };
return ( return (
<PageHeader> <Flex>
<LibraryHeaderBar> <PageHeader>
<Flex <LibraryHeaderBar>
align="center" <Flex
justify="space-between" align="center"
w="100%" justify="space-between"
> w="100%"
<Group noWrap>
<RiSettings2Fill size="2rem" />
<LibraryHeaderBar.Title>Settings</LibraryHeaderBar.Title>
<LibraryHeaderBar.Badge>v{packageJson.version}</LibraryHeaderBar.Badge>
</Group>
<Button
compact
variant="default"
onClick={openResetConfirmModal}
> >
Reset to default <Group noWrap>
</Button> <RiSettings2Fill size="2rem" />
</Flex> <LibraryHeaderBar.Title>Settings</LibraryHeaderBar.Title>
</LibraryHeaderBar> <LibraryHeaderBar.Badge>v{packageJson.version}</LibraryHeaderBar.Badge>
</PageHeader> </Group>
<Button
compact
variant="default"
onClick={openResetConfirmModal}
>
Reset to default
</Button>
</Flex>
</LibraryHeaderBar>
</PageHeader>
</Flex>
); );
}; };

2
src/renderer/hooks/use-should-pad-titlebar.tsx
View file

@ -1,3 +1,4 @@
import isElectron from 'is-electron';
import { useLocation } from 'react-router'; import { useLocation } from 'react-router';
import { AppRoute } from '/@/renderer/router/routes'; import { AppRoute } from '/@/renderer/router/routes';
import { useSidebarRightExpanded, useGeneralSettings, useWindowSettings } from '/@/renderer/store'; import { useSidebarRightExpanded, useGeneralSettings, useWindowSettings } from '/@/renderer/store';
@ -11,6 +12,7 @@ export const useShouldPadTitlebar = () => {
const { windowBarStyle } = useWindowSettings(); const { windowBarStyle } = useWindowSettings();
const conditions = [ const conditions = [
isElectron(),
windowBarStyle === Platform.WEB, windowBarStyle === Platform.WEB,
!(isSidebarExpanded && sideQueueType === 'sideQueue' && !isQueuePage), !(isSidebarExpanded && sideQueueType === 'sideQueue' && !isQueuePage),
]; ];