From 87f300b2bcf166474e5f7824fb3126a7992613ba Mon Sep 17 00:00:00 2001
From: Brandon Mathis <brandon@imathis.com>
Date: Wed, 13 Jul 2011 22:23:19 -0400
Subject: 1. Styled pagination for blog index 2. Fixed Newer pagination link on
 page 2 3. Improved sidebar section breakdown on collapse 4. Removed sharing
 links from the blog index page (moved to pages) 5. Improved styling for
 metadata on the blog index 6. Moved /blog/archives.html to
 /blog/archives/index.html 7. Improved responsive layout styling bugs

---
 .themes/classic/source/_includes/article.html         | 15 ++++++---------
 .themes/classic/source/_includes/navigation.html      |  2 +-
 .themes/classic/source/_includes/post_categories.html |  2 +-
 .themes/classic/source/blog/archives.html             | 18 ------------------
 .themes/classic/source/blog/archives/index.html       | 18 ++++++++++++++++++
 .themes/classic/source/index.html                     | 18 +++++++++++-------
 .themes/classic/source/javascripts/octopress.js       |  2 +-
 7 files changed, 38 insertions(+), 37 deletions(-)
 delete mode 100644 .themes/classic/source/blog/archives.html
 create mode 100644 .themes/classic/source/blog/archives/index.html

(limited to '.themes/classic/source')

diff --git a/.themes/classic/source/_includes/article.html b/.themes/classic/source/_includes/article.html
index b458d732..603c2f97 100644
--- a/.themes/classic/source/_includes/article.html
+++ b/.themes/classic/source/_includes/article.html
@@ -5,20 +5,17 @@
     {% else %}
       <h1 class="entry-title">{{ page.title | titlecase }}</h1>
     {% endif %}
-    {% unless page.no_meta or !index %}<p class="meta">{% include post_date.html %}</p>{% endunless %}
+    {% unless page.no_meta %}
+      <p class="meta">{% include post_date.html %}</p>
+    {% endunless %}
   </header>
+  {% if index %}
+  {% endif %}
 {% endunless %}
 {% if index %}
   <div class="entry-content">{{ content | exerpt | smart_quotes }}</div>
-  <p><a rel="full-article" href="{{ post.url }}">Read on &rarr;</a></p>
   <footer>
-    <p class="meta">
-      {% include post_author.html %}
-      {% include post_date.html %}
-      {% include post_categories.html %}
-      <span class="comments"><a rel="comments" href="{{ post.url }}#disqus_thread">Comments</a></span>
-      {% include sharing.html %}
-    </p>
+    <a rel="full-article" href="{{ post.url }}">Read on &rarr;</a>
   </footer>
 {% else %}
 <div class="entry-content">{{ content | smart_quotes }}</div>
diff --git a/.themes/classic/source/_includes/navigation.html b/.themes/classic/source/_includes/navigation.html
index 6c8efaad..ec18512b 100644
--- a/.themes/classic/source/_includes/navigation.html
+++ b/.themes/classic/source/_includes/navigation.html
@@ -12,5 +12,5 @@
 </form>
 <ul role="main-nav">
   <li><a href="/">Blog</a></li>
-  <li><a href="/blog/archives.html">Archives</a></li>
+  <li><a href="/blog/archives/index.html">Archives</a></li>
 </ul>
diff --git a/.themes/classic/source/_includes/post_categories.html b/.themes/classic/source/_includes/post_categories.html
index 7bf7528f..4a98b29d 100644
--- a/.themes/classic/source/_includes/post_categories.html
+++ b/.themes/classic/source/_includes/post_categories.html
@@ -1,6 +1,6 @@
 {% capture category %}{% if post %}{{ post.categories | category_links | size }}{% else %}{{ page.categories | category_links | size }}{% endif %}{% endcapture %}
 {% unless category == '0' %}
-<span class="categories"> in
+<span class="categories">
   {% if post %}
     {{ post.categories | category_links }}
   {% else %}
diff --git a/.themes/classic/source/blog/archives.html b/.themes/classic/source/blog/archives.html
deleted file mode 100644
index cdc5f17c..00000000
--- a/.themes/classic/source/blog/archives.html
+++ /dev/null
@@ -1,18 +0,0 @@
----
-layout: page
-title: Blog Archive
-no_footer: true
----
-
-<div id="blog-archives">
-{% for post in site.posts reverse %}
-{% capture this_year %}{{ post.date | date: "%Y" }}{% endcapture %}
-{% unless year == this_year %}
-  {% assign year = this_year %}
-  <h2>{{ year }}</h2>
-{% endunless %}
-<article>
-  {% include archive_post.html %}
-</article>
-{% endfor %}
-</div>
diff --git a/.themes/classic/source/blog/archives/index.html b/.themes/classic/source/blog/archives/index.html
new file mode 100644
index 00000000..cdc5f17c
--- /dev/null
+++ b/.themes/classic/source/blog/archives/index.html
@@ -0,0 +1,18 @@
+---
+layout: page
+title: Blog Archive
+no_footer: true
+---
+
+<div id="blog-archives">
+{% for post in site.posts reverse %}
+{% capture this_year %}{{ post.date | date: "%Y" }}{% endcapture %}
+{% unless year == this_year %}
+  {% assign year = this_year %}
+  <h2>{{ year }}</h2>
+{% endunless %}
+<article>
+  {% include archive_post.html %}
+</article>
+{% endfor %}
+</div>
diff --git a/.themes/classic/source/index.html b/.themes/classic/source/index.html
index 3f6b11b8..8754a82b 100644
--- a/.themes/classic/source/index.html
+++ b/.themes/classic/source/index.html
@@ -11,13 +11,17 @@ blog_index: true
   </article>
 {% endfor %}
 <nav role="pagination">
-  {% if paginator.next_page %}
-    <a href="/page{{paginator.next_page}}/">&larr; Older</a>
-  {% endif %}
-  <a href="/blog/archive.html">Blog Archive</a>
-  {% if paginator.previous_page %}
-    <a href="/page{{paginator.previous_page}}/">Newer &rarr;</a>
-  {% endif %}
+  <div>
+    {% if paginator.next_page %}
+      <a class="prev" href="/page{{paginator.next_page}}/">&larr; Older</a>
+    {% endif %}
+    <a href="/blog/archives/index.html">Blog Archives</a>
+    {% if paginator.previous_page and paginator.previous_page > 1 %}
+      <a class="next" href="/page{{paginator.previous_page}}/">Newer &rarr;</a>
+    {% elsif paginator.previous_page %}
+      <a class="next" href="/">Newer &rarr;</a>
+    {% endif %}
+  </div>
 </nav>
 {% if site.disqus_short_name %}
 <script type="text/javascript">
diff --git a/.themes/classic/source/javascripts/octopress.js b/.themes/classic/source/javascripts/octopress.js
index 949f7a03..6a5ad2ea 100644
--- a/.themes/classic/source/javascripts/octopress.js
+++ b/.themes/classic/source/javascripts/octopress.js
@@ -9,7 +9,7 @@ function getNav(){
   });
 }
 function addSidebarToggler() {
-  $('#content').prepend('<a href="#" class="toggle-sidebar">&raquo;</a>');
+  $('#content').append('<a href="#" class="toggle-sidebar">&raquo;</a>');
   $('.toggle-sidebar').bind('click', function(e){
     e.preventDefault();
     if($('body').hasClass('collapse-sidebar')){
-- 
cgit v1.2.1