Fix entries_layout: grid

Close #2639
This commit is contained in:
Michael Rose 2020-08-04 12:59:44 -04:00
parent 5741539e17
commit d57fe1de2c
7 changed files with 19 additions and 13 deletions

View file

@ -10,7 +10,7 @@
{% assign title = post.title %} {% assign title = post.title %}
{% endif %} {% endif %}
<div class="{{ include.type | default: "list" }}__item"> <div class="{{ include.type | default: 'list' }}__item">
<article class="archive__item" itemscope itemtype="https://schema.org/CreativeWork"> <article class="archive__item" itemscope itemtype="https://schema.org/CreativeWork">
{% if include.type == "grid" and teaser %} {% if include.type == "grid" and teaser %}
<div class="archive__item-teaser"> <div class="archive__item-teaser">

View file

@ -25,14 +25,15 @@ layout: archive
{% endfor %} {% endfor %}
</ul> </ul>
{% assign entries_layout = page.entries_layout | default: 'list' %}
{% for i in (1..categories_max) reversed %} {% for i in (1..categories_max) reversed %}
{% for category in site.categories %} {% for category in site.categories %}
{% if category[1].size == i %} {% if category[1].size == i %}
<section id="{{ category[0] | slugify | downcase }}" class="taxonomy__section"> <section id="{{ category[0] | slugify | downcase }}" class="taxonomy__section">
<h2 class="archive__subtitle">{{ category[0] }}</h2> <h2 class="archive__subtitle">{{ category[0] }}</h2>
<div class="entries-{{ page.entries_layout | default: 'list' }}"> <div class="entries-{{ entries_layout }}">
{% for post in category.last %} {% for post in category.last %}
{% include archive-single.html type=page.entries_layout %} {% include archive-single.html type=entries_layout %}
{% endfor %} {% endfor %}
</div> </div>
<a href="#page-title" class="back-to-top">{{ site.data.ui-text[site.locale].back_to_top | default: 'Back to Top' }} &uarr;</a> <a href="#page-title" class="back-to-top">{{ site.data.ui-text[site.locale].back_to_top | default: 'Back to Top' }} &uarr;</a>

View file

@ -4,6 +4,7 @@ layout: archive
{{ content }} {{ content }}
<div class="entries-{{ page.entries_layout }}"> {% assign entries_layout = page.entries_layout | default: 'list' %}
{% include posts-category.html taxonomy=page.taxonomy type=page.entries_layout %} <div class="entries-{{ entries_layout }}">
{% include posts-category.html taxonomy=page.taxonomy type=entries_layout %}
</div> </div>

View file

@ -4,6 +4,7 @@ layout: archive
{{ content }} {{ content }}
<div class="entries-{{ page.entries_layout }}"> {% assign entries_layout = page.entries_layout | default: 'list' %}
{% include documents-collection.html collection=page.collection sort_by=page.sort_by sort_order=page.sort_order type=page.entries_layout %} <div class="entries-{{ entries_layout }}">
{% include documents-collection.html collection=page.collection sort_by=page.sort_by sort_order=page.sort_order type=entries_layout %}
</div> </div>

View file

@ -15,13 +15,14 @@ layout: archive
{% endfor %} {% endfor %}
</ul> </ul>
{% assign entries_layout = page.entries_layout | default: 'list' %}
{% assign postsByYear = site.posts | where_exp: "item", "item.hidden != true" | group_by_exp: 'post', 'post.date | date: "%Y"' %} {% assign postsByYear = site.posts | where_exp: "item", "item.hidden != true" | group_by_exp: 'post', 'post.date | date: "%Y"' %}
{% for year in postsByYear %} {% for year in postsByYear %}
<section id="{{ year.name }}" class="taxonomy__section"> <section id="{{ year.name }}" class="taxonomy__section">
<h2 class="archive__subtitle">{{ year.name }}</h2> <h2 class="archive__subtitle">{{ year.name }}</h2>
<div class="entries-{{ page.entries_layout | default: 'list' }}"> <div class="entries-{{ entries_layout }}">
{% for post in year.items %} {% for post in year.items %}
{% include archive-single.html type=page.entries_layout %} {% include archive-single.html type=entries_layout %}
{% endfor %} {% endfor %}
</div> </div>
<a href="#page-title" class="back-to-top">{{ site.data.ui-text[site.locale].back_to_top | default: 'Back to Top' }} &uarr;</a> <a href="#page-title" class="back-to-top">{{ site.data.ui-text[site.locale].back_to_top | default: 'Back to Top' }} &uarr;</a>

View file

@ -4,6 +4,7 @@ layout: archive
{{ content }} {{ content }}
<div class="entries-{{ page.entries_layout | default: 'list' }}"> {% assign entries_layout = page.entries_layout | default: 'list' %}
{% include posts-tag.html taxonomy=page.taxonomy type=page.entries_layout %} <div class="entries-{{ entries_layout }}">
{% include posts-tag.html taxonomy=page.taxonomy type=entries_layout %}
</div> </div>

View file

@ -25,14 +25,15 @@ layout: archive
{% endfor %} {% endfor %}
</ul> </ul>
{% assign entries_layout = page.entries_layout | default: 'list' %}
{% for i in (1..tags_max) reversed %} {% for i in (1..tags_max) reversed %}
{% for tag in site.tags %} {% for tag in site.tags %}
{% if tag[1].size == i %} {% if tag[1].size == i %}
<section id="{{ tag[0] | slugify | downcase }}" class="taxonomy__section"> <section id="{{ tag[0] | slugify | downcase }}" class="taxonomy__section">
<h2 class="archive__subtitle">{{ tag[0] }}</h2> <h2 class="archive__subtitle">{{ tag[0] }}</h2>
<div class="entries-{{ page.entries_layout | default: 'list' }}"> <div class="entries-{{ entries_layout }}">
{% for post in tag.last %} {% for post in tag.last %}
{% include archive-single.html type=page.entries_layout %} {% include archive-single.html type=entries_layout %}
{% endfor %} {% endfor %}
</div> </div>
<a href="#page-title" class="back-to-top">{{ site.data.ui-text[site.locale].back_to_top | default: 'Back to Top' }} &uarr;</a> <a href="#page-title" class="back-to-top">{{ site.data.ui-text[site.locale].back_to_top | default: 'Back to Top' }} &uarr;</a>