diff --git a/src/frontend/apps/desk/src/features/header/assets/icon-gouv.svg b/src/frontend/apps/desk/src/assets/icons/icon-gouv.svg similarity index 100% rename from src/frontend/apps/desk/src/features/header/assets/icon-gouv.svg rename to src/frontend/apps/desk/src/assets/icons/icon-gouv.svg diff --git a/src/frontend/apps/desk/src/features/header/assets/icon-marianne.svg b/src/frontend/apps/desk/src/assets/icons/icon-marianne.svg similarity index 100% rename from src/frontend/apps/desk/src/features/header/assets/icon-marianne.svg rename to src/frontend/apps/desk/src/assets/icons/icon-marianne.svg diff --git a/src/frontend/apps/desk/src/components/Box.tsx b/src/frontend/apps/desk/src/components/Box.tsx index 2dd8562..a4ab116 100644 --- a/src/frontend/apps/desk/src/components/Box.tsx +++ b/src/frontend/apps/desk/src/components/Box.tsx @@ -28,6 +28,7 @@ export interface BoxProps { $position?: CSSProperties['position']; $radius?: CSSProperties['borderRadius']; $width?: CSSProperties['width']; + $zIndex?: CSSProperties['zIndex']; } export type BoxType = ComponentPropsWithRef; @@ -53,4 +54,5 @@ export const Box = styled('div')` ${({ $maxWidth }) => $maxWidth && `max-width: ${$maxWidth};`} ${({ $minWidth }) => $minWidth && `min-width: ${$minWidth};`} ${({ $css }) => $css && `${$css};`} + ${({ $zIndex }) => $zIndex && `z-index: ${$zIndex};`} `; diff --git a/src/frontend/apps/desk/src/components/Link.tsx b/src/frontend/apps/desk/src/components/Link.tsx index 8081db2..b84de0d 100644 --- a/src/frontend/apps/desk/src/components/Link.tsx +++ b/src/frontend/apps/desk/src/components/Link.tsx @@ -1,11 +1,16 @@ import Link from 'next/link'; import styled from 'styled-components'; -export const StyledLink = styled(Link)` +export interface LinkProps { + $css?: string; +} + +export const StyledLink = styled(Link)` text-decoration: none; color: #ffffff33; &[aria-current='page'] { color: #ffffff; } display: flex; + ${({ $css }) => $css && `${$css};`} `; diff --git a/src/frontend/apps/desk/src/core/MainLayout.tsx b/src/frontend/apps/desk/src/core/MainLayout.tsx index 77bdc54..617e004 100644 --- a/src/frontend/apps/desk/src/core/MainLayout.tsx +++ b/src/frontend/apps/desk/src/core/MainLayout.tsx @@ -1,19 +1,27 @@ import { PropsWithChildren } from 'react'; import { Box } from '@/components'; +import { Footer } from '@/features/footer/Footer'; import { HEADER_HEIGHT, Header } from '@/features/header'; import { Menu } from '@/features/menu'; export function MainLayout({ children }: PropsWithChildren) { return ( - -
- - - - {children} + + +
+ + + + {children} + +