Re-organise layouts

This commit is contained in:
Oliver Davies 2018-12-06 18:20:14 +00:00
parent 661a4c6c96
commit d366b6d6d2
4 changed files with 42 additions and 37 deletions

View file

@ -26,39 +26,7 @@
</head>
<body class="font-sans leading-normal">
<div id="app" v-cloak>
{% include 'layout/navbar' %}
<div class="container mx-auto px-4">
<div class="text-grey-darkest md:flex -mx-4">
<main class="md:w-2/3 lg:w-3/4 px-4 mb-8 lg:mb-0">
{% block page_title %}
<h1>{{ page.title }}</h1>
{% endblock %}
{% block content_wrapper %}
{% block content %}{% endblock %}
{% endblock %}
</main>
{% block sidebar_wrapper %}
<div class="md:w-1/3 lg:w-1/4 px-4" role="complementary">
{% block sidebar %}
{% include 'badges' %}
{% endblock %}
</div>
{% endblock %}
</div>
<footer class="border-t border-grey-light pt-4 mt-4">
<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>
{% block body %}{% endblock %}
</div>
{% if site.google_analytics_tracking_id %}

View file

@ -1,5 +1,37 @@
{% extends 'base' %}
{% extends 'app' %}
{% block content_top %}
{% block body %}
{% include 'layout/navbar' %}
<div class="container mx-auto px-4">
<div class="text-grey-darkest md:flex -mx-4">
<main class="md:w-2/3 lg:w-3/4 px-4 mb-8 lg:mb-0">
{% block page_title %}
<h1>{{ page.title }}</h1>
{% endblock %}
{% block content_wrapper %}
{% block content %}{% endblock %}
{% endblock %}
</main>
{% block sidebar_wrapper %}
<div class="md:w-1/3 lg:w-1/4 px-4" role="complementary">
{% block sidebar %}
{% include 'badges' %}
{% endblock %}
</div>
{% endblock %}
</div>
<footer class="border-t border-grey-light pt-4 mt-4">
<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 %}

View file

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

View file

@ -1,4 +1,4 @@
{% extends 'base' %}
{% extends 'page' %}
{% block page_title %}{% endblock %}