Merge branch 'master' into gh-pages

This commit is contained in:
Michael Rose 2013-06-20 08:00:38 -04:00
commit cb8e604a98

View file

@ -3,7 +3,7 @@
<meta name="description" content="{{ page.description }}"> <meta name="description" content="{{ page.description }}">
<meta name="keywords" content="{{ page.tags | join: ', ' }}"> <meta name="keywords" content="{{ page.tags | join: ', ' }}">
<!-- Twitter Card and Open Graph meta --> <!-- Twitter Card and Open Graph meta -->
<meta name="twitter:title" content="{% if page.title %}{{ page.title }} &#8211; {% endif %}Made Mistakes"> <meta name="twitter:title" content="{% if page.title %}{{ page.title }} &#8211; {% endif %}{{ site.title }}">
<meta name="twitter:description" content="{% if page.description %}{{ page.description }}{% else %}{{ page.content | strip_html | strip_newlines | truncate: 120 }}{% endif %}"> <meta name="twitter:description" content="{% if page.description %}{{ page.description }}{% else %}{{ page.content | strip_html | strip_newlines | truncate: 120 }}{% endif %}">
<meta name="twitter:creator" content="@{{ site.owner.twitter }}"> <meta name="twitter:creator" content="@{{ site.owner.twitter }}">
{% if page.layout == 'photo' %} {% if page.layout == 'photo' %}