diff --git a/.gitignore b/.gitignore index 3f793f4..daf1032 100644 --- a/.gitignore +++ b/.gitignore @@ -3,4 +3,4 @@ _site/ .bundle/ .sass-cache/ vendor/ -.vscode/ +.jekyll-metadata diff --git a/Gemfile b/Gemfile index 4404724..0250c2d 100644 --- a/Gemfile +++ b/Gemfile @@ -1,10 +1,11 @@ source 'https://rubygems.org' -ruby '2.3.3' -gem 'bundler', '1.16.1' -gem 'jekyll' +ruby '2.6.3' +gem 'bundler', '1.17.2' +gem "jekyll" gem 'rack-jekyll' gem 'rake' gem 'jekyll-theme-minimal' + group :jekyll_plugins do gem 'jekyll-feed' gem 'jekyll-seo-tag' diff --git a/Gemfile.lock b/Gemfile.lock index b318cad..ffe44d0 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,20 +1,20 @@ GEM remote: https://rubygems.org/ specs: - addressable (2.5.2) - public_suffix (>= 2.0.2, < 4.0) + addressable (2.7.0) + public_suffix (>= 2.0.2, < 5.0) colorator (1.1.0) - concurrent-ruby (1.0.5) + concurrent-ruby (1.1.6) em-websocket (0.5.1) eventmachine (>= 0.12.9) http_parser.rb (~> 0.6.0) eventmachine (1.2.7) - ffi (1.9.23) + ffi (1.13.1) forwardable-extended (2.6.0) http_parser.rb (0.6.0) i18n (0.9.5) concurrent-ruby (~> 1.0) - jekyll (3.8.2) + jekyll (3.8.7) addressable (~> 2.4) colorator (~> 1.0) em-websocket (~> 0.5) @@ -27,52 +27,50 @@ GEM pathutil (~> 0.9) rouge (>= 1.7, < 4) safe_yaml (~> 1.0) - jekyll-feed (0.9.3) - jekyll (~> 3.3) - jekyll-include-cache (0.1.0) - jekyll (~> 3.3) - jekyll-last-modified-at (1.0.1) - jekyll (~> 3.3) + jekyll-feed (0.14.0) + jekyll (>= 3.7, < 5.0) + jekyll-include-cache (0.2.0) + jekyll (>= 3.7, < 5.0) + jekyll-last-modified-at (1.3.0) + jekyll (>= 3.7, < 5.0) posix-spawn (~> 0.3.9) - jekyll-paginate-v2 (1.9.4) - jekyll (~> 3.0) - jekyll-redirect-from (0.13.0) - jekyll (~> 3.3) + jekyll-paginate-v2 (3.0.0) + jekyll (>= 3.0, < 5.0) + jekyll-redirect-from (0.16.0) + jekyll (>= 3.3, < 5.0) jekyll-sass-converter (1.5.2) sass (~> 3.4) - jekyll-seo-tag (2.5.0) - jekyll (~> 3.3) - jekyll-sitemap (1.2.0) - jekyll (~> 3.3) + jekyll-seo-tag (2.6.1) + jekyll (>= 3.3, < 5.0) + jekyll-sitemap (1.4.0) + jekyll (>= 3.7, < 5.0) jekyll-theme-minimal (0.1.1) jekyll (~> 3.5) jekyll-seo-tag (~> 2.0) - jekyll-watch (2.0.0) + jekyll-watch (2.2.1) listen (~> 3.0) - kramdown (1.16.2) - liquid (4.0.0) - listen (3.1.5) - rb-fsevent (~> 0.9, >= 0.9.4) - rb-inotify (~> 0.9, >= 0.9.7) - ruby_dep (~> 1.2) + kramdown (1.17.0) + liquid (4.0.3) + listen (3.2.1) + rb-fsevent (~> 0.10, >= 0.10.3) + rb-inotify (~> 0.9, >= 0.9.10) mercenary (0.3.6) - pathutil (0.16.1) + pathutil (0.16.2) forwardable-extended (~> 2.6) - posix-spawn (0.3.13) - public_suffix (3.0.2) - rack (1.6.10) + posix-spawn (0.3.14) + public_suffix (4.0.5) + rack (1.6.13) rack-jekyll (0.5.0) jekyll (>= 1.3) listen (>= 1.3) rack (~> 1.5) - rake (12.3.1) - rb-fsevent (0.10.3) - rb-inotify (0.9.10) - ffi (>= 0.5.0, < 2) - rouge (3.1.1) - ruby_dep (1.5.0) - safe_yaml (1.0.4) - sass (3.5.6) + rake (13.0.1) + rb-fsevent (0.10.4) + rb-inotify (0.10.1) + ffi (~> 1.0) + rouge (3.20.0) + safe_yaml (1.0.5) + sass (3.7.4) sass-listen (~> 4.0.0) sass-listen (4.0.0) rb-fsevent (~> 0.9, >= 0.9.4) @@ -82,7 +80,7 @@ PLATFORMS ruby DEPENDENCIES - bundler (= 1.16.1) + bundler (= 1.17.2) jekyll jekyll-feed jekyll-include-cache @@ -96,7 +94,7 @@ DEPENDENCIES rake RUBY VERSION - ruby 2.3.3p222 + ruby 2.6.3p62 BUNDLED WITH - 1.16.1 + 1.17.2 diff --git a/README.md b/README.md index 161b9e0..d0bfc0a 100644 --- a/README.md +++ b/README.md @@ -309,12 +309,11 @@ on Heroku. ## 5. Built With -- [Jekyll 3.8.2][jekyll] +- [Jekyll 3.8.7][jekyll] - [Heroku][heroku-main] -- [ruby 2.3.3p222][ruby] -- [Homebrew 1.6.3-56-g5e77335][brew] -- [Visual Studio Code][vscode] -- [Bundler version 1.16.1][bundler] +- [ruby 2.6.3][ruby] +- [Homebrew 2.4.0][brew] +- [Bundler version 1.17.2][bundler] ## 6. Contributing @@ -388,7 +387,6 @@ some way to make this project a reality. [heroku]: https://blog.heroku.com/jekyll-on-heroku [jekyll]: https://jekyllrb.com/ [heroku-main]: https://www.heroku.com/ -[vscode]: https://code.visualstudio.com/ [localhost]: http://127.0.0.1:4000 -[livesite]: https://camo.githubusercontent.com/2733ea1835f3fe38ce6d0e120dd631c9c9e4547f/68747470733a2f2f7773312e73696e61696d672e636e2f6c617267652f303036744b665463677931667270367864726976766a3330756a306f6e6165712e6a7067 +[livesite]: /config/livesite.jpg [example]: https://jekyll-heroku-starter-kit.herokuapp.com diff --git a/_config.yml b/_config.yml index ffc8cd5..6294f5c 100644 --- a/_config.yml +++ b/_config.yml @@ -2,7 +2,7 @@ title: Jekyll Heroku Starter Kit description: Minimum boilerplate code for setting up and running a Jekyll site on Heroku. timezone: Africa/Johannesburg -locale: en_ZA +locale: en_GB ## Set the url to your site below ## url: baseurl: @@ -40,7 +40,6 @@ exclude: - 'Procfile' - 'Rakefile' - 'README.md' -- 'starter-kit.code-workspace' - 'static.json' ## Configure and setup plugins for the site. ## plugins: @@ -67,9 +66,8 @@ social: name: Justin Hartman links: - https://twitter.com/justinhartman - - https://www.facebook.com/justin.hartman.me + - https://www.facebook.com/justinhartman.blog - https://www.linkedin.com/in/justinhartman - - https://plus.google.com/+iamjustinhartman - https://github.com/justinhartman # When you verify with either of the Webmaster Tools below, enter the # verification key below. @@ -80,7 +78,7 @@ webmaster_verifications: yandex: 1234 baidu: 1234 # Setting a default image: -# Settings to provide a default Twitter Card or OGP image to all of your +# Settings to provide a default Twitter Card or OGP image to all of your # posts and pages. defaults: - scope: @@ -94,7 +92,7 @@ pagination: collection: 'posts' per_page: 10 permalink: '/page/:num/' # Pages are index.html inside this folder (default) - #permalink: '/page/:num.html' # Pages are simple html files + #permalink: '/page/:num.html' # Pages are simple html files #permalink: '/page/:num' # Pages are html files, linked jekyll extensionless permalink style. title: ':title - page :num' limit: 0 # 0 means all @@ -102,10 +100,10 @@ pagination: sort_reverse: true # Optional, sorts the posts in reverse order category: 'posts' tag: '' - locale: 'en_ZA' - # Optional,omit or set both before and after to zero to disable. - # Controls how the pagination trail for the paginated pages look like. - trail: + locale: 'en_GB' + # Optional,omit or set both before and after to zero to disable. + # Controls how the pagination trail for the paginated pages look like. + trail: before: 2 after: 2 # Optional, the default file extension for generated pages (e.g html, json, xml). diff --git a/config/livesite.jpg b/config/livesite.jpg new file mode 100644 index 0000000..9e8c6f3 Binary files /dev/null and b/config/livesite.jpg differ diff --git a/index.md b/index.md index 4245f24..ab22cfb 100644 --- a/index.md +++ b/index.md @@ -22,7 +22,7 @@ last_modified_at: 2018-27-05 03:54:10 +02:00 # - /post/123456789/ # - /post/123456789/my-amazing-post/ # Settings for @jekyll-paginate-v2 -pagination: +pagination: enabled: true # Set categories for the site and URL structure categories: @@ -312,12 +312,11 @@ on Heroku. ## 5. Built With -- [Jekyll 3.8.2][jekyll] +- [Jekyll 3.8.7][jekyll] - [Heroku][heroku-main] -- [ruby 2.3.3p222][ruby] -- [Homebrew 1.6.3-56-g5e77335][brew] -- [Visual Studio Code][vscode] -- [Bundler version 1.16.1][bundler] +- [ruby 2.6.3][ruby] +- [Homebrew 2.4.0][brew] +- [Bundler version 1.17.2][bundler] ## 6. Contributing @@ -391,7 +390,6 @@ some way to make this project a reality. [heroku]: https://blog.heroku.com/jekyll-on-heroku [jekyll]: https://jekyllrb.com/ [heroku-main]: https://www.heroku.com/ -[vscode]: https://code.visualstudio.com/ [localhost]: http://127.0.0.1:4000 -[livesite]: https://camo.githubusercontent.com/2733ea1835f3fe38ce6d0e120dd631c9c9e4547f/68747470733a2f2f7773312e73696e61696d672e636e2f6c617267652f303036744b665463677931667270367864726976766a3330756a306f6e6165712e6a7067 +[livesite]: /config/livesite.jpg [example]: https://jekyll-heroku-starter-kit.herokuapp.com diff --git a/starter-kit.code-workspace b/starter-kit.code-workspace deleted file mode 100644 index 44a071d..0000000 --- a/starter-kit.code-workspace +++ /dev/null @@ -1,27 +0,0 @@ -{ - "folders": [ - { - "path": "." - } - ], - "settings": { - "editor.autoIndent": true, - "editor.wordWrap": "off", - "editor.trimAutoWhitespace": true, - "files.insertFinalNewline": true, - "files.trimFinalNewlines": true, - "[yaml]": { - "editor.tabSize": 2, - "editor.insertSpaces": true, - }, - "[markdown]": { - "editor.tabSize": 2, - "editor.insertSpaces": true, - "editor.trimAutoWhitespace": false, - }, - "markdownlint.config": { - "MD001": false, - "MD014": false - }, - } -}