From 7632b4058e443b5381248844f129540af4b621c0 Mon Sep 17 00:00:00 2001
From: Dan Head <me@danielhead.com>
Date: Sat, 15 Dec 2018 17:38:37 +0000
Subject: [PATCH] Fix layout issues in Webkit browsers

---
 css/content.css  |  1 -
 css/page.css     | 12 ++++++------
 theme/index.php  |  4 ++--
 theme/page.php   | 29 ++++++++++++-----------------
 theme/search.php | 12 +++++-------
 theme/single.php |  8 ++++----
 theme/tag.php    | 12 +++++-------
 7 files changed, 34 insertions(+), 44 deletions(-)

diff --git a/css/content.css b/css/content.css
index b9e321c..502fb28 100644
--- a/css/content.css
+++ b/css/content.css
@@ -1,6 +1,5 @@
 .content {
   border-bottom: 1px solid var(--color-light-grey);
-  margin-bottom: var(--space-md);
   padding-bottom: var(--space-md);
 }
 
diff --git a/css/page.css b/css/page.css
index 7a6ee91..60c4802 100644
--- a/css/page.css
+++ b/css/page.css
@@ -27,7 +27,8 @@
 @media (--viewport-lg) {
   .page {
     grid-template-columns: 224px 1fr;
-    grid-template-rows: 60px 134px;
+    grid-template-rows: 60px 134px 1fr;
+    grid-auto-rows: auto;
     grid-gap: var(--space-md);
     padding: 0 var(--space-md);
   }
@@ -45,16 +46,15 @@
   .page__content,
   .page__article {
     grid-column-start: 2;
+  }
+
+  .page__content,
+  .page__article.is-first {
     grid-row: span 2;
   }
 
   .page__metadata {
     grid-column-start: 1;
-    grid-row: span 2;
-  }
-
-  .page__metadata.is-first {
-    grid-row: span 1;
   }
 
   .page__pagination,
diff --git a/theme/index.php b/theme/index.php
index e1ad4e2..f26fbd2 100644
--- a/theme/index.php
+++ b/theme/index.php
@@ -4,7 +4,7 @@
     <?php get_template_part('partials/logo') ?>
   </section>
   <?php while ( have_posts() ) : the_post(); $index++; ?>
-  <section class="page__article">
+  <section class="page__article<?php echo ($index === 1 ? ' is-first' : '') ?>">
     <article class="article">
       <div class="article__date">
         <svg class="icon">
@@ -24,7 +24,7 @@
       </div>
     </article>
   </section>
-  <section class="page__metadata<?php echo ($index === 1 ? ' is-first' : '') ?>">
+  <section class="page__metadata">
     <?php get_template_part('partials/metadata') ?>
   </section>
   <?php endwhile; ?>
diff --git a/theme/page.php b/theme/page.php
index 88d6618..35766e6 100644
--- a/theme/page.php
+++ b/theme/page.php
@@ -4,27 +4,22 @@
     <?php get_template_part('partials/logo') ?>
   </section>
   <?php if (have_posts()): while (have_posts()) : the_post(); ?>
-  <section class="page__article">
-    <article class="article">
-      <div class="article__content">
-        <h1 class="title">
-          <a href="<?php the_permalink(); ?>">
-            <?php the_title(); ?>
-          </a>
-        </h1>
-        <?php the_content(__('Continue reading <span class="meta-nav">&raquo;</span>', 'windycoys')); ?>
+  <section class="page__content">
+    <div class="content">
+      <h1 class="title">
+        <?php the_title(); ?>
+      </h1>
+      <?php the_content(); ?>
       </div>
-    </article>
+    </div>
   </section>
   <?php endwhile; ?>
   <?php else: ?>
-  <section class="page__article">
-    <article class="article">
-      <h1 class="article__title">Sorry, there is no article to display</h1>
-      <div class="article__content">
-        <a class="link" href="<?php echo get_site_url() ?>/">Go back home</a>
-      </div>
-    </article>
+  <section class="page__content">
+    <div class="content">
+      <h1 class="title">Sorry, there is no article to display</h1>
+      <a class="link" href="<?php echo get_site_url() ?>/">Go back home</a>
+    </div>
   </section>
   <?php endif; ?>
   <section class="page__banner">
diff --git a/theme/search.php b/theme/search.php
index dd5448b..edf4507 100644
--- a/theme/search.php
+++ b/theme/search.php
@@ -56,13 +56,11 @@ get_header();
     <?php get_template_part('partials/pagination') ?>
   </section>
   <?php else: ?>
-  <section class="page__article">
-    <article class="article">
-      <h1 class="article__title">Sorry, no results found.</h1>
-      <div class="article__content">
-        <a class="link" href="<?php echo get_site_url() ?>/">Go back home</a>
-      </div>
-    </article>
+  <section class="page__content">
+    <div class="content">
+      <h1 class="title">Sorry, no results found.</h1>
+      <a class="link" href="<?php echo get_site_url() ?>/">Go back home</a>
+    </div>
   </section>
   <?php endif; ?>
   <section class="page__banner">
diff --git a/theme/single.php b/theme/single.php
index fe60f49..6224053 100644
--- a/theme/single.php
+++ b/theme/single.php
@@ -4,7 +4,7 @@
     <?php get_template_part('partials/logo') ?>
   </section>
   <?php if (have_posts()): while (have_posts()) : the_post(); ?>
-  <section class="page__article">
+  <section class="page__article is-first">
     <article class="article">
       <div class="article__date">
         <svg class="icon">
@@ -25,14 +25,14 @@
       </div>
     </article>
   </section>
-  <section class="page__metadata is-first">
+  <section class="page__metadata">
     <?php get_template_part('partials/metadata') ?>
   </section>
   <?php endwhile; ?>
   <?php else: ?>
-  <section class="page__article">
+  <section class="page__article is-first">
     <article class="article">
-      <h1 class="article__title">Sorry, there is no article to display</h1>
+      <h1 class="title">Sorry, there is no article to display</h1>
       <div class="article__content">
         <a class="link" href="<?php get_site_url() ?>/">Go back home</a>
       </div>
diff --git a/theme/tag.php b/theme/tag.php
index e2b9c1b..77811ce 100644
--- a/theme/tag.php
+++ b/theme/tag.php
@@ -57,13 +57,11 @@
     <?php get_template_part('partials/pagination') ?>
   </section>
   <?php else: ?>
-  <section class="page__article">
-    <article class="article">
-      <h1 class="article__title">Sorry, no results found.</h1>
-      <div class="article__content">
-        <a class="link" href="<?php echo get_site_url() ?>/">Go back home</a>
-      </div>
-    </article>
+  <section class="page__content">
+    <div class="content">
+      <h1 class="title">Sorry, no results found.</h1>
+      <a class="link" href="<?php echo get_site_url() ?>/">Go back home</a>
+    </div>
   </section>
   <?php endif; ?>
   <section class="page__banner">