layout

1 files changed, 13 insertions, 26 deletions

diff --git a/source/_includes/article.html b/source/_includes/article.html
index 941dd86..d9c5139 100644
--- a/source/_includes/article.html
+++ b/source/_includes/article.html
@@ -1,34 +1,21 @@
-{% unless page.no_header %}
-    <header>
-        {% if index %}
-            <div class="date left"><strong>{{ post.date | date: "%e" }}</strong>{{ post.date | date: "%b" }}</div>
-            <h1 class="title left"><a href="{{ root_url }}{{ post.url }}">{% if site.titlecase %}{{ post.title | titlecase }}{% else %}{{ post.title }}{% endif %}</a></h2>
-        {% else %}
-            <div class="date left"><strong>{{ post.date | date: "%e" }}</strong>{{ post.date | date: "%b" }}</div>
-            <h1 class="title left">{% if site.titlecase %}{{ page.title | titlecase }}{% else %}{{ page.title }}{% endif %}</h1>
-        {% endif %}
-        <div class="clear"></div>
-    </header>
-{% endunless %}
 {% if index %}
+    <h1 class="title"><a href="{{ root_url }}{{ post.url }}">{% if site.titlecase %}{{ post.title | titlecase }}{% else %}{{ post.title }}{% endif %}</a></h1>
     <div class="entry">
         {{ content | excerpt }}
         {% capture excerpted %}{{ content | has_excerpt }}{% endcapture %}
-        <footer>
-            {% if excerpted == 'true' %}
-                <a href="{{ root_url }}{{ post.url }}" class="more-link">閱讀全文</a>
-            {% endif %}
-            <a href="{% if index %}{{ root_url }}{{ post.url }}{% endif %}#disqus_thread" class="comment right">留言</a>
-        </footer>
+        {% if excerpted == 'true' %}<a href="{{ root_url }}{{ post.url }}" class="more-link">閱讀全文</a>{% endif %}
+    </div>
+    <div class="meta">
+        <div class="date">{% include post/date.html %}{{ time }}</div>
+        <div class="tags">{% include post/categories.html %}</div>
+        <div class="comments"><a href="{% if index %}{{ root_url }}{{ post.url }}{% endif %}#disqus_thread">留言</a></div>
     </div>
 {% else %}
-    <div class="entry">
-        {{ content }}
-        <footer>
-            <div class="social left">{% include post/sharing.html %}</div>
-            <a href="#disqus_thread" class="comment right">留言</a>
-            <div class="clear"></div>
-            {% include post/categories.html %}
-        </footer>
+    <h1 class="title">{% if site.titlecase %}{{ page.title | titlecase }}{% else %}{{ page.title }}{% endif %}</h1>
+    <div class="entry">{{ content }}</div>
+    <div class="meta">
+        <div class="date">{% include post/date.html %}{{ time }}</div>
+        <div class="tags">{% include post/categories.html %}</div>
+        <div class="comments"><a href="{% if index %}{{ root_url }}{{ post.url }}{% endif %}#disqus_thread">留言</a></div>
     </div>
 {% endif %}
\ No newline at end of file