From b726aba69f5c1476c8e332562aa941483032f30f Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Thu, 20 Aug 2015 22:17:31 +0100 Subject: [PATCH] Template tidy --- source/_layouts/default.html.twig | 88 ++++++++++++++++++++--- source/_partials/footer_content.html.twig | 5 -- source/_partials/footer_scripts.html.twig | 22 ------ source/_partials/head.html.twig | 24 ------- source/_partials/navbar.html.twig | 22 ------ 5 files changed, 80 insertions(+), 81 deletions(-) delete mode 100644 source/_partials/footer_content.html.twig delete mode 100644 source/_partials/footer_scripts.html.twig delete mode 100644 source/_partials/head.html.twig delete mode 100644 source/_partials/navbar.html.twig diff --git a/source/_layouts/default.html.twig b/source/_layouts/default.html.twig index 6ce534b2..7c02702d 100644 --- a/source/_layouts/default.html.twig +++ b/source/_layouts/default.html.twig @@ -1,11 +1,57 @@ - - - - - {% include 'head' %} + + + + + + {% include 'title' %} + + {% if page.meta.description %} + + {% endif %} + + {% if page.meta.og %} + {% include "og" with { og: page.meta.og } %} + {% endif %} + + + + + + + + + {% for size in site.apple_touch_icon_sizes %} + + {% endfor %} + + {% for size in site.favicon_sizes %} + + {% endfor %} + - {% include 'navbar' %} +
@@ -19,7 +65,33 @@
{# .row #}
{# .container #} - {% include 'footer_content' %} - {% include 'footer_scripts' %} + + + + + + + + {% block scripts %}{% endblock %} + + {% if page.tweets is defined and page.tweets == true %} + + {% endif %} + + {% if site.google_analytics_tracking_id %} + + {% endif %} diff --git a/source/_partials/footer_content.html.twig b/source/_partials/footer_content.html.twig deleted file mode 100644 index 1151e188..00000000 --- a/source/_partials/footer_content.html.twig +++ /dev/null @@ -1,5 +0,0 @@ - diff --git a/source/_partials/footer_scripts.html.twig b/source/_partials/footer_scripts.html.twig deleted file mode 100644 index 8478800e..00000000 --- a/source/_partials/footer_scripts.html.twig +++ /dev/null @@ -1,22 +0,0 @@ - - - - - -{% block scripts %}{% endblock %} - -{% if page.tweets is defined and page.tweets == true %} - -{% endif %} - -{% if site.google_analytics_tracking_id %} - -{% endif %} diff --git a/source/_partials/head.html.twig b/source/_partials/head.html.twig deleted file mode 100644 index 3e779079..00000000 --- a/source/_partials/head.html.twig +++ /dev/null @@ -1,24 +0,0 @@ - - {% include 'title' %} - - {% if page.meta.description %} - - {% endif %} - - {% if page.meta.og %}{% include "og" with { og: page.meta.og } %}{% endif %} - - - - - - - - - {% for size in site.apple_touch_icon_sizes %} - - {% endfor %} - - {% for size in site.favicon_sizes %} - - {% endfor %} - diff --git a/source/_partials/navbar.html.twig b/source/_partials/navbar.html.twig deleted file mode 100644 index a398435a..00000000 --- a/source/_partials/navbar.html.twig +++ /dev/null @@ -1,22 +0,0 @@ -