From 1137ac1063febde74ae7ce724b7655269c6dfb44 Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Wed, 3 Jan 2024 20:00:00 +0000 Subject: [PATCH] Split default.html.twig into base.html.twig --- source/_layouts/base.html.twig | 29 +++++++++++ source/_layouts/default.html.twig | 86 +++++++++++-------------------- 2 files changed, 59 insertions(+), 56 deletions(-) create mode 100644 source/_layouts/base.html.twig diff --git a/source/_layouts/base.html.twig b/source/_layouts/base.html.twig new file mode 100644 index 000000000..5d9679dc5 --- /dev/null +++ b/source/_layouts/base.html.twig @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + + + + + + + + {{ page.title }} | {{ site.name }} + + + {% block body %}{% endblock %} + + diff --git a/source/_layouts/default.html.twig b/source/_layouts/default.html.twig index 008e8cdc7..6a14f4cf5 100644 --- a/source/_layouts/default.html.twig +++ b/source/_layouts/default.html.twig @@ -1,59 +1,33 @@ - - - - - - - - - - - - - - - - - - - - - {{ page.title }} | {{ site.name }} - - -
- {% include 'banner.html.twig' %} +{% extends 'base' %} -
-
- {% include 'logo.html.twig' %} -
+{% block body %} +
+ {% include 'banner.html.twig' %} + +
+
+ {% include 'logo.html.twig' %} +
+
+ +
+
+ {% block content_top %}{% endblock %} + +
+

{{ page.title }}

+ +
+ {% block content %}{% endblock %} +
+
+ + {% block content_bottom %}{% endblock %}
-
-
- {% block content_top %}{% endblock %} - -
-

{{ page.title }}

- -
- {% block content %}{% endblock %} -
-
- - {% block content_bottom %} - {% include 'about-me.html.twig' %} - {% endblock %} -
- -
- {% include 'main-menu.html.twig' %} -
-
-
- - +
+ {% include 'main-menu.html.twig' %} +
+
+
+{% endblock %}