feat(design): conformite marque de l etat

SocialGouv · Aug 12, 2021 · 7916064 · 7916064
1 parent f2c3822
commit 7916064
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 51 deletions.
diff --git a/public/Ministere_des_Solidarites_et_de_la_Sante.png b/public/Ministere_des_Solidarites_et_de_la_Sante.png
diff --git a/src/components/common/Logo/Logo.js b/src/components/common/Logo/Logo.js
@@ -2,16 +2,16 @@ import PropTypes from "prop-types";
 import React from "react";
 import { Box, Flex, Text } from "rebass";
 
-import { Marianne } from "./Marianne";
+import LogoEtat from "../LogoEtat";
 import { logoStyle, logoTextStyle } from "./style";
 
 const Logo = (props) => {
   const { hasTitle, title } = props;
 
   return (
     <Flex>
-      <Box sx={logoStyle}>
-        <Marianne />
+      <Box sx={logoStyle} mr="6">
+        <LogoEtat />
       </Box>
       {hasTitle && (
         <Box>

diff --git a/src/components/common/Logo/Marianne.js b/src/components/common/Logo/Marianne.js
diff --git a/src/components/common/Logo/style.js b/src/components/common/Logo/style.js
@@ -8,6 +8,7 @@ const logoTextStyle = {
   fontWeight: 500,
   lineHeight: "46px",
   ml: 3,
+  mt: 2,
   "@media screen and (max-width: 700px)": {
     fontSize: 3,
     ml: 5,

diff --git a/src/components/common/LogoEtat/index.js b/src/components/common/LogoEtat/index.js
@@ -0,0 +1,13 @@
+import React from "react";
+
+function LogoEtat(props) {
+  return (
+    <img
+      src="/Ministere_des_Solidarites_et_de_la_Sante.png"
+      alt="Ministère des Solidarités et de la Santé"
+      {...props}
+    />
+  );
+}
+
+export default LogoEtat;
diff --git a/src/pages/_app.js b/src/pages/_app.js
@@ -44,7 +44,7 @@ function App({ Component, pageProps }) {
           }
         `}</style>
       </Head>
-      {router.pathname !== "/" && <Header />}
+      <Header />
       <Component {...pageProps} />
       <Footer landing />
     </ThemeProvider>