_includes/post-paginator.html in jekyll-theme-chirpy-6.1.0 vs _includes/post-paginator.html in jekyll-theme-chirpy-6.2.0

- old
+ new

@@ -1,89 +1,91 @@ <!-- The paginator for post list on HomgPage. --> -<ul class="pagination align-items-center mt-4 mb-1 ps-lg-2"> - <!-- left arrow --> - {% if paginator.previous_page %} - {% assign prev_url = paginator.previous_page_path | relative_url %} - {% else %} - {% assign prev_url = '#' %} - {% endif %} +<nav aria-label="Page Navigation"> + <ul class="pagination align-items-center mt-4 mb-0"> + <!-- left arrow --> + {% if paginator.previous_page %} + {% assign prev_url = paginator.previous_page_path | relative_url %} + {% else %} + {% assign prev_url = '#' %} + {% endif %} - <li class="page-item {% unless paginator.previous_page %}disabled{% endunless %}"> - <a class="page-link btn-box-shadow" href="{{ prev_url }}" aria-label="previous-page"> - <i class="fas fa-angle-left"></i> - </a> - </li> + <li class="page-item {% unless paginator.previous_page %}disabled{% endunless %}"> + <a class="page-link" href="{{ prev_url }}" aria-label="previous-page"> + <i class="fas fa-angle-left"></i> + </a> + </li> - <!-- page numbers --> - {% assign left_ellipsis = false %} - {% assign right_ellipsis = false %} + <!-- page numbers --> + {% assign left_ellipsis = false %} + {% assign right_ellipsis = false %} - {% for i in (1..paginator.total_pages) %} - {% assign pre = paginator.page | minus: 1 %} - {% assign next = paginator.page | plus: 1 %} - {% assign pre_less = pre | minus: 1 %} - {% assign next_more = next | plus: 1 %} - {% assign show = false %} + {% for i in (1..paginator.total_pages) %} + {% assign pre = paginator.page | minus: 1 %} + {% assign next = paginator.page | plus: 1 %} + {% assign pre_less = pre | minus: 1 %} + {% assign next_more = next | plus: 1 %} + {% assign show = false %} - {% if paginator.page == 1 %} - {% if i <= 3 or i == paginator.total_pages %} - {% assign show = true %} + {% if paginator.page == 1 %} + {% if i <= 3 or i == paginator.total_pages %} + {% assign show = true %} + {% endif %} + {% elsif paginator.page == paginator.total_pages %} + {% if i == 1 or i >= pre_less %} + {% assign show = true %} + {% endif %} + {% else %} + {% if i == 1 or i == paginator.total_pages %} + {% assign show = true %} + {% elsif i >= pre and i <= next %} + {% assign show = true %} + {% endif %} {% endif %} - {% elsif paginator.page == paginator.total_pages %} - {% if i == 1 or i >= pre_less %} - {% assign show = true %} - {% endif %} - {% else %} - {% if i == 1 or i == paginator.total_pages %} - {% assign show = true %} - {% elsif i >= pre and i <= next %} - {% assign show = true %} - {% endif %} - {% endif %} - {% if show %} - <!-- show number --> - <li class="page-item {% if i == paginator.page %} active{% endif %}"> - <a - class="page-link btn-box-shadow" - href="{% if i > 1 %}{{ site.paginate_path | replace: ':num', i | relative_url }}{% else %}{{ '/' | relative_url }}{% endif %}" - > - {{- i -}} - </a> - </li> - {% else %} - <!-- hide number --> - {% if i < pre and left_ellipsis == false %} - <li class="page-item disabled"> - <span class="page-link btn-box-shadow">...</span> + {% if show %} + <!-- show number --> + <li class="page-item {% if i == paginator.page %} active{% endif %}"> + <a + class="page-link" + href="{% if i > 1 %}{{ site.paginate_path | replace: ':num', i | relative_url }}{% else %}{{ '/' | relative_url }}{% endif %}" + > + {{- i -}} + </a> </li> - {% assign left_ellipsis = true %} - {% elsif i > next and right_ellipsis == false %} - <li class="page-item disabled"> - <span class="page-link btn-box-shadow">...</span> - </li> - {% assign right_ellipsis = true %} + {% else %} + <!-- hide number --> + {% if i < pre and left_ellipsis == false %} + <li class="page-item disabled"> + <span class="page-link">...</span> + </li> + {% assign left_ellipsis = true %} + {% elsif i > next and right_ellipsis == false %} + <li class="page-item disabled"> + <span class="page-link">...</span> + </li> + {% assign right_ellipsis = true %} + {% endif %} {% endif %} - {% endif %} - {% endfor %} + {% endfor %} - <!-- mobile pagination --> - <li class="page-index align-middle"> - <span>{{ paginator.page }}</span> - <span class="text-muted">/ {{ paginator.total_pages }}</span> - </li> + <!-- mobile pagination --> + <li class="page-index align-middle"> + <span>{{ paginator.page }}</span> + <span class="text-muted">/ {{ paginator.total_pages }}</span> + </li> - <!-- right arrow --> - {% if paginator.next_page_path %} - {% assign next_url = paginator.next_page_path | relative_url %} - {% else %} - {% assign next_url = '#' %} - {% endif %} + <!-- right arrow --> + {% if paginator.next_page_path %} + {% assign next_url = paginator.next_page_path | relative_url %} + {% else %} + {% assign next_url = '#' %} + {% endif %} - <li class="page-item {% unless paginator.next_page_path %}disabled{% endunless %}"> - <a class="page-link btn-box-shadow" href="{{ next_url }}" aria-label="next-page"> - <i class="fas fa-angle-right"></i> - </a> - </li> -</ul> + <li class="page-item {% unless paginator.next_page_path %}disabled{% endunless %}"> + <a class="page-link" href="{{ next_url }}" aria-label="next-page"> + <i class="fas fa-angle-right"></i> + </a> + </li> + </ul> +</nav> <!-- .pagination -->