diff --git a/404.md b/404.md index 178cb7d..bd41ab8 100644 --- a/404.md +++ b/404.md @@ -1,7 +1,7 @@ --- layout: default title: Page Not Found -permalink: 404.html +description: "404: Page not found" --- # 404: Page not found diff --git a/_config.dev.yml b/_config.dev.yml index ffdd7e2..2d6a2cc 100644 --- a/_config.dev.yml +++ b/_config.dev.yml @@ -1,4 +1,3 @@ -permalink: pretty host: 0.0.0.0 author: Avery Magnotti alias: citrusui @@ -40,4 +39,4 @@ gems: - jekyll-redirect-from - jekyll-sitemap paginate: 4 -paginate_path: "/blog/page/:num/" +paginate_path: "/blog/page/:num" diff --git a/_config.yml b/_config.yml index 035c935..99a7cd3 100644 --- a/_config.yml +++ b/_config.yml @@ -1,4 +1,3 @@ -permalink: pretty incremental: true author: Avery Magnotti alias: citrusui diff --git a/_includes/head.html b/_includes/head.html index 1dc4a5a..ea71d59 100644 --- a/_includes/head.html +++ b/_includes/head.html @@ -10,9 +10,9 @@ - + - + {% capture poole %} @@ -20,6 +20,14 @@ {% endcapture %} - {% if page.title == "main" %}{{ site.alias }}{% elsif page.blog %}{{ site.alias }} blog{% else %}{{ page.title }} | {{ site.alias }}{% endif %} + {% if page.title == "main" %} + {{ site.alias }} + {% elsif paginator.page > 1 %} + {{ site.alias }} blog | Page {{ paginator.page }} + {% elsif page.blog %} + {{ site.alias }} blog + {% else %} + {{ page.title }} | {{ site.alias }} + {% endif %} diff --git a/_includes/javascript.html b/_includes/javascript.html index def3f6f..87353c2 100644 --- a/_includes/javascript.html +++ b/_includes/javascript.html @@ -1,9 +1,9 @@ @@ -14,7 +14,7 @@ searchInput: document.getElementById('search-input'), resultsContainer: document.getElementById('search-results'), searchResultTemplate: '

{title}

', - noResultsText: '

No results found.

', + noResultsText: '

No results found.

', json: '/search.json' }); diff --git a/_layouts/default.html b/_layouts/default.html index c3e614e..4a5f9b3 100644 --- a/_layouts/default.html +++ b/_layouts/default.html @@ -13,10 +13,8 @@
-
- +
-
diff --git a/_layouts/post.html b/_layouts/post.html index 1484079..de23b5c 100644 --- a/_layouts/post.html +++ b/_layouts/post.html @@ -20,7 +20,7 @@

Recent posts