Merge branch '2.1' of github.com:imathis/octopress into site

This commit is contained in:
Brandon Mathis 2012-09-06 10:22:02 -05:00
commit 118e71660e
3 changed files with 4 additions and 4 deletions

View File

@ -5,9 +5,9 @@
<li class="loading">Status updating...</li>
</ul>
{% if site.twitter_follow_button %}
<a href="http://twitter.com/{{ site.twitter_user }}" class="twitter-follow-button" data-show-count="{{ site.twitter_show_follower_count }}">Follow @{{ site.twitter_user }}</a>
<a href="//twitter.com/{{ site.twitter_user }}" class="twitter-follow-button" data-show-count="{{ site.twitter_show_follower_count }}">Follow @{{ site.twitter_user }}</a>
{% else %}
<p>Follow <a href="http://twitter.com/{{site.twitter_user}}">@{{ site.twitter_user }}</a></p>
<p>Follow <a href="//twitter.com/{{site.twitter_user}}">@{{ site.twitter_user }}</a></p>
{% endif %}
</section>
{% endif %}

View File

@ -4,7 +4,7 @@
var twitterWidgets = document.createElement('script');
twitterWidgets.type = 'text/javascript';
twitterWidgets.async = true;
twitterWidgets.src = 'http://platform.twitter.com/widgets.js';
twitterWidgets.src = '//platform.twitter.com/widgets.js';
document.getElementsByTagName('head')[0].appendChild(twitterWidgets);
})();
</script>

View File

@ -13,7 +13,7 @@ layout: default
{{ content }}
{% unless page.footer == false %}
<footer>
<p class="meta">{% include post/meta.html %}{% include custom/page-meta.html %}</p>
<p class="meta">{% include post/meta.html %}{% include custom/page_meta.html %}</p>
{% unless page.sharing == false %}
{% include post/sharing.html %}
{% endunless %}