From 3320eac42b8d1177937525f0da5ca92807cfac10 Mon Sep 17 00:00:00 2001 From: sakrecoer Date: Sun, 19 Jul 2020 13:39:02 +0200 Subject: [PATCH] bump to jekyll 4 --- Gemfile | 22 ++------- Gemfile.lock | 69 +++++++++++++------------- _config.yml | 1 - _includes/cookiemonster.html | 3 +- _includes/liberapay.html | 1 + _includes/navmenu.html | 9 ++-- _includes/relBase.html | 12 +++++ _includes/seo.html | 2 +- _layouts/default.html | 9 ++-- _layouts/music.html | 13 ++--- _layouts/nil.html | 1 + _sass/main.scss | 2 +- about/index.html | 8 +-- index.html | 95 +++++++++++++++++++++++++++++++----- links.html | 43 ++++++++-------- music.html | 5 +- musicindex.html | 1 + 17 files changed, 188 insertions(+), 108 deletions(-) create mode 100644 _includes/relBase.html diff --git a/Gemfile b/Gemfile index 52827af..ed02c2f 100644 --- a/Gemfile +++ b/Gemfile @@ -1,21 +1,9 @@ -source "https://rubygems.org" +source 'https://rubygems.org' -# Hello! This is where you manage which Jekyll version is used to run. -# When you want to use a different version, change it below, save the -# file and run `bundle install`. Run Jekyll with `bundle exec`, like so: -# -# bundle exec jekyll serve -# -# This will help ensure the proper Jekyll version is running. -# Happy Jekylling! -gem "jekyll", "~> 3.8.5" +gem 'jekyll', '4.0.0' -# If you have any plugins, put them here! group :jekyll_plugins do - gem "jekyll-paginate-v2", "~>1.7" - gem "jekyll-sitemap", "1.2.0" - gem "jekyll-seo-tag", "2.6.0" - gem 'jekyll-last-modified-at' + gem 'jekyll-seo-tag', '2.6.1' + gem 'jekyll-sitemap', '1.4.0' + gem 'jekyll-last-modified-at','1.1.0' end - - diff --git a/Gemfile.lock b/Gemfile.lock index e5993d0..cdfcd25 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -4,43 +4,46 @@ GEM addressable (2.7.0) public_suffix (>= 2.0.2, < 5.0) colorator (1.1.0) - concurrent-ruby (1.1.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.12.1) + ffi (1.13.1) forwardable-extended (2.6.0) http_parser.rb (0.6.0) - i18n (0.9.5) + i18n (1.8.3) concurrent-ruby (~> 1.0) - jekyll (3.8.6) + jekyll (4.0.0) addressable (~> 2.4) colorator (~> 1.0) em-websocket (~> 0.5) - i18n (~> 0.7) - jekyll-sass-converter (~> 1.0) + i18n (>= 0.9.5, < 2) + jekyll-sass-converter (~> 2.0) jekyll-watch (~> 2.0) - kramdown (~> 1.14) + kramdown (~> 2.1) + kramdown-parser-gfm (~> 1.0) liquid (~> 4.0) mercenary (~> 0.3.3) pathutil (~> 0.9) - rouge (>= 1.7, < 4) + rouge (~> 3.0) safe_yaml (~> 1.0) - jekyll-last-modified-at (1.2.1) + terminal-table (~> 1.8) + jekyll-last-modified-at (1.1.0) jekyll (>= 3.7, < 5.0) posix-spawn (~> 0.3.9) - jekyll-paginate-v2 (1.9.4) - jekyll (~> 3.0) - jekyll-sass-converter (1.5.2) - sass (~> 3.4) - jekyll-seo-tag (2.6.0) - jekyll (~> 3.3) - jekyll-sitemap (1.2.0) - jekyll (~> 3.3) + jekyll-sass-converter (2.1.0) + sassc (> 2.0.1, < 3.0) + jekyll-seo-tag (2.6.1) + jekyll (>= 3.3, < 5.0) + jekyll-sitemap (1.4.0) + jekyll (>= 3.7, < 5.0) jekyll-watch (2.2.1) listen (~> 3.0) - kramdown (1.17.0) + kramdown (2.3.0) + rexml + kramdown-parser-gfm (1.1.0) + kramdown (~> 2.0) liquid (4.0.3) listen (3.2.1) rb-fsevent (~> 0.10, >= 0.10.3) @@ -48,28 +51,28 @@ GEM mercenary (0.3.6) pathutil (0.16.2) forwardable-extended (~> 2.6) - posix-spawn (0.3.13) - public_suffix (4.0.3) - rb-fsevent (0.10.3) + posix-spawn (0.3.15) + public_suffix (4.0.5) + rb-fsevent (0.10.4) rb-inotify (0.10.1) ffi (~> 1.0) - rouge (3.15.0) + rexml (3.2.4) + rouge (3.21.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) - rb-inotify (~> 0.9, >= 0.9.7) + sassc (2.4.0) + ffi (~> 1.9) + terminal-table (1.8.0) + unicode-display_width (~> 1.1, >= 1.1.1) + unicode-display_width (1.7.0) PLATFORMS ruby DEPENDENCIES - jekyll (~> 3.8.5) - jekyll-last-modified-at - jekyll-paginate-v2 (~> 1.7) - jekyll-seo-tag (= 2.6.0) - jekyll-sitemap (= 1.2.0) + jekyll (= 4.0.0) + jekyll-last-modified-at (= 1.1.0) + jekyll-seo-tag (= 2.6.1) + jekyll-sitemap (= 1.4.0) BUNDLED WITH - 2.0.2 + 2.1.4 diff --git a/_config.yml b/_config.yml index e0412c7..e484464 100644 --- a/_config.yml +++ b/_config.yml @@ -36,7 +36,6 @@ social: plugins: - jekyll-sitemap - jekyll-seo-tag - - jekyll-paginate-v2 ### Plugin settings: diff --git a/_includes/cookiemonster.html b/_includes/cookiemonster.html index 2e24b33..e48216c 100644 --- a/_includes/cookiemonster.html +++ b/_includes/cookiemonster.html @@ -1,3 +1,4 @@ - +{% include relBase.html %} + diff --git a/_includes/liberapay.html b/_includes/liberapay.html index 9fe4f78..6109a44 100644 --- a/_includes/liberapay.html +++ b/_includes/liberapay.html @@ -1,3 +1,4 @@ +{% include relBase.html %} Donate using Liberapay diff --git a/_includes/navmenu.html b/_includes/navmenu.html index acc58c1..9c5fda9 100644 --- a/_includes/navmenu.html +++ b/_includes/navmenu.html @@ -1,13 +1,14 @@ +{% include relBase.html %} {% if page.collection != 'tracks' %} diff --git a/_includes/relBase.html b/_includes/relBase.html new file mode 100644 index 0000000..94ba93e --- /dev/null +++ b/_includes/relBase.html @@ -0,0 +1,12 @@ +{% assign relBase = '' %} +{% assign tempDepth = page.url | append: 'hackish-solution' | split: '/' | size | minus: 2 %} +{% for i in (1..tempDepth) %} + {% if forloop.last %} + {% assign relBase = relBase | append: ".." %} + {% else %} + {% assign relBase = relBase | append: "../" %} + {% endif %} +{% endfor %} +{% if relBase == '' %} + {% assign relBase = '.' %} +{% endif %} \ No newline at end of file diff --git a/_includes/seo.html b/_includes/seo.html index 408aaa2..51ba3fb 100644 --- a/_includes/seo.html +++ b/_includes/seo.html @@ -1,5 +1,5 @@ - +{% include relBase.html %} {% if page.collection == 'tracks' %}{{ page.title }} - A musical piece by Sakrecoer{% else %}{{ page.title }} | {{ site.title }}{% endif %} {% seo title=false %} diff --git a/_layouts/default.html b/_layouts/default.html index 4fda008..795c109 100644 --- a/_layouts/default.html +++ b/_layouts/default.html @@ -1,13 +1,14 @@ --- --- +{% include relBase.html %} - - - - + + + + {% include seo.html %} diff --git a/_layouts/music.html b/_layouts/music.html index a73b478..3e2a58a 100644 --- a/_layouts/music.html +++ b/_layouts/music.html @@ -1,6 +1,7 @@ --- layout: default --- +{% include relBase.html %} {% include navmenu.html %}
@@ -8,14 +9,14 @@ layout: default


{% if page.previous != nil %} - + {% endif %} + src="{{ relBase }}/assets/img/icons/download.svg" title="Download Track" /> {% if page.next != nil %} - {% endif %} + {% endif %}

{% include liberapay.html %}
@@ -58,7 +59,7 @@ layout: default mu.pause(); mu.currentTime = 0; {% if page.previous != nil %} - loadUrl('{{ site.baseurl }}{{ page.previous.url }}'); return false; + loadUrl('{{ relBase }}{{ page.previous.url }}'); return false; {% endif %} // qq IE10 muFade(); diff --git a/_layouts/nil.html b/_layouts/nil.html index 2e58579..e9f1c0a 100644 --- a/_layouts/nil.html +++ b/_layouts/nil.html @@ -1,4 +1,5 @@ --- --- +{% include relBase.html %} {{ content }} diff --git a/_sass/main.scss b/_sass/main.scss index 60b7471..4e791f5 100644 --- a/_sass/main.scss +++ b/_sass/main.scss @@ -44,7 +44,7 @@ a:hover { flex-direction: row; background-color: transparent; position: relative; - height: 100vh; + min-height: 50vh; width: 100%; // background: linear-gradient(230deg, rgba(218, 159, 142, 0.8), rgba(236, 0, 228, 0.8), rgba(0, 212, 236, 0.8), rgba(0, 236, 173, 0.8), rgba(110, 0, 236, 0.8)); // background-size: 1000% 1000%; diff --git a/about/index.html b/about/index.html index 17054c9..396e5dd 100644 --- a/about/index.html +++ b/about/index.html @@ -7,7 +7,7 @@ description: What is Sakrecoer about and what does its music stand for?
- +

Back

{{ page.title }}

@@ -15,9 +15,9 @@ description: What is Sakrecoer about and what does its music stand for? {% include liberapay.html %}
-
diff --git a/index.html b/index.html index 09dd437..9ca8d67 100644 --- a/index.html +++ b/index.html @@ -11,30 +11,99 @@ webm_path: /assets/vi/0001-0076.webm

{{ site.title }}

{{ page.title }}

{{ page.description }}

+

Read more

{% include liberapay.html %} -
-
-

You are here

-

Where am I?

-
-
-

Stream

-

Music

+ + +
-
+
+ + + + + {% assign categories_array = "" | split:"|" %} + + + {% for post in site.tracks %} + {% for category in post.categories %} + {% assign categories_array = categories_array | push: category | uniq %} + {% endfor %} + {% endfor %} + + + {% for category in categories_array %} + + + {% endfor %} +
+ +
+ + {% for track in site.tracks reversed %} +
+ +
+ +
+ {% endfor %} + +
+ + +
\ No newline at end of file diff --git a/links.html b/links.html index 6be7691..5e70867 100644 --- a/links.html +++ b/links.html @@ -3,27 +3,28 @@ title: Links layout: default image: /links/linkbg.jpg --- +{% include relBase.html %}
- - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + +
{% include navmenu.html %} \ No newline at end of file diff --git a/music.html b/music.html index 8da3af0..ddf45ca 100644 --- a/music.html +++ b/music.html @@ -4,14 +4,15 @@ description: Officially released but also exclusive audio-material by Sakrecoer layout: default image: /assets/img/world2.svg --- +{% include relBase.html %} {% include navmenu.html %} -
+
-

Back

 +

Back

Music

{{ page.description }}

{% include liberapay.html %} diff --git a/musicindex.html b/musicindex.html index 1ad402b..23b28cc 100644 --- a/musicindex.html +++ b/musicindex.html @@ -2,6 +2,7 @@ layout: default sitemap: false --- +{% include relBase.html %}