From adf326cbf11b90ec1ca0c27ad1cfdc35f4b0fb11 Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Tue, 28 Jul 2015 20:20:41 +0100 Subject: [PATCH] Added base.html.twig --- source/_layouts/base.html.twig | 24 ++++++++++++++++++++++++ source/_layouts/default.html.twig | 25 +------------------------ source/_layouts/post.html.twig | 2 +- source/_layouts/talk.html.twig | 2 +- 4 files changed, 27 insertions(+), 26 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 00000000..ebfd59b2 --- /dev/null +++ b/source/_layouts/base.html.twig @@ -0,0 +1,24 @@ + + + + + + {% include 'head' %} + + {% include 'navbar' %} + +
+
+ {% block content_wrapper %} +
+ {% block content %}{% endblock %} +
+ {% endblock %} + + {% include 'sidebar' %} +
{# .row #} +
{# .container #} + + {% include 'footer' %} + + diff --git a/source/_layouts/default.html.twig b/source/_layouts/default.html.twig index ebfd59b2..d2b36be9 100644 --- a/source/_layouts/default.html.twig +++ b/source/_layouts/default.html.twig @@ -1,24 +1 @@ - - - - - - {% include 'head' %} - - {% include 'navbar' %} - -
-
- {% block content_wrapper %} -
- {% block content %}{% endblock %} -
- {% endblock %} - - {% include 'sidebar' %} -
{# .row #} -
{# .container #} - - {% include 'footer' %} - - +{% extends "base.html.twig" %} diff --git a/source/_layouts/post.html.twig b/source/_layouts/post.html.twig index c2b1c681..794649f8 100644 --- a/source/_layouts/post.html.twig +++ b/source/_layouts/post.html.twig @@ -1,4 +1,4 @@ -{% extends 'default' %} +{% extends 'base.html.twig' %} {% block body_classes 'page--blog page--blog__post' %} diff --git a/source/_layouts/talk.html.twig b/source/_layouts/talk.html.twig index c5c035b6..7381b31f 100644 --- a/source/_layouts/talk.html.twig +++ b/source/_layouts/talk.html.twig @@ -1,4 +1,4 @@ -{% extends 'default' %} +{% extends 'base.html.twig' %} {% block body_classes %}page--talks page--talks__talk{% endblock %}