Merge branch 'release/1.1.0'

master
Michael Rose 2013-08-25 23:04:34 -04:00
commit 9ebb1473d2
3 changed files with 45 additions and 10 deletions

View File

@ -43,15 +43,27 @@
</footer>
</div><!-- /.entry-content -->
{% if site.disqus_shortname and page.comments %}<section id="disqus_thread"></section><!-- /#disqus_thread -->{% endif %}
{% if page.previous %}<div class="read-more">
<div class="read-more-header">
<a href="{{ site.url }}{{ page.previous.url }}" class="read-more-btn">Read More</a>
</div><!-- /.read-more-header -->
<div class="read-more-content">
<h3><a href="{{ site.url }}{{ page.previous.url }}" title="{{ page.previous.title }}">{{ page.previous.title }}</a></h2>
<p>{% if page.previous.description %}{{ page.previous.description }}{% else %}{{ page.previous.content | strip_html | strip_newlines | truncate: 120 }}{% endif %} <a href="{{ site.url }}{{ page.previous.url }}">Continue reading</a></p>
</div><!-- /.read-more-content -->
</div><!-- /.read-more -->{% endif %}
{% if site.related_posts.size %}
<div class="read-more">
{% for post in site.related_posts limit:1 %}
<div class="read-more-header">
<a href="{{ site.url }}{{ page.previous.url }}" class="read-more-btn">Read More</a>
</div><!-- /.read-more-header -->
<div class="read-more-content">
<h3><a href="{{ site.url }}{{ post.url }}" title="{{ post.title }}">{{ post.title }}</a></h3>
<p>{% if post.description %}{{ post.description }}{% else %}{{ content | strip_html | strip_newlines | truncate: 140 }}&hellip;{% endif %} <a href="{{ site.url }}{{ post.url }}">Continue reading</a></p>
</div><!-- /.read-more-content -->
{% endfor %}
<div class="read-more-list">
{% for post in site.related_posts limit:2 offset:1 %}
<div class="list-item">
<h4><a href="{{ site.url }}{{ post.url }}" title="{{ post.title }}">{{ post.title }}</a></h4>
<span>Published on {{ post.date | date: "%B %d, %Y" }}</span>
</div><!-- /.list-item -->
{% endfor %}
</div><!-- /.read-more-list -->
{% endif %}
</div><!-- /.read-more -->
</article>
</div><!-- /#main -->

File diff suppressed because one or more lines are too long

View File

@ -279,6 +279,29 @@ body {
}
}
}
.read-more-list {
border-top: solid 1px lighten(@base-color,60);
}
.list-item {
width: 100%;
text-align: left;
h4 {
.font-rem(18);
margin-bottom: 0;
}
span {
display: block;
.font-rem(14);
color: lighten(@base-color,50);
}
@media @medium {
width: 49%;
float: left;
&:nth-child(2) {
text-align: right;
}
}
}
// Post Index
// --------------------------------------------------