diff --git a/source/_includes/banner.html.twig b/source/_includes/banner.html.twig index 0e5508986..6d1f90c61 100644 --- a/source/_includes/banner.html.twig +++ b/source/_includes/banner.html.twig @@ -1,11 +1,11 @@
-
-
- -
- - {% include 'nav' %} +
+ + + {% include 'nav' %} +
diff --git a/source/_includes/footer.html.twig b/source/_includes/footer.html.twig index d52527885..756a87bb0 100644 --- a/source/_includes/footer.html.twig +++ b/source/_includes/footer.html.twig @@ -1,15 +1,15 @@ diff --git a/source/_includes/front-speakers.html.twig b/source/_includes/front-speakers.html.twig index cf90453e8..bc52a2613 100644 --- a/source/_includes/front-speakers.html.twig +++ b/source/_includes/front-speakers.html.twig @@ -1,36 +1,36 @@
-

Featuring Talks From

+

Featuring Talks From

-
- +
-
-

- We’re currently in the process of announcing speakers. -
- Check back soon to see who else has been added or follow us on Twitter. -

-
+
+

+ We’re currently in the process of announcing speakers. +
+ Check back soon to see who else has been added or follow us on Twitter. +

+
diff --git a/source/_includes/nav.html.twig b/source/_includes/nav.html.twig index 644d1fe4e..033b779c8 100644 --- a/source/_includes/nav.html.twig +++ b/source/_includes/nav.html.twig @@ -1,48 +1,45 @@ {% set links = [ - { - title: 'Tickets', - href: site['tickets']['url'], - active: false, - enabled: site['tickets']['available'], - }, - { - title: 'Submit a session', - href: site['cfp']['url'], - active: false, - enabled: site['cfp']['open'], - }, - { - title: 'Speakers', - href: '/#speakers', - active: page.layout in ['session', 'speaker'], - enabled: true, - }, - { - title: 'Schedule', - href: '/schedule', - active: page.url == '/schedule' or page.layout in ['session', 'speaker'], - enabled: false, - }, - { - title: 'Sponsor us', - href: '/sponsor-us', - active: page.url == '/sponsor-us', - enabled: now|date('U') < site['date'], - } + { + title: 'Tickets', + href: site['tickets']['url'], + active: false, + enabled: site['tickets']['available'], + }, + { + title: 'Submit a session', + href: site['cfp']['url'], + active: false, + enabled: site['cfp']['open'], + }, + { + title: 'Speakers', + href: '/#speakers', + active: page.layout in ['session', 'speaker'], + enabled: true, + }, + { + title: 'Schedule', + href: '/schedule', + active: page.url == '/schedule' or page.layout in ['session', 'speaker'], + enabled: false, + }, + { + title: 'Sponsor us', + href: '/sponsor-us', + active: page.url == '/sponsor-us', + enabled: now|date('U') < site['date'], + } ] %} diff --git a/source/_includes/session-speakers.html.twig b/source/_includes/session-speakers.html.twig index 24c8b8e1b..8b504078f 100644 --- a/source/_includes/session-speakers.html.twig +++ b/source/_includes/session-speakers.html.twig @@ -4,7 +4,7 @@ {% for speaker in speakers %}
  • - {{ speaker.title }} + {{ speaker.title }}
    • {% endfor %} diff --git a/source/_includes/update-text.html.twig b/source/_includes/update-text.html.twig index 82bf247b7..4d5ade0f9 100644 --- a/source/_includes/update-text.html.twig +++ b/source/_includes/update-text.html.twig @@ -1,3 +1,3 @@
    - {{ page.update_text }} + {{ page.update_text }}
    diff --git a/source/_layouts/app.html.twig b/source/_layouts/app.html.twig index f410de065..df3bfdf09 100644 --- a/source/_layouts/app.html.twig +++ b/source/_layouts/app.html.twig @@ -17,8 +17,8 @@ -
    - {% block body %}{% endblock %} -
    +
    + {% block body %}{% endblock %} +
    diff --git a/source/_layouts/base.html.twig b/source/_layouts/base.html.twig index bf1f1d855..3a9311c2b 100644 --- a/source/_layouts/base.html.twig +++ b/source/_layouts/base.html.twig @@ -5,23 +5,23 @@ Skip to main content
    - {% include 'banner' %} + {% include 'banner' %} -
    - {% block content_wrapper %} - {% block content %}{% endblock %} - {% endblock %} +
    + {% block content_wrapper %} + {% block content %}{% endblock %} + {% endblock %} - {% block content_botton %}{% endblock %} + {% block content_botton %}{% endblock %} - {% if page.update_text %} - {% include 'update-text' %} - {% endif %} -
    + {% if page.update_text %} + {% include 'update-text' %} + {% endif %} +
    -
    - {% block footer_top %}{% endblock %} - {% include 'footer' %} -
    +
    + {% block footer_top %}{% endblock %} + {% include 'footer' %} +
    {% endblock %} diff --git a/source/_layouts/page.html.twig b/source/_layouts/page.html.twig index 369c26077..f501e5cd5 100644 --- a/source/_layouts/page.html.twig +++ b/source/_layouts/page.html.twig @@ -4,18 +4,18 @@
    -

    - {% block title %}{{ page.title }}{% endblock %} -

    +

    + {% block title %}{{ page.title }}{% endblock %} +

    - {% block content_wrapper_inner %} -
    - {% block content %}{% endblock %} -
    - {% endblock %} + {% block content_wrapper_inner %} +
    + {% block content %}{% endblock %} +
    + {% endblock %} - {% block content_bottom %}{% endblock %} -
    + {% block content_bottom %}{% endblock %} +
    {% endblock %} diff --git a/source/_layouts/session.html.twig b/source/_layouts/session.html.twig index bf7fd2705..f0efc4f1e 100644 --- a/source/_layouts/session.html.twig +++ b/source/_layouts/session.html.twig @@ -1,7 +1,7 @@ {% extends 'page' %} {% block content_bottom %} - {% include 'session-speakers' with { - speakers: sessionSpeakers(page, data.speakers), - } %} + {% include 'session-speakers' with { + speakers: sessionSpeakers(page, data.speakers), + } %} {% endblock %} diff --git a/source/_layouts/speaker.html.twig b/source/_layouts/speaker.html.twig index ba56f9d52..a22138a36 100644 --- a/source/_layouts/speaker.html.twig +++ b/source/_layouts/speaker.html.twig @@ -44,9 +44,9 @@