From 20f939c3038d48e8f589d7267e493419c56f2e1b Mon Sep 17 00:00:00 2001
From: Oliver Davies <oliver@oliverdavies.co.uk>
Date: Sun, 12 Apr 2015 20:36:05 +0100
Subject: [PATCH] Updated title.html.twig

---
 .../opdavies/opdavies/_partials/title.html.twig      | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/source/themes/opdavies/opdavies/_partials/title.html.twig b/source/themes/opdavies/opdavies/_partials/title.html.twig
index 200ce09a..3ddec683 100644
--- a/source/themes/opdavies/opdavies/_partials/title.html.twig
+++ b/source/themes/opdavies/opdavies/_partials/title.html.twig
@@ -1,16 +1,12 @@
-{% set separator = '-' %}
+{% set separator = '|' %}
 {% spaceless %}<title>
   {% if page.full_title %}
     {{ page.full_title }}
-  {% elseif page.title %}
-    {% if site.title %}
-      {{ page.title }} {{ separator }} {{ site.title }}
-    {% elseif page.subtitle %}
-      {{ page.title }} {{ separator }} {{ site.title }} {{ separator }} {{ site.subtitle }}
-    {% endif %}
+  {% elseif page.title and site.title %}
+    {{ page.title }} {{ separator }} {{ site.title }}
   {% elseif site.title %}
     {% if site.subtitle %}
-      {{ site.title }} {{ separator }} {{ site.subtitle }}
+      {{ site.subtitle }} {{ separator }} {{ site.title }}
     {% else %}
       {{ site.title }}
     {% endif %}