summaryrefslogtreecommitdiffstats
path: root/blog/_includes
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/_includes
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/_includes')
-rw-r--r--blog/_includes/head.html2
-rw-r--r--blog/_includes/header.html2
-rw-r--r--blog/_includes/menubar.html22
-rw-r--r--blog/_includes/post-excerpt.html8
4 files changed, 17 insertions, 17 deletions
diff --git a/blog/_includes/head.html b/blog/_includes/head.html
index e345ae5..eac4a09 100644
--- a/blog/_includes/head.html
+++ b/blog/_includes/head.html
@@ -1,6 +1,6 @@
<head>
<meta charset="utf-8">
- <meta name="viewport" content="width=device-width initial-scale=1">
+ <meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<title>
{{ site.title }}
diff --git a/blog/_includes/header.html b/blog/_includes/header.html
index 6813c67..0372333 100644
--- a/blog/_includes/header.html
+++ b/blog/_includes/header.html
@@ -1,6 +1,6 @@
<header id="header">
<div id="logo">
- {% image header.png alt="Norsk Urskog" %}
+ {% image "logos/norsk-urskog-web.svg" alt:"Norsk Urskog" width:100% height:100% %}
<p>Norwegian Underground Metal Sampler</p>
</div>
<div id="banner-pos-1">
diff --git a/blog/_includes/menubar.html b/blog/_includes/menubar.html
index 04be761..3076326 100644
--- a/blog/_includes/menubar.html
+++ b/blog/_includes/menubar.html
@@ -1,10 +1,12 @@
-<nav class="site-nav">
- <a class="page-link" href="{{ site.baseurl | append: "/" }}">{% t titles.home %}</a>
- <a class="page-link" href="{{ site.baseurl_root | append: "/registration" }}">{% t titles.registration %}</a>
- {% for page in site.pages %}
- {% if page.title and (!page.hidden == true) %}
- <a class="page-link" href="{{ page.url | prepend: site.baseurl | remove: 'index.html' }}">{% page_title page.title %}</a>
- {% endif %}
- {% endfor %}
- {% include language-switcher.html %}
-</nav>
+<div id="page-menu">
+ <nav class="site-nav">
+ <a class="page-link" href="{{ site.baseurl | append: "/" }}">{% t titles.home %}</a>
+ <a class="page-link" href="{{ site.baseurl_root | append: "/registration" }}">{% t titles.registration %}</a>
+ {% for page in site.pages %}
+ {% if page.title and (!page.hidden == true) %}
+ <a class="page-link" href="{{ page.url | prepend: site.baseurl | remove: 'index.html' }}">{% page_title page.title %}</a>
+ {% endif %}
+ {% endfor %}
+ {% include language-switcher.html %}
+ </nav>
+</div>
diff --git a/blog/_includes/post-excerpt.html b/blog/_includes/post-excerpt.html
index e87b12b..b3616d8 100644
--- a/blog/_includes/post-excerpt.html
+++ b/blog/_includes/post-excerpt.html
@@ -1,13 +1,11 @@
{% assign post = include.post %}
-<article class="post">
+<article class="post-excerpt">
{% include post-header.html post = post %}
<section class="post-body">
{% if post.page-image %}
- {% if include.sidebar %}
+ <div class="post-image">
{{ post.page-image | img: "magick:resize:290x" }}
- {% else %}
- {{ post.page-image | img: "magick:resize:290x class:right" }}
- {% endif %}
+ </div>
{% endif %}
{{ post.excerpt }}
<p><a href="{{ post.url | prepend: site.baseurl }}">{% t global.read_more %}</a></p>