summaryrefslogtreecommitdiffstats
path: root/blog/_layouts
diff options
context:
space:
mode:
authorHarald Eilertsen <haraldei@anduin.net>2017-03-10 19:28:51 +0100
committerHarald Eilertsen <haraldei@anduin.net>2017-03-10 19:28:51 +0100
commit7603cecd364eb04fe6eac75971107796171287ef (patch)
tree365ca4077c408c45da535cacd98eeefb8464cc58 /blog/_layouts
parent87cd103c98265adc2a0cb256b14cd7b1d2d8e543 (diff)
parent0cb9284d51b16d192f42e2d2a4c12a2911668b2e (diff)
downloadnorsk-urskog-main-7603cecd364eb04fe6eac75971107796171287ef.tar.gz
norsk-urskog-main-7603cecd364eb04fe6eac75971107796171287ef.tar.bz2
norsk-urskog-main-7603cecd364eb04fe6eac75971107796171287ef.zip
Merge branch 'responsive-design'
Diffstat (limited to 'blog/_layouts')
-rw-r--r--blog/_layouts/default.html9
-rw-r--r--blog/_layouts/post.html8
2 files changed, 5 insertions, 12 deletions
diff --git a/blog/_layouts/default.html b/blog/_layouts/default.html
index 2488ce3..bd0ee80 100644
--- a/blog/_layouts/default.html
+++ b/blog/_layouts/default.html
@@ -10,15 +10,6 @@
<section id="body">
{{ content }}
</section>
- <section id="side-body">
- {% include news.html sidebar=true %}
-
- {% if site.links %}
- <section id="links">
- <h2>{% t home.links %}</h2>
- </section>
- {% endif %}
- </section>
</section>
</section>
diff --git a/blog/_layouts/post.html b/blog/_layouts/post.html
index 555bdc6..8a3cccb 100644
--- a/blog/_layouts/post.html
+++ b/blog/_layouts/post.html
@@ -5,9 +5,11 @@ layout: default
<article class="post">
{% include post-header.html post = page %}
<section class="post-body">
- {% if page.page-image %}
- {{ page.page-image | img: "magick:resize:590x" }}
- {% endif %}
+ <div class="post-image">
+ {% if page.page-image %}
+ {{ page.page-image | img: "magick:resize:590x" }}
+ {% endif %}
+ </div>
{{ content }}
</section>
<footer>