fix: put back Marianne 👧 + tailwind (#1024)

SocialGouv · Aug 4, 2023 · e4db769 · e4db769
1 parent 9d966a0
commit e4db769
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 35 deletions.
diff --git a/src/app/globals.css b/src/app/globals.css
@@ -1,4 +1,4 @@
-/* @tailwind base;
+@tailwind base;
 @tailwind components;
 @tailwind utilities;
 
@@ -18,10 +18,6 @@
 
 body {
   color: rgb(var(--foreground-rgb));
-  background: linear-gradient(
-      to bottom,
-      transparent,
-      rgb(var(--background-end-rgb))
-    )
+  background: linear-gradient(to bottom, transparent, rgb(var(--background-end-rgb)))
     rgb(var(--background-start-rgb));
-} */
+}
diff --git a/src/app/layout.tsx b/src/app/layout.tsx
@@ -1,6 +1,5 @@
-import './globals.css'
-import type { Metadata } from 'next'
-import { Inter } from 'next/font/google'
+import "./globals.css";
+import type { Metadata } from "next";
 
 import { defaultColorScheme } from "./defaultColorScheme";
 import { DsfrHead } from "@codegouvfr/react-dsfr/next-appdir/DsfrHead";
@@ -12,44 +11,40 @@ import Link from "next/link";
 import Header from "./components/Header";
 import Footer from "./components/Footer";
 
-const inter = Inter({ subsets: ['latin'] })
-
 export const metadata: Metadata = {
-  title: 'Create Next App',
-  description: 'Generated by create next app',
-}
+  title: "Create Next App",
+  description: "Generated by create next app",
+};
 
-export default function RootLayout({
-  children,
-}: {
-  children: React.ReactNode
-}) {
+export default function RootLayout({ children }: { children: React.ReactNode }) {
   const lang = "fr";
   return (
     <html {...getHtmlAttributes({ defaultColorScheme, lang })}>
       <head>
         <StartDsfr />
-        <DsfrHead Link={Link}
-        preloadFonts={[
-          //"Marianne-Light",
-          //"Marianne-Light_Italic",
-          "Marianne-Regular",
-          //"Marianne-Regular_Italic",
-          "Marianne-Medium",
-          //"Marianne-Medium_Italic",
-          "Marianne-Bold",
-          //"Marianne-Bold_Italic",
-          //"Spectral-Regular",
-          //"Spectral-ExtraBold"
-        ]} />
+        <DsfrHead
+          Link={Link}
+          preloadFonts={[
+            //"Marianne-Light",
+            //"Marianne-Light_Italic",
+            "Marianne-Regular",
+            //"Marianne-Regular_Italic",
+            "Marianne-Medium",
+            //"Marianne-Medium_Italic",
+            "Marianne-Bold",
+            //"Marianne-Bold_Italic",
+            //"Spectral-Regular",
+            //"Spectral-ExtraBold"
+          ]}
+        />
       </head>
-      <body className={inter.className}>
+      <body>
         <DsfrProvider lang={lang}>
           <Header />
           {children}
           <Footer />
         </DsfrProvider>
       </body>
     </html>
-  )
+  );
 }