diff options
author | Brandon Mathis <brandon@imathis.com> | 2011-07-13 22:23:19 -0400 |
---|---|---|
committer | Brandon Mathis <brandon@imathis.com> | 2011-07-13 22:23:19 -0400 |
commit | 87f300b2bcf166474e5f7824fb3126a7992613ba (patch) | |
tree | 15ab7545844898a2095ba9cbff73d904d7a59c2c /.themes/classic/source | |
parent | b0921c1e2707e561d71c4debd3b54466fa3f3b4a (diff) | |
download | my_new_personal_website-87f300b2bcf166474e5f7824fb3126a7992613ba.tar.xz my_new_personal_website-87f300b2bcf166474e5f7824fb3126a7992613ba.zip |
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
Diffstat (limited to '.themes/classic/source')
-rw-r--r-- | .themes/classic/source/_includes/article.html | 15 | ||||
-rw-r--r-- | .themes/classic/source/_includes/navigation.html | 2 | ||||
-rw-r--r-- | .themes/classic/source/_includes/post_categories.html | 2 | ||||
-rw-r--r-- | .themes/classic/source/blog/archives/index.html (renamed from .themes/classic/source/blog/archives.html) | 0 | ||||
-rw-r--r-- | .themes/classic/source/index.html | 18 | ||||
-rw-r--r-- | .themes/classic/source/javascripts/octopress.js | 2 |
6 files changed, 20 insertions, 19 deletions
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 →</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 →</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/index.html index cdc5f17c..cdc5f17c 100644 --- a/.themes/classic/source/blog/archives.html +++ b/.themes/classic/source/blog/archives/index.html 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}}/">← Older</a> - {% endif %} - <a href="/blog/archive.html">Blog Archive</a> - {% if paginator.previous_page %} - <a href="/page{{paginator.previous_page}}/">Newer →</a> - {% endif %} + <div> + {% if paginator.next_page %} + <a class="prev" href="/page{{paginator.next_page}}/">← 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 →</a> + {% elsif paginator.previous_page %} + <a class="next" href="/">Newer →</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">»</a>'); + $('#content').append('<a href="#" class="toggle-sidebar">»</a>'); $('.toggle-sidebar').bind('click', function(e){ e.preventDefault(); if($('body').hasClass('collapse-sidebar')){ |