From b3c7e26a5812e64a038593394a953500404f4803 Mon Sep 17 00:00:00 2001
From: Oliver Davies <oliver@oliverdavies.uk>
Date: Mon, 31 Dec 2018 12:15:23 +0000
Subject: [PATCH] Combine templates

---
 .../_partials/pages/blog/read-more.html.twig  |  4 ----
 source/_partials/pages/blog/teaser.html.twig  |  9 ---------
 source/blog.html                              | 19 ++++++++++---------
 3 files changed, 10 insertions(+), 22 deletions(-)
 delete mode 100644 source/_partials/pages/blog/read-more.html.twig
 delete mode 100644 source/_partials/pages/blog/teaser.html.twig

diff --git a/source/_partials/pages/blog/read-more.html.twig b/source/_partials/pages/blog/read-more.html.twig
deleted file mode 100644
index c8f917d0..00000000
--- a/source/_partials/pages/blog/read-more.html.twig
+++ /dev/null
@@ -1,4 +0,0 @@
-<a href="{{ post.url }}" class="button">
-    Read more
-    <span class="visuallyhidden">about {{ post.title }}</span>
-</a>
diff --git a/source/_partials/pages/blog/teaser.html.twig b/source/_partials/pages/blog/teaser.html.twig
deleted file mode 100644
index 3945c66b..00000000
--- a/source/_partials/pages/blog/teaser.html.twig
+++ /dev/null
@@ -1,9 +0,0 @@
-{% if post.summary %}
-    {{ post.summary|markdown }}
-    {% include 'pages/blog/read-more' %}
-{% elseif post.blocks.excerpt is defined %}
-    {{ post.blocks.excerpt|markdown }}
-    {% include 'pages/blog/read-more' %}
-{% else %}
-    {{ post.blocks.content|markdown }}
-{% endif %}
diff --git a/source/blog.html b/source/blog.html
index 0156ae01..5970ce3c 100644
--- a/source/blog.html
+++ b/source/blog.html
@@ -1,27 +1,28 @@
 ---
 layout: default
 title: Blog
-generator: pagination
-pagination:
-    max_per_page: 10
 use: [posts]
 ---
 {% block content %}
     <ul class="list-reset">
-        {% for post in page.pagination.items %}
+        {% for post in data.posts %}
             <li class="mb-12">
-                <h2 class="text-2xl mb-2">{{ post.title }}</h2>
+                <h2 class="text-2xl mb-1">{{ post.title }}</h2>
+                <p class="text-sm text-grey-dark mb-4">Posted on {{ post.date|date('jS F Y') }}</p>
 
                 {% include 'post/intro-image' with { page: post } %}
 
-                <div class="markdown mb-4">
-                    {% include 'pages/blog/teaser' %}
+                <div class="markup">
+                    <p>{{ post.excerpt }}</p>
+
+                    <a href="{{ post.url }}" class="button">
+                        Read more
+                        <span class="visuallyhidden">about {{ post.title }}</span>
+                    </a>
                 </div>
             </li>
         {% endfor %}
     </ul>
-
-    {% include 'post-pager' %}
 {% endblock %}
 
 {% block scripts %}