From d366b6d6d28ddaf1b3c41bc3388631ff58dfcb24 Mon Sep 17 00:00:00 2001
From: Oliver Davies <oliver@oliverdavies.uk>
Date: Thu, 6 Dec 2018 18:20:14 +0000
Subject: [PATCH] Re-organise layouts
---
.../{base.html.twig => app.html.twig} | 34 +----------------
source/_layouts/default.html.twig | 38 +++++++++++++++++--
source/_layouts/page.html.twig | 5 +++
source/_layouts/post.html.twig | 2 +-
4 files changed, 42 insertions(+), 37 deletions(-)
rename source/_layouts/{base.html.twig => app.html.twig} (54%)
create mode 100644 source/_layouts/page.html.twig
diff --git a/source/_layouts/base.html.twig b/source/_layouts/app.html.twig
similarity index 54%
rename from source/_layouts/base.html.twig
rename to source/_layouts/app.html.twig
index b0d131244..ce4579a01 100644
--- a/source/_layouts/base.html.twig
+++ b/source/_layouts/app.html.twig
@@ -26,39 +26,7 @@
</head>
<body class="font-sans leading-normal">
<div id="app" v-cloak>
- {% include 'layout/navbar' %}
-
- <div class="container mx-auto px-4">
- <div class="text-grey-darkest md:flex -mx-4">
- <main class="md:w-2/3 lg:w-3/4 px-4 mb-8 lg:mb-0">
- {% block page_title %}
- <h1>{{ page.title }}</h1>
- {% endblock %}
-
- {% block content_wrapper %}
- {% block content %}{% endblock %}
- {% endblock %}
- </main>
-
- {% block sidebar_wrapper %}
- <div class="md:w-1/3 lg:w-1/4 px-4" role="complementary">
- {% block sidebar %}
- {% include 'badges' %}
- {% endblock %}
- </div>
- {% endblock %}
- </div>
-
- <footer class="border-t border-grey-light pt-4 mt-4">
- <p>
- © 2010-{{ 'now'|date('Y') }} {{ site.title }}.
- Built with <a class="link" href="https://sculpin.io">Sculpin</a> and <a class="link" href="https://tailwindcss.com">Tailwind CSS</a>.
- Hosted on <a class="link" href="https://www.netlify.com">Netlify</a>.
- </p>
-
- {% include 'meetups' %}
- </footer>
- </div>
+ {% block body %}{% endblock %}
</div>
{% if site.google_analytics_tracking_id %}
diff --git a/source/_layouts/default.html.twig b/source/_layouts/default.html.twig
index 68173dd66..da552ab95 100644
--- a/source/_layouts/default.html.twig
+++ b/source/_layouts/default.html.twig
@@ -1,5 +1,37 @@
-{% extends 'base' %}
+{% extends 'app' %}
-{% block content_top %}
- <h1>{{ page.title }}</h1>
+{% block body %}
+ {% include 'layout/navbar' %}
+
+ <div class="container mx-auto px-4">
+ <div class="text-grey-darkest md:flex -mx-4">
+ <main class="md:w-2/3 lg:w-3/4 px-4 mb-8 lg:mb-0">
+ {% block page_title %}
+ <h1>{{ page.title }}</h1>
+ {% endblock %}
+
+ {% block content_wrapper %}
+ {% block content %}{% endblock %}
+ {% endblock %}
+ </main>
+
+ {% block sidebar_wrapper %}
+ <div class="md:w-1/3 lg:w-1/4 px-4" role="complementary">
+ {% block sidebar %}
+ {% include 'badges' %}
+ {% endblock %}
+ </div>
+ {% endblock %}
+ </div>
+
+ <footer class="border-t border-grey-light pt-4 mt-4">
+ <p>
+ © 2010-{{ 'now'|date('Y') }} {{ site.title }}.
+ Built with <a class="link" href="https://sculpin.io">Sculpin</a> and <a class="link" href="https://tailwindcss.com">Tailwind CSS</a>.
+ Hosted on <a class="link" href="https://www.netlify.com">Netlify</a>.
+ </p>
+
+ {% include 'meetups' %}
+ </footer>
+ </div>
{% endblock %}
diff --git a/source/_layouts/page.html.twig b/source/_layouts/page.html.twig
new file mode 100644
index 000000000..a60b03d2d
--- /dev/null
+++ b/source/_layouts/page.html.twig
@@ -0,0 +1,5 @@
+{% extends 'default' %}
+
+{% block content_top %}
+ <h1>{{ page.title }}</h1>
+{% endblock %}
diff --git a/source/_layouts/post.html.twig b/source/_layouts/post.html.twig
index 0a61456b1..90f3d4a64 100644
--- a/source/_layouts/post.html.twig
+++ b/source/_layouts/post.html.twig
@@ -1,4 +1,4 @@
-{% extends 'base' %}
+{% extends 'page' %}
{% block page_title %}{% endblock %}