Move header blocks to sidebar

3 files changed, 16 insertions, 15 deletions

diff --git a/alabaster-lite/config.html b/alabaster-lite/config.html
index 51f1871..10fc18a 100644
--- a/alabaster-lite/config.html
+++ b/alabaster-lite/config.html
@@ -7,7 +7,7 @@
   "include_toc": e.include_toc             | default(true),
   "extra_nav_links": e.extra_nav_links     | default({}),
   "show_powered_by": e.show_powered_by     | default(true),
-  "sidebars": e.sidebars                   | default(["about", "toc"]),
+  "sidebars": e.sidebars                   | default(["title", "toc"]),
   "homepage_nav": e.homepage_nav           | default(true),
-  "homepage_sidebars": e.homepage_sidebars | default(["about"]),
+  "homepage_sidebars": e.homepage_sidebars | default(["title", "about"]),
 }%}
diff --git a/alabaster-lite/sidebars/about.html b/alabaster-lite/sidebars/about.html
index 89de15b..ed6cb0e 100644
--- a/alabaster-lite/sidebars/about.html
+++ b/alabaster-lite/sidebars/about.html
@@ -1,19 +1,8 @@
-{% if theme.logo %}
-  <p class="logo">
-    <a href="{{nav.homepage.url|url}}">
-      <img class="logo" src="{{base_url}}/{{theme.logo}}" title="{{theme.logo_title}}">
-    </a>
-  </p>
-  {% if theme.logo_name %}
-    <h1 class="logo">{{ config.site_name }}</h1>
-  {% endif %}
-{% else %}
-  <h1 class="logo"><a href="{{nav.homepage.url|url}}">{{ config.site_name }}</a></h1>
-{% endif %}
-
 <p class="blurb">This is technically a blog.</p>
 
 <ul>
 	<li><a href="/about">About Me</a></li>
 	<li><a href="/feed/atom.xml">Atom Feed</a></li>
+  <li><a href="/links">Links</a></li>
+  <li><a href="/x">~x</a></li>
 </ul>
diff --git a/alabaster-lite/sidebars/title.html b/alabaster-lite/sidebars/title.html
new file mode 100644
index 0000000..becb5b3
--- /dev/null
+++ b/alabaster-lite/sidebars/title.html
@@ -0,0 +1,12 @@
+{% if theme.logo %}
+  <p class="logo">
+    <a href="{{nav.homepage.url|url}}">
+      <img class="logo" src="{{base_url}}/{{theme.logo}}" title="{{theme.logo_title}}">
+    </a>
+  </p>
+  {% if theme.logo_name %}
+    <h1 class="logo">{{ config.site_name }}</h1>
+  {% endif %}
+{% else %}
+  <h1 class="logo"><a href="{{nav.homepage.url|url}}">{{ config.site_name }}</a></h1>
+{% endif %}