From c8226a32a675fc59e4e713bb3384a1e64fb698e9 Mon Sep 17 00:00:00 2001 From: Michael Rose Date: Tue, 20 Mar 2018 11:35:36 -0400 Subject: [PATCH] Replace `absolute_url` with `relative_url` Where it makes sense replace asset paths and navigation related paths with `relative_url` filter. Leave SEO related `` elements and social sharing links as `absolute_url`. Fixes #1588 --- CHANGELOG.md | 6 ++++++ _includes/archive-single.html | 6 +++--- _includes/author-profile.html | 4 ++-- _includes/breadcrumbs.html | 2 +- _includes/category-list.html | 2 +- _includes/feature_row | 4 ++-- _includes/figure | 2 +- _includes/footer.html | 2 +- _includes/gallery | 6 +++--- _includes/head.html | 6 +++--- _includes/masthead.html | 2 +- _includes/page__hero.html | 6 +++--- _includes/paginator.html | 12 ++++++------ _includes/post_pagination.html | 4 ++-- _includes/scripts.html | 4 ++-- _includes/search/lunr-search-scripts.html | 6 +++--- _includes/sidebar.html | 2 +- _includes/tag-list.html | 2 +- docs/_docs/18-history.md | 8 +++++++- 19 files changed, 49 insertions(+), 37 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f43e2cc1..badb68ac 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,13 @@ ## Unreleased +### Enhancements + * Add default `theme` and `remote_theme` values to `_config.yml`. +### Bug Fixes + +* Replace `absolute_url` filter with `relative_url` where it makes sense (asset/nagivation related paths). [#1588](https://github.com/mmistakes/minimal-mistakes/issues/1588) + ## [4.10.1](https://github.com/mmistakes/minimal-mistakes/releases/tag/4.10.1) ### Enhancements diff --git a/_includes/archive-single.html b/_includes/archive-single.html index 769d9184..fa550252 100644 --- a/_includes/archive-single.html +++ b/_includes/archive-single.html @@ -18,16 +18,16 @@ {% if teaser contains "://" %} "{{ teaser }}" {% else %} - "{{ teaser | absolute_url }}" + "{{ teaser | relative_url }}" {% endif %} alt=""> {% endif %}

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

{% if post.read_time %} diff --git a/_includes/author-profile.html b/_includes/author-profile.html index 612f3ca2..bd560f71 100644 --- a/_includes/author-profile.html +++ b/_includes/author-profile.html @@ -8,14 +8,14 @@ {% if author.avatar contains "://" %} {% assign author_src = author.avatar %} {% else %} - {% assign author_src = author.avatar | absolute_url %} + {% assign author_src = author.avatar | relative_url %} {% endif %} {% if author.home %} {% if author.home contains "://" %} {% assign author_link = author.home %} {% else %} - {% assign author_link = author.home | absolute_url %} + {% assign author_link = author.home | relative_url %} {% endif %} {{ author.name }} diff --git a/_includes/breadcrumbs.html b/_includes/breadcrumbs.html index 6eec214b..82fe2cc4 100644 --- a/_includes/breadcrumbs.html +++ b/_includes/breadcrumbs.html @@ -29,7 +29,7 @@ {% 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: "/" }} diff --git a/_includes/category-list.html b/_includes/category-list.html index 97408c9c..7cffdb76 100644 --- a/_includes/category-list.html +++ b/_includes/category-list.html @@ -19,7 +19,7 @@ {% 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 %}

    diff --git a/_includes/feature_row b/_includes/feature_row index 1cfefff0..e953cd06 100644 --- a/_includes/feature_row +++ b/_includes/feature_row @@ -11,7 +11,7 @@ {% if f.url contains "://" %} {% capture f_url %}{{ f.url }}{% endcapture %} {% else %} - {% capture f_url %}{{ f.url | absolute_url }}{% endcapture %} + {% capture f_url %}{{ f.url | relative_url }}{% endcapture %} {% endif %}
    @@ -22,7 +22,7 @@ {% if f.image_path contains "://" %} "{{ f.image_path }}" {% else %} - "{{ f.image_path | absolute_url }}" + "{{ f.image_path | relative_url }}" {% endif %} alt="{% if f.alt %}{{ f.alt }}{% endif %}">
    diff --git a/_includes/figure b/_includes/figure index da829e48..3fb15c0f 100644 --- a/_includes/figure +++ b/_includes/figure @@ -3,7 +3,7 @@ {% if include.image_path contains "://" %} "{{ include.image_path }}" {% else %} - "{{ include.image_path | absolute_url }}" + "{{ include.image_path | relative_url }}" {% endif %} alt="{% if include.alt %}{{ include.alt }}{% endif %}"> {% if include.caption %} diff --git a/_includes/footer.html b/_includes/footer.html index 5fb5f3f2..91378caf 100644 --- a/_includes/footer.html +++ b/_includes/footer.html @@ -18,7 +18,7 @@ {% if site.author.bitbucket %}
  • Bitbucket
    • {% endif %} -
  • {{ site.data.ui-text[site.locale].feed_label | default: "Feed" }}
    • +
  • {{ site.data.ui-text[site.locale].feed_label | default: "Feed" }}
    • diff --git a/_includes/gallery b/_includes/gallery index 3d4c0379..ab2fd618 100644 --- a/_includes/gallery +++ b/_includes/gallery @@ -19,7 +19,7 @@ {% if img.url contains "://" %} "{{ img.url }}" {% else %} - "{{ img.url | absolute_url }}" + "{{ img.url | relative_url }}" {% endif %} {% if img.title %}title="{{ img.title }}"{% endif %} > @@ -27,7 +27,7 @@ {% if img.image_path contains "://" %} "{{ img.image_path }}" {% else %} - "{{ img.image_path | absolute_url }}" + "{{ img.image_path | relative_url }}" {% endif %} alt="{% if img.alt %}{{ img.alt }}{% endif %}"> @@ -36,7 +36,7 @@ {% if img.image_path contains "://" %} "{{ img.image_path }}" {% else %} - "{{ img.image_path | absolute_url }}" + "{{ img.image_path | relative_url }}" {% endif %} alt="{% if img.alt %}{{ img.alt }}{% endif %}"> {% endif %} diff --git a/_includes/head.html b/_includes/head.html index 7e98d306..73f8c270 100644 --- a/_includes/head.html +++ b/_includes/head.html @@ -2,7 +2,7 @@ {% include seo.html %} - + @@ -14,7 +14,7 @@ - +