diff --git a/inertia/components/footer/footer.module.css b/inertia/components/footer/footer.module.css index 246d367..7704b36 100644 --- a/inertia/components/footer/footer.module.css +++ b/inertia/components/footer/footer.module.css @@ -1,16 +1,11 @@ .footer { width: 100%; - margin-top: rem(40px); - border-top: rem(1px) solid - light-dark(var(--mantine-color-gray-2), var(--mantine-color-dark-5)); } .inner { display: flex; justify-content: space-between; align-items: center; - padding-top: var(--mantine-spacing-md); - padding-bottom: var(--mantine-spacing-md); @media (max-width: $mantine-breakpoint-xs) { flex-direction: column; diff --git a/inertia/pages/mantine_dashboard.tsx b/inertia/pages/mantine_dashboard.tsx index aee11d6..70ec81e 100644 --- a/inertia/pages/mantine_dashboard.tsx +++ b/inertia/pages/mantine_dashboard.tsx @@ -9,6 +9,7 @@ import { import { useDisclosure } from '@mantine/hooks'; import DashboardProviders from '~/components/dashboard/dashboard_provider'; import LinkItem from '~/components/dashboard/link/link_item'; +import { MantineFooter } from '~/components/footer/mantine_footer'; import { DashboardNavbar } from '~/mantine/components/dashboard/dashboard_navbar'; import { MantineDashboardLayout } from '~/mantine/layouts/mantine_dashboard_layout'; import { CollectionWithLinks } from '~/types/app'; @@ -30,7 +31,6 @@ export default function MantineDashboard(props: Readonly) { ) { breakpoint: 'md', collapsed: { mobile: !openedAside }, }} - padding={0} classNames={{ aside: classes.ml_bg_color, footer: classes.ml_bg_color, @@ -58,7 +57,7 @@ export default function MantineDashboard(props: Readonly) { hiddenFrom="sm" size="sm" /> - Ma super collection + {props.activeCollection.name} ) { /> - Footer + + +