From 24f8844f4d53653f7e2327c9b785047b245aacce Mon Sep 17 00:00:00 2001
From: Oliver Davies <oliver@oliverdavies.co.uk>
Date: Thu, 28 May 2015 18:01:03 +0100
Subject: [PATCH] Moved the main content wrapper

---
 source/_layouts/default.html.twig |  8 +++----
 source/_layouts/post.html.twig    | 38 +++++++++++++++++--------------
 2 files changed, 25 insertions(+), 21 deletions(-)

diff --git a/source/_layouts/default.html.twig b/source/_layouts/default.html.twig
index 403da0ec2..55ed12bcc 100644
--- a/source/_layouts/default.html.twig
+++ b/source/_layouts/default.html.twig
@@ -27,11 +27,11 @@
 
     <div class="container">
       <div class="row">
-        <div class="col-md-10">
-          {% block content_wrapper %}
+        {% block content_wrapper %}
+          <div class="col-md-10">
             {% block content %}{% endblock %}
-          {% endblock %}
-        </div>
+          </div>
+        {% endblock %}
 
         {% include 'sidebar' %}
       </div>{# .row #}
diff --git a/source/_layouts/post.html.twig b/source/_layouts/post.html.twig
index f7e377dd8..42a5cb95a 100644
--- a/source/_layouts/post.html.twig
+++ b/source/_layouts/post.html.twig
@@ -1,24 +1,28 @@
 {% extends 'default' %}
 
 {% block content_wrapper %}
-  {% include 'post-header' %}
-  {% block content %}{% endblock %}
+  <div class="col-md-10">
 
-  {% if page.tags %}
-    <p class="tags">
-      Tags:
-      {% for tag in page.tags %}
-        <a href="{{ site.url }}/blog/tags/{{ tag|url_encode(true) }}">{{ tag }}</a>{% if not loop.last %}, {% endif %}
-      {% endfor %}
-    </p>
-  {% endif %}
+    {% include 'post-header' %}
+    {% block content %}{% endblock %}
 
-  {% include 'about-author' %}
+    {% if page.tags %}
+      <p class="tags">
+        Tags:
+        {% for tag in page.tags %}
+          <a href="{{ site.url }}/blog/tags/{{ tag|url_encode(true) }}">{{ tag }}</a>{% if not loop.last %}, {% endif %}
+        {% endfor %}
+      </p>
+    {% endif %}
 
-  {% if page.next_post or page.previous_post %}
-    <ul>
-      {% if page.next_post %}<li>Next post: <a href="{{ page.next_post.url }}">{{ page.next_post.title }}</a></li>{% endif %}
-      {% if page.previous_post %}<li>Previous post: <a href="{{ page.previous_post.url }}">{{ page.previous_post.title }}</a></li>{% endif %}
-    </ul>
-  {% endif %}
+    {% include 'about-author' %}
+
+    {% if page.next_post or page.previous_post %}
+      <ul>
+        {% if page.next_post %}<li>Next post: <a href="{{ page.next_post.url }}">{{ page.next_post.title }}</a></li>{% endif %}
+        {% if page.previous_post %}<li>Previous post: <a href="{{ page.previous_post.url }}">{{ page.previous_post.title }}</a></li>{% endif %}
+      </ul>
+    {% endif %}
+
+  </div>
 {% endblock %}
\ No newline at end of file