Template tidy

This commit is contained in:
Oliver Davies 2015-09-27 12:01:49 +01:00
parent 54111726b3
commit 8b18076d5f
2 changed files with 13 additions and 13 deletions

View file

@ -4,14 +4,14 @@
<!--[if gt IE 9]><html lang="{{ site.html_lang }}"><![endif]--> <!--[if gt IE 9]><html lang="{{ site.html_lang }}"><![endif]-->
<!--[if !IE]><!--><html lang="{{ site.html_lang }}"><!--<![endif]--> <!--[if !IE]><!--><html lang="{{ site.html_lang }}"><!--<![endif]-->
<head> <head>
{% include 'title' %} {% include('title') %}
{% if page.meta.description %} {% if page.meta.description %}
<meta name="description" content="{{ page.meta.description|e('html') }}"> <meta name="description" content="{{ page.meta.description|e('html') }}">
{% endif %} {% endif %}
{% if page.meta.og %} {% if page.meta.og %}
{% include "og" with { og: page.meta.og } %} {{ include('og', { og: page.meta.og }) }}
{% endif %} {% endif %}
<meta lang="{{ site.html_lang }}" charset="utf-8"> <meta lang="{{ site.html_lang }}" charset="utf-8">
@ -31,7 +31,7 @@
<link rel="icon" href="{{ site.gravatar.url }}?s={{ size }}" sizes="{{ size }}x{{ size }}"> <link rel="icon" href="{{ site.gravatar.url }}?s={{ size }}" sizes="{{ size }}x{{ size }}">
{% endfor %} {% endfor %}
</head> </head>
<body{% if page.blocks.body_classes %} class="{{ page.blocks.body_classes }}"{% endif %}> <body class="{{ page.blocks.body_classes }}">
<nav class="navbar navbar-inverse navbar-fixed-top"> <nav class="navbar navbar-inverse navbar-fixed-top">
<div class="container"> <div class="container">
<div class="navbar-header"> <div class="navbar-header">
@ -60,9 +60,9 @@
<div class="row"> <div class="row">
{% block content_wrapper %} {% block content_wrapper %}
<main class="col-md-9"> <main class="col-md-9">
{% block content %}{% endblock content %} {% block content %}{% endblock %}
</main> </main>
{% endblock content_wrapper %} {% endblock %}
{% block sidebar_wrapper %} {% block sidebar_wrapper %}
<div class="col-md-3"> <div class="col-md-3">
@ -77,17 +77,17 @@
</a> </a>
</div> </div>
{% include 'availability' %} {% include('availability') %}
{% endblock sidebar %} {% endblock %}
</div> </div>
{% endblock sidebar_wrapper %} {% endblock %}
</div>{# .row #} </div>{# .row #}
</div>{# .container #} </div>{# .container #}
<footer class="container"> <footer class="container">
<p class="copyright">&copy; 2010-{{ 'now'|date('Y') }} {{ site.title }}. Powered by <a href="https://sculpin.io">Sculpin</a> and <a href="https://www.digitalocean.com/?refcode={{ site.digitalocean_referral }}">DigitalOcean</a>.</p> <p class="copyright">&copy; 2010-{{ 'now'|date('Y') }} {{ site.title }}. Powered by <a href="https://sculpin.io">Sculpin</a> and <a href="https://www.digitalocean.com/?refcode={{ site.digitalocean_referral }}">DigitalOcean</a>.</p>
{% include 'meetups' %} {% include('meetups') %}
</footer> </footer>
<script src="{{ site.url }}/components/jquery/jquery.min.js"></script> <script src="{{ site.url }}/components/jquery/jquery.min.js"></script>
@ -95,7 +95,7 @@
<script src="{{ site.url }}/components/highlightjs/highlight.pack.js"></script> <script src="{{ site.url }}/components/highlightjs/highlight.pack.js"></script>
<script>hljs.initHighlightingOnLoad();</script> <script>hljs.initHighlightingOnLoad();</script>
{% block scripts %}{% endblock scripts %} {% block scripts %}{% endblock %}
{% if page.tweets %} {% if page.tweets %}
<script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script> <script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>

View file

@ -2,9 +2,9 @@
{% block content_wrapper %} {% block content_wrapper %}
<main class="col-md-9"> <main class="col-md-9">
{% include 'post-header' %} {% include('post-header') %}
{% block content %}{% endblock content %} {% block content %}{% endblock %}
<p class="post-feedback" style="font-style: italic"> <p class="post-feedback" style="font-style: italic">
<b>Have feedback about this post?</b> <a href="mailto:{{ site.email }}?subject=Feedback: {{ page.title }}">Email me</a> or <a href="https://twitter.com/home?status=@{{ site.twitter.name }} {{ site.url }}{{ page.url }}:">send me a tweet</a>. <b>Have feedback about this post?</b> <a href="mailto:{{ site.email }}?subject=Feedback: {{ page.title }}">Email me</a> or <a href="https://twitter.com/home?status=@{{ site.twitter.name }} {{ site.url }}{{ page.url }}:">send me a tweet</a>.
@ -47,4 +47,4 @@
{% endif %} {% endif %}
</main> </main>
{% endblock content_wrapper %} {% endblock %}