More fixes

This commit is contained in:
Paulus Schoutsen 2015-10-27 00:53:57 -07:00
parent e59252a39b
commit 8f47eb20e5
12 changed files with 30 additions and 232 deletions

View file

@ -17,9 +17,15 @@
</header>
{% endunless %}
{% if index %}
<div class="entry-content">{{ content | excerpt }}</div>
{% capture excerpted %}{{ content | has_excerpt }}{% endcapture %}
{% if excerpted == 'true' %}
<div class="entry-content">
{% if post.excerpted %}
{{ post.excerpt }}
<a href="{{ post.url }}"Continue reading </a>
{% else %}
{{ post.content }}
{% endif %}
</div>
{% if post.excerpted %}
<footer>
<a rel="full-article" href="{{ root_url }}{{ post.url }}">{{ site.excerpt_link }}</a>
</footer>

View file

@ -22,13 +22,11 @@
{% endunless %}
</header>
{% capture excerpted %}{{ content | has_excerpt }}{% endcapture %}
{% if excerpted == 'true' and index %}
{% if post.excerpted and index %}
<div class="entry-content clearfix">
{{ content | excerpt }}
{{ post.excerpt }}
<a class="btn pull-right" href="{{ root_url }}{{ post.url }}#read-more">{{ site.excerpt_link }}</a>
</div>
{% else %}
{{ content | replace: site.excerpt_separator, '<a name="read-more"></a>' }}
{% endif %}
{{ post.content | replace: site.excerpt_separator, '<a name="read-more"></a>' }}
{% endif %}

View file

@ -1 +1 @@
<span><i class='icon-time'></i> {{ content | reading_time_as_s }} reading time</span>
<span><i class='icon-time'></i> {{ post.content | reading_time_as_s }} reading time</span>

View file

@ -4,7 +4,7 @@
<!--[if IE 8]> <html class="no-js lt-ie9"> <![endif]-->
<!--[if gt IE 8]><!--> <html> <!--<![endif]-->
{% capture canonical %}{{ site.url }}{% if site.permalink contains '.html' %}{{ page.url }}{% else %}{{ page.url | remove:'index.html' | strip_slash }}{% endif %}{% endcapture %}
{% capture canonical %}{{ site.url }}{% if site.permalink contains '.html' %}{{ page.url }}{% else %}{{ page.url | remove:'index.html' }}{% endif %}{% endcapture %}
{% if page.description %} {% capture fb_description %}{{ page.description }}{% endcapture %} {% else %} {% capture fb_description %}{{ content | raw_content }}{% endcapture %} {% endif %}
<head>
<meta charset="utf-8">

View file

@ -4,10 +4,11 @@ is_post: true
---
<article class="post">
{% assign post = page %}
{% include blog/post/article.html %}
</article>
{% if site.disqus_short_name and page.comments == true %}
{% if site.disqus_short_name and page.comments == true %}
<section id="disqus">
<h3 class="indent title">Comments</h3>
<div id="disqus_thread" aria-live="polite">{% include blog/post/disqus_thread.html %}</div>

View file

@ -1,10 +1,10 @@
---
layout: default
sidebar: false
regenerate: true
---
{% assign index = true %}
{% for post in paginator.posts %}
{% assign content = post.content %}
<article class="listing">
{% include blog/post/article.html %}
</article>

View file

@ -169,7 +169,7 @@ go automate!
- Learn about the available [automation conditions](/components/automation/#conditions)
- Learn about [scripts](/components/script/) to help you trigger multiple actions and delays
- Learn about [scenes](/components/scene/) to help you set many entities at once to your liking
- Setup the [notification component](/components/#notify-service) to sent yourself messages
- Setup a [notification platform](/components/#notifications) to sent yourself messages
<p class='note warning'>
Whenever you write the value <code>on</code> or <code>off</code>, surround it with quotes to avoid