4 files changed, 21 insertions, 16 deletions
diff --git a/themes/classic/source/_includes/article.html b/themes/classic/source/_includes/article.html
index 764e36d1..c0a9782f 100644
--- a/themes/classic/source/_includes/article.html
+++ b/themes/classic/source/_includes/article.html
@@ -10,22 +10,19 @@
     {% else %}
       <h1 class="entry-title">{{ page.title | titlecase }}</h1>
     {% endif %}
-    {% unless page.no_meta %}
-      <p>
-        {% if page.date %}
-          <time datetime="{{ page.date | datetime }}" pubdate {% if page.updated %} updated {% endif %}>{{ page.date | ordinalize }}</time>
-        {% endif %}
-        {% if page.updated %}
-          <time class="updated" datetime="{{ page.updated | datetime }}"></time>
-        {% endif %}
-        {% if author %}<span class="byline author vcard">By <span class="fn">{{ author }}</span></span>{% endif %}
-      </p>
-    {% endunless %}
+    {% unless page.no_meta or !index %}<p class="meta">{% include post_meta.html %}</p>{% endunless %}
   </header>
 {% endunless %}
 {% if index %}
-<div class="entry-content">{{ content | exerpt(content, page.url, 'Continue reading &raquo;') | smart_quotes }}</div>
+<div class="entry-content">{{ content | exerpt | smart_quotes }}</div>
+<footer>
+  <p>
+  {% if content contains "<!-- more -->" or content contains "<!--more-->" %}
+    <a rel="full-article" href="{{ page.url }}">Read more &hellip;</a>
+  {% endif %}
+  {% include post_meta.html %}
+  </p>
+</footer>
 {% else %}
 <div class="entry-content">{{ content | smart_quotes }}</div>
 {% endif %}
-
diff --git a/themes/classic/source/_includes/post_meta.html b/themes/classic/source/_includes/post_meta.html
new file mode 100644
index 00000000..24768255
--- /dev/null
+++ b/themes/classic/source/_includes/post_meta.html
@@ -0,0 +1,7 @@
+{% if page.date %}
+<time datetime="{{ page.date | datetime }}" pubdate {% if page.updated %} updated {% endif %}>{{ page.date | ordinalize }}</time>
+{% endif %}
+{% if page.updated %}
+<time class="updated" datetime="{{ page.updated | datetime }}"></time>
+{% endif %}
+{% if author %}<span class="byline author vcard"><span class="fn">{{ author }}</span></span>{% endif %}
diff --git a/themes/classic/source/_layouts/default.html b/themes/classic/source/_layouts/default.html
index dc69ef83..4e4f81a3 100644
--- a/themes/classic/source/_layouts/default.html
+++ b/themes/classic/source/_layouts/default.html
@@ -4,7 +4,7 @@
   <nav>{% include navigation.html %}</nav>
   <div>
     <div>
-      <div id="articles">{{ content }}</div>
+      <div id="articles" {% if page.blog_index %} class="blog-index" {% endif %}>{{ content }}</div>
       {% unless page.sidebar == 'none' %}
         <aside>{% include sidebar.html %}</aside>
       {% endunless %}
diff --git a/themes/classic/source/index.html b/themes/classic/source/index.html
index 09eb8d13..f151e06e 100644
--- a/themes/classic/source/index.html
+++ b/themes/classic/source/index.html
@@ -1,9 +1,10 @@
 ---
 layout: default
+blog_index: true
 ---
-{% for page in site.posts limit:3 %}
-{% assign content = page.content %}
 {% assign index = true %}
+{% for page in site.posts limit:site.posts_per_page %}
+{% assign content = page.content %}
   <article>
     {% include article.html %}
   </article>