aboutsummaryrefslogtreecommitdiff
path: root/.themes/classic/source/_includes/head.html
diff options
context:
space:
mode:
authorBrandon Mathis <brandon@imathis.com>2011-09-04 08:37:22 -0500
committerBrandon Mathis <brandon@imathis.com>2011-09-04 08:37:22 -0500
commited0c220523f81a9f29009f8bbb75ff50052465d4 (patch)
treeed925f206fc9d72fe806856a07525ec0118a3972 /.themes/classic/source/_includes/head.html
parent3cedd387a0fd4522023ef335307cbc096a3c2005 (diff)
parentf03c4cdb2abe524e097fdfc67194e8d9fc0d19ab (diff)
downloadmy_new_personal_website-ed0c220523f81a9f29009f8bbb75ff50052465d4.tar.xz
my_new_personal_website-ed0c220523f81a9f29009f8bbb75ff50052465d4.zip
Merge branch 'master' of https://github.com/fhemberger/octopress into fhemberger-master
Conflicts: plugins/category_generator.rb
Diffstat (limited to '.themes/classic/source/_includes/head.html')
-rw-r--r--.themes/classic/source/_includes/head.html5
1 files changed, 1 insertions, 4 deletions
diff --git a/.themes/classic/source/_includes/head.html b/.themes/classic/source/_includes/head.html
index d6a6735b..5370cb4a 100644
--- a/.themes/classic/source/_includes/head.html
+++ b/.themes/classic/source/_includes/head.html
@@ -4,7 +4,7 @@
<!--[if (gt IE 8)|(gt IEMobile 7)|!(IEMobile)|!(IE)]><!--><html class="no-js" lang="en"><!--<![endif]-->
<head>
<meta charset="utf-8">
- <title>{{site.title}}{% if page.title %}: {{page.title}}{% endif %}</title>
+ <title>{% if page.title %}{{page.title}} « {% endif %}{{site.title}}</title>
<meta name="author" content="{{site.author}}">
{% if page.description %}
<meta name="description" content="{{page.description}}"/>
@@ -26,8 +26,5 @@
<script src="http://s3.amazonaws.com/ender-js/jeesh.min.js"></script>
<script src="{{ root_url }}/javascripts/octopress.js" type="text/javascript"></script>
<link href="{{ site.subscribe_rss }}" rel="alternate" title="{{site.title}}" type="application/atom+xml"/>
- {% include google_analytics.html %}
- {% include google_plus_one.html %}
- {% include twitter_sharing.html %}
{% include custom/head.html %}
</head>