diff --git a/.gitignore b/.gitignore index 10c58cf685c..fd68528f868 100644 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,7 @@ _gh_pages _site .ruby-version +.jekyll-cache # Numerous always-ignore extensions *.diff diff --git a/404.html b/404.html deleted file mode 100644 index 9703ba819b7..00000000000 --- a/404.html +++ /dev/null @@ -1,10 +0,0 @@ ---- -layout: default -title: "404: Page not found" -permalink: 404.html ---- - -
-

404: Page not found

-

Sorry, we've misplaced that URL or it's pointing to something that doesn't exist. Head back home to try finding it again.

-
diff --git a/404.md b/404.md new file mode 100644 index 00000000000..a8a831d4fa7 --- /dev/null +++ b/404.md @@ -0,0 +1,8 @@ +— +layout: default +title: “404: Page not found” +permalink: 404.html +— + +# 404: Page not found +Sorry, we’ve misplaced that URL or it’s pointing to something that doesn’t exist. [Head back home]({{ site.url }}) to try finding it again. diff --git a/README.md b/README.md index 26fe63f0534..279acdc7aea 100644 --- a/README.md +++ b/README.md @@ -44,7 +44,7 @@ title: About ### Sticky sidebar content -By default Hyde ships with a sidebar that affixes it's content to the bottom of the sidebar. You can optionally disable this by removing the `.sidebar-sticky` class from the sidebar's `.container`. Sidebar content will then normally flow from top to bottom. +By default Hyde ships with a sidebar that affixes its content to the bottom of the sidebar. You can optionally disable this by removing the `.sidebar-sticky` class from the sidebar's `.container`. Sidebar content will then normally flow from top to bottom. ```html diff --git a/_config.yml b/_config.yml index 3e2f2432dd5..eb3d120b02e 100644 --- a/_config.yml +++ b/_config.yml @@ -1,26 +1,20 @@ -# Dependencies -markdown: redcarpet -highlighter: pygments - -# Permalinks -permalink: pretty -relative_permalinks: true - # Setup title: Hyde tagline: 'A Jekyll theme' -description: 'A brazen two-column Jekyll theme that pairs a prominent sidebar with uncomplicated content. Made by @mdo.' -url: http://hyde.getpoole.com -baseurl: / +description: 'A brazen two-column Jekyll theme that pairs a prominent sidebar with uncomplicated content. Made by @mdo.' +url: https://hyde.getpoole.com +baseurl: '' +paginate: 5 +# About and contact author: name: 'Mark Otto' url: https://twitter.com/mdo -paginate: 5 +# Gems +plugins: + - jekyll-paginate + - jekyll-gist # Custom vars -version: 2.1.0 - -github: - repo: https://github.com/poole/hyde +version: 3.0.0 diff --git a/_includes/head.html b/_includes/head.html index e2b070e242a..e2e4553c6b4 100644 --- a/_includes/head.html +++ b/_includes/head.html @@ -1,9 +1,6 @@ - - - @@ -14,16 +11,13 @@ {% endif %} - - - - + + + - - - + + - - - + + \ No newline at end of file diff --git a/_includes/sidebar.html b/_includes/sidebar.html index 586f47b2d74..e4f4e2b4817 100644 --- a/_includes/sidebar.html +++ b/_includes/sidebar.html @@ -10,7 +10,7 @@