Merge pull request #675 from ajnart/fix-overflow-docker-drawer

💄 Fix overflow in about modal and docker drawer #674
This commit is contained in:
Thomas Camlong
2023-02-02 19:02:12 +09:00
committed by GitHub
4 changed files with 51 additions and 31 deletions

View File

@@ -5,6 +5,7 @@ import {
Button,
createStyles,
Divider,
Grid,
Group,
HoverCard,
Modal,
@@ -86,35 +87,45 @@ export const AboutModal = ({ opened, closeModal, newVersionAvailable }: AboutMod
{t('layout/modals/about:contact')}
</Title>
<Group grow>
<Button
component="a"
href="https://github.com/ajnart/homarr"
target="_blank"
leftIcon={<IconBrandGithub size={20} />}
variant="default"
>
GitHub
</Button>
<Button
component="a"
href="https://homarr.dev/"
target="_blank"
leftIcon={<IconWorldWww size={20} />}
variant="default"
>
Documentation
</Button>
<Button
component="a"
href="https://discord.gg/aCsmEV5RgA"
target="_blank"
leftIcon={<IconBrandDiscord size={20} />}
variant="default"
>
Discord
</Button>
</Group>
<Grid grow>
<Grid.Col md={4} xs={12}>
<Button
component="a"
href="https://github.com/ajnart/homarr"
target="_blank"
leftIcon={<IconBrandGithub size={20} />}
variant="default"
fullWidth
>
GitHub
</Button>
</Grid.Col>
<Grid.Col md={4} xs={12}>
<Button
component="a"
href="https://homarr.dev/"
target="_blank"
leftIcon={<IconWorldWww size={20} />}
variant="default"
fullWidth
>
Documentation
</Button>
</Grid.Col>
<Grid.Col md={4} xs={12}>
<Button
component="a"
href="https://discord.gg/aCsmEV5RgA"
target="_blank"
leftIcon={<IconBrandDiscord size={20} />}
variant="default"
fullWidth
>
Discord
</Button>
</Grid.Col>
</Grid>
<Credits />
</Modal>
);

View File

@@ -2,7 +2,7 @@ import { Badge, Button, Menu } from '@mantine/core';
import { useDisclosure } from '@mantine/hooks';
import { IconInfoCircle, IconMenu2, IconSettings } from '@tabler/icons';
import { useTranslation } from 'next-i18next';
import { AboutModal } from '../../About/AboutModal';
import { AboutModal } from '../../Dashboard/Modals/AboutModal/AboutModal';
import { SettingsDrawer } from '../../Settings/SettingsDrawer';
import { useCardStyles } from '../useCardStyles';
import { ColorSchemeSwitch } from './SettingsMenu/ColorSchemeSwitch';

View File

@@ -68,6 +68,15 @@ export default function DockerMenuButton(props: any) {
position="right"
size="full"
title={<ContainerActionBar selected={selection} reload={reload} />}
styles={{
drawer: {
display: 'flex',
flexDirection: 'column',
},
body: {
minHeight: 0,
},
}}
>
<DockerTable containers={containers} selection={selection} setSelection={setSelection} />
</Drawer>

View File

@@ -120,7 +120,7 @@ export default function DockerTable({
});
return (
<ScrollArea style={{ height: '90vh' }} offsetScrollbars>
<ScrollArea style={{ height: '100%' }} offsetScrollbars>
<TextInput
placeholder={t('search.placeholder')}
mr="md"