summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordavidtsadler <davidtsadler@googlemail.com>2012-05-16 22:45:07 +0100
committerdavidtsadler <davidtsadler@googlemail.com>2012-05-16 22:45:07 +0100
commitc4d95c9b21b13146e6e1e1bb76d27926e307c896 (patch)
tree55c3fdc8add4b0b687911222743bbf24073281c2
parenta9c0c81dd39a7e9b82781c2fa5b6471f99e523aa (diff)
parentb0648d46df6a9e8244c5e225f36d167d7ff92658 (diff)
Merge remote-tracking branch 'upstream/master'
-rw-r--r--_config.yml.example5
-rw-r--r--_site_build/_includes/sidebar.html5
2 files changed, 9 insertions, 1 deletions
diff --git a/_config.yml.example b/_config.yml.example
index 731d12c..8ddaf3b 100644
--- a/_config.yml.example
+++ b/_config.yml.example
@@ -36,7 +36,10 @@ description:
#github:
# Facebook username
-#facebook
+#facebook:
+
+# Google plus profile ID
+#google_plus_id:
# Controls the number of recent posts shown on the main index page and in the RSS feed.
max_recent_posts: 10
diff --git a/_site_build/_includes/sidebar.html b/_site_build/_includes/sidebar.html
index 2577a28..73cef70 100644
--- a/_site_build/_includes/sidebar.html
+++ b/_site_build/_includes/sidebar.html
@@ -16,6 +16,11 @@
<a href="mailto:{{ site.email }}" rel="author" target="_blank" title="Email {{site.author }}"><span>Email</span>{{ site.email }}</a>
</li>
{% endif %}
+ {% if site.google_plus_id %}
+ <li>
+ <a href="https://plus.google.com/{{ site.google_plus_id }}" rel="external nofollow author" target="_blank" title="Follow {{ site.author }} on Google+"><span>Google+</span>{{ site.author }}</a>
+ </li>
+ {% endif %}
{% if site.twitter %}
<li>
<a href="http://twitter.com/#!/{{ site.twitter }}" rel="external nofollow" target="_blank" title="Follow {{ site.author }} on Twitter"><span>Twitter</span>@{{ site.twitter }}</a>