diff --git a/source/404.md b/source/404.md index bec4b0d9..2296803e 100644 --- a/source/404.md +++ b/source/404.md @@ -1,5 +1,5 @@ --- -layout: default +layout: page title: Page Not Found permalink: /404.html use: [posts] diff --git a/source/_layouts/app.html.twig b/source/_layouts/base.html.twig similarity index 52% rename from source/_layouts/app.html.twig rename to source/_layouts/base.html.twig index 2109d880..c3de2693 100644 --- a/source/_layouts/app.html.twig +++ b/source/_layouts/base.html.twig @@ -23,7 +23,37 @@
- {% block body %}{% endblock %} + {% include 'layout/navbar' %} + +
+
+
+ {% block content_top %}{% endblock %} + {% block content_wrapper %}{% block content %}{% endblock %}{% endblock %} + {% block content_bottom %}{% endblock %} +
+ + {% block sidebar_wrapper %} + + {% endblock %} +
+ + +
{% if site.google_analytics_tracking_id %} diff --git a/source/_layouts/default.html.twig b/source/_layouts/default.html.twig deleted file mode 100644 index f4aca320..00000000 --- a/source/_layouts/default.html.twig +++ /dev/null @@ -1,35 +0,0 @@ -{% extends 'app' %} - -{% block body %} - {% include 'layout/navbar' %} - -
-
-
- {% block content_top %}{% endblock %} - {% block content_wrapper %}{% block content %}{% endblock %}{% endblock %} - {% block content_bottom %}{% endblock %} -
- - {% block sidebar_wrapper %} - - {% endblock %} -
- - -
-{% endblock %} diff --git a/source/_layouts/page.html.twig b/source/_layouts/page.html.twig index a60b03d2..68173dd6 100644 --- a/source/_layouts/page.html.twig +++ b/source/_layouts/page.html.twig @@ -1,4 +1,4 @@ -{% extends 'default' %} +{% extends 'base' %} {% block content_top %}

{{ page.title }}

diff --git a/source/_layouts/post.html.twig b/source/_layouts/post.html.twig index e95ee869..db7227b9 100644 --- a/source/_layouts/post.html.twig +++ b/source/_layouts/post.html.twig @@ -1,4 +1,4 @@ -{% extends 'default' %} +{% extends 'base' %} {% block content_wrapper %} {% include 'post/header' %} diff --git a/source/about.md b/source/about.md index ae6c24a3..65b27142 100644 --- a/source/about.md +++ b/source/about.md @@ -1,6 +1,6 @@ --- -layout: default -title: About +layout: page +title: About Me meta: og: title: 'Oliver Davies - Full Stack Developer, System Administrator, PHP and Drupal specialist' @@ -12,8 +12,6 @@ use: permalink: / ---
-# About Me -
Blog -