bump jekyll-theme

7 files changed, 10 insertions, 33 deletions

diff --git a/_config.yml b/_config.yml
index d71875c..50d2981 100644
--- a/_config.yml
+++ b/_config.yml
@@ -3,6 +3,7 @@ plugins:
   - jekyll-paginate
   - jekyll-github-metadata
   - jekyll-remote-theme
+  - jekyll-default-layout
 
 exclude:
   - Gemfile
@@ -20,23 +21,13 @@ defaults:
       path: ""
       type: pages
     values:
-      layout: default
+      layout: page
       navbar_priority: 999
   - scope:
       path: ""
-      type: posts
-    values:
-      layout: post
-  - scope:
-      path: ""
       type: notes
     values:
-      layout: note
-  - scope:
-      path: categories
-      type: pages
-    values:
-      layout: category
+      layout: page
 
 highlighter: rouge
 markdown: kramdown
@@ -50,7 +41,7 @@ paginate: 10
 # jekyll-github-metadata
 repository: egor-tensin/blog
 # jekyll-remote-theme
-remote_theme: egor-tensin/jekyll-theme@823883ffc36d5b9c02b64a545061c740364e7454
+remote_theme: egor-tensin/jekyll-theme@3e22ef60fd2e89dc0817ff2c1a19178d91e23981
 
 # egor-tensin/jekyll-theme
 bootstrap_version: 3.3.7
diff --git a/all/index.html b/all/index.html
index 71e24f2..98b96ba 100644
--- a/all/index.html
+++ b/all/index.html
@@ -1,21 +1,9 @@
 ---
 title: All posts
+layout: default
 groups:
   - navbar
 navbar_link: <span class="glyphicon glyphicon-th-list"></span>&nbsp;Posts
 navbar_priority: 2
 ---
-{% if site.categories.size != 0 %}
-  {% for category in site.categories %}
-    <h1><a class="category" href="{{ site.baseurl }}/categories/{{ category[0] | slugify: 'pretty' }}">{{ category[0] }}</a></h1>
-    <hr/>
-    <ul>
-      {% for post in category[1] %}
-        <li><a href="{{ site.baseurl }}{{ post.url }}">{{ post.date | date: "%Y-%m-%d" }} &mdash; {{ post.title }}</a></li>
-      {% endfor %}
-    </ul>
-  {% endfor %}
-{% else %}
-  <p>Sorry, no posts have been added yet.</p>
-  <hr/>
-{% endif %}
+{% include categories/categories.html %}
diff --git a/categories/c++/index.html b/categories/c++/index.html
index 05a5f3f..ae41976 100644
--- a/categories/c++/index.html
+++ b/categories/c++/index.html
@@ -1,4 +1,4 @@
 ---
 title: C++
-category: C++
 ---
+{% include categories/category.html category=page.title %}
diff --git a/categories/haskell/index.html b/categories/haskell/index.html
index 1f19919..d2a1e89 100644
--- a/categories/haskell/index.html
+++ b/categories/haskell/index.html
@@ -1,4 +1,4 @@
 ---
 title: Haskell
-category: Haskell
 ---
+{% include categories/category.html category=page.title %}
diff --git a/categories/math/index.html b/categories/math/index.html
index 9019971..1fb0ad0 100644
--- a/categories/math/index.html
+++ b/categories/math/index.html
@@ -1,4 +1,4 @@
 ---
 title: Math
-category: Math
 ---
+{% include categories/category.html category=page.title %}
diff --git a/index.html b/index.html
index d3914c2..96ddbe4 100644
--- a/index.html
+++ b/index.html
@@ -1,5 +1,6 @@
 ---
 title: Main page
+layout: default
 groups:
   - navbar
 navbar_link: <span class="glyphicon glyphicon-home"></span>&nbsp;Main page
diff --git a/notes/index.html b/notes/index.html
index 0ceb78c..79e716a 100644
--- a/notes/index.html
+++ b/notes/index.html
@@ -1,13 +1,10 @@
 ---
-layout: default
 title: Notes
 groups:
   - navbar
 navbar_link: <span class="glyphicon glyphicon-search"></span>&nbsp;Notes
 navbar_priority: 3
 ---
-<h1>{{ page.title }}</h1>
-<hr/>
 {% if site.notes.size != 0 %}
   <p>This is a complete list of notes I maintain for my personal usage.</p>
   <ul>