From ed8de4962250c423790a2bb28e72e5a3692c49d2 Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Sun, 9 Aug 2015 01:34:20 +0100 Subject: [PATCH] Changed base to default --- source/_layouts/base.html.twig | 29 ----------------------------- source/_layouts/default.html.twig | 30 +++++++++++++++++++++++++++++- 2 files changed, 29 insertions(+), 30 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 fe5bdc405..000000000 --- a/source/_layouts/base.html.twig +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - {% include 'head' %} - - - - {% include 'navbar' %} - -
-
- {% block content_wrapper %} -
- {% block content %}{% endblock %} -
- {% endblock %} - - {% include 'sidebar' %} -
{# .row #} -
{# .container #} - - {% include 'footer_content' %} - {% include 'footer_scripts' %} - - diff --git a/source/_layouts/default.html.twig b/source/_layouts/default.html.twig index d2b36be95..fe5bdc405 100644 --- a/source/_layouts/default.html.twig +++ b/source/_layouts/default.html.twig @@ -1 +1,29 @@ -{% extends "base.html.twig" %} + + + + + + {% include 'head' %} + + + + {% include 'navbar' %} + +
+
+ {% block content_wrapper %} +
+ {% block content %}{% endblock %} +
+ {% endblock %} + + {% include 'sidebar' %} +
{# .row #} +
{# .container #} + + {% include 'footer_content' %} + {% include 'footer_scripts' %} + +