Add tagline to logo

2 files changed, 11 insertions, 4 deletions

diff --git a/src/components/logo/logo.css b/src/components/logo/logo.css
index 823273f..13b102c 100644
--- a/src/components/logo/logo.css
+++ b/src/components/logo/logo.css
@@ -1,10 +1,16 @@
 @import "../../globals.css";
+@import "../layout/layout.css";
 
-.logo {
-  composes: marginMixin;
+.logoText {
+  margin: 0;
   padding: 0.5em 0 0 0;
   line-height: 0.5em;
   font-family: 'BeachBar-Bold';
   color: var(--logoColor);
   @apply --logoSize;
 }
+
+.logo {
+  composes: marginMixin;
+  composes: layout;
+}
diff --git a/src/components/logo/logo.js b/src/components/logo/logo.js
index 53a63c1..7c4f4e2 100644
--- a/src/components/logo/logo.js
+++ b/src/components/logo/logo.js
@@ -1,10 +1,11 @@
 import React from 'react';
 
-import { logo } from './logo.css'
+import { logo, logoText } from './logo.css'
 
 const Logo = p =>
   <div className={logo}>
-    {p.children}
+    <h1 className={logoText}>{p.name}</h1>
+    <h2>{p.tagline}</h2>
   </div>
 
 export default Logo