Merge branch 'image-credit' of https://github.com/sandeepc/so-simple-theme into sandeepc-image-credit

This commit is contained in:
Michael Rose 2013-08-05 11:37:27 -04:00
commit 768e69bd4d
3 changed files with 5 additions and 2 deletions

View file

@ -14,7 +14,7 @@
<div id="main" role="main" itemprop="mainContentOfPage">
<article class="entry" itemscope itemtype="http://schema.org/ItemPage">
{% if page.image.feature %}<img src="{{ site.url }}/images/{{ page.image.feature }}" class="entry-feature-image" alt="{{ page.title }}" itemprop="image">{% endif %}
{% 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 class="image-credit" href="{{page.image.creditlink}}">{{page.image.credit}}</a>{% endif %}{% endif %}
<div class="entry-wrapper">
<header class="entry-header">
<h1 class="entry-title" itemprop="name">{% if page.headline %}{{ page.headline }}{% else %}{{ page.title }}</h1>{% endif %}

View file

@ -14,7 +14,7 @@
<div id="main" role="main" itemprop="mainContentOfPage">
<article class="hentry" itemscope itemtype="http://schema.org/BlogPosting">
{% if page.image.feature %}<img src="{{ site.url }}/images/{{ page.image.feature }}" class="entry-feature-image" alt="{{ page.title }}" itemprop="image">{% endif %}
{% 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 class="image-credit" 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>

View file

@ -630,3 +630,6 @@ span+.entry-title{margin-top:0;}
#goog-wm-qt{width:auto;margin-right:10px;}
#goog-wm-sb{display:inline-block;padding:8px 20px;background-color:#000000;color:#ffffff;border:2px solid #000000 !important;-webkit-border-radius:20px;-moz-border-radius:20px;border-radius:20px;}#goog-wm-sb:visited{color:#ffffff;}
#goog-wm-sb:hover{background-color:#ffffff;color:#000000;}
.image-credit{font-size:0.8rem; color: #999; margin-top:-40px;text-transform:uppercase}
.image-credit a{font-size:0.8rem; color: #999;}