make the new style also work for blog posts

[web.git] / _layouts / default.html
diff --git a/_layouts/default.html b/_layouts/default.html

index cff4389b9f615936a127fae8423131098fcee3a3..aba9c6c0724b0ec74199c5a5afc39a12e77fb997 100644 (file)
--- a/_layouts/default.html
+++ b/_layouts/default.html
@@ -5,29 +5,24 @@
      <meta charset="utf-8">
      <meta name="viewport" content="width=device-width">
  
      <meta charset="utf-8">
      <meta name="viewport" content="width=device-width">
  
-    <title>{{ page.title }}</title>
+    <title>{% if page.pretitle %}{{ page.pretitle }} • {% endif %}{{ page.title }}</title>
      {% if page.excerpt %}<meta name="description" content="{{ page.excerpt | strip_html | strip_newlines | truncate: 160 }}">{% endif %}
  
      <link rel="stylesheet" href="/style.css">
      {% capture canonicalurl %}{{ page.url | replace:'index.html','' }}{% endcapture %}
      <link rel="canonical" href="{{ canonicalurl | prepend: site.url }}">
      {% if page.excerpt %}<meta name="description" content="{{ page.excerpt | strip_html | strip_newlines | truncate: 160 }}">{% endif %}
  
      <link rel="stylesheet" href="/style.css">
      {% capture canonicalurl %}{{ page.url | replace:'index.html','' }}{% endcapture %}
      <link rel="canonical" href="{{ canonicalurl | prepend: site.url }}">
-    {% if page.rss or page.layout == 'post' %}<link rel="alternate" type="application/rss+xml" title="{{ site.blog.title }}" href="/feed.xml" />{% endif %}
+    {% if page.rss %}<link rel="alternate" type="application/rss+xml" title="{{ site.blog.title }}" href="/blog/feed.xml" />{% endif %}
    </head>
  
    </head>
  
-
    <body><div id="-frame">
    <body><div id="-frame">
-  
-    <header id="-title">
-      <h1>{{ page.title }}</h1>
-    </header>
  
      <nav id="-navi">
  
      <nav id="-navi">
-      {% assign menu = site.html_pages | menu: page.url %}
+      {% assign menu = site.pages | menu: page.url %}
        {% include menu-level.html menu=menu %}
      </nav>
        {% include menu-level.html menu=menu %}
      </nav>
-
+  
      <article id="-content">
      <article id="-content">
-      {{ content }}
+        {{ content }}
      </article>
  
    </div></body>
      </article>
  
    </div></body>