Merge branch 'master' of https://github.com/mmistakes/minimal-mistakes
This commit is contained in:
commit
29c403b3f6
2 changed files with 4 additions and 18 deletions
|
@ -6,19 +6,12 @@
|
||||||
{% endcase %}
|
{% endcase %}
|
||||||
|
|
||||||
{% if site.category_archive.path %}
|
{% if site.category_archive.path %}
|
||||||
{% comment %}
|
{% assign categories_sorted = page.categories | sort_natural %}
|
||||||
<!-- Sort alphabetically regardless of case e.g. a B c d E -->
|
|
||||||
<!-- modified from http://www.codeofclimber.ru/2015/sorting-site-tags-in-jekyll/ -->
|
|
||||||
{% 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 %}
|
|
||||||
|
|
||||||
<p class="page__taxonomy">
|
<p class="page__taxonomy">
|
||||||
<strong><i class="fas fa-fw fa-folder-open" aria-hidden="true"></i> {{ site.data.ui-text[site.locale].categories_label | default: "Categories:" }} </strong>
|
<strong><i class="fas fa-fw fa-folder-open" aria-hidden="true"></i> {{ site.data.ui-text[site.locale].categories_label | default: "Categories:" }} </strong>
|
||||||
<span itemprop="keywords">
|
<span itemprop="keywords">
|
||||||
{% for hash in category_hashes %}
|
{% for category_word in categories_sorted %}
|
||||||
{% assign keyValue = hash | split: '|' %}
|
|
||||||
{% capture category_word %}{{ keyValue[1] | strip_newlines }}{% endcapture %}
|
|
||||||
<a href="{{ category_word | slugify | prepend: path_type | prepend: site.category_archive.path | relative_url }}" class="page__taxonomy-item" rel="tag">{{ category_word }}</a>{% unless forloop.last %}<span class="sep">, </span>{% endunless %}
|
<a href="{{ category_word | slugify | prepend: path_type | prepend: site.category_archive.path | relative_url }}" class="page__taxonomy-item" rel="tag">{{ category_word }}</a>{% unless forloop.last %}<span class="sep">, </span>{% endunless %}
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
</span>
|
</span>
|
||||||
|
|
|
@ -6,19 +6,12 @@
|
||||||
{% endcase %}
|
{% endcase %}
|
||||||
|
|
||||||
{% if site.tag_archive.path %}
|
{% if site.tag_archive.path %}
|
||||||
{% comment %}
|
{% assign tags_sorted = page.tags | sort_natural %}
|
||||||
<!-- Sort alphabetically regardless of case e.g. a B c d E -->
|
|
||||||
<!-- modified from http://www.codeofclimber.ru/2015/sorting-site-tags-in-jekyll/ -->
|
|
||||||
{% endcomment %}
|
|
||||||
{% capture page_tags %}{% for tag in page.tags %}{{ tag | downcase }}|{{ tag }}{% unless forloop.last %},{% endunless %}{% endfor %}{% endcapture %}
|
|
||||||
{% assign tag_hashes = page_tags | split: ',' | sort %}
|
|
||||||
|
|
||||||
<p class="page__taxonomy">
|
<p class="page__taxonomy">
|
||||||
<strong><i class="fas fa-fw fa-tags" aria-hidden="true"></i> {{ site.data.ui-text[site.locale].tags_label | default: "Tags:" }} </strong>
|
<strong><i class="fas fa-fw fa-tags" aria-hidden="true"></i> {{ site.data.ui-text[site.locale].tags_label | default: "Tags:" }} </strong>
|
||||||
<span itemprop="keywords">
|
<span itemprop="keywords">
|
||||||
{% for hash in tag_hashes %}
|
{% for tag_word in tags_sorted %}
|
||||||
{% assign keyValue = hash | split: '|' %}
|
|
||||||
{% capture tag_word %}{{ keyValue[1] | strip_newlines }}{% endcapture %}
|
|
||||||
<a href="{{ tag_word | slugify | prepend: path_type | prepend: site.tag_archive.path | relative_url }}" class="page__taxonomy-item" rel="tag">{{ tag_word }}</a>{% unless forloop.last %}<span class="sep">, </span>{% endunless %}
|
<a href="{{ tag_word | slugify | prepend: path_type | prepend: site.tag_archive.path | relative_url }}" class="page__taxonomy-item" rel="tag">{{ tag_word }}</a>{% unless forloop.last %}<span class="sep">, </span>{% endunless %}
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
</span>
|
</span>
|
||||||
|
|
Loading…
Reference in a new issue