Remove potential whitespaces through Liquid tags

This commit is contained in:
foo-dogsquared 2018-10-29 11:44:13 +08:00
parent 05c8a73839
commit e2f458cf04
4 changed files with 54 additions and 46 deletions

View File

@ -1,18 +1,18 @@
<ul class="pinned-posts">
{% for posts in site.posts %}
{% for post in site.pinpost %}
{% if posts.title == post %}
{%- for posts in site.posts -%}
{%- for post in site.pinpost -%}
{%- if posts.title == post -%}
<li style="margin-bottom: 1em">
{%- assign date_format = site.minima.date_format | default: "%b %-d, %Y" -%}
<span class="post-meta" title="{{ posts.date }}">{{ posts.date | date: date_format }}</span>
<h3 style="margin:0">
<a class="post-link" href="{{ posts.url | relative_url }}">
{{ posts.title | escape }}
</a>
</h3>
{% endif %}
{%- include post_meta.html page=posts include_link=true -%}
</li>
{% endfor %}
{% endfor %}
{%- endif -%}
{%- endfor -%}
{%- endfor -%}
</ul>

View File

@ -7,12 +7,14 @@
<span title="{{ page.date }}">{{ page.date | date: date_format }}</span>
</time>
<span class="reading-minutes" style="margin-left: 1.25em">
<img src="{{ 'assets/main/icons/time-clock.svg' | relative_url }}" class="post-meta-icons"><span class="no-of-mins">{{ page.content | number_of_words | divided_by: 225 }}</span> minutes
<span class="reading-minutes">
<img src="{{ 'assets/main/icons/time-clock.svg' | relative_url }}" class="post-meta-icons">
{%- assign wpm = page.content | number_of_words | divided_by: 225 -%}{%- if wpm <= 0 -%}1{%- else -%}{{ wpm }}{%- endif -%}
<span> minute{%- if wpm > 1 -%}s{%- endif -%}</span>
</span>
{%- if page.categories -%}
<span class="post-category" style="margin-left: 1.25em">
<span class="post-category">
<img src="{{ 'assets/main/icons/categories.svg' | relative_url }}" class="post-meta-icons">
{%- if include_link -%}<a href="{{ site.baseurl }}/data/categories#{{ page.categories }}">{{ page.categories }}</a>
{%- else -%}<span>{{ page.categories }}</span>{%- endif -%}
@ -20,6 +22,8 @@
{%- endif -%}
{%- if page.updatedOn -%}
<p class="dt-updated">Updated: <span>{{ page.updatedOn | escape }}</span></p>
<span class="dt-updated">
<img src="{{ 'assets/main/icons/update.svg' | relative_url }}" class="post-meta-icons"><span>{{ page.updatedOn | escape }}</span>
</span>
{%- endif -%}
</p>

View File

@ -2,6 +2,10 @@
layout: default
---
{%- if page.title -%}
<h1>{{ page.title }}</h1>
{%- endif -%}
{%- if content -%}
{{ content }}
{%- endif -%}
@ -11,36 +15,36 @@ layout: default
https://codinfox.github.io/dev/2015/03/06/use-tags-and-categories-in-your-jekyll-based-github-pages/
-->
{%- if page.data -%}
{% assign page_data = page.data %}
{% assign rawdata = "" %}
{% for post in site.posts %}
{% assign tdata = post[page_data] | join:'|' | append:'|' %}
{% assign rawdata = rawdata | append:tdata %}
{% endfor %}
{% assign rawdata = rawdata | split:'|' | sort %}
{%- assign page_data = page.data -%}
{%- assign rawdata = "" -%}
{%- for post in site.posts -%}
{%- assign tdata = post[page_data] | join:'|' | append:'|' -%}
{%- assign rawdata = rawdata | append:tdata -%}
{%- endfor -%}
{%- assign rawdata = rawdata | split:'|' | sort -%}
{% assign data = "" %}
{% for datum in rawdata %}
{% if datum != "" %}
{% if data == "" %}
{% assign data = datum | split:'|' %}
{% endif %}
{% unless data contains datum %}
{% assign data = data | join:'|' | append:'|' | append:datum | split:'|' %}
{% endunless %}
{% endif %}
{% endfor %}
{%- assign data = "" -%}
{%- for datum in rawdata -%}
{%- if datum != "" -%}
{%- if data == "" -%}
{% assign data = datum | split:'|' -%}
{%- endif -%}
{%- unless data contains datum -%}
{%- assign data = data | join:'|' | append:'|' | append:datum | split:'|' -%}
{%- endunless -%}
{%- endif -%}
{%- endfor -%}
<div class="keyword__grid">
{% for datum in data %}<a class="keywords" href="#{{ datum | slugify }}"> {{ datum }} </a>{% endfor %}
{%- for datum in data -%}<a class="keywords" href="#{{ datum | slugify }}"> {{ datum }} </a>{%- endfor -%}
</div>
{% for datum in data %}
{%- for datum in data -%}
<div class="datum__post_list">
<h2 id="{{ datum | slugify }}">{{ datum }}</h2>
<ul>
{% for post in site.posts %}
{% if post[page_data] contains datum %}
{%- for post in site.posts -%}
{%- if post[page_data] contains datum -%}
<li>
<h3>
<a href="{{site.url}}{{site.baseurl}}{{ post.url }}">
@ -49,9 +53,9 @@ layout: default
<small>{{ post.date | date_to_string }}</small>
</h3>
</li>
{% endif %}
{% endfor %}
{%- endif -%}
{%- endfor -%}
</ul>
</div>
{% endfor %}
{%- endfor -%}
{%- endif -%}

View File

@ -9,37 +9,37 @@ layout: default
{{ content }}
{% if site.pinpost %}
{%- if site.pinpost -%}
<section id="pinned-section">
<h3>Pinned Posts:</h3>
{%- include pinpost.html -%}
</section>
{% endif %}
{%- endif -%}
{%- if site.posts.size > 0 -%}
<h2 class="post-list-heading">{{ page.list_title | default: "Posts" }}</h2>
<!-- Pagination links -->
{% for post in paginator.posts %}
{%- for post in paginator.posts -%}
<div class="home-post">
<h2><a href="{{ post.url | relative_url }}" class="post-link">{{ post.title }}</a></h2>
{%- include post_meta.html page=post include_link=true -%}
</div>
{% endfor %}
{%- endfor -%}
<!-- Pagination links -->
<div class="pagination">
{% if paginator.previous_page %}
{%- if paginator.previous_page -%}
<a href="{{ paginator.previous_page_path | relative_url }}" class="previous">Previous</a>
{% else %}
{%- else -%}
<span class="previous disabled">Previous</span>
{% endif %}
{%- endif -%}
<span class="page_number ">Page: {{ paginator.page }} of {{ paginator.total_pages }}</span>
{% if paginator.next_page %}
{%- if paginator.next_page -%}
<a href="{{ paginator.next_page_path | relative_url }}" class="next">Next</a>
{% else %}
{%- else -%}
<span class="next disabled">Next</span>
{% endif %}
{%- endif -%}
</div>
<p class="rss-subscribe">subscribe <a href="{{ "/feed.xml" | relative_url }}">via RSS</a></p>