layout

9 files changed, 39 insertions, 87 deletions

diff --git a/source/_includes/after_footer.html b/source/_includes/after_footer.html
index 20b9e4d..9e4e391 100644
--- a/source/_includes/after_footer.html
+++ b/source/_includes/after_footer.html
@@ -1,2 +1 @@
-{% include disqus.html %}
-{% include custom/after_footer.html %}
+{% include custom/after_footer.html %}
\ No newline at end of file
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
diff --git a/source/_includes/banner.html b/source/_includes/banner.html
index 93286a8..7da6092 100644
--- a/source/_includes/banner.html
+++ b/source/_includes/banner.html
@@ -1,10 +1 @@
-<div id="banner" class="inner">
-	<div class="image">
-		<div class="wrap"></div>
-	</div>
-	<div class="prev"></div>
-	<div class="next"></div>
-	<ul class="dots"></ul>
-	<div class="loading"><div>載入中</div></div>
-	<div class="error"><div>請開啟 Javascript 以獲得最佳的瀏覽效果</div></div>
-</div>
\ No newline at end of file
+<div id="banner" class="inner"></div>
\ No newline at end of file
diff --git a/source/_includes/custom/footer.html b/source/_includes/custom/footer.html
index f742b2f..488ea2f 100644
--- a/source/_includes/custom/footer.html
+++ b/source/_includes/custom/footer.html
@@ -1 +1 @@
-版權所有 &copy; {{ site.time | date: "%Y" }} {{ site.title }}
\ No newline at end of file
+Copyright &copy; {{ site.time | date: "%Y" }} {{ site.title }}
\ No newline at end of file
diff --git a/source/_includes/disqus.html b/source/_includes/disqus.html
deleted file mode 100644
index eb30877..0000000
--- a/source/_includes/disqus.html
+++ /dev/null
@@ -1,21 +0,0 @@
-{% comment %} Load script if disquss comments are enabled and `page.comments` is either empty (index) or set to true {% endcomment %}
-{% if site.disqus_short_name and page.comments != false %}
-<script type="text/javascript">
-      var disqus_shortname = '{{ site.disqus_short_name }}';
-      {% if page.comments == true %}
-        {% comment %} `page.comments` can be only be set to true on pages/posts, so we embed the comments here. {% endcomment %}
-        // var disqus_developer = 1;
-        var disqus_identifier = '{{ site.url }}{{ page.url }}';
-        var disqus_url = '{{ site.url }}{{ page.url }}';
-        var disqus_script = 'embed.js';
-      {% else %}
-        {% comment %} As `page.comments` is empty, we must be on the index page. {% endcomment %}
-        var disqus_script = 'count.js';
-      {% endif %}
-    (function () {
-      var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-      dsq.src = 'http://' + disqus_shortname + '.disqus.com/' + disqus_script;
-      (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-    }());
-</script>
-{% endif %}
diff --git a/source/_includes/footer.html b/source/_includes/footer.html
index 2a5a0eb..aa81074 100644
--- a/source/_includes/footer.html
+++ b/source/_includes/footer.html
@@ -1,6 +1 @@
-<div class="wrap">
-	{% include custom/footer.html %}
-	<div class="right">
-		<a href="http://www.facebook.com/tommy351" title="Facebook" target="_blank">Facebook</a><a href="https://plus.google.com/105931860008509594725" title="Google+" target="_blank">Google+</a><a href="http://twitter.com/tommy351" title="Twitter" target="_blank">Twitter</a><a href="{{ site.subscribe_rss }}" title="RSS" target="_blank">RSS</a>
-	</div>
-</div>
+{% include custom/footer.html %}
\ No newline at end of file
diff --git a/source/_includes/header.html b/source/_includes/header.html
index 6c7e800..8e4297c 100644
--- a/source/_includes/header.html
+++ b/source/_includes/header.html
@@ -2,7 +2,12 @@
 <nav class="menu left">{% include navigation.html %}</nav>
 <form class="search right" action="{{ site.simple_search }}" method="get">
 	<input class="left" type="text" name="q" results="0">
-	<input class="left" type="submit" name="q" value="L">
 	<input type="hidden" name="q" value="site:{{ site.url | shorthand_url }}">
 </form>
+<div class="social right">
+	<a href="">Facebook</a>
+	<a href="">Google+</a>
+	<a href="">Twitter</a>
+	<a href="">RSS</a>
+</div>
 {% include custom/header.html %}
\ No newline at end of file
diff --git a/source/_layouts/default.html b/source/_layouts/default.html
index a9cffe9..ad02643 100644
--- a/source/_layouts/default.html
+++ b/source/_layouts/default.html
@@ -1,11 +1,11 @@
 {% capture root_url %}{{ site.root | strip_slash }}{% endcapture %}
 {% include head.html %}
 
-<body {% if page.body_id %} id="{{ page.body_id }}" {% endif %} {% if page.sidebar == false %} class="no-sidebar" {% endif %} {% if page.sidebar == 'collapse' or site.sidebar == 'collapse' %} class="collapse-sidebar sidebar-footer" {% endif %}>
-	<header id="header" class="inner">{% include header.html %}</header>
+<body>
+	<header class="inner">{% include header.html %}</header>
 	{% include banner.html %}
 	<div id="content" class="inner">{{ content | expand_urls: root_url }}</div>
-	<footer id="footer" class="inner">{% include footer.html %}</footer>
+	<footer class="inner">{% include footer.html %}</footer>
 	{% include after_footer.html %}
 </body>
 </html>
\ No newline at end of file
diff --git a/source/index.html b/source/index.html
index 2614667..df4533d 100644
--- a/source/index.html
+++ b/source/index.html
@@ -2,20 +2,16 @@
 layout: default
 ---
 
-<section id="main_col" class="left">
-    {% assign index = true %}
-    {% for post in paginator.posts %}
-    {% assign content = post.content %}
-        <article class="post">{% include article.html %}</article>
-    {% endfor %}
-    <nav id="pagenavi">
-        {% if paginator.previous_page %}
-            <a href="{{paginator.previous_page}}" class="prev">上一頁</a>
-        {% endif %}
-        {% if paginator.next_page %}
-            <a href="{{paginator.next_page}}" class="next">下一頁</a>
-        {% endif %}
-    </nav>
-</section>
-{% include asides.html %}
-<div class="clear"></div>
\ No newline at end of file
+{% assign index = true %}
+{% for post in paginator.posts %}
+{% assign content = post.content %}
+    <article class="post">{% include article.html %}</article>
+{% endfor %}
+<nav id="pagenavi">
+    {% if paginator.previous_page %}
+        <a href="{{paginator.previous_page}}" class="prev">上一頁</a>
+    {% endif %}
+    {% if paginator.next_page %}
+        <a href="{{paginator.next_page}}" class="next">下一頁</a>
+    {% endif %}
+</nav>
\ No newline at end of file