Ensure spaces are consistent
This commit is contained in:
parent
f2a17b63aa
commit
178d3bb30e
|
|
@ -1,11 +1,11 @@
|
|||
<header role="banner">
|
||||
<div class="region region-header tw-max-w-6xl tw-px-6 sm:tw-flex sm:tw-justify-between sm:tw-items-center">
|
||||
<div id="block-dcb2017-branding" class="block block-system block-system-branding-block tw-mx-auto tw-my-2 sm:tw-mx-0">
|
||||
<a href="/" title="Home" rel="home" class="site-logo">
|
||||
<img src="/themes/dcb2017/logo.svg" alt="Home" />
|
||||
</a>
|
||||
</div>
|
||||
|
||||
{% include 'nav' %}
|
||||
<div class="region region-header tw-max-w-6xl tw-px-6 sm:tw-flex sm:tw-justify-between sm:tw-items-center">
|
||||
<div id="block-dcb2017-branding" class="block block-system block-system-branding-block tw-mx-auto tw-my-2 sm:tw-mx-0">
|
||||
<a href="/" title="Home" rel="home" class="site-logo">
|
||||
<img src="/themes/dcb2017/logo.svg" alt="Home" />
|
||||
</a>
|
||||
</div>
|
||||
|
||||
{% include 'nav' %}
|
||||
</div>
|
||||
</header>
|
||||
|
|
|
|||
|
|
@ -1,15 +1,15 @@
|
|||
<footer role="contentinfo" class="tw-bg-balloon tw-bg-center tw-bg-cover">
|
||||
<div class="region region-footer">
|
||||
<div id="block-footerinfo" class="block block-block-content block-block-content1df4705d-991d-45d4-8c83-fa337eec6a69">
|
||||
<nav class="tw-mt-2 tw-mb-6 tw--ml-8">
|
||||
<a class="tw-uppercase tw-no-underline hocus:tw-text-green-600 tw-ml-8" href="http://2017.drupalcampbristol.co.uk" title="DrupalCamp Bristol 2017">2017</a>
|
||||
<a class="tw-uppercase tw-no-underline hocus:tw-text-green-600 tw-ml-8" href="{{ page.twitter.url }}" title="DrupalCamp Bristol on Twitter">Twitter</a>
|
||||
<a class="tw-uppercase tw-no-underline hocus:tw-text-green-600 tw-ml-8" href="https://www.youtube.com/channel/UCoHlMzj9iT4xOlpgYOg_rjw" title="View previous videos on YouTube">YouTube</a>
|
||||
</nav>
|
||||
<div class="region region-footer">
|
||||
<div id="block-footerinfo" class="block block-block-content block-block-content1df4705d-991d-45d4-8c83-fa337eec6a69">
|
||||
<nav class="tw-mt-2 tw-mb-6 tw--ml-8">
|
||||
<a class="tw-uppercase tw-no-underline hocus:tw-text-green-600 tw-ml-8" href="http://2017.drupalcampbristol.co.uk" title="DrupalCamp Bristol 2017">2017</a>
|
||||
<a class="tw-uppercase tw-no-underline hocus:tw-text-green-600 tw-ml-8" href="{{ page.twitter.url }}" title="DrupalCamp Bristol on Twitter">Twitter</a>
|
||||
<a class="tw-uppercase tw-no-underline hocus:tw-text-green-600 tw-ml-8" href="https://www.youtube.com/channel/UCoHlMzj9iT4xOlpgYOg_rjw" title="View previous videos on YouTube">YouTube</a>
|
||||
</nav>
|
||||
|
||||
<div class="clearfix text-formatted field field--name-body field--type-text-with-summary field--label-hidden field__item">
|
||||
<p><span>DrupalCamp Bristol is a non-profit event brought to you by a team of volunteers from the<span> </span></span><a href="https://www.drupalbristol.co.uk">Bristol Drupal community</a></p>
|
||||
</div>
|
||||
</div>
|
||||
<div class="clearfix text-formatted field field--name-body field--type-text-with-summary field--label-hidden field__item">
|
||||
<p><span>DrupalCamp Bristol is a non-profit event brought to you by a team of volunteers from the<span> </span></span><a href="https://www.drupalbristol.co.uk">Bristol Drupal community</a></p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</footer>
|
||||
|
|
|
|||
|
|
@ -1,36 +1,36 @@
|
|||
<section id="speakers" class="tw-w-full sm:tw-max-w-5xl tw-mx-auto tw-text-center tw-my-12 md:tw-my-24">
|
||||
<div class="tw-px-4">
|
||||
<h2 class="tw-text-3xl md:tw-text-4xl tw-font-bold tw-mb-10">Featuring Talks From</h2>
|
||||
<h2 class="tw-text-3xl md:tw-text-4xl tw-font-bold tw-mb-10">Featuring Talks From</h2>
|
||||
|
||||
<div class="text-left sm:tw-px-12">
|
||||
<ul class="tw-list-reset tw-flex tw-flex-wrap tw--mx-4 tw--mb-10">
|
||||
<div class="text-left sm:tw-px-12">
|
||||
<ul class="tw-list-reset tw-flex tw-flex-wrap tw--mx-4 tw--mb-10">
|
||||
{% for speaker in speakers %}
|
||||
<li class="tw-w-full lg:tw-w-1/2 tw-text-left tw-mb-10">
|
||||
<a href="{{ speaker.url }}" class="group tw-px-4 tw-flex tw-flex-row-reverse tw-no-underline focus:tw-outline-none">
|
||||
<span class="tw-flex-1 tw-flex tw-flex-col tw-justify-center">
|
||||
<span class="tw-block tw-font-bold tw-text-xl tw-text-gray-900 group-hocus:tw-underline">{{ speaker.title }}</span>
|
||||
<span class="tw-block tw-text-gray-800">
|
||||
<li class="tw-w-full lg:tw-w-1/2 tw-text-left tw-mb-10">
|
||||
<a href="{{ speaker.url }}" class="group tw-px-4 tw-flex tw-flex-row-reverse tw-no-underline focus:tw-outline-none">
|
||||
<span class="tw-flex-1 tw-flex tw-flex-col tw-justify-center">
|
||||
<span class="tw-block tw-font-bold tw-text-xl tw-text-gray-900 group-hocus:tw-underline">{{ speaker.title }}</span>
|
||||
<span class="tw-block tw-text-gray-800">
|
||||
{% include 'speaker-role' with { speaker: speaker } %}
|
||||
</span>
|
||||
</span>
|
||||
</span>
|
||||
|
||||
<span class="tw-w-24 md:tw-w-32 tw-mr-6">
|
||||
<span class="tw-rounded-full tw-overflow-hidden tw-block tw-border-4 tw-border-solid tw-border-purple-500 group-hocus:tw-border-pink-500 tw-transition-border tw-transition-100">
|
||||
<img class="tw-block tw-w-full" src="/images/speakers/{{ speaker.image }}" alt="Photo of {{ speaker.name }}">
|
||||
</span>
|
||||
<span class="tw-w-24 md:tw-w-32 tw-mr-6">
|
||||
<span class="tw-rounded-full tw-overflow-hidden tw-block tw-border-4 tw-border-solid tw-border-purple-500 group-hocus:tw-border-pink-500 tw-transition-border tw-transition-100">
|
||||
<img class="tw-block tw-w-full" src="/images/speakers/{{ speaker.image }}" alt="Photo of {{ speaker.name }}">
|
||||
</span>
|
||||
</a>
|
||||
</li>
|
||||
</span>
|
||||
</a>
|
||||
</li>
|
||||
{% endfor %}
|
||||
</ul>
|
||||
</div>
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
<div class="tw-mt-12 tw-leading-relaxed">
|
||||
<p class="tw-text-lg">
|
||||
We’re currently in the process of announcing speakers.
|
||||
<br class="tw-hidden md:tw-inline">
|
||||
Check back soon to see who else has been added or <a class="tw-text-purple-600 hocus:tw-text-purple-700 hocus:tw-no-underline" href="{{ site.twitter.url }}">follow us on Twitter</a>.
|
||||
</p>
|
||||
</div>
|
||||
<div class="tw-mt-12 tw-leading-relaxed">
|
||||
<p class="tw-text-lg">
|
||||
We’re currently in the process of announcing speakers.
|
||||
<br class="tw-hidden md:tw-inline">
|
||||
Check back soon to see who else has been added or <a class="tw-text-purple-600 hocus:tw-text-purple-700 hocus:tw-no-underline" href="{{ site.twitter.url }}">follow us on Twitter</a>.
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
</section>
|
||||
|
|
|
|||
|
|
@ -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'],
|
||||
}
|
||||
] %}
|
||||
|
||||
<nav role="navigation" aria-labelledby="block-dcb2017-main-menu-menu" id="block-dcb2017-main-menu" class="block block-menu navigation menu--main">
|
||||
<h2 class="visually-hidden" id="block-dcb2017-main-menu-menu">Main navigation</h2>
|
||||
<ul class="tw-list-reset tw-flex tw-flex-wrap tw-justify-center tw--ml-8">
|
||||
{% for link in links if link.enabled %}
|
||||
<li class="tw-mb-2 tw-mx-4 md:tw-m-0 md:tw-ml-8">
|
||||
<a
|
||||
class="tw-uppercase tw-no-underline hocus:tw-text-green-600 {{ link.active ? 'tw-text-green-600' : 'tw-text-black' }}"
|
||||
href="{{ link.href|raw }}"
|
||||
>
|
||||
{{ link.title }}
|
||||
</a>
|
||||
</li>
|
||||
{% endfor %}
|
||||
</ul>
|
||||
<h2 class="visually-hidden" id="block-dcb2017-main-menu-menu">Main navigation</h2>
|
||||
<ul class="tw-list-reset tw-flex tw-flex-wrap tw-justify-center tw--ml-8">
|
||||
{% for link in links if link.enabled %}
|
||||
<li class="tw-mb-2 tw-mx-4 md:tw-m-0 md:tw-ml-8">
|
||||
<a class="tw-uppercase tw-no-underline hocus:tw-text-green-600 {{ link.active ? 'tw-text-green-600' : 'tw-text-black' }}" href="{{ link.href|raw }}">
|
||||
{{ link.title }}
|
||||
</a>
|
||||
</li>
|
||||
{% endfor %}
|
||||
</ul>
|
||||
</nav>
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
{% for speaker in speakers %}
|
||||
<li>
|
||||
<a href="{{ speaker.url }}">
|
||||
{{ speaker.title }}
|
||||
{{ speaker.title }}
|
||||
</a>
|
||||
</li>
|
||||
{% endfor %}
|
||||
|
|
|
|||
|
|
@ -1,3 +1,3 @@
|
|||
<div class="tw-bg-black tw-font-bold tw-text-lg tw-text-white tw-text-center tw-p-4 tw-uppercase tw-mt-auto">
|
||||
{{ page.update_text }}
|
||||
{{ page.update_text }}
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -17,8 +17,8 @@
|
|||
<![endif]-->
|
||||
</head>
|
||||
<body class="path-frontpage">
|
||||
<div id="app">
|
||||
{% block body %}{% endblock %}
|
||||
</div>
|
||||
<div id="app">
|
||||
{% block body %}{% endblock %}
|
||||
</div>
|
||||
</body>
|
||||
</html>
|
||||
|
|
|
|||
|
|
@ -5,23 +5,23 @@
|
|||
Skip to main content
|
||||
</a>
|
||||
<div class="tw-min-h-screen tw-flex tw-flex-col">
|
||||
{% include 'banner' %}
|
||||
{% include 'banner' %}
|
||||
|
||||
<div class="tw-flex tw-flex-col tw-flex-1">
|
||||
{% block content_wrapper %}
|
||||
{% block content %}{% endblock %}
|
||||
{% endblock %}
|
||||
<div class="tw-flex tw-flex-col tw-flex-1">
|
||||
{% block content_wrapper %}
|
||||
{% block content %}{% endblock %}
|
||||
{% endblock %}
|
||||
|
||||
{% block content_botton %}{% endblock %}
|
||||
{% block content_botton %}{% endblock %}
|
||||
|
||||
{% if page.update_text %}
|
||||
{% include 'update-text' %}
|
||||
{% endif %}
|
||||
</div>
|
||||
{% if page.update_text %}
|
||||
{% include 'update-text' %}
|
||||
{% endif %}
|
||||
</div>
|
||||
|
||||
<div>
|
||||
{% block footer_top %}{% endblock %}
|
||||
{% include 'footer' %}
|
||||
</div>
|
||||
<div>
|
||||
{% block footer_top %}{% endblock %}
|
||||
{% include 'footer' %}
|
||||
</div>
|
||||
</div>
|
||||
{% endblock %}
|
||||
|
|
|
|||
|
|
@ -4,18 +4,18 @@
|
|||
<main class="tw-justify-start">
|
||||
<div class="tw-w-full tw-max-w-4xl tw-mx-auto tw-my-10">
|
||||
<div class="tw-px-4 xl:tw-px-0">
|
||||
<h1 class="tw-mt-0">
|
||||
{% block title %}{{ page.title }}{% endblock %}
|
||||
</h1>
|
||||
<h1 class="tw-mt-0">
|
||||
{% block title %}{{ page.title }}{% endblock %}
|
||||
</h1>
|
||||
|
||||
{% block content_wrapper_inner %}
|
||||
<div class="markup">
|
||||
{% block content %}{% endblock %}
|
||||
</div>
|
||||
{% endblock %}
|
||||
{% block content_wrapper_inner %}
|
||||
<div class="markup">
|
||||
{% block content %}{% endblock %}
|
||||
</div>
|
||||
{% endblock %}
|
||||
|
||||
{% block content_bottom %}{% endblock %}
|
||||
</div>
|
||||
{% block content_bottom %}{% endblock %}
|
||||
</div>
|
||||
</div>
|
||||
</main>
|
||||
{% endblock %}
|
||||
|
|
|
|||
|
|
@ -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 %}
|
||||
|
|
|
|||
|
|
@ -44,9 +44,9 @@
|
|||
</div>
|
||||
|
||||
<aside>
|
||||
{% include 'speaker-session' with {
|
||||
sessions: speakerSessions(page, data.sessions),
|
||||
} %}
|
||||
{% include 'speaker-session' with {
|
||||
sessions: speakerSessions(page, data.sessions),
|
||||
} %}
|
||||
</aside>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
Loading…
Reference in a new issue