Merge branch 'master' into develop

This commit is contained in:
Michael Rose 2013-08-12 14:15:13 -04:00
commit e9d79cde13
5 changed files with 22 additions and 9 deletions

View file

@ -1,6 +1,6 @@
# So Simple Theme
Looking for a simple, responsive, theme for your Jekyll powered blog? Well look no further. Here be **So Simple Theme**, the followup to [**Minimal Mistakes**](http://mmistakes.github.io/so-simple-theme) -- by designer slash illustrator [Michael Rose](http://mademistakes).
Looking for a simple, responsive, theme for your Jekyll powered blog? Well look no further. Here be **So Simple Theme**, the followup to [**Minimal Mistakes**](http://mmistakes.github.io/minimal-mistakes/) -- by designer slash illustrator [Michael Rose](http://mademistakes.com).
## So Simple Theme is all about:

View file

@ -17,8 +17,12 @@
{% if page.image.feature %}<img src="{{ site.url }}/images/{{ page.image.feature }}" class="entry-feature-image" alt="{{ page.title }}" itemprop="image">{% if page.image.credit %}<p class="image-credit">Photo Credit: <a href="{{ page.image.creditlink }}">{{ page.image.credit }}</a>{% endif %}{% endif %}
<div class="entry-wrapper">
<header class="entry-header">
<span class="entry-tags">{% for tag in page.tags %}<a href="{{ site.url }}/tags.html#{{ tag | cgi_encode }}" title="Pages tagged {{ tag }}" rel="tag">{{ tag }}</a>{% unless forloop.last %} &bull; {% endunless %}{% endfor %}</span>
<h1 class="entry-title" itemprop="name">{% if page.headline %}{{ page.headline }}{% else %}{{ page.title }}{% endif %}</h1>
<span class="entry-tags">{% for tag in page.tags %}<a href="{{ site.url }}/tags.html#{{ tag | cgi_encode }}" title="Pages tagged {{ tag }}" rel="tag">{{ tag }}</a>{% unless forloop.last %}&nbsp;&bull;&nbsp;{% endunless %}{% endfor %}</span>
{% if page.link %}
<h1 class="entry-title" itemprop="headline"><a href="{{ page.link }}">{% if page.headline %}{{ page.headline }}{% else %}{{ page.title }}{% endif %} <span class="link-arrow">&rarr;</span></a></h1>
{% else %}
<h1 class="entry-title" itemprop="headline">{% if page.headline %}{{ page.headline }}{% else %}{{ page.title }}{% endif %}</h1>
{% endif %}
</header>
<footer class="entry-meta">
<img src="{{ site.url }}/images/{{ site.owner.avatar }}" alt="{{ site.owner.name }} photo" class="author-photo">

View file

@ -215,7 +215,10 @@ span + .entry-title {
font-weight: 700;
line-height: 1;
letter-spacing: -3px;
a { color: @black; }
a {
color: @black;
text-decoration: underline;
}
@media @medium {
max-width: 600px;
.font-rem(52);
@ -289,7 +292,7 @@ span + .entry-title {
@media @large {
float: left;
}
p > a,
p > a
li > a {
border-bottom: 1px dotted lighten(@link-color, 50);
&:hover {
@ -433,4 +436,4 @@ span + .entry-title {
background-color: @white;
color: @black;
}
}
}

View file

@ -32,6 +32,12 @@ a {
}
}
.link-arrow {
font-weight: 100;
text-decoration: underline;
font-style: normal;
}
// Figures
// --------------------------------------------------
figcaption {
@ -114,4 +120,4 @@ li {
}
pre {
.font(12);
}
}

View file

@ -18,7 +18,7 @@ layout: none
<entry>
<title type="html"><![CDATA[{{ post.title | cdata_escape }}]]></title>
<link rel="alternate" type="text/html" href="{{ site.url }}{{ post.url }}" />
<link>{% if post.link %}{{ post.link }}{% else %}{{ site.url }}{{ post.url }}{% endif %}</link>
<id>{{ site.url }}{{ post.id }}</id>
{% if post.modified %}<updated>{{ post.modified | to_xmlschema }}T00:00:00-00:00</updated>
<published>{{ post.date | date_to_xmlschema }}</published>
@ -33,4 +33,4 @@ layout: none
&lt;p&gt;&lt;a href=&quot;{{ site.url }}{{ post.url }}&quot;&gt;{{ post.title }}&lt;/a&gt; was originally published by {{ site.owner.name }} at &lt;a href=&quot;{{ site.url }}&quot;&gt;{{ site.title }}&lt;/a&gt; on {{ post.date | date: "%B %d, %Y" }}.&lt;/p&gt;</content>
</entry>
{% endfor %}
</feed>
</feed>