Merge app.html.twig and default.html.twig
This commit is contained in:
parent
8a35a18bbf
commit
83ed930cb1
|
|
@ -1,5 +1,5 @@
|
||||||
---
|
---
|
||||||
layout: default
|
layout: page
|
||||||
title: Page Not Found
|
title: Page Not Found
|
||||||
permalink: /404.html
|
permalink: /404.html
|
||||||
use: [posts]
|
use: [posts]
|
||||||
|
|
|
||||||
|
|
@ -23,7 +23,37 @@
|
||||||
</head>
|
</head>
|
||||||
<body class="font-sans text-black text-sm leading-normal">
|
<body class="font-sans text-black text-sm leading-normal">
|
||||||
<div id="app" v-cloak>
|
<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>
|
||||||
|
© 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>
|
</div>
|
||||||
|
|
||||||
{% if site.google_analytics_tracking_id %}
|
{% if site.google_analytics_tracking_id %}
|
||||||
|
|
@ -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>
|
|
||||||
© 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 %}
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
{% extends 'default' %}
|
{% extends 'base' %}
|
||||||
|
|
||||||
{% block content_top %}
|
{% block content_top %}
|
||||||
<h1>{{ page.title }}</h1>
|
<h1>{{ page.title }}</h1>
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
{% extends 'default' %}
|
{% extends 'base' %}
|
||||||
|
|
||||||
{% block content_wrapper %}
|
{% block content_wrapper %}
|
||||||
{% include 'post/header' %}
|
{% include 'post/header' %}
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
---
|
---
|
||||||
layout: default
|
layout: page
|
||||||
title: About
|
title: About Me
|
||||||
meta:
|
meta:
|
||||||
og:
|
og:
|
||||||
title: 'Oliver Davies - Full Stack Developer, System Administrator, PHP and Drupal specialist'
|
title: 'Oliver Davies - Full Stack Developer, System Administrator, PHP and Drupal specialist'
|
||||||
|
|
@ -12,8 +12,6 @@ use:
|
||||||
permalink: /
|
permalink: /
|
||||||
---
|
---
|
||||||
<div class="markdown" markdown="1">
|
<div class="markdown" markdown="1">
|
||||||
# About Me
|
|
||||||
|
|
||||||
<div class="mb-4 w-1/3 sm:w-1/4 lg:w-1/6">
|
<div class="mb-4 w-1/3 sm:w-1/4 lg:w-1/6">
|
||||||
<img
|
<img
|
||||||
src="{{ site.avatar.url }}"
|
src="{{ site.avatar.url }}"
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
---
|
---
|
||||||
layout: default
|
layout: page
|
||||||
title: Accessibility
|
title: Accessibility
|
||||||
use: [posts]
|
use: [posts]
|
||||||
---
|
---
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
---
|
---
|
||||||
layout: default
|
layout: page
|
||||||
title: Blog
|
title: Blog
|
||||||
generator: pagination
|
generator: pagination
|
||||||
pagination:
|
pagination:
|
||||||
|
|
@ -7,8 +7,6 @@ pagination:
|
||||||
use: [posts]
|
use: [posts]
|
||||||
---
|
---
|
||||||
{% block content %}
|
{% block content %}
|
||||||
<h1>Blog</h1>
|
|
||||||
|
|
||||||
<ul class="list-reset">
|
<ul class="list-reset">
|
||||||
{% for post in page.pagination.items %}
|
{% for post in page.pagination.items %}
|
||||||
<li class="mb-12">
|
<li class="mb-12">
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
---
|
---
|
||||||
layout: default
|
layout: page
|
||||||
nav: blog
|
nav: blog
|
||||||
title: Tags
|
title: Tags
|
||||||
use:
|
use:
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
---
|
---
|
||||||
layout: default
|
layout: page
|
||||||
nav: blog
|
nav: blog
|
||||||
title: Tag Archive
|
title: Tag Archive
|
||||||
generator:
|
generator:
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
---
|
---
|
||||||
layout: default
|
layout: page
|
||||||
title: Company Information
|
title: Company Information
|
||||||
meta:
|
meta:
|
||||||
description: 'Company information for Oliver Davies Ltd.'
|
description: 'Company information for Oliver Davies Ltd.'
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
---
|
---
|
||||||
layout: default
|
layout: page
|
||||||
title: Experience
|
title: Experience
|
||||||
use: [posts]
|
use: [posts]
|
||||||
experiences:
|
experiences:
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
---
|
---
|
||||||
layout: default
|
layout: page
|
||||||
title: Development Terms
|
title: Development Terms
|
||||||
use: [posts]
|
use: [posts]
|
||||||
---
|
---
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue