From bdd0624af07450e95725b942d4b0323f71c97cae Mon Sep 17 00:00:00 2001
From: Matthias Kretschmann <m@kretschmann.io>
Date: Thu, 16 Aug 2018 16:00:42 +0200
Subject: [PATCH] updates and refactoring

---
 gatsby-browser.js                           | 2 +-
 package.json                                | 4 ++--
 src/components/atoms/LogoUnit.jsx           | 4 +---
 src/components/atoms/LogoUnit.module.scss   | 1 +
 src/components/organisms/Header.jsx         | 6 +-----
 src/components/organisms/Header.module.scss | 1 +
 src/styles/{base.scss => global.scss}       | 0
 7 files changed, 7 insertions(+), 11 deletions(-)
 rename src/styles/{base.scss => global.scss} (100%)

diff --git a/gatsby-browser.js b/gatsby-browser.js
index 2f3892a..78851ef 100644
--- a/gatsby-browser.js
+++ b/gatsby-browser.js
@@ -1,4 +1,4 @@
-require('./src/styles/base.scss')
+require('./src/styles/global.scss')
 
 exports.onClientEntry = () => {
   // IntersectionObserver polyfill for gatsby-image (Safari, IE)
diff --git a/package.json b/package.json
index bc9c78f..2ed94a2 100644
--- a/package.json
+++ b/package.json
@@ -21,14 +21,14 @@
   },
   "dependencies": {
     "file-saver": "^1.3.8",
-    "gatsby": "^2.0.0-beta.105",
+    "gatsby": "^2.0.0-beta.106",
     "gatsby-image": "^2.0.0-beta.8",
     "gatsby-plugin-manifest": "^2.0.2-beta.6",
     "gatsby-plugin-matomo": "^0.5.0",
     "gatsby-plugin-offline": "^2.0.0-beta.9",
     "gatsby-plugin-react-helmet": "^3.0.0-beta.4",
     "gatsby-plugin-sass": "^2.0.0-beta.10",
-    "gatsby-plugin-sharp": "^2.0.0-beta.7",
+    "gatsby-plugin-sharp": "^2.0.0-beta.8",
     "gatsby-plugin-sitemap": "^2.0.0-beta.4",
     "gatsby-source-filesystem": "^2.0.1-beta.10",
     "gatsby-transformer-json": "^2.1.1-beta.5",
diff --git a/src/components/atoms/LogoUnit.jsx b/src/components/atoms/LogoUnit.jsx
index f7dba7b..e7a5ba3 100644
--- a/src/components/atoms/LogoUnit.jsx
+++ b/src/components/atoms/LogoUnit.jsx
@@ -4,9 +4,7 @@ import Logo from '../svg/Logo'
 import styles from './LogoUnit.module.scss'
 
 const LogoUnit = ({ meta, minimal }) => {
-  const classes = minimal
-    ? `${styles.logounit} ${styles.minimal}`
-    : styles.logounit
+  const classes = minimal ? styles.minimal : styles.logounit
 
   return (
     <div className={classes}>
diff --git a/src/components/atoms/LogoUnit.module.scss b/src/components/atoms/LogoUnit.module.scss
index 7273691..6b4c6ae 100644
--- a/src/components/atoms/LogoUnit.module.scss
+++ b/src/components/atoms/LogoUnit.module.scss
@@ -43,6 +43,7 @@
 }
 
 .minimal {
+    composes: logounit;
     transform: scale(.7);
     transform-origin: top center;
     transform-box: border-box;
diff --git a/src/components/organisms/Header.jsx b/src/components/organisms/Header.jsx
index fce2edc..424db69 100644
--- a/src/components/organisms/Header.jsx
+++ b/src/components/organisms/Header.jsx
@@ -16,11 +16,7 @@ class Header extends PureComponent {
     const { isHomepage, meta } = this.props
 
     return (
-      <header
-        className={
-          isHomepage ? `${styles.header}` : `${styles.header} ${styles.minimal}`
-        }
-      >
+      <header className={isHomepage ? styles.header : styles.minimal}>
         <ThemeSwitch />
 
         <Link className={styles.header__link} to={'/'}>
diff --git a/src/components/organisms/Header.module.scss b/src/components/organisms/Header.module.scss
index 45a3b7f..62bb371 100644
--- a/src/components/organisms/Header.module.scss
+++ b/src/components/organisms/Header.module.scss
@@ -19,6 +19,7 @@
 }
 
 .minimal {
+    composes: header;
     height: auto;
     padding-top: $spacer * 2;
     padding-bottom: 0;
diff --git a/src/styles/base.scss b/src/styles/global.scss
similarity index 100%
rename from src/styles/base.scss
rename to src/styles/global.scss