diff options
| author | Parker Moore <parkrmoore@gmail.com> | 2013-11-17 22:47:27 -0500 |
|---|---|---|
| committer | Parker Moore <parkrmoore@gmail.com> | 2013-11-17 22:47:27 -0500 |
| commit | 1230e018843ec3bcb17dc4297f2b0f47693a7608 (patch) | |
| tree | 64d9578e934d058dd0bcd1da380ae6379fe187f2 /.themes/classic/source/_includes/head.html | |
| parent | 7f26224bb84e5fef01c4a55effd22fc2b7f1e9c4 (diff) | |
| parent | d577da7c0af912cec131fa76ea5f265388aae5eb (diff) | |
| download | my_new_personal_website-1230e018843ec3bcb17dc4297f2b0f47693a7608.tar.xz my_new_personal_website-1230e018843ec3bcb17dc4297f2b0f47693a7608.zip | |
Merge branch 'master' of github.com:imathis/octopress
* 'master' of github.com:imathis/octopress:
removing border from iframe in jsFiddle plugin
* properly escaped site title and post/page title in the RSS feeds;
* consistently convert page and post titles to titlecase if site.titlecase is true;
Diffstat (limited to '.themes/classic/source/_includes/head.html')
| -rw-r--r-- | .themes/classic/source/_includes/head.html | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.themes/classic/source/_includes/head.html b/.themes/classic/source/_includes/head.html index b4af2b87..6b5412ca 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>{% if page.title %}{{ page.title }} - {% endif %}{{ site.title }}</title> + <title>{% if page.title %}{% if site.titlecase %}{{ page.title | titlecase }}{% else %}{{ page.title }}{% endif %} - {% endif %}{{ site.title }}</title> <meta name="author" content="{{ site.author }}"> {% capture description %}{% if page.description %}{{ page.description }}{% else %}{{ content | raw_content }}{% endif %}{% endcapture %} |