minimal-mistakes-jekyll 4.25.1 → 4.26.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/CHANGELOG.md +31 -0
- data/LICENSE +1 -1
- data/README.md +18 -11
- data/_includes/copyright.html +1 -1
- data/_includes/copyright.js +1 -1
- data/_includes/documents-collection.html +2 -4
- data/_includes/figure +2 -0
- data/_includes/head.html +4 -1
- data/_includes/masthead.html +5 -1
- data/_includes/nav_list +18 -17
- data/_includes/page__hero.html +1 -3
- data/_includes/page__related.html +2 -6
- data/_includes/paginator-v1.html +70 -0
- data/_includes/paginator-v2.html +68 -0
- data/_includes/paginator.html +5 -68
- data/_includes/posts-category.html +3 -4
- data/_includes/posts-tag.html +3 -4
- data/_includes/posts-taxonomy.html +37 -0
- data/_includes/schema.html +16 -0
- data/_includes/seo.html +15 -43
- data/_layouts/archive.html +1 -1
- data/_layouts/categories.html +1 -37
- data/_layouts/single.html +8 -6
- data/_layouts/tags.html +1 -37
- data/_sass/minimal-mistakes/_copyright.scss +1 -1
- data/_sass/minimal-mistakes/_utilities.scss +57 -0
- data/assets/js/_main.js +123 -45
- data/assets/js/main.min.js +2 -2
- data/assets/js/main.min.js.map +1 -0
- data/assets/js/plugins/jquery.greedy-navigation.js +1 -0
- metadata +7 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 9ef9cce9aa23ff10eab969ab4f54fe05de5e157b3a3f25f222b707a83aeb61a0
|
4
|
+
data.tar.gz: 592a1965254ef132d7f1c8f905951725ebe4080e71535e0590fe03aa43ff3365
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 9f9e4387d34838fe1726ad88328b4168e42cf1063360e31278a099222cb66656c6df62c07a72ad12821d450eb945b835a6e8aa10251261f5d0050cd1ee544e85
|
7
|
+
data.tar.gz: ce2a66c3ffa4069ef04edbaba0a94b3a0c752c099b4af134501627a71a50f6dae2245e1565578d56910a593c274e9c5e7cfe6ebc7a52985c2c1b018960dd5871
|
data/CHANGELOG.md
CHANGED
@@ -1,5 +1,36 @@
|
|
1
1
|
# Changelog
|
2
2
|
|
3
|
+
## Unreleased
|
4
|
+
|
5
|
+
### Bug Fixes
|
6
|
+
|
7
|
+
- Fix an unclosed `<p>` tag in `page__hero.html`, near `page.header.actions`.
|
8
|
+
- Remove overlay and revert X to hamburger icon when popup disappears. [#3958](https://github.com/mmistakes/minimal-mistakes/pull/3958)
|
9
|
+
- Fix SEO title when it contains a vertical bar. [#3094](https://github.com/mmistakes/minimal-mistakes/pull/3094) [#3113](https://github.com/mmistakes/minimal-mistakes/pull/3113)
|
10
|
+
- Remove "sticky sidebar" JS as it's now completely based on CSS media queries. [#4245](https://github.com/mmistakes/minimal-mistakes/issues/4245) [#4645](https://github.com/mmistakes/minimal-mistakes/pull/4645)
|
11
|
+
|
12
|
+
### Enhancements
|
13
|
+
|
14
|
+
- Add support for [Jekyll Paginate V2](https://github.com/sverrirs/jekyll-paginate-v2) 🎉 [#2636](https://github.com/mmistakes/minimal-mistakes/pull/2636)
|
15
|
+
- Add "copy to clipboard" button for code blocks 🎉 [#2812](https://github.com/mmistakes/minimal-mistakes/pull/2812)
|
16
|
+
- Auto scroll sticky ToC with content. [#3115](https://github.com/mmistakes/minimal-mistakes/pull/3115)
|
17
|
+
- Replace "hidden" check in Liquid templates with `where_exp: "item", "item.hidden != true"`.
|
18
|
+
- Remove deprecated `page.header.cta_url` setting. [#4821](https://github.com/mmistakes/minimal-mistakes/pull/4821)
|
19
|
+
- Allow multiple nav lists in sidebar. [#2843](https://github.com/mmistakes/minimal-mistakes/pull/2843)
|
20
|
+
- Add popup parameter to `{% include figure %}` to enable Magnific Popup. [#3119](https://github.com/mmistakes/minimal-mistakes/pull/3119)
|
21
|
+
- Add target attribute for navigation link. [#3056](https://github.com/mmistakes/minimal-mistakes/pull/3056)
|
22
|
+
- Split schema to a separate include file. [#3085](https://github.com/mmistakes/minimal-mistakes/pull/3085)
|
23
|
+
- Cleanup `_includes/seo.html`.
|
24
|
+
|
25
|
+
### Documentation & Maintenance
|
26
|
+
|
27
|
+
- Rewrite skin previews on `05-configuration.md` in Liquid template.
|
28
|
+
- Remove unused classes from `_layouts/single.html`.
|
29
|
+
- Migrate npm run scripts to Ruby Rake tasks.
|
30
|
+
- Add Rake task `version` for updating all hard-coded version numbers from `package.json` all at once.
|
31
|
+
- Merge `categories` and `tags` layout into `_includes/posts-taxonomy.html`.
|
32
|
+
- Update Social Sharing links section. [#4066](https://github.com/mmistakes/minimal-mistakes/pull/4066)
|
33
|
+
|
3
34
|
## [4.25.1](https://github.com/mmistakes/minimal-mistakes/releases/tag/4.25.1)
|
4
35
|
|
5
36
|
### Bug Fixes
|
data/LICENSE
CHANGED
@@ -1,6 +1,6 @@
|
|
1
1
|
The MIT License (MIT)
|
2
2
|
|
3
|
-
Copyright (c) 2013-
|
3
|
+
Copyright (c) 2013-2024 Michael Rose and contributors
|
4
4
|
|
5
5
|
Permission is hereby granted, free of charge, to any person obtaining a copy
|
6
6
|
of this software and associated documentation files (the "Software"), to deal
|
data/README.md
CHANGED
@@ -121,28 +121,30 @@ To install:
|
|
121
121
|
bundle
|
122
122
|
```
|
123
123
|
|
124
|
-
4. Add `remote_theme: "mmistakes/minimal-mistakes@4.
|
124
|
+
4. Add `remote_theme: "mmistakes/minimal-mistakes@4.26.0"` to your `_config.yml` file. Remove any other `theme:` or `remote_theme:` entry.
|
125
125
|
|
126
126
|
<!--
|
127
127
|
Dev note: The version number is currently hard-coded in these files:
|
128
128
|
|
129
|
-
- README.md (this file)
|
130
129
|
- package.json
|
131
|
-
-
|
130
|
+
- README.md (this file)
|
131
|
+
- docs/_data/theme.yml
|
132
132
|
- docs/_pages/home.md (in Front Matter "excerpt")
|
133
133
|
|
134
|
-
|
135
|
-
|
136
|
-
Additionally, the license year is hard-coded in these files:
|
137
|
-
|
138
|
-
- README.md (this file, near the end)
|
139
|
-
- LICENSE
|
134
|
+
`package.json` holds the authoritative version number, and the others can be updated with `bundle exec rake version`.
|
140
135
|
|
141
136
|
The following files should also be regenerated:
|
142
137
|
|
143
138
|
- _includes/copyright.html, _includes/copyright.js, _sass/minimal-mistakes/_copyright.scss
|
144
139
|
(Run `bundle exec rake clean` then `bundle exec rake copyright` - all three references `package.json`)
|
145
|
-
- assets/js/main.min.js (Run `
|
140
|
+
- assets/js/main.min.js (Run `bundle exec rake js`, references `_includes/copyright.js`)
|
141
|
+
|
142
|
+
*Tip*: The default Rake task will update all of the above files at once.
|
143
|
+
|
144
|
+
Additionally, the license year is hard-coded in these files and are NOT covered by a Rake task:
|
145
|
+
|
146
|
+
- README.md (this file, near the end)
|
147
|
+
- LICENSE
|
146
148
|
-->
|
147
149
|
|
148
150
|
**Looking for an example?** Use the [Minimal Mistakes remote theme starter](https://github.com/mmistakes/mm-github-pages-starter/generate) for the quickest method of getting a GitHub Pages hosted site up and running. Generate a new repository from the starter, replace sample content with your own, and configure as needed.
|
@@ -202,12 +204,13 @@ To test the theme, run `bundle exec rake preview` and open your browser at `http
|
|
202
204
|
- [Gumshoe](https://github.com/cferdinandi/gumshoe)
|
203
205
|
- [jQuery throttle / debounce](http://benalman.com/projects/jquery-throttle-debounce-plugin/)
|
204
206
|
- [Lunr](http://lunrjs.com)
|
207
|
+
- [Clipboard.js](https://clipboardjs.com)
|
205
208
|
|
206
209
|
## License
|
207
210
|
|
208
211
|
The MIT License (MIT)
|
209
212
|
|
210
|
-
Copyright (c) 2013-
|
213
|
+
Copyright (c) 2013-2024 Michael Rose and contributors
|
211
214
|
|
212
215
|
Permission is hereby granted, free of charge, to any person obtaining a copy
|
213
216
|
of this software and associated documentation files (the "Software"), to deal
|
@@ -280,3 +283,7 @@ Pure Liquid Jekyll Table of Contents is distributed under the terms of the [MIT
|
|
280
283
|
Minimal Mistakes incorporates [Lunr](http://lunrjs.com),
|
281
284
|
Copyright (c) 2018 Oliver Nightingale.
|
282
285
|
Lunr is distributed under the terms of the [MIT License](http://opensource.org/licenses/MIT).
|
286
|
+
|
287
|
+
Minimal Mistakes incorporates [clipboard.js](https://clipboardjs.com/),
|
288
|
+
Copyright (c) 2021 Zeno Rocha.
|
289
|
+
Clipboard.js is distributed under the terms of the [MIT License](https://opensource.org/licenses/MIT).
|
data/_includes/copyright.html
CHANGED
@@ -1,5 +1,5 @@
|
|
1
1
|
<!--
|
2
|
-
Minimal Mistakes Jekyll Theme 4.
|
2
|
+
Minimal Mistakes Jekyll Theme 4.26.0 by Michael Rose
|
3
3
|
Copyright 2013-2024 Michael Rose - mademistakes.com | @mmistakes
|
4
4
|
Free for personal and commercial use under the MIT license
|
5
5
|
https://github.com/mmistakes/minimal-mistakes/blob/master/LICENSE
|
data/_includes/copyright.js
CHANGED
@@ -1,5 +1,5 @@
|
|
1
1
|
/*!
|
2
|
-
* Minimal Mistakes Jekyll Theme 4.
|
2
|
+
* Minimal Mistakes Jekyll Theme 4.26.0 by Michael Rose
|
3
3
|
* Copyright 2013-2024 Michael Rose - mademistakes.com | @mmistakes
|
4
4
|
* Free for personal and commercial use under the MIT license
|
5
5
|
* https://github.com/mmistakes/minimal-mistakes/blob/master/LICENSE
|
@@ -1,4 +1,4 @@
|
|
1
|
-
{% assign entries = site[include.collection] %}
|
1
|
+
{% assign entries = site[include.collection] | where_exp: "post", "post.hidden != true" %}
|
2
2
|
|
3
3
|
{% if include.sort_by %}
|
4
4
|
{% assign entries = entries | sort: include.sort_by %}
|
@@ -9,7 +9,5 @@
|
|
9
9
|
{% endif %}
|
10
10
|
|
11
11
|
{%- for post in entries -%}
|
12
|
-
{
|
13
|
-
{% include archive-single.html %}
|
14
|
-
{%- endunless -%}
|
12
|
+
{% include archive-single.html %}
|
15
13
|
{%- endfor -%}
|
data/_includes/figure
CHANGED
@@ -1,6 +1,8 @@
|
|
1
1
|
<figure class="{{ include.class }}">
|
2
|
+
{%- if include.popup -%}<a href="{{ include.image_path | relative_url }}" class="image-popup" title="{% if include.caption %}{{ include.caption | markdownify | remove: "<p>" | remove: "</p>" }}{% endif %}">{%- endif -%}
|
2
3
|
<img src="{{ include.image_path | relative_url }}"
|
3
4
|
alt="{% if include.alt %}{{ include.alt }}{% endif %}">
|
5
|
+
{%- if include.popup -%}</a>{%- endif -%}
|
4
6
|
{%- if include.caption -%}
|
5
7
|
<figcaption>
|
6
8
|
{{ include.caption | markdownify | remove: "<p>" | remove: "</p>" }}
|
data/_includes/head.html
CHANGED
@@ -9,8 +9,11 @@
|
|
9
9
|
{%- comment %} https://docs.google.com/presentation/d/1rmxwWa9P6_xHqonmh5ONXRS-jPc5XKbnv99Rjkhe04s/present {% endcomment -%}
|
10
10
|
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
11
11
|
|
12
|
-
<script>
|
12
|
+
<script type="text/javascript">
|
13
13
|
document.documentElement.className = document.documentElement.className.replace(/\bno-js\b/g, '') + ' js ';
|
14
|
+
{% if site.enable_copy_code_button -%}
|
15
|
+
window.enable_copy_code_button = true;
|
16
|
+
{%- endif %}
|
14
17
|
</script>
|
15
18
|
|
16
19
|
<!-- For all browsers -->
|
data/_includes/masthead.html
CHANGED
@@ -14,7 +14,11 @@
|
|
14
14
|
<ul class="visible-links">
|
15
15
|
{%- for link in site.data.navigation.main -%}
|
16
16
|
<li class="masthead__menu-item">
|
17
|
-
<a
|
17
|
+
<a
|
18
|
+
href="{{ link.url | relative_url }}"
|
19
|
+
{% if link.description %} title="{{ link.description }}"{% endif %}
|
20
|
+
{% if link.target %} target="{{ link.target }}"{% endif %}
|
21
|
+
>{{ link.title }}</a>
|
18
22
|
</li>
|
19
23
|
{%- endfor -%}
|
20
24
|
</ul>
|
data/_includes/nav_list
CHANGED
@@ -1,26 +1,27 @@
|
|
1
|
-
{% assign navigation = site.data.navigation[include.nav] %}
|
2
|
-
|
3
1
|
<nav class="nav__list">
|
4
2
|
{% if page.sidebar.title %}<h3 class="nav__title" style="padding-left: 0;">{{ page.sidebar.title }}</h3>{% endif %}
|
5
3
|
<input id="ac-toc" name="accordion-toc" type="checkbox" />
|
6
4
|
<label for="ac-toc">{{ site.data.ui-text[site.locale].menu_label | default: "Toggle Menu" }}</label>
|
7
5
|
<ul class="nav__items">
|
8
|
-
{% for
|
9
|
-
|
10
|
-
|
11
|
-
|
12
|
-
|
13
|
-
|
14
|
-
|
6
|
+
{% for navname in include.nav %}
|
7
|
+
{% assign navigation = site.data.navigation[navname] %}
|
8
|
+
{% for nav in navigation %}
|
9
|
+
<li>
|
10
|
+
{% if nav.url %}
|
11
|
+
<a href="{{ nav.url | relative_url }}"><span class="nav__sub-title">{{ nav.title }}</span></a>
|
12
|
+
{% else %}
|
13
|
+
<span class="nav__sub-title">{{ nav.title }}</span>
|
14
|
+
{% endif %}
|
15
15
|
|
16
|
-
|
17
|
-
|
18
|
-
|
19
|
-
|
20
|
-
|
21
|
-
|
22
|
-
|
23
|
-
|
16
|
+
{% if nav.children != null %}
|
17
|
+
<ul>
|
18
|
+
{% for child in nav.children %}
|
19
|
+
<li><a href="{{ child.url | relative_url }}"{% if child.url == page.url %} class="active"{% endif %}>{{ child.title }}</a></li>
|
20
|
+
{% endfor %}
|
21
|
+
</ul>
|
22
|
+
{% endif %}
|
23
|
+
</li>
|
24
|
+
{% endfor %}
|
24
25
|
{% endfor %}
|
25
26
|
</ul>
|
26
27
|
</nav>
|
data/_includes/page__hero.html
CHANGED
@@ -36,14 +36,12 @@
|
|
36
36
|
<p class="page__lead">{{ page.excerpt | markdownify | remove: "<p>" | remove: "</p>" }}</p>
|
37
37
|
{% endif %}
|
38
38
|
{% include page__meta.html %}
|
39
|
-
{% if page.header.cta_url %}
|
40
|
-
<p><a href="{{ page.header.cta_url | relative_url }}" class="btn btn--light-outline btn--large">{{ page.header.cta_label | default: site.data.ui-text[site.locale].more_label | default: "Learn More" }}</a></p>
|
41
|
-
{% endif %}
|
42
39
|
{% if page.header.actions %}
|
43
40
|
<p>
|
44
41
|
{% for action in page.header.actions %}
|
45
42
|
<a href="{{ action.url | relative_url }}" class="btn btn--light-outline btn--large">{{ action.label | default: site.data.ui-text[site.locale].more_label | default: "Learn More" }}</a>
|
46
43
|
{% endfor %}
|
44
|
+
</p>
|
47
45
|
{% endif %}
|
48
46
|
</div>
|
49
47
|
{% else %}
|
@@ -1,14 +1,10 @@
|
|
1
|
+
{% assign posts = include.posts | where_exp: "post", "post.hidden != true" %}
|
1
2
|
<div class="page__related">
|
2
3
|
{% include before-related.html %}
|
3
4
|
<h2 class="page__related-title">{{ site.data.ui-text[site.locale].related_label | default: "You May Also Enjoy" }}</h2>
|
4
5
|
<div class="grid__wrapper">
|
5
|
-
{%
|
6
|
-
{% assign limit = include.limit | default: 4 %}
|
7
|
-
{% for post in include.posts %}
|
8
|
-
{% if post.hidden %}{% continue %}{% endif %}
|
6
|
+
{% for post in posts limit:4 %}
|
9
7
|
{% if post.id == page.id %}{% continue %}{% endif %}
|
10
|
-
{% if count >= limit %}{% break %}{% endif %}
|
11
|
-
{% assign count = count | plus: 1 %}
|
12
8
|
{% include archive-single.html type="grid" %}
|
13
9
|
{% endfor %}
|
14
10
|
</div>
|
@@ -0,0 +1,70 @@
|
|
1
|
+
{% if paginator.total_pages > 1 %}
|
2
|
+
<nav class="pagination">
|
3
|
+
{% assign paginate_path_last = site.paginate_path | split: '/' | last %}
|
4
|
+
{% assign first_page_path = paginator.first_page_path | default: site.paginate_path | replace: paginate_path_last, '' | replace: '//', '/' | relative_url %}
|
5
|
+
<ul>
|
6
|
+
{% comment %} Link for previous page {% endcomment %}
|
7
|
+
{% if paginator.previous_page %}
|
8
|
+
{% if paginator.previous_page == 1 %}
|
9
|
+
<li><a href="{{ first_page_path }}">{{ site.data.ui-text[site.locale].pagination_previous | default: "Previous" }}</a></li>
|
10
|
+
{% else %}
|
11
|
+
<li><a href="{{ site.paginate_path | replace: ':num', paginator.previous_page | replace: '//', '/' | relative_url }}">{{ site.data.ui-text[site.locale].pagination_previous | default: "Previous" }}</a></li>
|
12
|
+
{% endif %}
|
13
|
+
{% else %}
|
14
|
+
<li><a href="#" class="disabled"><span aria-hidden="true">{{ site.data.ui-text[site.locale].pagination_previous | default: "Previous" }}</span></a></li>
|
15
|
+
{% endif %}
|
16
|
+
|
17
|
+
{% comment %} First page {% endcomment %}
|
18
|
+
{% if paginator.page == 1 %}
|
19
|
+
<li><a href="#" class="disabled current">1</a></li>
|
20
|
+
{% else %}
|
21
|
+
<li><a href="{{ first_page_path }}">1</a></li>
|
22
|
+
{% endif %}
|
23
|
+
|
24
|
+
{% assign page_start = 2 %}
|
25
|
+
{% if paginator.page > 4 %}
|
26
|
+
{% assign page_start = paginator.page | minus: 2 %}
|
27
|
+
{% comment %} Ellipsis for truncated links {% endcomment %}
|
28
|
+
<li><a href="#" class="disabled">…</a></li>
|
29
|
+
{% endif %}
|
30
|
+
|
31
|
+
{% assign page_end = paginator.total_pages | minus: 1 %}
|
32
|
+
{% assign pages_to_end = paginator.total_pages | minus: paginator.page %}
|
33
|
+
{% if pages_to_end > 4 %}
|
34
|
+
{% assign page_end = paginator.page | plus: 2 %}
|
35
|
+
{% endif %}
|
36
|
+
|
37
|
+
{% for index in (page_start..page_end) %}
|
38
|
+
{% if index == paginator.page %}
|
39
|
+
<li><a href="{{ site.paginate_path | replace: ':num', index | replace: '//', '/' | relative_url }}" class="disabled current">{{ index }}</a></li>
|
40
|
+
{% else %}
|
41
|
+
{% comment %} Distance from current page and this link {% endcomment %}
|
42
|
+
{% assign dist = paginator.page | minus: index %}
|
43
|
+
{% if dist < 0 %}
|
44
|
+
{% comment %} Distance must be a positive value {% endcomment %}
|
45
|
+
{% assign dist = 0 | minus: dist %}
|
46
|
+
{% endif %}
|
47
|
+
<li><a href="{{ site.paginate_path | replace: ':num', index | relative_url }}">{{ index }}</a></li>
|
48
|
+
{% endif %}
|
49
|
+
{% endfor %}
|
50
|
+
|
51
|
+
{% comment %} Ellipsis for truncated links {% endcomment %}
|
52
|
+
{% if pages_to_end > 3 %}
|
53
|
+
<li><a href="#" class="disabled">…</a></li>
|
54
|
+
{% endif %}
|
55
|
+
|
56
|
+
{% if paginator.page == paginator.total_pages %}
|
57
|
+
<li><a href="#" class="disabled current">{{ paginator.page }}</a></li>
|
58
|
+
{% else %}
|
59
|
+
<li><a href="{{ site.paginate_path | replace: ':num', paginator.total_pages | replace: '//', '/' | relative_url }}">{{ paginator.total_pages }}</a></li>
|
60
|
+
{% endif %}
|
61
|
+
|
62
|
+
{% comment %} Link next page {% endcomment %}
|
63
|
+
{% if paginator.next_page %}
|
64
|
+
<li><a href="{{ site.paginate_path | replace: ':num', paginator.next_page | replace: '//', '/' | relative_url }}">{{ site.data.ui-text[site.locale].pagination_next | default: "Next" }}</a></li>
|
65
|
+
{% else %}
|
66
|
+
<li><a href="#" class="disabled"><span aria-hidden="true">{{ site.data.ui-text[site.locale].pagination_next | default: "Next" }}</span></a></li>
|
67
|
+
{% endif %}
|
68
|
+
</ul>
|
69
|
+
</nav>
|
70
|
+
{% endif %}
|
@@ -0,0 +1,68 @@
|
|
1
|
+
<nav class="pagination">
|
2
|
+
<ul>
|
3
|
+
{% comment %} Link for previous page {% endcomment %}
|
4
|
+
{% if paginator.previous_page %}
|
5
|
+
{% if paginator.previous_page == 1 %}
|
6
|
+
<li><a href="{{ paginator.first_page_path | relative_url }}">{{ site.data.ui-text[site.locale].pagination_previous | default: "Previous" }}</a></li>
|
7
|
+
{% else %}
|
8
|
+
<li><a href="{{ paginator.previous_page_path | relative_url }}">{{ site.data.ui-text[site.locale].pagination_previous | default: "Previous" }}</a></li>
|
9
|
+
{% endif %}
|
10
|
+
{% else %}
|
11
|
+
<li><a href="#" class="disabled"><span aria-hidden="true">{{ site.data.ui-text[site.locale].pagination_previous | default: "Previous" }}</span></a></li>
|
12
|
+
{% endif %}
|
13
|
+
|
14
|
+
{% comment %} Determine whether the first page and the last page are already included in trail {% endcomment %}
|
15
|
+
{% for trail in paginator.page_trail %}
|
16
|
+
{% if trail.num == paginator.first_page %}
|
17
|
+
{% assign has_first_page = true %}
|
18
|
+
{% elsif trail.num == paginator.last_page %}
|
19
|
+
{% assign has_last_page = true %}
|
20
|
+
{% endif %}
|
21
|
+
{% endfor %}
|
22
|
+
|
23
|
+
{% comment %} First page {% endcomment %}
|
24
|
+
{% unless has_first_page %}
|
25
|
+
{% if paginator.page == 1 %}
|
26
|
+
<li><a href="#" class="disabled current">1</a></li>
|
27
|
+
{% else %}
|
28
|
+
<li><a href="{{ paginator.first_page_path | relative_url }}">1</a></li>
|
29
|
+
{% endif %}
|
30
|
+
{% endunless %}
|
31
|
+
|
32
|
+
{% comment %} Ellipsis for truncated links {% endcomment %}
|
33
|
+
{% assign ellipsis_start = paginator.first_page | plus: 1 %}
|
34
|
+
{% if paginator.page_trail.first.num > ellipsis_start %}
|
35
|
+
<li><a href="#" class="disabled">…</a></li>
|
36
|
+
{% endif %}
|
37
|
+
|
38
|
+
{% comment %} Main pagination trail {% endcomment %}
|
39
|
+
{% for trail in paginator.page_trail %}
|
40
|
+
{% if paginator.page == trail.num %}
|
41
|
+
<li><a href="{{ trail.path | remove: 'index.html' | relative_url }}" class="disabled current">{{ trail.num }}</a></li>
|
42
|
+
{% else %}
|
43
|
+
<li><a href="{{ trail.path | remove: 'index.html' | relative_url }}">{{ trail.num }}</a></li>
|
44
|
+
{% endif %}
|
45
|
+
{% endfor %}
|
46
|
+
|
47
|
+
{% comment %} Ellipsis for truncated links {% endcomment %}
|
48
|
+
{% assign ellipsis_end = paginator.last_page | minus: 1 %}
|
49
|
+
{% if paginator.page_trail.last.num < ellipsis_end %}
|
50
|
+
<li><a href="#" class="disabled">…</a></li>
|
51
|
+
{% endif %}
|
52
|
+
|
53
|
+
{% unless has_last_page %}
|
54
|
+
{% if paginator.page == paginator.total_pages %}
|
55
|
+
<li><a href="#" class="disabled current">{{ paginator.page }}</a></li>
|
56
|
+
{% else %}
|
57
|
+
<li><a href="{{ paginator.last_page_path | remove: 'index.html' | relative_url }}">{{ paginator.total_pages }}</a></li>
|
58
|
+
{% endif %}
|
59
|
+
{% endunless %}
|
60
|
+
|
61
|
+
{% comment %} Link next page {% endcomment %}
|
62
|
+
{% if paginator.next_page %}
|
63
|
+
<li><a href="{{ paginator.next_page_path | remove: 'index.html' | relative_url }}">{{ site.data.ui-text[site.locale].pagination_next | default: "Next" }}</a></li>
|
64
|
+
{% else %}
|
65
|
+
<li><a href="#" class="disabled"><span aria-hidden="true">{{ site.data.ui-text[site.locale].pagination_next | default: "Next" }}</span></a></li>
|
66
|
+
{% endif %}
|
67
|
+
</ul>
|
68
|
+
</nav>
|
data/_includes/paginator.html
CHANGED
@@ -1,70 +1,7 @@
|
|
1
1
|
{% if paginator.total_pages > 1 %}
|
2
|
-
|
3
|
-
|
4
|
-
{%
|
5
|
-
|
6
|
-
|
7
|
-
{% if paginator.previous_page %}
|
8
|
-
{% if paginator.previous_page == 1 %}
|
9
|
-
<li><a href="{{ first_page_path }}">{{ site.data.ui-text[site.locale].pagination_previous | default: "Previous" }}</a></li>
|
10
|
-
{% else %}
|
11
|
-
<li><a href="{{ site.paginate_path | replace: ':num', paginator.previous_page | replace: '//', '/' | relative_url }}">{{ site.data.ui-text[site.locale].pagination_previous | default: "Previous" }}</a></li>
|
12
|
-
{% endif %}
|
13
|
-
{% else %}
|
14
|
-
<li><a href="#" class="disabled"><span aria-hidden="true">{{ site.data.ui-text[site.locale].pagination_previous | default: "Previous" }}</span></a></li>
|
15
|
-
{% endif %}
|
16
|
-
|
17
|
-
{% comment %} First page {% endcomment %}
|
18
|
-
{% if paginator.page == 1 %}
|
19
|
-
<li><a href="#" class="disabled current">1</a></li>
|
20
|
-
{% else %}
|
21
|
-
<li><a href="{{ first_page_path }}">1</a></li>
|
22
|
-
{% endif %}
|
23
|
-
|
24
|
-
{% assign page_start = 2 %}
|
25
|
-
{% if paginator.page > 4 %}
|
26
|
-
{% assign page_start = paginator.page | minus: 2 %}
|
27
|
-
{% comment %} Ellipsis for truncated links {% endcomment %}
|
28
|
-
<li><a href="#" class="disabled">…</a></li>
|
29
|
-
{% endif %}
|
30
|
-
|
31
|
-
{% assign page_end = paginator.total_pages | minus: 1 %}
|
32
|
-
{% assign pages_to_end = paginator.total_pages | minus: paginator.page %}
|
33
|
-
{% if pages_to_end > 4 %}
|
34
|
-
{% assign page_end = paginator.page | plus: 2 %}
|
35
|
-
{% endif %}
|
36
|
-
|
37
|
-
{% for index in (page_start..page_end) %}
|
38
|
-
{% if index == paginator.page %}
|
39
|
-
<li><a href="{{ site.paginate_path | replace: ':num', index | replace: '//', '/' | relative_url }}" class="disabled current">{{ index }}</a></li>
|
40
|
-
{% else %}
|
41
|
-
{% comment %} Distance from current page and this link {% endcomment %}
|
42
|
-
{% assign dist = paginator.page | minus: index %}
|
43
|
-
{% if dist < 0 %}
|
44
|
-
{% comment %} Distance must be a positive value {% endcomment %}
|
45
|
-
{% assign dist = 0 | minus: dist %}
|
46
|
-
{% endif %}
|
47
|
-
<li><a href="{{ site.paginate_path | replace: ':num', index | relative_url }}">{{ index }}</a></li>
|
48
|
-
{% endif %}
|
49
|
-
{% endfor %}
|
50
|
-
|
51
|
-
{% comment %} Ellipsis for truncated links {% endcomment %}
|
52
|
-
{% if pages_to_end > 3 %}
|
53
|
-
<li><a href="#" class="disabled">…</a></li>
|
54
|
-
{% endif %}
|
55
|
-
|
56
|
-
{% if paginator.page == paginator.total_pages %}
|
57
|
-
<li><a href="#" class="disabled current">{{ paginator.page }}</a></li>
|
58
|
-
{% else %}
|
59
|
-
<li><a href="{{ site.paginate_path | replace: ':num', paginator.total_pages | replace: '//', '/' | relative_url }}">{{ paginator.total_pages }}</a></li>
|
60
|
-
{% endif %}
|
61
|
-
|
62
|
-
{% comment %} Link next page {% endcomment %}
|
63
|
-
{% if paginator.next_page %}
|
64
|
-
<li><a href="{{ site.paginate_path | replace: ':num', paginator.next_page | replace: '//', '/' | relative_url }}">{{ site.data.ui-text[site.locale].pagination_next | default: "Next" }}</a></li>
|
65
|
-
{% else %}
|
66
|
-
<li><a href="#" class="disabled"><span aria-hidden="true">{{ site.data.ui-text[site.locale].pagination_next | default: "Next" }}</span></a></li>
|
67
|
-
{% endif %}
|
68
|
-
</ul>
|
69
|
-
</nav>
|
2
|
+
{% if site.paginate %}
|
3
|
+
{% include paginator-v1.html %}
|
4
|
+
{% elsif site.pagination.enabled %}
|
5
|
+
{% include paginator-v2.html %}
|
6
|
+
{% endif %}
|
70
7
|
{% endif %}
|
@@ -1,5 +1,4 @@
|
|
1
|
-
{
|
2
|
-
|
3
|
-
|
4
|
-
{%- endunless -%}
|
1
|
+
{% assign posts = site.categories[include.taxonomy] | where_exp: "post", "post.hidden != true" %}
|
2
|
+
{%- for post in posts -%}
|
3
|
+
{% include archive-single.html %}
|
5
4
|
{%- endfor -%}
|
data/_includes/posts-tag.html
CHANGED
@@ -1,5 +1,4 @@
|
|
1
|
-
{
|
2
|
-
|
3
|
-
|
4
|
-
{%- endunless -%}
|
1
|
+
{% assign posts = site.tags[include.taxonomy] | where_exp: "post", "post.hidden != true" %}
|
2
|
+
{%- for post in posts -%}
|
3
|
+
{% include archive-single.html %}
|
5
4
|
{%- endfor -%}
|
@@ -0,0 +1,37 @@
|
|
1
|
+
{% assign items_max = 0 %}
|
2
|
+
{% for item in include.taxonomies %}
|
3
|
+
{% if item[1].size > items_max %}
|
4
|
+
{% assign items_max = item[1].size %}
|
5
|
+
{% endif %}
|
6
|
+
{% endfor %}
|
7
|
+
|
8
|
+
<ul class="taxonomy__index">
|
9
|
+
{% for i in (1..items_max) reversed %}
|
10
|
+
{% for item in include.taxonomies %}
|
11
|
+
{% if item[1].size == i %}
|
12
|
+
<li>
|
13
|
+
<a href="#{{ item[0] | slugify }}">
|
14
|
+
<strong>{{ item[0] }}</strong> <span class="taxonomy__count">{{ i }}</span>
|
15
|
+
</a>
|
16
|
+
</li>
|
17
|
+
{% endif %}
|
18
|
+
{% endfor %}
|
19
|
+
{% endfor %}
|
20
|
+
</ul>
|
21
|
+
|
22
|
+
{% assign entries_layout = page.entries_layout | default: 'list' %}
|
23
|
+
{% for i in (1..items_max) reversed %}
|
24
|
+
{% for taxonomy in include.taxonomies %}
|
25
|
+
{% if taxonomy[1].size == i %}
|
26
|
+
<section id="{{ taxonomy[0] | slugify }}" class="taxonomy__section">
|
27
|
+
<h2 class="archive__subtitle">{{ taxonomy[0] }}</h2>
|
28
|
+
<div class="entries-{{ entries_layout }}">
|
29
|
+
{% for post in taxonomy.last %}
|
30
|
+
{% include archive-single.html type=entries_layout %}
|
31
|
+
{% endfor %}
|
32
|
+
</div>
|
33
|
+
<a href="#page-title" class="back-to-top">{{ site.data.ui-text[site.locale].back_to_top | default: 'Back to Top' }} ↑</a>
|
34
|
+
</section>
|
35
|
+
{% endif %}
|
36
|
+
{% endfor %}
|
37
|
+
{% endfor %}
|
@@ -0,0 +1,16 @@
|
|
1
|
+
<script type="application/ld+json">
|
2
|
+
{
|
3
|
+
"@context": "https://schema.org",
|
4
|
+
{% if site.social.type == "Organization" -%}
|
5
|
+
"@type": "Organization",
|
6
|
+
"url": {{ '/' | absolute_url | jsonify }}{% if site.og_image %},
|
7
|
+
"logo": {{ site_og_image | jsonify }}{% endif %}{% if site.social.links %},
|
8
|
+
"sameAs": {{ site.social.links | jsonify }}{% endif %}
|
9
|
+
{%- else -%}
|
10
|
+
"@type": "Person",
|
11
|
+
"name": {{ site.social.name | default: site.name | jsonify }},
|
12
|
+
"url": {{ '/' | absolute_url | jsonify }}{% if site.social.links %},
|
13
|
+
"sameAs": {{ site.social.links | jsonify }}{% endif %}
|
14
|
+
{%- endif %}
|
15
|
+
}
|
16
|
+
</script>
|