From 54cb1d4d7094e9ea6157d5f82a4b2a60c2767f7b Mon Sep 17 00:00:00 2001
From: David Darnes <me@daviddarnes.com>
Date: Wed, 6 Nov 2019 17:58:03 +0700
Subject: [PATCH] Clear up header

---
 assets/css/components/content.css | 24 +++++++++++++++++++-----
 page.hbs                          | 12 ++++++++++++
 post.hbs                          | 10 ++++------
 3 files changed, 35 insertions(+), 11 deletions(-)

diff --git a/assets/css/components/content.css b/assets/css/components/content.css
index 2da4f671..73dc8640 100644
--- a/assets/css/components/content.css
+++ b/assets/css/components/content.css
@@ -1,4 +1,10 @@
 
+/* Main
+/* ---------------------------------------------------------- */
+.gh-main {
+    margin: 2rem 0;
+}
+
 /* Content grid
 /* ---------------------------------------------------------- */
 .gh-canvas {
@@ -100,24 +106,32 @@
 /* Post header
 /* ---------------------------------------------------------- */
 
-.gh-post-header {
+.gh-header {
     grid-row-gap: 2rem;
 }
 
-.gh-post-title,
-.gh-post-image {
+.gh-title,
+.gh-image {
     grid-row: 1 / 2;
     align-self: end;
 }
 
-.gh-post-excerpt {
+.gh-excerpt {
     grid-row: 2 / 3;
 }
 
-.gh-post-image {
+.gh-image {
     grid-column: full-start / full-end;
 }
 
+.gh-title {
+    margin-top: 2rem;
+}
+
+.gh-post-footer {
+    margin: 2rem 0;
+}
+
 /* Standard content
 /* ---------------------------------------------------------- */
 
diff --git a/page.hbs b/page.hbs
index cc243844..79d1f2d9 100644
--- a/page.hbs
+++ b/page.hbs
@@ -3,6 +3,18 @@
 {{#post}}
 <article class="gh-page {{post_class}} {{#unless feature_image}}no-image{{/unless}}">
 
+    <header class="gh-header gh-canvas">
+        {{#if feature_image}}
+            <img class="gh-image" src="{{feature_image}}" alt="{{title}}" />
+        {{/if}}
+
+        <h1 class="gh-title">{{title}}</h1>
+
+        {{#if custom_excerpt}}
+            <p class="gh-excerpt">{{custom_excerpt}}</p>
+        {{/if}}
+    </header>
+
     <div class="gh-content gh-canvas">
         {{content}}
     </div>
diff --git a/post.hbs b/post.hbs
index d13ed322..609a46e9 100644
--- a/post.hbs
+++ b/post.hbs
@@ -3,17 +3,15 @@
 {{#post}}
 <article class="gh-post {{post_class}}">
 
-    <header class="gh-post-header gh-canvas">
+    <header class="gh-header gh-canvas">
         {{#if feature_image}}
-            <div class="gh-post-image">
-                <img class="kg-image" src="{{feature_image}}" alt="{{title}}" />
-            </div>
+            <img class="gh-image" src="{{feature_image}}" alt="{{title}}" />
         {{/if}}
 
-        <h1 class="gh-post-title">{{title}}</h1>
+        <h1 class="gh-title">{{title}}</h1>
 
         {{#if custom_excerpt}}
-            <p class="gh-post-excerpt">{{custom_excerpt}}</p>
+            <p class="gh-excerpt">{{custom_excerpt}}</p>
         {{/if}}
     </header>