diff --git a/.bundle/config b/.bundle/config new file mode 100644 index 00000000..23692288 --- /dev/null +++ b/.bundle/config @@ -0,0 +1,2 @@ +--- +BUNDLE_PATH: "vendor/bundle" diff --git a/.gitignore b/.gitignore index ff70641a..89166f47 100644 --- a/.gitignore +++ b/.gitignore @@ -14,4 +14,5 @@ _posts/companies/2020-12-31-blockpass.md _posts/organizations/2020-12-30-ixo-foundation.md _posts/blockchain/2020-12-22-polkadot.md _posts/blockchain/2020-12-30-ocean-protocol.md -_posts/blockchain/ethereum/2020-12-12-lab10-collective.md \ No newline at end of file +_posts/blockchain/ethereum/2020-12-12-lab10-collective.md +vendor \ No newline at end of file diff --git a/Gemfile.lock b/Gemfile.lock index 53c5b442..9192e552 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,12 +1,11 @@ GEM remote: https://rubygems.org/ specs: - activesupport (6.0.6.1) + activesupport (7.0.4.2) concurrent-ruby (~> 1.0, >= 1.0.2) - i18n (>= 0.7, < 2) - minitest (~> 5.1) - tzinfo (~> 1.1) - zeitwerk (~> 2.2, >= 2.2.2) + i18n (>= 1.6, < 2) + minitest (>= 5.1) + tzinfo (~> 2.0) addressable (2.8.1) public_suffix (>= 2.0.2, < 6.0) coffee-script (2.4.1) @@ -14,8 +13,8 @@ GEM execjs coffee-script-source (1.11.1) colorator (1.1.0) - commonmarker (0.23.6) - concurrent-ruby (1.1.10) + commonmarker (0.23.8) + concurrent-ruby (1.2.0) dnsruby (1.61.9) simpleidn (~> 0.1) em-websocket (0.5.3) @@ -25,19 +24,19 @@ GEM ffi (>= 1.15.0) eventmachine (1.2.7) execjs (2.8.1) - faraday (2.7.3) + faraday (2.7.4) faraday-net_http (>= 2.0, < 3.1) ruby2_keywords (>= 0.0.4) faraday-net_http (3.0.2) ffi (1.15.5) forwardable-extended (2.6.0) gemoji (3.0.1) - github-pages (227) + github-pages (228) github-pages-health-check (= 1.17.9) - jekyll (= 3.9.2) + jekyll (= 3.9.3) jekyll-avatar (= 0.7.0) jekyll-coffeescript (= 1.1.1) - jekyll-commonmark-ghpages (= 0.2.0) + jekyll-commonmark-ghpages (= 0.4.0) jekyll-default-layout (= 0.1.4) jekyll-feed (= 0.15.1) jekyll-gist (= 1.5.0) @@ -71,7 +70,7 @@ GEM jemoji (= 0.12.0) kramdown (= 2.3.2) kramdown-parser-gfm (= 1.1.0) - liquid (= 4.0.3) + liquid (= 4.0.4) mercenary (~> 0.3) minima (= 2.5.1) nokogiri (>= 1.13.6, < 2.0) @@ -87,13 +86,13 @@ GEM activesupport (>= 2) nokogiri (>= 1.4) http_parser.rb (0.8.0) - i18n (0.9.5) + i18n (1.12.0) concurrent-ruby (~> 1.0) - jekyll (3.9.2) + jekyll (3.9.3) addressable (~> 2.4) colorator (~> 1.0) em-websocket (~> 0.5) - i18n (~> 0.7) + i18n (>= 0.7, < 2) jekyll-sass-converter (~> 1.0) jekyll-watch (~> 2.0) kramdown (>= 1.17, < 3) @@ -109,11 +108,11 @@ GEM coffee-script-source (~> 1.11.1) jekyll-commonmark (1.4.0) commonmarker (~> 0.22) - jekyll-commonmark-ghpages (0.2.0) - commonmarker (~> 0.23.4) + jekyll-commonmark-ghpages (0.4.0) + commonmarker (~> 0.23.7) jekyll (~> 3.9.0) jekyll-commonmark (~> 1.4.0) - rouge (>= 2.0, < 4.0) + rouge (>= 2.0, < 5.0) jekyll-default-layout (0.1.4) jekyll (~> 3.0) jekyll-feed (0.15.1) @@ -201,19 +200,17 @@ GEM rexml kramdown-parser-gfm (1.1.0) kramdown (~> 2.0) - liquid (4.0.3) + liquid (4.0.4) listen (3.8.0) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) mercenary (0.3.6) - mini_portile2 (2.8.1) minima (2.5.1) jekyll (>= 3.5, < 5.0) jekyll-feed (~> 0.9) jekyll-seo-tag (~> 2.1) minitest (5.17.0) - nokogiri (1.14.0) - mini_portile2 (~> 2.8.0) + nokogiri (1.14.1-x86_64-linux) racc (~> 1.4) octokit (4.25.1) faraday (>= 1, < 3) @@ -242,20 +239,18 @@ GEM unf (~> 0.1.4) terminal-table (1.8.0) unicode-display_width (~> 1.1, >= 1.1.1) - thread_safe (0.3.6) typhoeus (1.4.0) ethon (>= 0.9.0) - tzinfo (1.2.10) - thread_safe (~> 0.1) + tzinfo (2.0.6) + concurrent-ruby (~> 1.0) unf (0.1.4) unf_ext unf_ext (0.0.8.2) unicode-display_width (1.8.0) - webrick (1.7.0) - zeitwerk (2.6.6) + webrick (1.8.1) PLATFORMS - ruby + x86_64-linux DEPENDENCIES github-pages @@ -266,4 +261,4 @@ DEPENDENCIES webrick BUNDLED WITH - 2.1.4 + 2.4.6 diff --git a/_includes/archive-single.html b/_includes/archive-single.html index 7ac71745..768f5313 100644 --- a/_includes/archive-single.html +++ b/_includes/archive-single.html @@ -10,20 +10,14 @@ {% assign title = post.title %} {% endif %} -
+
{% if include.type == "grid" and teaser %}
- +
{% endif %} -

+

{% if post.link %} {{ title }} Permalink {% else %} diff --git a/_includes/archive-twitter.html b/_includes/archive-twitter.html deleted file mode 100644 index 4eccddc8..00000000 --- a/_includes/archive-twitter.html +++ /dev/null @@ -1,34 +0,0 @@ -{% if post.header.teaser %} - {% capture teaser %}{{ post.header.teaser }}{% endcapture %} -{% else %} - {% assign teaser = site.teaser %} -{% endif %} - -{% if post.id %} - {% assign title = post.title | markdownify | remove: "

" | remove: "

" %} -{% else %} - {% assign title = post.title %} -{% endif %} - -
-
- {% if include.type == "grid" and teaser %} -
- -
- {% endif %} -

- {% if post.link %} - {{ title }} Permalink - {% else %} - {{ title }} - {% endif %} -

-
-
diff --git a/_includes/author-profile-custom-links.html b/_includes/author-profile-custom-links.html index b89ffcb7..1a3d4cae 100644 --- a/_includes/author-profile-custom-links.html +++ b/_includes/author-profile-custom-links.html @@ -1,6 +1,6 @@ diff --git a/_includes/category-list.html b/_includes/category-list.html index d684a282..ad9a3fc7 100644 --- a/_includes/category-list.html +++ b/_includes/category-list.html @@ -6,20 +6,13 @@ {% endcase %} {% if site.category_archive.path %} - {% comment %} - - - {% endcomment %} - {% capture page_categories %}{% for category in page.categories %}{{ category | downcase }}|{{ category }}{% unless forloop.last %},{% endunless %}{% endfor %}{% endcapture %} - {% assign category_hashes = page_categories | split: ',' | sort %} + {% assign categories_sorted = page.categories | sort_natural %}

{{ site.data.ui-text[site.locale].categories_label | default: "Categories:" }} - {% for hash in category_hashes %} - {% assign keyValue = hash | split: '|' %} - {% capture category_word %}{{ keyValue[1] | strip_newlines }}{% endcapture %} - {% unless forloop.last %}, {% endunless %} + {% for category_word in categories_sorted %} + {% unless forloop.last %}, {% endunless %} {% endfor %}

diff --git a/_includes/comment.html b/_includes/comment.html index cebedabf..2e3013ee 100644 --- a/_includes/comment.html +++ b/_includes/comment.html @@ -13,7 +13,7 @@

{% if include.date %} {% if include.index %}{% endif %} {% endif %}

diff --git a/_includes/comments-providers/custom_scripts.html b/_includes/comments-providers/custom_scripts.html new file mode 100644 index 00000000..6947946a --- /dev/null +++ b/_includes/comments-providers/custom_scripts.html @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/_includes/comments-providers/disqus.html b/_includes/comments-providers/disqus.html index 8cf7acab..16a6027c 100644 --- a/_includes/comments-providers/disqus.html +++ b/_includes/comments-providers/disqus.html @@ -1,10 +1,10 @@ {% if site.comments.disqus.shortname %} \ No newline at end of file diff --git a/_includes/comments-providers/scripts.html b/_includes/comments-providers/scripts.html index 4e3f5854..e87badab 100644 --- a/_includes/comments-providers/scripts.html +++ b/_includes/comments-providers/scripts.html @@ -12,7 +12,9 @@ {% include /comments-providers/staticman_v2.html %} {% when "utterances" %} {% include /comments-providers/utterances.html %} + {% when "giscus" %} + {% include /comments-providers/giscus.html %} {% when "custom" %} - {% include /comments-providers/custom.html %} + {% include /comments-providers/custom_scripts.html %} {% endcase %} {% endif %} \ No newline at end of file diff --git a/_includes/comments-providers/staticman_v2.html b/_includes/comments-providers/staticman_v2.html index ae3991d9..3d8ba111 100644 --- a/_includes/comments-providers/staticman_v2.html +++ b/_includes/comments-providers/staticman_v2.html @@ -1,4 +1,4 @@ -{% if site.repository and site.staticman.branch %} +{% if site.repository and site.comments.staticman.branch %} + {% endfor %} {% endif %} diff --git a/_includes/head/custom.html b/_includes/head/custom.html index e6b9138e..978d84fd 100644 --- a/_includes/head/custom.html +++ b/_includes/head/custom.html @@ -1,4 +1,5 @@ + - \ No newline at end of file + diff --git a/_includes/masthead.html b/_includes/masthead.html index b2aca064..0c66aa65 100644 --- a/_includes/masthead.html +++ b/_includes/masthead.html @@ -1,35 +1,27 @@ -{% if site.logo contains "://" %} - {% capture logo_path %}{{ site.logo }}{% endcapture %} -{% else %} - {% capture logo_path %}{{ site.logo }}{% endcapture %} -{% endif %} +{% capture logo_path %}{{ site.logo }}{% endcapture %}
\ No newline at end of file + diff --git a/_includes/page__date.html b/_includes/page__date.html new file mode 100644 index 00000000..ec02005f --- /dev/null +++ b/_includes/page__date.html @@ -0,0 +1,6 @@ +{% assign date_format = site.date_format | default: "%B %-d, %Y" %} +{% if page.last_modified_at %} +

{{ site.data.ui-text[site.locale].date_label | default: "Updated:" }}

+{% elsif page.date %} +

{{ site.data.ui-text[site.locale].date_label | default: "Updated:" }}

+{% endif %} \ No newline at end of file diff --git a/_includes/page__hero.html b/_includes/page__hero.html index 98bff72a..dd1c26fb 100644 --- a/_includes/page__hero.html +++ b/_includes/page__hero.html @@ -1,25 +1,13 @@ -{% if page.header.image contains "://" %} - {% capture img_path %}{{ page.header.image }}{% endcapture %} -{% else %} - {% capture img_path %}{{ page.header.image | relative_url }}{% endcapture %} -{% endif %} +{% capture overlay_img_path %}{{ page.header.overlay_image | relative_url }}{% endcapture %} -{% if page.header.cta_url contains "://" %} - {% capture cta_path %}{{ page.header.cta_url }}{% endcapture %} -{% else %} - {% capture cta_path %}{{ page.header.cta_url | relative_url }}{% endcapture %} -{% endif %} - -{% if page.header.overlay_image contains "://" %} - {% capture overlay_img_path %}{{ page.header.overlay_image }}{% endcapture %} -{% elsif page.header.overlay_image %} - {% capture overlay_img_path %}{{ page.header.overlay_image | relative_url }}{% endcapture %} -{% endif %} - -{% if page.header.overlay_filter contains "rgba" %} +{% if page.header.overlay_filter contains "gradient" %} {% capture overlay_filter %}{{ page.header.overlay_filter }}{% endcapture %} +{% elsif page.header.overlay_filter contains "rgba" %} + {% capture overlay_filter %}{{ page.header.overlay_filter }}{% endcapture %} + {% capture overlay_filter %}linear-gradient({{ overlay_filter }}, {{ overlay_filter }}){% endcapture %} {% elsif page.header.overlay_filter %} {% capture overlay_filter %}rgba(0, 0, 0, {{ page.header.overlay_filter }}){% endcapture %} + {% capture overlay_filter %}linear-gradient({{ overlay_filter }}, {{ overlay_filter }}){% endcapture %} {% endif %} {% if page.header.image_description %} @@ -31,7 +19,7 @@ {% assign image_description = image_description | markdownify | strip_html | strip_newlines | escape_once %}
{% if page.header.overlay_color or page.header.overlay_image %}
@@ -42,29 +30,24 @@ {{ page.title | default: site.title | markdownify | remove: "

" | remove: "

" }} {% endif %}

- {% if page.header.show_overlay_excerpt != false and page.excerpt %} + {% if page.tagline %} +

{{ page.tagline | markdownify | remove: "

" | remove: "

" }}

+ {% elsif page.header.show_overlay_excerpt != false and page.excerpt %}

{{ page.excerpt | markdownify | remove: "

" | remove: "

" }}

{% endif %} - {% if page.read_time %} -

{% include read-time.html %}

- {% endif %} + {% include page__meta.html %} {% if page.header.cta_url %} -

{{ page.header.cta_label | default: site.data.ui-text[site.locale].more_label | default: "Learn More" }}

+

{{ page.header.cta_label | default: site.data.ui-text[site.locale].more_label | default: "Learn More" }}

{% endif %} {% if page.header.actions %}

{% for action in page.header.actions %} - {% if action.url contains "://" %} - {% assign url = action.url %} - {% else %} - {% assign url = action.url | relative_url %} - {% endif %} - {{ action.label | default: site.data.ui-text[site.locale].more_label | default: "Learn More" }} + {{ action.label | default: site.data.ui-text[site.locale].more_label | default: "Learn More" }} {% endfor %} {% endif %}

{% else %} - {{ image_description }} + {{ image_description }} {% endif %} {% if page.header.caption %} {{ page.header.caption | markdownify | remove: "

" | remove: "

" }} diff --git a/_includes/page__hero_video.html b/_includes/page__hero_video.html index 8586a95a..a313a23d 100644 --- a/_includes/page__hero_video.html +++ b/_includes/page__hero_video.html @@ -1,4 +1,2 @@ -{% capture video_id %}{{ page.header.video.id }}{% endcapture %} -{% capture video_provider %}{{ page.header.video.provider }}{% endcapture %} - -{% include video id=video_id provider=video_provider %} +{% assign video = page.header.video %} +{% include video id=video.id provider=video.provider danmaku=video.danmaku %} diff --git a/_includes/page__meta.html b/_includes/page__meta.html new file mode 100644 index 00000000..3d228c92 --- /dev/null +++ b/_includes/page__meta.html @@ -0,0 +1,31 @@ +{% assign document = post | default: page %} +{% if document.read_time or document.show_date %} +

+ {% if document.show_date and document.date %} + {% assign date = document.date %} + + + {% assign date_format = site.date_format | default: "%B %-d, %Y" %} + + + {% endif %} + + {% if document.read_time and document.show_date %}{% endif %} + + {% if document.read_time %} + {% assign words_per_minute = document.words_per_minute | default: site.words_per_minute | default: 200 %} + {% assign words = document.content | strip_html | number_of_words %} + + + + {% if words < words_per_minute %} + {{ site.data.ui-text[site.locale].less_than | default: "less than" }} 1 {{ site.data.ui-text[site.locale].minute_read | default: "minute read" }} + {% elsif words == words_per_minute %} + 1 {{ site.data.ui-text[site.locale].minute_read | default: "minute read" }} + {% else %} + {{ words | divided_by: words_per_minute }} {{ site.data.ui-text[site.locale].minute_read | default: "minute read" }} + {% endif %} + + {% endif %} +

+{% endif %} diff --git a/_includes/paginator.html b/_includes/paginator.html index 592a2cfc..bffa0794 100644 --- a/_includes/paginator.html +++ b/_includes/paginator.html @@ -1,6 +1,6 @@ {% if paginator.total_pages > 1 %}
diff --git a/_layouts/categories.html b/_layouts/categories.html index 1a5b6545..44adf117 100644 --- a/_layouts/categories.html +++ b/_layouts/categories.html @@ -15,39 +15,30 @@ layout: archive {% for i in (1..categories_max) reversed %} {% for category in site.categories %} {% if category[1].size == i %} - {% if category[0] == "Twitter" %} - - {% else if %} -
  • - - {{ category[0] }} {{ i }} - -
    • - {% endif %} +
  • + + {{ category[0] }} {{ i }} + +
    • {% endif %} {% endfor %} {% endfor %} +{% assign entries_layout = page.entries_layout | default: 'list' %} {% for i in (1..categories_max) reversed %} {% for category in site.categories %} {% if category[1].size == i %} - {% if category[0] == "Twitter" %} - - {% else if %} -
    -

    {{ category[0] }}

    - {% assign sorted_posts = category[1] | sort: 'last_modified_at' | reverse %} -
    +
    +

    {{ category[0] }}

    + {% assign sorted_posts = category[1] | sort: 'last_modified_at' | reverse %} +
    {% for post in sorted_posts %} - {% include archive-single.html type=page.entries_layout %} + {% include archive-single.html type=entries_layout %} {% endfor %} -
    - {{ site.data.ui-text[site.locale].back_to_top | default: 'Back to Top' }} ↑ -
    - {% endif %} +
    + {{ site.data.ui-text[site.locale].back_to_top | default: 'Back to Top' }} ↑ +
    {% endif %} {% endfor %} {% endfor %} - -{% include social-share.html %} \ No newline at end of file diff --git a/_layouts/category.html b/_layouts/category.html index 79b81ce0..b281c856 100644 --- a/_layouts/category.html +++ b/_layouts/category.html @@ -4,6 +4,7 @@ layout: archive {{ content }} -
    - {% include posts-category.html taxonomy=page.taxonomy type=page.entries_layout %} +{% assign entries_layout = page.entries_layout | default: 'list' %} +
    + {% include posts-category.html taxonomy=page.taxonomy type=entries_layout %}
    diff --git a/_layouts/collection.html b/_layouts/collection.html index 3bcd916a..d23d0c72 100644 --- a/_layouts/collection.html +++ b/_layouts/collection.html @@ -4,6 +4,7 @@ layout: archive {{ content }} -
    - {% include documents-collection.html collection=page.collection sort_by=page.sort_by sort_order=page.sort_order type=page.entries_layout %} +{% assign entries_layout = page.entries_layout | default: 'list' %} +
    + {% include documents-collection.html collection=page.collection sort_by=page.sort_by sort_order=page.sort_order type=entries_layout %}
    diff --git a/_layouts/default.html b/_layouts/default.html index cea72a81..fc6beea0 100644 --- a/_layouts/default.html +++ b/_layouts/default.html @@ -3,20 +3,19 @@ {% include head.html %} - {% include head/custom.html %} + {% include head/custom.html %} {% include_cached skip-links.html %} - {% include_cached browser-upgrade.html %} {% include_cached masthead.html %}
    diff --git a/_layouts/home.html b/_layouts/home.html index 9f728d9b..d16f6893 100644 --- a/_layouts/home.html +++ b/_layouts/home.html @@ -12,6 +12,7 @@ layout: archive {{ content }} +

    Categories

    {% assign categories_max = 0 %} @@ -62,3 +63,21 @@ layout: archive {% include social-share.html %} + + + diff --git a/_layouts/posts.html b/_layouts/posts.html index 76d25f9d..13fc707c 100644 --- a/_layouts/posts.html +++ b/_layouts/posts.html @@ -5,7 +5,7 @@ layout: archive {{ content }}
      - {% assign postsInYear = site.posts | group_by_exp: 'post', 'post.date | date: "%Y"' %} + {% assign postsInYear = site.posts | where_exp: "item", "item.hidden != true" | group_by_exp: 'post', 'post.date | date: "%Y"' %} {% for year in postsInYear %}
    • @@ -15,13 +15,14 @@ layout: archive {% endfor %}
    -{% assign postsByYear = site.posts | group_by_exp: 'post', 'post.date | date: "%Y"' %} +{% assign entries_layout = page.entries_layout | default: 'list' %} +{% assign postsByYear = site.posts | where_exp: "item", "item.hidden != true" | group_by_exp: 'post', 'post.date | date: "%Y"' %} {% for year in postsByYear %}

    {{ year.name }}

    -
    +
    {% for post in year.items %} - {% include archive-single.html type=page.entries_layout %} + {% include archive-single.html type=entries_layout %} {% endfor %}
    {{ site.data.ui-text[site.locale].back_to_top | default: 'Back to Top' }} ↑ diff --git a/_layouts/search.html b/_layouts/search.html index d18f2235..9e661a36 100644 --- a/_layouts/search.html +++ b/_layouts/search.html @@ -25,11 +25,11 @@ layout: default {%- assign search_provider = site.search_provider | default: "lunr" -%} {%- case search_provider -%} {%- when "lunr" -%} - +
    {%- when "google" -%}
    - +
    diff --git a/_layouts/single.html b/_layouts/single.html index 9135de71..0c8c0506 100644 --- a/_layouts/single.html +++ b/_layouts/single.html @@ -8,7 +8,11 @@ layout: default {% include page__hero_video.html %} {% endif %} -{% if page.url != "/" and site.breadcrumbs %} +'[]{% assign breadcrumbs_enabled = site.breadcrumbs %} +{% if page.breadcrumbs != null %} + {% assign breadcrumbs_enabled = page.breadcrumbs %} +{% endif %} +{% if page.url != "/" and breadcrumbs_enabled %} {% unless paginator %} {% include breadcrumbs.html %} {% endunless %} @@ -17,79 +21,75 @@ layout: default
    {% include sidebar.html %} -
    +
    {% if page.title %}{% endif %} {% if page.excerpt %}{% endif %} - {% if page.date %}{% endif %} - {% if page.last_modified_at %}{% endif %} + {% if page.date %}{% endif %} + {% if page.last_modified_at %}{% endif %}
    {% unless page.header.overlay_color or page.header.overlay_image %}
    - {% if page.title %}

    {{ page.title | markdownify | remove: "

    " | remove: "

    " }}

    {% endif %} - {% if page.read_time %} -

    {% include read-time.html %}

    - {% endif %} + {% if page.title %}

    + +

    {% endif %} + {% include page__meta.html %}
    {% endunless %} -
    +
    {% if page.toc %} {% endif %} {{ content }} {% if page.link %}{% endif %}
    +
    -
    {% if site.data.ui-text[site.locale].meta_label %} -

    {{ site.data.ui-text[site.locale].meta_label }}

    +

    {{ site.data.ui-text[site.locale].meta_label }}

    {% endif %} {% include page__taxonomy.html %} - {% if page.last_modified_at %} -

    {{ site.data.ui-text[site.locale].date_label | default: "Updated:" }}

    - {% elsif page.date %} -

    {{ site.data.ui-text[site.locale].date_label | default: "Updated:" }}

    - {% endif %} -

    Edit this page

    - {% if page.share %}{% include social-share.html %}{% endif %} -
    + {% include page__date.html %}
    + + {% if page.share %}{% include social-share.html %}{% endif %} + + {% include post_pagination.html %}
    - {% if site.comments.provider and page.comments %} + + {% if jekyll.environment == 'production' and site.comments.provider and page.comments %} {% include comments.html %} {% endif %}
    - {% comment %}{% endcomment %} - {% if page.related %} - {% assign n_posts = 0 %} - {% for post in site.posts %} - {% if post.id == page.id %}{% continue %}{% endif %} - {% for this_category in page.categories %} - {% if post.categories contains this_category %} - {% if n_posts == 0 %} -
    - {% if site.data.ui-text[site.locale].related_label %} -

    {{ site.data.ui-text[site.locale].related_label | default: "You May Also Enjoy" }}

    - {% endif %} -
    - {% endif %} - {% include archive-single.html type="grid" %} - {% assign n_posts = n_posts | plus: 1 %} - {% break %} - {% endif %} - {% endfor %} - {% if n_posts > 3 %}{% break %}{% endif %} - {% endfor %} - {% if n_posts > 0 %} -
    + {% comment %}{% endcomment %} + {% if page.id and page.related and site.related_posts.size > 0 %} +
    +

    {{ site.data.ui-text[site.locale].related_label | default: "You May Also Enjoy" }}

    +
    + {% for post in site.related_posts limit:4 %} + {% include archive-single.html type="grid" %} + {% endfor %}
    - {% endif %} +
    + {% comment %}{% endcomment %} + {% elsif page.id and page.related %} +
    +

    {{ site.data.ui-text[site.locale].related_label | default: "You May Also Enjoy" }}

    +
    + {% for post in site.posts limit:4 %} + {% if post.id == page.id %} + {% continue %} + {% endif %} + {% include archive-single.html type="grid" %} + {% endfor %} +
    +
    {% endif %}
    diff --git a/_layouts/splash.html b/_layouts/splash.html index b327607e..21165024 100644 --- a/_layouts/splash.html +++ b/_layouts/splash.html @@ -12,8 +12,8 @@ layout: default
    {% if page.title %}{% endif %} {% if page.excerpt %}{% endif %} - {% if page.date %}{% endif %} - {% if page.last_modified_at %}{% endif %} + {% if page.date %}{% endif %} + {% if page.last_modified_at %}{% endif %}
    {{ content }} diff --git a/_layouts/tag.html b/_layouts/tag.html index 5f83c2aa..8b1c1885 100644 --- a/_layouts/tag.html +++ b/_layouts/tag.html @@ -4,6 +4,7 @@ layout: archive {{ content }} -
    - {% include posts-tag.html taxonomy=page.taxonomy type=page.entries_layout %} +{% assign entries_layout = page.entries_layout | default: 'list' %} +
    + {% include posts-tag.html taxonomy=page.taxonomy type=entries_layout %}
    diff --git a/_layouts/tags.html b/_layouts/tags.html index e6c36306..daa11828 100644 --- a/_layouts/tags.html +++ b/_layouts/tags.html @@ -5,8 +5,7 @@ layout: archive {{ content }} {% assign tags_max = 0 %} -{% assign sortedtags = site.tags | sort %} -{% for tag in sortedtags %} +{% for tag in site.tags %} {% if tag[1].size > tags_max %} {% assign tags_max = tag[1].size %} {% endif %} @@ -14,34 +13,31 @@ layout: archive
      {% for i in (1..tags_max) reversed %} - {% for tag in sortedtags %} + {% for tag in site.tags %} {% if tag[1].size == i %} - {% unless tag[1].size == 1 %} -
    • - - {{ tag[0] }} {{ i }} - -
      • - {% endunless %} +
    • + + {{ tag[0] }} {{ i }} + +
      • {% endif %} {% endfor %} {% endfor %}
    +{% assign entries_layout = page.entries_layout | default: 'list' %} {% for i in (1..tags_max) reversed %} - {% for tag in sortedtags %} + {% for tag in site.tags %} {% if tag[1].size == i %} - {% unless tag[1].size == 1 %} -
    -

    {{ tag[0] }}

    -
    - {% for post in tag.last %} - {% include archive-single.html type=page.entries_layout %} - {% endfor %} -
    - {{ site.data.ui-text[site.locale].back_to_top | default: 'Back to Top' }} ↑ -
    - {% endunless %} +
    +

    {{ tag[0] }}

    +
    + {% for post in tag.last %} + {% include archive-single.html type=entries_layout %} + {% endfor %} +
    + {{ site.data.ui-text[site.locale].back_to_top | default: 'Back to Top' }} ↑ +
    {% endif %} {% endfor %} {% endfor %} diff --git a/_sass/minimal-mistakes.scss b/_sass/minimal-mistakes.scss index 708d1892..3b252e56 100644 --- a/_sass/minimal-mistakes.scss +++ b/_sass/minimal-mistakes.scss @@ -1,6 +1,6 @@ /*! - * Minimal Mistakes Jekyll Theme 4.16.4 by Michael Rose - * Copyright 2013-2019 Michael Rose - mademistakes.com | @mmistakes + * Minimal Mistakes Jekyll Theme 4.24.0 by Michael Rose + * Copyright 2013-2020 Michael Rose - mademistakes.com | @mmistakes * Licensed under MIT (https://github.com/mmistakes/minimal-mistakes/blob/master/LICENSE) */ diff --git a/minimal-mistakes-jekyll.gemspec b/minimal-mistakes-jekyll.gemspec new file mode 100644 index 00000000..e985e498 --- /dev/null +++ b/minimal-mistakes-jekyll.gemspec @@ -0,0 +1,27 @@ +# coding: utf-8 + +Gem::Specification.new do |spec| + spec.name = "minimal-mistakes-jekyll" + spec.version = "4.24.0" + spec.authors = ["Michael Rose"] + + spec.summary = %q{A flexible two-column Jekyll theme.} + spec.homepage = "https://github.com/mmistakes/minimal-mistakes" + spec.license = "MIT" + + spec.metadata["plugin_type"] = "theme" + + spec.files = `git ls-files -z`.split("\x0").select do |f| + f.match(%r{^(assets|_(data|includes|layouts|sass)/|(LICENSE|README|CHANGELOG)((\.(txt|md|markdown)|$)))}i) + end + + spec.add_runtime_dependency "jekyll", ">= 3.7", "< 5.0" + spec.add_runtime_dependency "jekyll-paginate", "~> 1.1" + spec.add_runtime_dependency "jekyll-sitemap", "~> 1.3" + spec.add_runtime_dependency "jekyll-gist", "~> 1.5" + spec.add_runtime_dependency "jekyll-feed", "~> 0.1" + spec.add_runtime_dependency "jekyll-include-cache", "~> 0.1" + + spec.add_development_dependency "bundler" + spec.add_development_dependency "rake", ">= 12.3.3" +end