diff --git a/source/_layouts/base.html.twig b/source/_layouts/base.html.twig deleted file mode 100644 index 4b7c1fde..00000000 --- a/source/_layouts/base.html.twig +++ /dev/null @@ -1,23 +0,0 @@ - - - {{ include('head') }} - - {{ include('nav') }} - -
-
-
- {% block content_top %}{% endblock %} - {% block content_wrapper %} - {% block content %}{% endblock %} - {% endblock %} - {% block content_bottom %}{% endblock %} -
- - {{ include('sidebar') }} -
{# .row #} -
{# .container #} - - {{ include('footer') }} - - diff --git a/source/_layouts/default.html.twig b/source/_layouts/default.html.twig index 5aedbbc4..4b7c1fde 100644 --- a/source/_layouts/default.html.twig +++ b/source/_layouts/default.html.twig @@ -1 +1,23 @@ -{% extends "base" %} + + + {{ include('head') }} + + {{ include('nav') }} + +
+
+
+ {% block content_top %}{% endblock %} + {% block content_wrapper %} + {% block content %}{% endblock %} + {% endblock %} + {% block content_bottom %}{% endblock %} +
+ + {{ include('sidebar') }} +
{# .row #} +
{# .container #} + + {{ include('footer') }} + + diff --git a/source/_layouts/talk.html.twig b/source/_layouts/talk.html.twig index f7a4a093..40296195 100644 --- a/source/_layouts/talk.html.twig +++ b/source/_layouts/talk.html.twig @@ -1,4 +1,4 @@ -{% extends "base" %} +{% extends 'default' %} {% block content_top %}

{{ page.title }}