From 76fbfec72aa606360e7abf2ab21ad8134e5ec9c4 Mon Sep 17 00:00:00 2001
From: Abhas Bhattacharya <abhasbhattacharya2@gmail.com>
Date: Wed, 31 Jul 2013 21:38:49 +0530
Subject: [PATCH 1/2] tagline support fixed

Both site.tagline and page.tagline (higher precedence) supported.
---
 _includes/themes/twitter/page.html |  6 +++++-
 _includes/themes/twitter/post.html | 12 +++++++++++-
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/_includes/themes/twitter/page.html b/_includes/themes/twitter/page.html
index 7ac6fab..0ab598c 100644
--- a/_includes/themes/twitter/page.html
+++ b/_includes/themes/twitter/page.html
@@ -1,5 +1,9 @@
 <div class="page-header">
-  <h1>{{ page.title }} <small>Supporting tagline</small></h1>
+  <h1>{{ page.title }} 
+	{% if page.tagline %}
+      <small>{{ page.tagline }}</small>
+    {% endif %}
+</h1>
 </div>
 
 <div class="row">
diff --git a/_includes/themes/twitter/post.html b/_includes/themes/twitter/post.html
index 416af10..706823e 100644
--- a/_includes/themes/twitter/post.html
+++ b/_includes/themes/twitter/post.html
@@ -1,5 +1,15 @@
 <div class="page-header">
-  <h1>{{ page.title }} <small>Supporting tagline</small></h1>
+  <h1>{{ page.title }} 
+	{% if site.tagline or page.tagline %}
+	{% if site.tagline %}
+		{% assign _tagline=site.tagline %}
+	{% endif %}
+	{% if page.tagline %}
+		{% assign _tagline=page.tagline %}
+	{% endif %}
+      <small>{{ _tagline }}</small>
+    {% endif %}
+</h1>
 </div>
 
 <div class="row">

From 37bcce0088296c588324cc7e95e41be32a19fe1d Mon Sep 17 00:00:00 2001
From: Abhas Bhattacharya <abhasbhattacharya2@gmail.com>
Date: Wed, 31 Jul 2013 21:46:32 +0530
Subject: [PATCH 2/2] page.tagline in page.html

---
 _includes/themes/twitter/page.html | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/_includes/themes/twitter/page.html b/_includes/themes/twitter/page.html
index 0ab598c..10acdf1 100644
--- a/_includes/themes/twitter/page.html
+++ b/_includes/themes/twitter/page.html
@@ -1,7 +1,13 @@
 <div class="page-header">
   <h1>{{ page.title }} 
+	{% if site.tagline or page.tagline %}
+	{% if site.tagline %}
+		{% assign _tagline=site.tagline %}
+	{% endif %}
 	{% if page.tagline %}
-      <small>{{ page.tagline }}</small>
+		{% assign _tagline=page.tagline %}
+	{% endif %}
+      <small>{{ _tagline }}</small>
     {% endif %}
 </h1>
 </div>