Merge branch 'feature/modified-date' into develop

This commit is contained in:
Michael Rose 2013-06-30 16:16:59 -04:00
commit 92ef268031
4 changed files with 2956 additions and 622 deletions

View file

@ -23,8 +23,9 @@
<footer class="entry-meta">
<img src="{{ site.url }}/images/{{ site.owner.avatar }}" alt="{{ site.owner.name }} photo" class="author-photo">
<span class="author vcard" itemprop="author" itemscope itemtype="http://schema.org/Person">By <span itemprop="name" class="fn"><a href="{{ site.url }}/about" title="About {{ site.owner.name }}" itemprop="url">{{ site.owner.name }}</a></span></span>
<span class="entry-date date updated"><time datetime="{{ page.date | date_to_xmlschema }}" itemprop="datePublished">{{ page.date | date: "%B %d, %Y" }}</time></span>
{% if page.comments %}<span class="entry-comments"><a href="#disqus_thread">Comment</a></span>{% endif %}
<span class="entry-date date published"><time datetime="{{ page.date | date_to_xmlschema }}" itemprop="datePublished"><i class="icon-calendar-empty"></i> {{ page.date | date: "%B %d, %Y" }}</time></span>
{% if page.modified %}<span class="entry-date date modified"><time datetime="{{ page.modified }}" itemprop="dateModified"><i class="icon-pencil"></i> {{ page.modified | date: "%B %d, %Y" }}</time></span>{% endif %}
{% if page.comments %}<span class="entry-comments"><i class="icon-comment-alt"></i> <a href="#disqus_thread">Comment</a></span>{% endif %}
<span><a href="{{ site.url }}{{ page.url }}" rel="bookmark" title="{{ page.title }}"><i class="icon-link"></i> Permalink</a></span>
</footer>
<div class="entry-content">

View file

@ -4,6 +4,7 @@ title: "Post with Large Feature Image and Text"
description: "Custom written post descriptions are the way to go... if you're not lazy."
category: articles
tags: [sample post, readability]
modified: 2013-06-30
image:
feature: so-simple-sample-image-3.jpg
comments: true

File diff suppressed because it is too large Load diff

View file

@ -11,7 +11,6 @@ body {
// Top Navigation
// --------------------------------------------------
.navigation-wrapper {
text-align: center;
.clearfix();
@ -84,7 +83,6 @@ body {
// Masthead
// --------------------------------------------------
.masthead {
margin-top: 40px;
.clearfix();
@ -164,7 +162,6 @@ body {
// Main
// --------------------------------------------------
#main {
.clearfix();
}
@ -235,6 +232,7 @@ span + .entry-title {
max-width: 640px;
width: 100%;
margin-right: auto;
margin-bottom: 30px;
margin-left: auto;
display: block;
text-transform: uppercase;
@ -247,7 +245,7 @@ span + .entry-title {
padding: 0;
}
& > span {
padding: 0 20px 30px 0;
padding: 0 20px 10px 0;
display: inline-block;
@media @large {
display: block;