From b7d8aa1cfef72ccde60a12eb1e850ab2c0f58ab6 Mon Sep 17 00:00:00 2001
From: Oliver Davies <opdavies@gmail.com>
Date: Tue, 30 Jan 2018 23:11:00 +0000
Subject: [PATCH] Re-order sidebar blocks, remove PHPNW badge

---
 source/_includes/availability.html.twig | 2 +-
 source/_includes/badges.html.twig       | 4 ----
 source/_includes/posts/latest.html.twig | 4 ++--
 source/_includes/sidebar.html.twig      | 2 +-
 4 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/source/_includes/availability.html.twig b/source/_includes/availability.html.twig
index 668a0e1a..46d4f55d 100644
--- a/source/_includes/availability.html.twig
+++ b/source/_includes/availability.html.twig
@@ -1,4 +1,4 @@
-<div class="block mb-4">
+<div class="block mb-6">
     <h2>Availability</h2>
 
     <ul class="list-reset">
diff --git a/source/_includes/badges.html.twig b/source/_includes/badges.html.twig
index 7fc7167b..66035be1 100644
--- a/source/_includes/badges.html.twig
+++ b/source/_includes/badges.html.twig
@@ -24,8 +24,4 @@
             </div>
         </div>
     </div>
-
-    <a href="http://conference.phpnw.org.uk/phpnw17" class="hidden lg:block mb-4">
-        <img src="{{ site.images_url }}/assets/images/badges/phpnw17.png" alt="">
-    </a>
 </div>
diff --git a/source/_includes/posts/latest.html.twig b/source/_includes/posts/latest.html.twig
index 3446b16c..eeaeed88 100644
--- a/source/_includes/posts/latest.html.twig
+++ b/source/_includes/posts/latest.html.twig
@@ -1,6 +1,6 @@
 {% if data.posts and page.url != '/blog' %}
-    <div class="lh-copy">
-        <h2>Latest blog posts</h2>
+    <div class="mb-6 lh-copy">
+        <h2>Latest Blog Posts</h2>
 
         <ul class="bullets">
             {% for post in data.posts|slice(0, site.latest_posts) %}
diff --git a/source/_includes/sidebar.html.twig b/source/_includes/sidebar.html.twig
index f9d70bf0..07d1e47f 100644
--- a/source/_includes/sidebar.html.twig
+++ b/source/_includes/sidebar.html.twig
@@ -1,9 +1,9 @@
 {% block sidebar_wrapper %}
     <div class="md:w-1/4 px-4">
         {% block sidebar %}
-            {% include 'badges' %}
             {% include 'availability' %}
             {% include 'posts/latest' %}
+            {% include 'badges' %}
         {% endblock %}
     </div>
 {% endblock %}