From f0a28b8c66aef266ca37ab996e69050679bb7028 Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Wed, 15 May 2019 23:35:18 +0100 Subject: [PATCH] Update base layouts --- .../{app.html.twig => base.html.twig} | 22 +++++++++++++++- source/_layouts/default.html.twig | 26 +------------------ 2 files changed, 22 insertions(+), 26 deletions(-) rename source/_layouts/{app.html.twig => base.html.twig} (67%) diff --git a/source/_layouts/app.html.twig b/source/_layouts/base.html.twig similarity index 67% rename from source/_layouts/app.html.twig rename to source/_layouts/base.html.twig index 01f94730..ae22b9ff 100644 --- a/source/_layouts/app.html.twig +++ b/source/_layouts/base.html.twig @@ -22,7 +22,27 @@
- {% block body %}{% endblock %} + + + {% include 'layout/navbar' %} + +
+
+ {% block page_title_wrapper %} +

+ {% block page_title %}{{ page.title }}{% endblock %} +

+ {% endblock %} + + {% block content_wrapper %} + {% block content %}{% endblock %} + {% endblock %} +
+ + {% include 'layout/footer' %} +
{% if site.google_analytics.id %} diff --git a/source/_layouts/default.html.twig b/source/_layouts/default.html.twig index 735a4ecc..9c11d90b 100644 --- a/source/_layouts/default.html.twig +++ b/source/_layouts/default.html.twig @@ -1,25 +1 @@ -{% extends 'app' %} - -{% block body %} - - - {% include 'layout/navbar' %} - -
-
- {% block page_title_wrapper %} -

- {% block page_title %}{{ page.title }}{% endblock %} -

- {% endblock %} - - {% block content_wrapper %} - {% block content %}{% endblock %} - {% endblock %} -
- - {% include 'layout/footer' %} -
-{% endblock %} +{% extends 'base' %}