diff --git a/source/_includes/footer.html.twig b/source/_includes/footer.html.twig deleted file mode 100644 index 555e4011..00000000 --- a/source/_includes/footer.html.twig +++ /dev/null @@ -1,7 +0,0 @@ - diff --git a/source/_includes/head.html.twig b/source/_includes/head.html.twig deleted file mode 100644 index c95afa0c..00000000 --- a/source/_includes/head.html.twig +++ /dev/null @@ -1,30 +0,0 @@ - - - {% if page.title is defined and page.url != '/.' %} - {{ page.title }} | - {% endif %} - {{ site.title }} - {{ site.subtitle }} - - - - - - - {% if page.meta.description %} - - {% endif %} - - {% include 'og' with { og: page.meta.og } %} - - {% block stylesheets %} - - {% endblock %} - - {% for size in site.apple_touch_icon_sizes %} - - {% endfor %} - - {% for size in site.favicon_sizes %} - - {% endfor %} - diff --git a/source/_includes/meetups.html.twig b/source/_includes/meetups.html.twig deleted file mode 100644 index f464f5e8..00000000 --- a/source/_includes/meetups.html.twig +++ /dev/null @@ -1,13 +0,0 @@ -
-

Things that I organise

- - -
diff --git a/source/_includes/nav.html.twig b/source/_includes/nav.html.twig index 5652f6ec..e69de29b 100644 --- a/source/_includes/nav.html.twig +++ b/source/_includes/nav.html.twig @@ -1,29 +0,0 @@ - diff --git a/source/_includes/scripts.html.twig b/source/_includes/scripts.html.twig deleted file mode 100644 index a4509c2f..00000000 --- a/source/_includes/scripts.html.twig +++ /dev/null @@ -1,16 +0,0 @@ - - -{% if site.google_analytics_tracking_id %} - -{% endif %} - -{% if page.has_tweets %} - -{% endif %} - -{% block scripts %}{% endblock %} diff --git a/source/_includes/sidebar.html.twig b/source/_includes/sidebar.html.twig index bb40ea25..e69de29b 100644 --- a/source/_includes/sidebar.html.twig +++ b/source/_includes/sidebar.html.twig @@ -1,9 +0,0 @@ -{% block sidebar_wrapper %} - -{% endblock %} diff --git a/source/_layouts/default.html.twig b/source/_layouts/default.html.twig index dce249f4..ef095ae6 100644 --- a/source/_layouts/default.html.twig +++ b/source/_layouts/default.html.twig @@ -1,8 +1,65 @@ - {% include 'head.html.twig' %} + + + {% if page.title is defined and page.url != '/.' %} + {{ page.title }} | + {% endif %} + {{ site.title }} - {{ site.subtitle }} + + + + + + + {% if page.meta.description %} + + {% endif %} + + {% include 'og' with { og: page.meta.og } %} + + {% block stylesheets %} + + {% endblock %} + + {% for size in site.apple_touch_icon_sizes %} + + {% endfor %} + + {% for size in site.favicon_sizes %} + + {% endfor %} + - {% include 'nav.html.twig' %} +
@@ -12,12 +69,53 @@ {% block content_bottom %}{% endblock %} - {% include 'sidebar.html.twig' %} + {% block sidebar_wrapper %} + + {% endblock %}
- {% include 'footer.html.twig' %} +
- {% include 'scripts.html.twig' %} + + + {% if site.google_analytics_tracking_id %} + + {% endif %} + + {% if page.has_tweets %} + + {% endif %} + + {% block scripts %}{% endblock %}