From 5c579c7ef19593310c0b519459a6418b763645ed Mon Sep 17 00:00:00 2001 From: Stefan Haslinger Date: Sat, 18 Nov 2017 14:50:46 +0100 Subject: [PATCH 1/4] update to current jekyll and gems, remove octopress --- .gitignore | 3 + Gemfile | 14 +++-- Gemfile.lock | 127 +++++++++++++++---------------------------- _config.dev.yml | 4 ++ _config.yml | 57 +++---------------- _data/navigation.yml | 4 +- _octopress.yml | 10 ---- 7 files changed, 70 insertions(+), 149 deletions(-) create mode 100644 .gitignore create mode 100644 _config.dev.yml delete mode 100644 _octopress.yml diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..45c1505 --- /dev/null +++ b/.gitignore @@ -0,0 +1,3 @@ +_site +.sass-cache +.jekyll-metadata diff --git a/Gemfile b/Gemfile index 37f50e5..0fed1b6 100644 --- a/Gemfile +++ b/Gemfile @@ -1,7 +1,11 @@ source 'https://rubygems.org' +ruby '2.4.2' -gem 'jekyll' -gem 'coderay' -gem 'sass', '3.4.5' -gem 'octopress', '~> 3.0.0.rc.12' -gem 'jekyll-sitemap' \ No newline at end of file +gem 'jekyll', "~> 3.6.0" + +group :jekyll_plugins do + gem 'jekyll-sitemap' + gem 'jekyll-paginate' +end + +gem 'sass' diff --git a/Gemfile.lock b/Gemfile.lock index 1772f84..2607fc8 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,97 +1,60 @@ GEM remote: https://rubygems.org/ specs: - blankslate (2.1.2.4) - celluloid (0.16.0) - timers (~> 4.0.0) - classifier-reborn (2.0.2) - fast-stemmer (~> 1.0) - coderay (1.1.0) - coffee-script (2.3.0) - coffee-script-source - execjs - coffee-script-source (1.8.0) - colorator (0.1) - execjs (2.2.2) - fast-stemmer (1.0.2) - ffi (1.9.6) - ffi (1.9.6-x86-mingw32) - hitimes (1.2.2) - jekyll (2.5.2) - classifier-reborn (~> 2.0) - colorator (~> 0.1) - jekyll-coffeescript (~> 1.0) - jekyll-gist (~> 1.0) - jekyll-paginate (~> 1.0) + addressable (2.5.2) + public_suffix (>= 2.0.2, < 4.0) + colorator (1.1.0) + ffi (1.9.18) + forwardable-extended (2.6.0) + jekyll (3.6.2) + addressable (~> 2.4) + colorator (~> 1.0) jekyll-sass-converter (~> 1.0) jekyll-watch (~> 1.1) - kramdown (~> 1.3) - liquid (~> 2.6.1) + kramdown (~> 1.14) + liquid (~> 4.0) mercenary (~> 0.3.3) - pygments.rb (~> 0.6.0) - redcarpet (~> 3.1) + pathutil (~> 0.9) + rouge (>= 1.7, < 3) safe_yaml (~> 1.0) - toml (~> 0.1.0) - jekyll-coffeescript (1.0.1) - coffee-script (~> 2.2) - jekyll-gist (1.1.0) jekyll-paginate (1.1.0) - jekyll-sass-converter (1.3.0) - sass (~> 3.2) - jekyll-sitemap (0.7.0) - jekyll-watch (1.2.0) - listen (~> 2.7) - kramdown (1.5.0) - liquid (2.6.1) - listen (2.8.3) - celluloid (>= 0.15.2) - rb-fsevent (>= 0.9.3) - rb-inotify (>= 0.9) - mercenary (0.3.5) - octopress (3.0.0.rc.22) - jekyll (~> 2.0) - mercenary (~> 0.3.2) - octopress-deploy - octopress-docs - titlecase - octopress-deploy (1.0.0) - colorator - octopress-docs - octopress-docs (0.0.11) - jekyll (~> 2.0) - octopress-escape-code (~> 1.0) - octopress-hooks (~> 2.0) - octopress-escape-code (1.0.4) - octopress-hooks (~> 2.0) - octopress-hooks (2.2.2) - jekyll (~> 2.0) - parslet (1.5.0) - blankslate (~> 2.0) - posix-spawn (0.3.9) - pygments.rb (0.6.0) - posix-spawn (~> 0.3.6) - yajl-ruby (~> 1.1.0) - rb-fsevent (0.9.4) - rb-inotify (0.9.5) - ffi (>= 0.5.0) - redcarpet (3.2.2) + jekyll-sass-converter (1.5.0) + sass (~> 3.4) + jekyll-sitemap (1.1.1) + jekyll (~> 3.3) + jekyll-watch (1.5.0) + listen (~> 3.0, < 3.1) + kramdown (1.15.0) + liquid (4.0.0) + listen (3.0.8) + rb-fsevent (~> 0.9, >= 0.9.4) + rb-inotify (~> 0.9, >= 0.9.7) + mercenary (0.3.6) + pathutil (0.16.0) + forwardable-extended (~> 2.6) + public_suffix (3.0.1) + rb-fsevent (0.10.2) + rb-inotify (0.9.10) + ffi (>= 0.5.0, < 2) + rouge (2.2.1) safe_yaml (1.0.4) - sass (3.4.5) - timers (4.0.1) - hitimes - titlecase (0.1.1) - toml (0.1.2) - parslet (~> 1.5.0) - yajl-ruby (1.1.0) - yajl-ruby (1.1.0-x86-mingw32) + sass (3.5.3) + sass-listen (~> 4.0.0) + sass-listen (4.0.0) + rb-fsevent (~> 0.9, >= 0.9.4) + rb-inotify (~> 0.9, >= 0.9.7) PLATFORMS ruby - x86-mingw32 DEPENDENCIES - coderay - jekyll + jekyll (~> 3.6.0) + jekyll-paginate jekyll-sitemap - octopress (~> 3.0.0.rc.12) - sass (= 3.4.5) + sass + +RUBY VERSION + ruby 2.4.2p198 + +BUNDLED WITH + 1.16.0 diff --git a/_config.dev.yml b/_config.dev.yml new file mode 100644 index 0000000..9119c1b --- /dev/null +++ b/_config.dev.yml @@ -0,0 +1,4 @@ +# use `jekyll serve --config _config.yml,_config.dev.yml --future` to be able to test and deploy +# without changing config files + +url: http://localhost:4000 diff --git a/_config.yml b/_config.yml index 5e6bf86..2e88860 100644 --- a/_config.yml +++ b/_config.yml @@ -1,72 +1,29 @@ title: Ardour 4 description: An updated version of the original FLOSS manual. -disqus_shortname: reading_time: true words_per_minute: 120 -url: http://brunoruviaro.github.io/ardour4-tutorial +url: https://brunoruviaro.github.io/ardour4-tutorial -#http://localhost:4000 - -#http://brunoruviaro.github.io/ardour3-floss-tutorial - -# Owner/author information owner: name: Ardour 4 Tutorial avatar: ardour-icon.png bio: "An updated version of the original Ardour FLOSS Manual." - email: - # Social networking links used in footer. Update and remove as you like. - twitter: - facebook: github: brunoruviaro/ardour4-tutorial/ - stackexchange: - linkedin: - instagram: - flickr: - tumblr: - # For Google Authorship https://plus.google.com/authorship - # google plus id, include the '+', eg +mmistakes - google_plus: - -# Background image to be tiled on all pages -background: -# Analytics and webmaster tools stuff goes here google_analytics: UA-66949361-1 -google_verify: -# https://ssl.bing.com/webmaster/configure/verify/ownership Option 2 content= goes here -bing_verify: - -# http://en.wikipedia.org/wiki/List_of_tz_database_time_zones timezone: America/Los_Angeles future: true -highlighter: pygments -markdown: kramdown -gems: - - jekyll-sitemap + +plugins: [jekyll-paginate, jekyll-sitemap] + sass: sass_dir: _sass style: compressed -# https://github.com/mojombo/jekyll/wiki/Permalinks permalink: /:categories/:title/ - -# Amount of post to show on home page paginate: 5 -kramdown: - auto_ids: true - footnote_nr: 1 - entity_output: as_char - toc_levels: 1..6 - use_coderay: true - - coderay: - coderay_line_numbers: nil - coderay_line_numbers_start: 1 - coderay_tab_width: 4 - coderay_bold_every: 10 - coderay_css: class - include: [".htaccess"] -exclude: ["drafts", "lib", "config.rb", "Capfile", "config", "Gemfile", "Gemfile.lock", "README.md", "LICENSE", "log", "Rakefile", "Rakefile.rb", "tmp", "less", "*.sublime-project", "*.sublime-workspace", "test", "spec", "Gruntfile.js", "package.json", "node_modules"] +exclude: ["drafts", "lib", "config.rb", "Capfile", "config", "Gemfile", "Gemfile.lock", "README.md", + "LICENSE", "log", "Rakefile", "Rakefile.rb", "tmp", "less", "*.sublime-project", + "*.sublime-workspace", "test", "spec", "Gruntfile.js", "package.json", "node_modules"] diff --git a/_data/navigation.yml b/_data/navigation.yml index e135ab2..ec44597 100644 --- a/_data/navigation.yml +++ b/_data/navigation.yml @@ -3,5 +3,5 @@ - title: Contents url: https://brunoruviaro.github.io/ardour4-tutorial/tags -#- title: External Link - # url: http://mademistakes.com +# Uncomment for testing in development +# url: http://localhost:4000/tags \ No newline at end of file diff --git a/_octopress.yml b/_octopress.yml deleted file mode 100644 index 3223f5e..0000000 --- a/_octopress.yml +++ /dev/null @@ -1,10 +0,0 @@ -# Default extensions -post_ext: md -page_ext: md - -# Found in _templates/ -post_layout: post -page_layout: page - -# Format titles with titlecase? -titlecase: true From f43c4a8d40cbca6d3c8b7fc275c4a09c028b2304 Mon Sep 17 00:00:00 2001 From: Stefan Haslinger Date: Sat, 18 Nov 2017 15:03:26 +0100 Subject: [PATCH 2/4] temparory change to fix links on intermediary github pages location --- _data/navigation.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_data/navigation.yml b/_data/navigation.yml index ec44597..c7f78f3 100644 --- a/_data/navigation.yml +++ b/_data/navigation.yml @@ -2,6 +2,6 @@ - title: Contents url: https://brunoruviaro.github.io/ardour4-tutorial/tags - + url: https://haslinger.github.io/ardour4-tutorial/ # Uncomment for testing in development # url: http://localhost:4000/tags \ No newline at end of file From 703689015cb489015ce22070fd5bf14590b17c72 Mon Sep 17 00:00:00 2001 From: Stefan Haslinger Date: Sat, 18 Nov 2017 15:05:12 +0100 Subject: [PATCH 3/4] temparory change to fix links on intermediary github pages location --- _data/navigation.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_data/navigation.yml b/_data/navigation.yml index c7f78f3..e9becc7 100644 --- a/_data/navigation.yml +++ b/_data/navigation.yml @@ -2,6 +2,6 @@ - title: Contents url: https://brunoruviaro.github.io/ardour4-tutorial/tags - url: https://haslinger.github.io/ardour4-tutorial/ + url: https://haslinger.github.io/ardour4-tutorial/tags # Uncomment for testing in development # url: http://localhost:4000/tags \ No newline at end of file From 0001ac95edaae98761d301953e8a4e329dc75701 Mon Sep 17 00:00:00 2001 From: Stefan Haslinger Date: Sat, 18 Nov 2017 15:06:13 +0100 Subject: [PATCH 4/4] temparory change to fix links on intermediary github pages location --- _config.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/_config.yml b/_config.yml index 2e88860..5f49b31 100644 --- a/_config.yml +++ b/_config.yml @@ -3,6 +3,7 @@ description: An updated version of the original FLOSS manual. reading_time: true words_per_minute: 120 url: https://brunoruviaro.github.io/ardour4-tutorial +url: https://haslinger.github.io/ardour4-tutorial/ owner: name: Ardour 4 Tutorial