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

Merge app.html.twig and default.html.twig

Browse source
This commit is contained in:
Oliver Davies 2018-09-27 23:47:15 +01:00
parent 8a35a18bbf
commit 83ed930cb1
13 changed files with 43 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

32
source/_layouts/app.html.twig → source/_layouts/base.html.twig
View file

@ -23,7 +23,37 @@
</head>
<body class="font-sans text-black text-sm leading-normal">
<div id="app" v-cloak>
{% block body %}{% endblock %}
{% include 'layout/navbar' %}
<div class="container mx-auto px-4">
<div class="md:flex -mx-4">
<main class="md:w-2/3 lg:w-3/4 px-4 mb-8 lg:mb-0" role="main">
{% block content_top %}{% endblock %}
{% block content_wrapper %}{% block content %}{% endblock %}{% endblock %}
{% block content_bottom %}{% endblock %}
</main>
{% block sidebar_wrapper %}
<div class="md:w-1/3 lg:w-1/4 px-4" role="complementary">
{% block sidebar %}
{% include 'availability' %}
{% include 'posts/latest' %}
{% include 'badges' %}
{% endblock %}
</div>
{% endblock %}
</div>
<footer class="border-t border-grey-light pt-4 mt-4" role="contentinfo">
<p>
&copy; 2010-{{ 'now'|date('Y') }} {{ site.title }}.
Built with <a class="link" href="https://sculpin.io">Sculpin</a> and <a class="link" href="https://tailwindcss.com">Tailwind CSS</a>.
Hosted on <a class="link" href="https://www.netlify.com">Netlify</a>.
</p>
{% include 'meetups' %}
</footer>
</div>
</div>
{% if site.google_analytics_tracking_id %}

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

@ -1,35 +0,0 @@
{% extends 'app' %}
{% block body %}
{% include 'layout/navbar' %}
<div class="container mx-auto px-4">
<div class="md:flex -mx-4">
<main class="md:w-3/4 px-4 mb-8 lg:mb-0" role="main">
{% block content_top %}{% endblock %}
{% block content_wrapper %}{% block content %}{% endblock %}{% endblock %}
{% block content_bottom %}{% endblock %}
</main>
{% block sidebar_wrapper %}
<div class="md:w-1/4 px-4" role="complementary">
{% block sidebar %}
{% include 'availability' %}
{% include 'posts/latest' %}
{% include 'badges' %}
{% endblock %}
</div>
{% endblock %}
</div>
<footer class="border-t border-grey-light pt-4 mt-4" role="contentinfo">
<p>
&copy; 2010-{{ 'now'|date('Y') }} {{ site.title }}.
Built with <a class="link" href="https://sculpin.io">Sculpin</a> and <a class="link" href="https://tailwindcss.com">Tailwind CSS</a>.
Hosted on <a class="link" href="https://www.netlify.com">Netlify</a>.
</p>
{% include 'meetups' %}
</footer>
</div>
{% endblock %}

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

@ -1,4 +1,4 @@
{% extends 'default' %}
{% extends 'base' %}
{% block content_top %}
<h1>{{ page.title }}</h1>

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

@ -1,4 +1,4 @@
{% extends 'default' %}
{% extends 'base' %}
{% block content_wrapper %}
{% include 'post/header' %}