diff --git a/app/config/sculpin_site.yml b/app/config/sculpin_site.yml index fc834a53..82a7e475 100644 --- a/app/config/sculpin_site.yml +++ b/app/config/sculpin_site.yml @@ -60,13 +60,6 @@ packagist: apple_touch_icon_sizes: [ 57, 114, 72, 144, 60, 120, 76, 152 ] favicon_sizes: [ 160, 96, 32, 16 ] -main_menu: - about: { title: About, href: / } - experience: { title: Experience, href: /experience/ } - testimonials: { title: Testimonials, href: /testimonials/ } - talks: { title: Talks, href: /talks/ } - blog: { title: Blog, href: /blog/ } - meetups: drupalbristol: { name: Drupal Bristol, logo: drupal-bristol.jpeg, url: https://groups.drupal.org/bristol-west-uk } phpsw: { name: PHPSW, logo: phpsw.jpeg, url: http://phpsw.uk } diff --git a/source/_includes/footer.html.twig b/source/_includes/footer.html.twig new file mode 100644 index 00000000..71b25a2d --- /dev/null +++ b/source/_includes/footer.html.twig @@ -0,0 +1,13 @@ + + + + +{% block scripts %}{% endblock %} + +{% if site.google_analytics_tracking_id %} + +{% endif %} diff --git a/source/_includes/head.html.twig b/source/_includes/head.html.twig new file mode 100644 index 00000000..767949a9 --- /dev/null +++ b/source/_includes/head.html.twig @@ -0,0 +1,27 @@ + + {% include('title') %} + + {% if page.meta.description %} + + {% endif %} + + {% if page.meta.og %} + {{ include('og', { og: page.meta.og }) }} + {% endif %} + + + + + + + + {% block styles %}{% endblock %} + + {% for size in site.apple_touch_icon_sizes %} + + {% endfor %} + + {% for size in site.favicon_sizes %} + + {% endfor %} + diff --git a/source/_includes/nav.html.twig b/source/_includes/nav.html.twig new file mode 100644 index 00000000..a923595b --- /dev/null +++ b/source/_includes/nav.html.twig @@ -0,0 +1,27 @@ + diff --git a/source/_includes/sidebar.html.twig b/source/_includes/sidebar.html.twig new file mode 100644 index 00000000..63417459 --- /dev/null +++ b/source/_includes/sidebar.html.twig @@ -0,0 +1,17 @@ +{% block sidebar_wrapper %} +
+ {% block sidebar %} +
+ + Drupal Association Individual Member + + + + I built Drupal 8 with hand holding a wrench on blue background + +
+ + {% include('availability') %} + {% endblock %} +
+{% endblock %} diff --git a/source/_layouts/default.html.twig b/source/_layouts/default.html.twig index e368ceb4..1a809662 100644 --- a/source/_layouts/default.html.twig +++ b/source/_layouts/default.html.twig @@ -1,59 +1,8 @@ - - - - - - {% include('title') %} - - {% if page.meta.description %} - - {% endif %} - - {% if page.meta.og %} - {{ include('og', { og: page.meta.og }) }} - {% endif %} - - - - - - - - {% block styles %}{% endblock %} - - {% for size in site.apple_touch_icon_sizes %} - - {% endfor %} - - {% for size in site.favicon_sizes %} - - {% endfor %} - + + {{ include('head.html.twig') }} - + {{ include('nav.html.twig') }}
@@ -65,38 +14,10 @@ {% endblock %} - {% block sidebar_wrapper %} -
- {% block sidebar %} -
- - Drupal Association Individual Member - - - - I built Drupal 8 with hand holding a wrench on blue background - -
- - {% include('availability') %} - {% endblock %} -
- {% endblock %} + {{ include('sidebar.html.twig') }}
{# .row #}
{# .container #} - - - - - {% block scripts %}{% endblock %} - - {% if site.google_analytics_tracking_id %} - - {% endif %} + {{ include('footer.html.twig') }}