From 83ed930cb1896465cb273bfa79ef4e097232083f Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Thu, 27 Sep 2018 23:47:15 +0100 Subject: [PATCH] Merge app.html.twig and default.html.twig --- source/404.md | 2 +- .../{app.html.twig => base.html.twig} | 32 ++++++++++++++++- source/_layouts/default.html.twig | 35 ------------------- source/_layouts/page.html.twig | 2 +- source/_layouts/post.html.twig | 2 +- source/about.md | 6 ++-- source/accessibility.md | 2 +- source/blog.html | 4 +-- source/blog/tags.html | 2 +- source/blog/tags/tag.html | 2 +- source/company-information.md | 2 +- source/experience.html.twig | 2 +- source/terms.md | 2 +- 13 files changed, 43 insertions(+), 52 deletions(-) rename source/_layouts/{app.html.twig => base.html.twig} (52%) delete mode 100644 source/_layouts/default.html.twig diff --git a/source/404.md b/source/404.md index bec4b0d9..2296803e 100644 --- a/source/404.md +++ b/source/404.md @@ -1,5 +1,5 @@ --- -layout: default +layout: page title: Page Not Found permalink: /404.html use: [posts] diff --git a/source/_layouts/app.html.twig b/source/_layouts/base.html.twig similarity index 52% rename from source/_layouts/app.html.twig rename to source/_layouts/base.html.twig index 2109d880..c3de2693 100644 --- a/source/_layouts/app.html.twig +++ b/source/_layouts/base.html.twig @@ -23,7 +23,37 @@
- {% block body %}{% endblock %} + {% include 'layout/navbar' %} + +
+
+
+ {% block content_top %}{% endblock %} + {% block content_wrapper %}{% block content %}{% endblock %}{% endblock %} + {% block content_bottom %}{% endblock %} +
+ + {% block sidebar_wrapper %} + + {% endblock %} +
+ +
+

+ © 2010-{{ 'now'|date('Y') }} {{ site.title }}. + Built with Sculpin and Tailwind CSS. + Hosted on Netlify. +

+ + {% include 'meetups' %} +
+
{% if site.google_analytics_tracking_id %} diff --git a/source/_layouts/default.html.twig b/source/_layouts/default.html.twig deleted file mode 100644 index f4aca320..00000000 --- a/source/_layouts/default.html.twig +++ /dev/null @@ -1,35 +0,0 @@ -{% extends 'app' %} - -{% block body %} - {% include 'layout/navbar' %} - -
-
-
- {% block content_top %}{% endblock %} - {% block content_wrapper %}{% block content %}{% endblock %}{% endblock %} - {% block content_bottom %}{% endblock %} -
- - {% block sidebar_wrapper %} - - {% endblock %} -
- -
-

- © 2010-{{ 'now'|date('Y') }} {{ site.title }}. - Built with Sculpin and Tailwind CSS. - Hosted on Netlify. -

- - {% include 'meetups' %} -
-
-{% endblock %} diff --git a/source/_layouts/page.html.twig b/source/_layouts/page.html.twig index a60b03d2..68173dd6 100644 --- a/source/_layouts/page.html.twig +++ b/source/_layouts/page.html.twig @@ -1,4 +1,4 @@ -{% extends 'default' %} +{% extends 'base' %} {% block content_top %}

{{ page.title }}

diff --git a/source/_layouts/post.html.twig b/source/_layouts/post.html.twig index e95ee869..db7227b9 100644 --- a/source/_layouts/post.html.twig +++ b/source/_layouts/post.html.twig @@ -1,4 +1,4 @@ -{% extends 'default' %} +{% extends 'base' %} {% block content_wrapper %} {% include 'post/header' %} diff --git a/source/about.md b/source/about.md index ae6c24a3..65b27142 100644 --- a/source/about.md +++ b/source/about.md @@ -1,6 +1,6 @@ --- -layout: default -title: About +layout: page +title: About Me meta: og: title: 'Oliver Davies - Full Stack Developer, System Administrator, PHP and Drupal specialist' @@ -12,8 +12,6 @@ use: permalink: / ---
-# About Me -
Blog -
    {% for post in page.pagination.items %}
  • diff --git a/source/blog/tags.html b/source/blog/tags.html index a170cb22..e3f17f78 100644 --- a/source/blog/tags.html +++ b/source/blog/tags.html @@ -1,5 +1,5 @@ --- -layout: default +layout: page nav: blog title: Tags use: diff --git a/source/blog/tags/tag.html b/source/blog/tags/tag.html index 06ea7229..56d65031 100644 --- a/source/blog/tags/tag.html +++ b/source/blog/tags/tag.html @@ -1,5 +1,5 @@ --- -layout: default +layout: page nav: blog title: Tag Archive generator: diff --git a/source/company-information.md b/source/company-information.md index 273c503d..c4961536 100644 --- a/source/company-information.md +++ b/source/company-information.md @@ -1,5 +1,5 @@ --- -layout: default +layout: page title: Company Information meta: description: 'Company information for Oliver Davies Ltd.' diff --git a/source/experience.html.twig b/source/experience.html.twig index ffe99871..c16bbdfb 100644 --- a/source/experience.html.twig +++ b/source/experience.html.twig @@ -1,5 +1,5 @@ --- -layout: default +layout: page title: Experience use: [posts] experiences: diff --git a/source/terms.md b/source/terms.md index 6296c3bb..3ed6b41b 100644 --- a/source/terms.md +++ b/source/terms.md @@ -1,5 +1,5 @@ --- -layout: default +layout: page title: Development Terms use: [posts] ---