From b7352e2fe99e3eeb25e5f09c837326abd5f909bc Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Mon, 20 May 2019 18:45:58 +0100 Subject: [PATCH] Remove base.html.twig --- source/_layouts/base.html.twig | 21 --------------------- source/_layouts/default.html.twig | 22 +++++++++++++++++++++- 2 files changed, 21 insertions(+), 22 deletions(-) delete mode 100644 source/_layouts/base.html.twig diff --git a/source/_layouts/base.html.twig b/source/_layouts/base.html.twig deleted file mode 100644 index 0dc8ca39..00000000 --- a/source/_layouts/base.html.twig +++ /dev/null @@ -1,21 +0,0 @@ -{% 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 %} diff --git a/source/_layouts/default.html.twig b/source/_layouts/default.html.twig index 9c11d90b..0dc8ca39 100644 --- a/source/_layouts/default.html.twig +++ b/source/_layouts/default.html.twig @@ -1 +1,21 @@ -{% extends 'base' %} +{% 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 %}