From 9ff45a2e80279a97ac12ebe3522e69ba1746cf00 Mon Sep 17 00:00:00 2001 From: Plailect Date: Tue, 22 Nov 2016 20:29:30 -0500 Subject: [PATCH] mm 4.0.9 --- .editorconfig | 13 -- .gitattributes | 5 - .gitignore | 6 +- Gemfile | 24 +-- Gemfile.lock | 122 ++++------- _config.yml | 2 +- _data/ui-text.yml | 1 + _includes/archive-single.html | 10 +- _includes/author-profile.html | 163 +++++++++++---- _includes/breadcrumbs.html | 8 +- _includes/category-list.html | 6 +- _includes/comments-providers/discourse.html | 5 +- _includes/comments.html | 12 +- _includes/feature_row | 8 +- _includes/figure | 12 ++ _includes/gallery | 10 +- _includes/head.html | 4 +- _includes/masthead.html | 10 +- _includes/nav_list | 19 +- _includes/page__hero.html | 10 +- _includes/page__taxonomy.html | 4 +- _includes/paginator.html | 18 +- _includes/post_pagination.html | 8 +- _includes/read-time.html | 18 +- _includes/scripts.html | 2 +- _includes/seo.html | 10 +- _includes/sidebar.html | 6 +- _includes/social-share.html | 10 +- _includes/tag-list.html | 6 +- _layouts/archive-taxonomy.html | 3 +- _layouts/home.html | 11 + _layouts/single-no-ads.html | 84 ++++++++ _layouts/single.html | 190 +++++++++--------- _layouts/splash.html | 4 +- _pages/404.md | 5 +- _pages/Donations.md | 1 + _pages/Home.md | 2 +- _pages/Why-Ads.md | 1 + _sass/_navigation.scss | 137 +++++++++++-- _sass/_sidebar.scss | 11 +- _sass/_variables.scss | 176 ++++++++-------- assets/css/main.scss | 56 +++++- assets/js/main.min.js | 10 +- assets/js/plugins/jquery.greedy-navigation.js | 2 +- minimal-mistakes-jekyll.gemspec | 28 +++ package.json | 2 +- 46 files changed, 753 insertions(+), 502 deletions(-) delete mode 100644 .editorconfig delete mode 100644 .gitattributes create mode 100644 _includes/figure create mode 100644 _layouts/home.html create mode 100644 _layouts/single-no-ads.html create mode 100644 minimal-mistakes-jekyll.gemspec diff --git a/.editorconfig b/.editorconfig deleted file mode 100644 index 3a287c45..00000000 --- a/.editorconfig +++ /dev/null @@ -1,13 +0,0 @@ -# editorconfig.org -root = true - -[*] -indent_style = space -indent_size = 2 -end_of_line = lf -charset = utf-8 -trim_trailing_whitespace = true -insert_final_newline = false - -[*.md] -trim_trailing_whitespace = false diff --git a/.gitattributes b/.gitattributes deleted file mode 100644 index ebe01992..00000000 --- a/.gitattributes +++ /dev/null @@ -1,5 +0,0 @@ -_assets/css/vendor/* linguist-vendored -_assets/js/plugins/* linguist-vendored -_assets/js/vendor/* linguist-vendored -assets/fonts/* linguist-vendored -assets/js/vendor/* linguist-vendored \ No newline at end of file diff --git a/.gitignore b/.gitignore index 26e8776e..3dfbdc09 100644 --- a/.gitignore +++ b/.gitignore @@ -1,11 +1,15 @@ +*.gem *.sublime-project *.sublime-workspace +.bundle .DS_Store .jekyll-metadata .sass-cache _asset_bundler_cache _site codekit-config.json +example/_site +Gemfile.lock node_modules npm-debug.log* -vendor/ +vendor diff --git a/Gemfile b/Gemfile index 6c08bcf0..3be9c3cd 100644 --- a/Gemfile +++ b/Gemfile @@ -1,24 +1,2 @@ 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 "github-pages", group: :jekyll_plugins - -# If you want to use Jekyll native, uncomment the line below. -# To upgrade, run `bundle update`. - -# gem "jekyll" - -gem "wdm", "~> 0.1.0" if Gem.win_platform? - -# If you have any plugins, put them here! -group :jekyll_plugins do - # gem "jekyll-archives" -end \ No newline at end of file +gemspec diff --git a/Gemfile.lock b/Gemfile.lock index 0152c3a8..a0e321cb 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,60 +1,38 @@ +PATH + remote: . + specs: + minimal-mistakes-jekyll (4.0.9) + jekyll (~> 3.3) + jekyll-feed (~> 0.8) + jekyll-gist (~> 1.4) + jekyll-paginate (~> 1.1) + jekyll-sitemap (~> 0.12) + jemoji (~> 0.7) + GEM remote: https://rubygems.org/ specs: - activesupport (4.2.7) + activesupport (4.2.7.1) i18n (~> 0.7) json (~> 1.7, >= 1.7.7) minitest (~> 5.1) thread_safe (~> 0.3, >= 0.3.4) tzinfo (~> 1.1) - addressable (2.4.0) - coffee-script (2.4.1) - coffee-script-source - execjs - coffee-script-source (1.10.0) + addressable (2.5.0) + public_suffix (~> 2.0, >= 2.0.2) colorator (1.1.0) - ethon (0.9.0) - ffi (>= 1.3.0) - execjs (2.7.0) - faraday (0.9.2) + faraday (0.10.0) multipart-post (>= 1.2, < 3) ffi (1.9.14) ffi (1.9.14-x64-mingw32) forwardable-extended (2.6.0) gemoji (2.1.0) - github-pages (96) - activesupport (= 4.2.7) - github-pages-health-check (= 1.2.0) - jekyll (= 3.2.1) - jekyll-coffeescript (= 1.0.1) - jekyll-feed (= 0.5.1) - jekyll-gist (= 1.4.0) - jekyll-github-metadata (= 2.0.2) - jekyll-mentions (= 1.2.0) - jekyll-paginate (= 1.1.0) - jekyll-redirect-from (= 0.11.0) - jekyll-sass-converter (= 1.3.0) - jekyll-seo-tag (= 2.0.0) - jekyll-sitemap (= 0.10.0) - jemoji (= 0.7.0) - kramdown (= 1.11.1) - liquid (= 3.0.6) - listen (= 3.0.6) - mercenary (~> 0.3) - minima (= 1.2.0) - rouge (= 1.11.1) - terminal-table (~> 1.4) - github-pages-health-check (1.2.0) - addressable (~> 2.3) - net-dns (~> 0.8) - octokit (~> 4.0) - public_suffix (~> 1.4) - typhoeus (~> 0.7) html-pipeline (2.4.2) activesupport (>= 2) nokogiri (>= 1.4) i18n (0.7.0) - jekyll (3.2.1) + jekyll (3.3.1) + addressable (~> 2.4) colorator (~> 1.0) jekyll-sass-converter (~> 1.0) jekyll-watch (~> 1.1) @@ -64,26 +42,15 @@ GEM pathutil (~> 0.9) rouge (~> 1.7) safe_yaml (~> 1.0) - jekyll-coffeescript (1.0.1) - coffee-script (~> 2.2) - jekyll-feed (0.5.1) + jekyll-feed (0.8.0) + jekyll (~> 3.3) jekyll-gist (1.4.0) octokit (~> 4.2) - jekyll-github-metadata (2.0.2) - jekyll (~> 3.1) - octokit (~> 4.0) - jekyll-mentions (1.2.0) - activesupport (~> 4.0) - html-pipeline (~> 2.3) - jekyll (~> 3.0) jekyll-paginate (1.1.0) - jekyll-redirect-from (0.11.0) - jekyll (>= 2.0) - jekyll-sass-converter (1.3.0) - sass (~> 3.2) - jekyll-seo-tag (2.0.0) - jekyll (~> 3.1) - jekyll-sitemap (0.10.0) + jekyll-sass-converter (1.5.0) + sass (~> 3.4) + jekyll-sitemap (0.12.0) + jekyll (~> 3.3) jekyll-watch (1.5.0) listen (~> 3.0, < 3.1) jemoji (0.7.0) @@ -92,53 +59,46 @@ GEM html-pipeline (~> 2.2) jekyll (>= 3.0) json (1.8.3) - kramdown (1.11.1) + kramdown (1.13.0) liquid (3.0.6) - listen (3.0.6) - rb-fsevent (>= 0.9.3) - rb-inotify (>= 0.9.7) + listen (3.0.8) + rb-fsevent (~> 0.9, >= 0.9.4) + rb-inotify (~> 0.9, >= 0.9.7) mercenary (0.3.6) mini_portile2 (2.1.0) - minima (1.2.0) - minitest (5.9.0) + minitest (5.9.1) multipart-post (2.0.0) - net-dns (0.8.0) - nokogiri (1.6.8) + nokogiri (1.6.8.1) mini_portile2 (~> 2.1.0) - pkg-config (~> 1.1.7) - nokogiri (1.6.8-x64-mingw32) + nokogiri (1.6.8.1-x64-mingw32) mini_portile2 (~> 2.1.0) - pkg-config (~> 1.1.7) - octokit (4.3.0) - sawyer (~> 0.7.0, >= 0.5.3) + octokit (4.6.2) + sawyer (~> 0.8.0, >= 0.5.3) pathutil (0.14.0) forwardable-extended (~> 2.6) - pkg-config (1.1.7) - public_suffix (1.5.3) - rb-fsevent (0.9.7) + public_suffix (2.0.4) + rake (10.5.0) + rb-fsevent (0.9.8) rb-inotify (0.9.7) ffi (>= 0.5.0) rouge (1.11.1) safe_yaml (1.0.4) sass (3.4.22) - sawyer (0.7.0) - addressable (>= 2.3.5, < 2.5) - faraday (~> 0.8, < 0.10) - terminal-table (1.7.2) - unicode-display_width (~> 1.1.1) + sawyer (0.8.1) + addressable (>= 2.3.5, < 2.6) + faraday (~> 0.8, < 1.0) thread_safe (0.3.5) - typhoeus (0.8.0) - ethon (>= 0.8.0) tzinfo (1.2.2) thread_safe (~> 0.1) - unicode-display_width (1.1.1) PLATFORMS ruby x64-mingw32 DEPENDENCIES - github-pages + bundler (~> 1.12) + minimal-mistakes-jekyll! + rake (~> 10.0) BUNDLED WITH 1.13.6 diff --git a/_config.yml b/_config.yml index bdd381c8..ea694117 100644 --- a/_config.yml +++ b/_config.yml @@ -30,7 +30,7 @@ comments: colorscheme : # "light" (default), "dark" staticman: allowedFields : ['name', 'email', 'url', 'message'] - branch : # "master", "gh-pages" + branch : "master" commitMessage : "New comment." filename : comment-{@timestamp} format : "yml" diff --git a/_data/ui-text.yml b/_data/ui-text.yml index 68c0476d..78c1a865 100644 --- a/_data/ui-text.yml +++ b/_data/ui-text.yml @@ -8,6 +8,7 @@ en: &DEFAULT_EN pagination_next : "Next" breadcrumb_home_label : "Home" breadcrumb_separator : "/" + menu_label : "Toggle Menu" toc_label : "On This Page" ext_link_label : "Direct Link" less_than : "less than" diff --git a/_includes/archive-single.html b/_includes/archive-single.html index e904447f..dc9ac737 100644 --- a/_includes/archive-single.html +++ b/_includes/archive-single.html @@ -1,5 +1,3 @@ -{% include base_path %} - {% if post.header.teaser %} {% capture teaser %}{{ post.header.teaser }}{% endcapture %} {% else %} @@ -20,16 +18,16 @@ {% if teaser contains "://" %} "{{ teaser }}" {% else %} - "{{ teaser | prepend: "/images/" | prepend: base_path }}" + "{{ teaser | absolute_url }}" {% endif %} alt=""> {% endif %}

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

{% if post.read_time %} @@ -37,4 +35,4 @@ {% endif %} {% if post.excerpt %}

{{ post.excerpt | markdownify | strip_html | truncate: 160 }}

{% endif %} - \ No newline at end of file + diff --git a/_includes/author-profile.html b/_includes/author-profile.html index 510a1ba9..f6637c8f 100644 --- a/_includes/author-profile.html +++ b/_includes/author-profile.html @@ -1,101 +1,190 @@ -{% include base_path %} - {% if page.author and site.data.authors[page.author] %} - {% assign author = site.data.authors[page.author] %}{% else %}{% assign author = site.author %} + {% assign author = site.data.authors[page.author] %} +{% else %} + {% assign author = site.author %} {% endif %}
-
- {% if author.avatar contains "://" %} - {{ author.name }} - {% else %} - {{ author.name }} - {% endif %} -
+ {% if author.avatar %} +
+ {% if author.avatar contains "://" %} + {{ author.name }} + {% else %} + {{ author.name }} + {% endif %} +
+ {% endif %}
-

{{ author.name }}

- {% if author.bio %}

{{ author.bio }}

{% endif %} +

{{ author.name }}

+ {% if author.bio %} +

+ {{ author.bio }} +

+ {% endif %}
diff --git a/_includes/breadcrumbs.html b/_includes/breadcrumbs.html index 2b9f7a9e..11ec3564 100644 --- a/_includes/breadcrumbs.html +++ b/_includes/breadcrumbs.html @@ -1,5 +1,3 @@ -{% include base_path %} - {% case site.categories.type %} {% when "liquid" %} {% assign path_type = "#" %} @@ -21,7 +19,7 @@ {% for crumb in crumbs offset: 1 %} {% if forloop.first %}
  • - {{ site.data.ui-text[site.locale].breadcrumb_home_label | default: "Home" }} + {{ site.data.ui-text[site.locale].breadcrumb_home_label | default: "Home" }}
    • {{ site.data.ui-text[site.locale].breadcrumb_separator | default: "/" }} @@ -31,11 +29,11 @@ {% else %} {% assign i = i | plus: 1 %}
  • - {{ crumb | replace: '-', ' ' | replace: '%20', ' ' | capitalize }} + {{ crumb | replace: '-', ' ' | replace: '%20', ' ' | capitalize }}
    • {{ site.data.ui-text[site.locale].breadcrumb_separator | default: "/" }} {% endif %} {% endfor %} - \ No newline at end of file + diff --git a/_includes/category-list.html b/_includes/category-list.html index 4c274270..f37fbf83 100644 --- a/_includes/category-list.html +++ b/_includes/category-list.html @@ -1,5 +1,3 @@ -{% include base_path %} - {% case site.category_archive.type %} {% when "liquid" %} {% assign path_type = "#" %} @@ -21,8 +19,8 @@ {% for hash in category_hashes %} {% assign keyValue = hash | split: '#' %} {% capture category_word %}{{ keyValue[1] | strip_newlines }}{% endcapture %} - {% unless forloop.last %}, {% endunless %} + {% unless forloop.last %}, {% endunless %} {% endfor %}

    -{% endif %} \ No newline at end of file +{% endif %} diff --git a/_includes/comments-providers/discourse.html b/_includes/comments-providers/discourse.html index 1d23b6f2..8484b2f9 100644 --- a/_includes/comments-providers/discourse.html +++ b/_includes/comments-providers/discourse.html @@ -1,6 +1,5 @@ {% if site.comments.discourse.server %} -{% include base_path %} -{% capture canonical %}{{ base_path }}{% if site.permalink contains '.html' %}{{ page.url }}{% else %}{{ page.url | remove:'index.html' | strip_slash }}{% endif %}{% endcapture %} +{% capture canonical %}{% if site.permalink contains '.html' %}{{ page.url | absolute_url }}{% else %}{{ page.url | absolute_url | remove:'index.html' | strip_slash }}{% endif %}{% endcapture %} -{% endif %} \ No newline at end of file +{% endif %} diff --git a/_includes/comments.html b/_includes/comments.html index 39b4983b..9d04fbcc 100644 --- a/_includes/comments.html +++ b/_includes/comments.html @@ -1,5 +1,3 @@ -{% include base_path %} -
    {% capture comments_label %}{{ site.data.ui-text[site.locale].comments_label | default: "Comments" }}{% endcapture %} {% case site.comments.provider %} @@ -8,12 +6,12 @@
    {% when "facebook" %}

    {{ comments_label }}

    -
    +
    {% when "google-plus" %}

    {{ comments_label }}

    -
    Loading Google+ Comments ...
    +
    Loading Google+ Comments ...
    {% when "staticman" %} -
    +
    {% if site.repository and site.staticman.branch %}
    @@ -77,6 +75,6 @@ {% endif %}
    {% when "custom" %} -
    +
    {% endcase %} -
    \ No newline at end of file +
    diff --git a/_includes/feature_row b/_includes/feature_row index b84f36b2..bd0b6b2b 100644 --- a/_includes/feature_row +++ b/_includes/feature_row @@ -1,5 +1,3 @@ -{% include base_path %} - {% if include.id %} {% assign feature_row = page.[include.id] %} {% else %} @@ -13,7 +11,7 @@ {% if f.url contains "://" %} {% capture f_url %}{{ f.url }}{% endcapture %} {% else %} - {% capture f_url %}{{ f.url | prepend: base_path }}{% endcapture %} + {% capture f_url %}{{ f.url | absolute_url }}{% endcapture %} {% endif %}
    @@ -24,7 +22,7 @@ {% if f.image_path contains "://" %} "{{ f.image_path }}" {% else %} - "{{ f.image_path | prepend: "/images/" | prepend: base_path }}" + "{{ f.image_path | absolute_url }}" {% endif %} alt="{% if f.alt %}{{ f.alt }}{% endif %}">
    @@ -49,4 +47,4 @@ {% endfor %} - \ No newline at end of file + diff --git a/_includes/figure b/_includes/figure new file mode 100644 index 00000000..da829e48 --- /dev/null +++ b/_includes/figure @@ -0,0 +1,12 @@ +
    + {% if include.alt %}{{ include.alt }}{% endif %} + {% if include.caption %} +
    {{ include.caption | markdownify | remove: "

    " | remove: "

    " }}
    + {% endif %} +
    diff --git a/_includes/gallery b/_includes/gallery index 4d271ee9..cb68ddd5 100644 --- a/_includes/gallery +++ b/_includes/gallery @@ -1,5 +1,3 @@ -{% include base_path %} - {% if include.id %} {% assign gallery = page.[include.id] %} {% else %} @@ -21,7 +19,7 @@ {% if img.url contains "://" %} "{{ img.url }}" {% else %} - "{{ img.url | prepend: "/images/" | prepend: base_path }}" + "{{ img.url | absolute_url }}" {% endif %} {% if img.title %}title="{{ img.title }}"{% endif %} > @@ -29,7 +27,7 @@ {% if img.image_path contains "://" %} "{{ img.image_path }}" {% else %} - "{{ img.image_path | prepend: "/images/" | prepend: base_path }}" + "{{ img.image_path | absolute_url }}" {% endif %} alt="{% if img.alt %}{{ img.alt }}{% endif %}"> @@ -38,7 +36,7 @@ {% if img.image_path contains "://" %} "{{ img.image_path }}" {% else %} - "{{ img.image_path | prepend: "/images/" | prepend: base_path }}" + "{{ img.image_path | absolute_url }}" {% endif %} alt="{% if img.alt %}{{ img.alt }}{% endif %}"> {% endif %} @@ -46,4 +44,4 @@ {% if include.caption %}
    {{ include.caption | markdownify | remove: "

    " | remove: "

    " }}
    {% endif %} - \ No newline at end of file + diff --git a/_includes/head.html b/_includes/head.html index 3da00624..82afbdb3 100644 --- a/_includes/head.html +++ b/_includes/head.html @@ -1,5 +1,3 @@ -{% include base_path %} - {% include seo.html %} @@ -16,6 +14,6 @@ - + diff --git a/_includes/masthead.html b/_includes/masthead.html index ffef5594..2c77426a 100644 --- a/_includes/masthead.html +++ b/_includes/masthead.html @@ -1,17 +1,15 @@ -{% include base_path %} -
    -
    \ No newline at end of file + diff --git a/_includes/nav_list b/_includes/nav_list index 91228ba8..36cfa912 100644 --- a/_includes/nav_list +++ b/_includes/nav_list @@ -1,17 +1,18 @@ -{% include base_path %} {% assign navigation = site.data.navigation[include.nav] %} \ No newline at end of file + diff --git a/_includes/page__hero.html b/_includes/page__hero.html index cd0fa9fd..8936e3af 100644 --- a/_includes/page__hero.html +++ b/_includes/page__hero.html @@ -1,21 +1,19 @@ -{% include base_path %} - {% if page.header.image contains "://" %} {% capture img_path %}{{ page.header.image }}{% endcapture %} {% else %} - {% capture img_path %}{{ page.header.image | prepend: "/images/" | prepend: base_path }}{% endcapture %} + {% capture img_path %}{{ page.header.image | absolute_url }}{% endcapture %} {% endif %} {% if page.header.cta_url contains "://" %} {% capture cta_path %}{{ page.header.cta_url }}{% endcapture %} {% else %} - {% capture cta_path %}{{ page.header.cta_url | prepend: base_path }}{% endcapture %} + {% capture cta_path %}{{ page.header.cta_url | absolute_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 | prepend: "/images/" | prepend: base_path }}{% endcapture %} + {% capture overlay_img_path %}{{ page.header.overlay_image | absolute_url }}{% endcapture %} {% endif %} {% if page.header.overlay_filter contains "rgba" %} @@ -52,4 +50,4 @@ {% if page.header.caption %} {{ page.header.caption | markdownify | remove: "

    " | remove: "

    " }}     {% endif %} - \ No newline at end of file + diff --git a/_includes/page__taxonomy.html b/_includes/page__taxonomy.html index 5a0c39fc..f10b2026 100644 --- a/_includes/page__taxonomy.html +++ b/_includes/page__taxonomy.html @@ -1,9 +1,7 @@ -{% include base_path %} - {% if site.tag_archive.type and page.tags[0] %} {% include tag-list.html %} {% endif %} {% if site.category_archive.type and page.categories[0] %} {% include category-list.html %} -{% endif %} \ No newline at end of file +{% endif %} diff --git a/_includes/paginator.html b/_includes/paginator.html index 2924f9a8..efe3fe14 100644 --- a/_includes/paginator.html +++ b/_includes/paginator.html @@ -1,14 +1,12 @@ -{% include base_path %} - {% if paginator.total_pages > 1 %} -{% endif %} \ No newline at end of file +{% endif %} diff --git a/_includes/post_pagination.html b/_includes/post_pagination.html index cb2005ea..902d2bc2 100644 --- a/_includes/post_pagination.html +++ b/_includes/post_pagination.html @@ -1,16 +1,14 @@ -{% include base_path %} - {% if page.previous or page.next %} -{% endif %} \ No newline at end of file +{% endif %} diff --git a/_includes/read-time.html b/_includes/read-time.html index a45043c1..e8b47cd7 100644 --- a/_includes/read-time.html +++ b/_includes/read-time.html @@ -1,17 +1,15 @@ +{% assign words_per_minute = site.words_per_minute | default: 200 %} + {% if post.read_time %} {% assign words = post.content | strip_html | number_of_words %} {% elsif page.read_time %} {% assign words = page.content | strip_html | number_of_words %} {% endif %} -{% if site.words_per_minute %} - {% if words < 180 %} - {{ 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 < 360 %} - 1 {{ site.data.ui-text[site.locale].minute_read | default: "minute read" }} - {% else %} - {{ words | divided_by:site.words_per_minute }} {{ site.data.ui-text[site.locale].minute_read | default: "minute read" }} - {% endif %} +{% if words < 180 %} + {{ 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 < 360 %} + 1 {{ site.data.ui-text[site.locale].minute_read | default: "minute read" }} {% else %} - {{ site.data.ui-text[site.locale].undefined_wpm | "Undefined parameter words_per_minute at _config.yml" }} -{% endif %} \ No newline at end of file + {{ words | divided_by:words_per_minute }} {{ site.data.ui-text[site.locale].minute_read | default: "minute read" }} +{% endif %} diff --git a/_includes/scripts.html b/_includes/scripts.html index 138d271e..844de82d 100644 --- a/_includes/scripts.html +++ b/_includes/scripts.html @@ -1,4 +1,4 @@ - + {% include analytics.html %} {% include /comments-providers/scripts.html %} diff --git a/_includes/seo.html b/_includes/seo.html index 190fcb27..f3301451 100644 --- a/_includes/seo.html +++ b/_includes/seo.html @@ -1,5 +1,3 @@ -{% include base_path %} - {% if site.url %} {% assign seo_url = site.url | append: site.baseurl %} @@ -25,6 +23,8 @@ {% assign seo_description = seo_description | markdownify | strip_html | strip_newlines | escape_once %} {% endif %} + + {% assign seo_author = page.author | default: page.author[0] | default: site.author[0] %} {% if seo_author %} {% if seo_author.twitter %} @@ -60,13 +60,13 @@ {% if page.header.image %} - + {% else %} {% if page.header.teaser %} - + {% elsif site.og_image %} - + {% endif %} {% endif %} diff --git a/_includes/sidebar.html b/_includes/sidebar.html index b8ee39ab..4ab6ef7a 100644 --- a/_includes/sidebar.html +++ b/_includes/sidebar.html @@ -1,5 +1,3 @@ -{% include base_path %} - {% if page.author_profile or layout.author_profile or page.sidebar %}
    {% if page.author_profile or layout.author_profile %}{% include author-profile.html %}{% endif %} @@ -10,7 +8,7 @@ {% if s.image contains "://" %} "{{ s.image }}" {% else %} - "{{ s.image | prepend: "/images/" | prepend: base_path }}" + "{{ s.image | absolute_url }}" {% endif %} alt="{% if s.image_alt %}{{ s.image_alt }}{% endif %}"> {% endif %} @@ -22,4 +20,4 @@ {% endif %} {% endif %}
    -{% endif %} \ No newline at end of file +{% endif %} diff --git a/_includes/social-share.html b/_includes/social-share.html index 2a05d50e..dbf769ef 100644 --- a/_includes/social-share.html +++ b/_includes/social-share.html @@ -1,15 +1,13 @@ -{% include base_path %} -
    {% if site.data.ui-text[site.locale].share_on_label %} {% endif %} - + - + - Google+ + Google+ - LinkedIn + LinkedIn
    diff --git a/_includes/tag-list.html b/_includes/tag-list.html index 80fcff3e..aa5a4fdd 100644 --- a/_includes/tag-list.html +++ b/_includes/tag-list.html @@ -1,5 +1,3 @@ -{% include base_path %} - {% case site.tag_archive.type %} {% when "liquid" %} {% assign path_type = "#" %} @@ -21,8 +19,8 @@ {% for hash in tag_hashes %} {% assign keyValue = hash | split: '#' %} {% capture tag_word %}{{ keyValue[1] | strip_newlines }}{% endcapture %} - {% unless forloop.last %}, {% endunless %} + {% unless forloop.last %}, {% endunless %} {% endfor %}

    -{% endif %} \ No newline at end of file +{% endif %} diff --git a/_layouts/archive-taxonomy.html b/_layouts/archive-taxonomy.html index 4d5827f1..a9087a2b 100644 --- a/_layouts/archive-taxonomy.html +++ b/_layouts/archive-taxonomy.html @@ -8,9 +8,8 @@ author_profile: false

    {{ page.title }}

    - {% include base_path %} {% for post in page.posts %} {% include archive-single.html %} {% endfor %}
    - \ No newline at end of file + diff --git a/_layouts/home.html b/_layouts/home.html new file mode 100644 index 00000000..bcce92ab --- /dev/null +++ b/_layouts/home.html @@ -0,0 +1,11 @@ +--- +layout: archive +--- + +

    {{ site.data.ui-text[site.locale].recent_posts | default: "Recent Posts" }}

    + +{% for post in paginator.posts %} + {% include archive-single.html %} +{% endfor %} + +{% include paginator.html %} diff --git a/_layouts/single-no-ads.html b/_layouts/single-no-ads.html new file mode 100644 index 00000000..32f5019d --- /dev/null +++ b/_layouts/single-no-ads.html @@ -0,0 +1,84 @@ +--- +layout: default +--- + +{% include base_path %} + +{% if page.header.overlay_color or page.header.overlay_image or page.header.image %} + {% include page__hero.html %} +{% endif %} + +{% if page.url != "/" and site.breadcrumbs %} + {% unless paginator %} + {% include breadcrumbs.html %} + {% endunless %} +{% endif %} + +
    + {% include sidebar.html %} + +
    + {% if page.title %}{% endif %} + {% if page.excerpt %}{% endif %} + {% if page.date %}{% endif %} + {% if page.modified %}{% 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 %} +
    + {% endunless %} + +
    + {{ content }} + {% if page.link %}{% endif %} + +
    + +
    For support, ask for help at #3dshacks on Rizon IRC or 3DS Hacking on Discord.
    If you appreciate this guide, I accept Donations through both Bitcoin and PayPal.
    + +
    + +
    + +
    + {% if site.data.ui-text[site.locale].meta_label %} +

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

    + {% endif %} + {% include page__taxonomy.html %} + {% if page.modified %} +

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

    + {% elsif page.date %} +

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

    + {% endif %} +
    + + {% if page.share %}{% include social-share.html %}{% endif %} + + {% include post_pagination.html %} +
    + + {% if site.comments.provider and page.comments %} + {% include comments.html %} + {% endif %} + +
    + + {% comment %}{% endcomment %} + {% if page.id and page.related and site.related_posts.size > 0 %} +
    + {% if site.data.ui-text[site.locale].related_label %} +

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

    + {% endif %} +
    + {% for post in site.related_posts limit:4 %} + {% include archive-single.html type="grid" %} + {% endfor %} +
    +
    + {% endif %} +
    diff --git a/_layouts/single.html b/_layouts/single.html index 6dc2cf65..c28706a8 100644 --- a/_layouts/single.html +++ b/_layouts/single.html @@ -1,95 +1,95 @@ ---- -layout: default ---- - -{% include base_path %} - -{% if page.header.overlay_color or page.header.overlay_image or page.header.image %} - {% include page__hero.html %} -{% endif %} - -{% if page.url != "/" and site.breadcrumbs %} - {% unless paginator %} - {% include breadcrumbs.html %} - {% endunless %} -{% endif %} - -
    - {% include sidebar.html %} - -
    - {% if page.title %}{% endif %} - {% if page.excerpt %}{% endif %} - {% if page.date %}{% endif %} - {% if page.modified %}{% 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 %} -
    - {% endunless %} - -
    - {{ content }} - {% if page.link %}{% endif %} - -
    - -
    For support, ask for help at #Cakey on Freenode.
    If you appreciate this guide, I accept Donations through both Bitcoin and PayPal.
    - - - - - - -
    - -
    - -
    - {% if site.data.ui-text[site.locale].meta_label %} -

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

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

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

    - {% elsif page.date %} -

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

    - {% endif %} -
    - - {% if page.share %}{% include social-share.html %}{% endif %} - - {% include post_pagination.html %} -
    - - {% if site.comments.provider and page.comments %} - {% include comments.html %} - {% endif %} - -
    - - {% comment %}{% endcomment %} - {% if page.id and page.related and site.related_posts.size > 0 %} -
    - {% if site.data.ui-text[site.locale].related_label %} -

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

    - {% endif %} -
    - {% for post in site.related_posts limit:4 %} - {% include archive-single.html type="grid" %} - {% endfor %} -
    -
    - {% endif %} -
    +--- +layout: default +--- + +{% include base_path %} + +{% if page.header.overlay_color or page.header.overlay_image or page.header.image %} + {% include page__hero.html %} +{% endif %} + +{% if page.url != "/" and site.breadcrumbs %} + {% unless paginator %} + {% include breadcrumbs.html %} + {% endunless %} +{% endif %} + +
    + {% include sidebar.html %} + +
    + {% if page.title %}{% endif %} + {% if page.excerpt %}{% endif %} + {% if page.date %}{% endif %} + {% if page.modified %}{% 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 %} +
    + {% endunless %} + +
    + {{ content }} + {% if page.link %}{% endif %} + +
    + +
    For support, ask for help at #3dshacks on Rizon IRC or 3DS Hacking on Discord.
    If you appreciate this guide, I accept Donations through both Bitcoin and PayPal.
    + + + + + + +
    + +
    + +
    + {% if site.data.ui-text[site.locale].meta_label %} +

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

    + {% endif %} + {% include page__taxonomy.html %} + {% if page.modified %} +

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

    + {% elsif page.date %} +

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

    + {% endif %} +
    + + {% if page.share %}{% include social-share.html %}{% endif %} + + {% include post_pagination.html %} +
    + + {% if site.comments.provider and page.comments %} + {% include comments.html %} + {% endif %} + +
    + + {% comment %}{% endcomment %} + {% if page.id and page.related and site.related_posts.size > 0 %} +
    + {% if site.data.ui-text[site.locale].related_label %} +

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

    + {% endif %} +
    + {% for post in site.related_posts limit:4 %} + {% include archive-single.html type="grid" %} + {% endfor %} +
    +
    + {% endif %} +
    diff --git a/_layouts/splash.html b/_layouts/splash.html index 119e24a1..6a8cc6ee 100644 --- a/_layouts/splash.html +++ b/_layouts/splash.html @@ -24,14 +24,14 @@ layout: default
    -
    For support, ask for help at #Cakey on Freenode.
    If you appreciate this guide, I accept Donations through both Bitcoin and PayPal.
    +
    For support, ask for help at #3dshacks on Rizon IRC or 3DS Hacking on Discord.
    If you appreciate this guide, I accept Donations through both Bitcoin and PayPal.