Merge branch 'master' into development

ConductionNL · Nov 5, 2021 · 56116e7 · 56116e7
2 parents 1d7f5f1 + 5f6589f
commit 56116e7
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/pwa/gatsby-browser.js b/pwa/gatsby-browser.js
@@ -2,11 +2,13 @@ import React, {useEffect} from "react";
 import "@utrecht/design-tokens/dist/theme/index.css";
 import Layout from "./src/components/common/layout";
 import {UrlContextWrapper} from "./src/context/urlContext";
+import {Helmet} from "react-helmet";
 
 export const wrapRootElement = ({ element }) => (
     <UrlContextWrapper>
-      <div className="utrecht-document utrecht-theme">
         {element}
-      </div>
+      <Helmet>
+        <script src="https://unpkg.com/@nl-design-system-unstable/theme-switcher" />
+      </Helmet>
     </UrlContextWrapper>
 )
diff --git a/pwa/src/components/common/layout.js b/pwa/src/components/common/layout.js
@@ -22,6 +22,7 @@ export default function Layout({ children }) {
     return (
         <>
             <ThemeProvider theme={theme}>
+              <div className="utrecht-document utrecht-theme">
                 <div className="utrecht-page">
                   <Header/>
                   <MainMenu />
@@ -34,6 +35,7 @@ export default function Layout({ children }) {
                     </div>
                   <Footer />
                 </div>
+              </div>
             </ThemeProvider>
         </>
     )