fix(theme): fix theme issue

gregberge · Jan 21, 2019 · 8f912e0 · 8f912e0
1 parent 6ecd010
commit 8f912e0
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 11 deletions.
diff --git a/src/components/BaseLayout.js b/src/components/BaseLayout.js
@@ -2,8 +2,8 @@ import React from 'react'
 import { styled, th, css } from '@smooth-ui/core-sc'
 import { WebsiteHeader } from './WebsiteHeader'
 import { ProjectHeader } from './ProjectHeader'
-import { GlobalStyle } from './GlobalStyle'
 import { Head } from './Head'
+import { ThemeProvider } from './ThemeProvider'
 
 const Headers = styled.div`
   position: fixed;
@@ -26,13 +26,14 @@ const PageWrapper = styled.div`
 `
 
 export const BaseLayout = ({ children, pageContext, variant = 'default' }) => (
-  <div>
-    <GlobalStyle />
-    <Head pageContext={pageContext} />
-    <Headers>
-      <WebsiteHeader />
-      <ProjectHeader />
-    </Headers>
-    <PageWrapper variant={variant}>{children}</PageWrapper>
-  </div>
+  <ThemeProvider>
+    <div>
+      <Head pageContext={pageContext} />
+      <Headers>
+        <WebsiteHeader />
+        <ProjectHeader />
+      </Headers>
+      <PageWrapper variant={variant}>{children}</PageWrapper>
+    </div>
+  </ThemeProvider>
 )
diff --git a/src/components/RootWrapper.js b/src/components/RootWrapper.js
@@ -2,6 +2,7 @@ import React from 'react'
 import { MDXProvider } from '@mdx-js/tag'
 import { th, styled, down, css } from '@smooth-ui/core-sc'
 import { ThemeProvider } from './ThemeProvider'
+import { GlobalStyle } from './GlobalStyle'
 import { Code } from './Code'
 
 const Editor = styled.div`
@@ -39,7 +40,12 @@ const components = {
 export function RootWrapper({ children }) {
   return (
     <ThemeProvider>
-      <MDXProvider components={components}>{children}</MDXProvider>
+      <MDXProvider components={components}>
+        <>
+          <GlobalStyle />
+          {children}
+        </>
+      </MDXProvider>
     </ThemeProvider>
   )
 }