opdavies/oliverdavies.uk
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Combine the default and base templates

Browse source
This commit is contained in:
Oliver Davies 2024-12-18 21:45:11 +00:00
parent e4a779fc45
commit 661669f2a5
3 changed files with 46 additions and 51 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
source/_layouts/base.html.twig
View file

@ -45,7 +45,51 @@
<body> <body>
<a class="sr-only focus:not-sr-only" href="#footer">Jump to the navigation menu</a> <a class="sr-only focus:not-sr-only" href="#footer">Jump to the navigation menu</a>
{% block body %}{% endblock %} <div class="min-h-screen font-sans text-base font-light md:text-xl dark:text-white text-grey-900 selection:bg-blue-primary selection:text-white dark:bg-grey-900 dark:selection:bg-blue-primary dark:selection:text-white">
{% include 'banner.html.twig' %}
<div class="py-4 px-4 mx-auto max-w-xl">
<header class="flex flex-col justify-between items-center md:flex-row">
{% include 'logo.html.twig' %}
</header>
</div>
<div class="py-10 px-6 mx-auto max-w-xl md:py-10">
<div class="space-y-10">
{% block content_top %}{% endblock %}
<main>
{% if page.url matches "#^/atdc/#" %}
<div class="mb-10 border border-grey-800 dark:border-grey-600">
<div class="py-4 px-4">
<div class="{{ site.prose_classes }}">
<p>I'm currently updating this course for Drupal 11. If you find any bugs or have any issues, <a href="mailto:{{ site.email }}?subject=ATDC">please let me know</a>.
</div>
</div>
</div>
{% endif %}
<h1 class="mb-4 text-xl font-bold md:text-2xl">
{% block page_title %}{{ page.title }}{% endblock %}
</h1>
<div class="{{ site.prose_classes }}">
{% block content_wrapper %}
{% block content %}{% endblock %}
{% endblock %}
</div>
</main>
{% block content_bottom %}{% endblock %}
</div>
<footer class="mt-16 mb-6">
<a id="footer" tabindex="-1"></a>
{% include 'main-menu.html.twig' %}
</footer>
</div>
</div>
{# Add the Mastodon verification link so pages can be verified. #} {# Add the Mastodon verification link so pages can be verified. #}
<a class="hidden" rel="me" href="{{ site.mastodon.url }}">Mastodon</a> <a class="hidden" rel="me" href="{{ site.mastodon.url }}">Mastodon</a>

49
source/_layouts/default.html.twig
View file

@ -1,49 +0,0 @@
{% extends 'base' %}
{% block body %}
<div class="min-h-screen font-sans text-base font-light md:text-xl dark:text-white text-grey-900 selection:bg-blue-primary selection:text-white dark:bg-grey-900 dark:selection:bg-blue-primary dark:selection:text-white">
{% include 'banner.html.twig' %}
<div class="py-4 px-4 mx-auto max-w-xl">
<header class="flex flex-col justify-between items-center md:flex-row">
{% include 'logo.html.twig' %}
</header>
</div>
<div class="py-10 px-6 mx-auto max-w-xl md:py-10">
<div class="space-y-10">
{% block content_top %}{% endblock %}
<main>
{% if page.url matches "#^/atdc/#" %}
<div class="mb-10 border border-grey-800 dark:border-grey-600">
<div class="py-4 px-4">
<div class="{{ site.prose_classes }}">
<p>I'm currently updating this course for Drupal 11. If you find any bugs or have any issues, <a href="mailto:{{ site.email }}?subject=ATDC">please let me know</a>.
</div>
</div>
</div>
{% endif %}
<h1 class="mb-4 text-xl font-bold md:text-2xl">
{% block page_title %}{{ page.title }}{% endblock %}
</h1>
<div class="{{ site.prose_classes }}">
{% block content_wrapper %}
{% block content %}{% endblock %}
{% endblock %}
</div>
</main>
{% block content_bottom %}{% endblock %}
</div>
<footer class="mt-16 mb-6">
<a id="footer" tabindex="-1"></a>
{% include 'main-menu.html.twig' %}
</footer>
</div>
</div>
{% endblock %}

2
source/_layouts/page.html.twig
View file

@ -1,4 +1,4 @@
{% extends 'default' %} {% extends 'base' %}
{% block content_bottom %} {% block content_bottom %}
{% include 'about-me.html.twig' %} {% include 'about-me.html.twig' %}