Merge branch 'master' of github.com:mklabs/jekyll-pullrequest.org

Conflicts:
	_layouts/default.html

Author: mklabs

_config.yml

@@ -1 +1,2 @@
 pygments: true
+paginate: 4

_layouts/default.html

@@ -18,8 +18,6 @@
   <!-- Mobile viewport optimized: j.mp/bplateviewport -->
   <meta name="viewport" content="width=device-width,initial-scale=1">
 
-  <!-- Place favicon.ico and apple-touch-icon.png in the root directory: mathiasbynens.be/notes/touch-icons -->
-
   <!-- CSS: implied media=all -->
   <!-- CSS concatenated and minified via ant build script-->
   <link rel="stylesheet" href="/public/css/style.css">

_layouts/post.html

@@ -33,7 +33,7 @@ <h1><a href="/article/${article.name}">{{ page.title }}</a></h1>
    <h1>Auteur</h1>
     <dl>
       <dt>Nom</dt>
-      <dd>${author.name}</dd>
+      <dd>{{ page.author }}</dd>
     </dl>
   <section class="about">
     <h1>Billet</h1>

favicon.ico

@@ -0,0 +1,33 @@
+---
+layout: default
+title: Pull Request
+---
+
+{% for page in paginator.posts %}
+    <article>
+        <header>
+            <h1>{{ page.title }}</h1>
+            <p><time pubdate="pubdate" datetime="{{ page.date }}">{{ page.date | date_to_string }}</time></p>
+        </header>
+        {{ page.content }}
+        <footer>
+            {% include categories.html %}
+        </footer>
+    </article>
+{% endfor %}
+
+<div class="pagination">
+    {% if paginator.previous_page %}
+        <a href="/page{{paginator.previous_page}}" class="previous">Previous</a>
+    {% else %}
+        <span class="previous">Previous</span>
+    {% endif %}
+
+    <span class="page_number ">Page: {{paginator.page}} of {{paginator.total_pages}}</span>
+
+    {% if paginator.next_page %}
+        <a href="/page{{paginator.next_page}}" class="next ">Next</a>
+    {% else %}
+        <span class="next ">Next</span>
+    {% endif %}
+</div>