From 65a78b90a8909e379688f903d8b34b7d93844c4f Mon Sep 17 00:00:00 2001
From: jdeluyck <5451787+jdeluyck@users.noreply.github.com>
Date: Mon, 1 Jul 2019 22:07:12 +0200
Subject: [PATCH 1/7] Add site subtitle

---
 _includes/masthead.html                | 7 ++++++-
 _sass/minimal-mistakes/_variables.scss | 1 +
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/_includes/masthead.html b/_includes/masthead.html
index b2aca064e7bc..f2b76b48be15 100644
--- a/_includes/masthead.html
+++ b/_includes/masthead.html
@@ -11,7 +11,12 @@
         {% unless logo_path == empty %}
           <a class="site-logo" href="{{ '/' | relative_url }}"><img src="{{ logo_path | relative_url }}" alt=""></a>
         {% endunless %}
-        <a class="site-title" href="{{ '/' | relative_url }}">{{ site.masthead_title | default: site.title }}</a>
+        <a class="site-title" href="{{ '/' | relative_url }}">{{ site.masthead_title | default: site.title }}
+	{% if site.subtitle == empty %}
+	  </a>
+	{% else %}
+	  <div class="site-subtitle">{{ site.description }}</div></a>
+        {% endif %}
         <ul class="visible-links">
           {%- for link in site.data.navigation.main -%}
             {%- if link.url contains '://' -%}
diff --git a/_sass/minimal-mistakes/_variables.scss b/_sass/minimal-mistakes/_variables.scss
index 9dd3a3866c9b..373f72f51170 100644
--- a/_sass/minimal-mistakes/_variables.scss
+++ b/_sass/minimal-mistakes/_variables.scss
@@ -42,6 +42,7 @@ $type-size-5: 1em !default; // ~16px
 $type-size-6: 0.75em !default; // ~12px
 $type-size-7: 0.6875em !default; // ~11px
 $type-size-8: 0.625em !default; // ~10px
+$type-size-9: 0.350em !default; // ~4px
 
 /*
    Colors

From 4a3ac5e180dc42b2b114465966c9fe4ba080b913 Mon Sep 17 00:00:00 2001
From: jdeluyck <5451787+jdeluyck@users.noreply.github.com>
Date: Mon, 1 Jul 2019 22:08:00 +0200
Subject: [PATCH 2/7] Tabs vs spaces - the ancient conflict

---
 _includes/masthead.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/_includes/masthead.html b/_includes/masthead.html
index f2b76b48be15..a5cec50600aa 100644
--- a/_includes/masthead.html
+++ b/_includes/masthead.html
@@ -12,9 +12,9 @@
           <a class="site-logo" href="{{ '/' | relative_url }}"><img src="{{ logo_path | relative_url }}" alt=""></a>
         {% endunless %}
         <a class="site-title" href="{{ '/' | relative_url }}">{{ site.masthead_title | default: site.title }}
-	{% if site.subtitle == empty %}
+        {% if site.subtitle == empty %}
 	  </a>
-	{% else %}
+        {% else %}
 	  <div class="site-subtitle">{{ site.description }}</div></a>
         {% endif %}
         <ul class="visible-links">

From cbad38ff546429ce5c188d24be5a5f709bc20889 Mon Sep 17 00:00:00 2001
From: jdeluyck <5451787+jdeluyck@users.noreply.github.com>
Date: Mon, 1 Jul 2019 22:09:54 +0200
Subject: [PATCH 3/7] Add css

---
 _sass/minimal-mistakes/_masthead.scss | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/_sass/minimal-mistakes/_masthead.scss b/_sass/minimal-mistakes/_masthead.scss
index ff3d2b95b1d5..f8543539b07d 100644
--- a/_sass/minimal-mistakes/_masthead.scss
+++ b/_sass/minimal-mistakes/_masthead.scss
@@ -53,6 +53,10 @@
   z-index: 20;
 }
 
+.site-subtitle {
+  font-size: $type-size-9;
+}
+
 .masthead__menu {
   float: left;
   margin-left: 0;

From 07cb686f9ec16c5749e85da42731f89c3f00a1a0 Mon Sep 17 00:00:00 2001
From: jdeluyck <5451787+jdeluyck@users.noreply.github.com>
Date: Thu, 11 Jul 2019 12:38:36 +0200
Subject: [PATCH 4/7] updates cfr PR #2205

---
 _includes/masthead.html                | 6 +-----
 _sass/minimal-mistakes/_masthead.scss  | 2 +-
 _sass/minimal-mistakes/_variables.scss | 1 -
 3 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/_includes/masthead.html b/_includes/masthead.html
index a5cec50600aa..9a2178311daf 100644
--- a/_includes/masthead.html
+++ b/_includes/masthead.html
@@ -12,11 +12,7 @@
           <a class="site-logo" href="{{ '/' | relative_url }}"><img src="{{ logo_path | relative_url }}" alt=""></a>
         {% endunless %}
         <a class="site-title" href="{{ '/' | relative_url }}">{{ site.masthead_title | default: site.title }}
-        {% if site.subtitle == empty %}
-	  </a>
-        {% else %}
-	  <div class="site-subtitle">{{ site.description }}</div></a>
-        {% endif %}
+	{% if site.subtitle %}<div class="site-subtitle">{{ site.description }}</div>{% endif %}
         <ul class="visible-links">
           {%- for link in site.data.navigation.main -%}
             {%- if link.url contains '://' -%}
diff --git a/_sass/minimal-mistakes/_masthead.scss b/_sass/minimal-mistakes/_masthead.scss
index f8543539b07d..11aace47418c 100644
--- a/_sass/minimal-mistakes/_masthead.scss
+++ b/_sass/minimal-mistakes/_masthead.scss
@@ -54,7 +54,7 @@
 }
 
 .site-subtitle {
-  font-size: $type-size-9;
+  font-size: $type-size-8;
 }
 
 .masthead__menu {
diff --git a/_sass/minimal-mistakes/_variables.scss b/_sass/minimal-mistakes/_variables.scss
index 373f72f51170..9dd3a3866c9b 100644
--- a/_sass/minimal-mistakes/_variables.scss
+++ b/_sass/minimal-mistakes/_variables.scss
@@ -42,7 +42,6 @@ $type-size-5: 1em !default; // ~16px
 $type-size-6: 0.75em !default; // ~12px
 $type-size-7: 0.6875em !default; // ~11px
 $type-size-8: 0.625em !default; // ~10px
-$type-size-9: 0.350em !default; // ~4px
 
 /*
    Colors

From 79a7379aefe5a092b5d1d8835d7b60f0017adaab Mon Sep 17 00:00:00 2001
From: jdeluyck <5451787+jdeluyck@users.noreply.github.com>
Date: Thu, 11 Jul 2019 12:42:09 +0200
Subject: [PATCH 5/7] Perhaps also add the closing anchor

---
 _includes/masthead.html | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/_includes/masthead.html b/_includes/masthead.html
index 9a2178311daf..e69fd6244f9e 100644
--- a/_includes/masthead.html
+++ b/_includes/masthead.html
@@ -12,7 +12,8 @@
           <a class="site-logo" href="{{ '/' | relative_url }}"><img src="{{ logo_path | relative_url }}" alt=""></a>
         {% endunless %}
         <a class="site-title" href="{{ '/' | relative_url }}">{{ site.masthead_title | default: site.title }}
-	{% if site.subtitle %}<div class="site-subtitle">{{ site.description }}</div>{% endif %}
+        {% if site.subtitle %}<div class="site-subtitle">{{ site.description }}</div>{% endif %}
+	</a>
         <ul class="visible-links">
           {%- for link in site.data.navigation.main -%}
             {%- if link.url contains '://' -%}

From e21d944969966babd894e37b84cb463b7ec3f9c1 Mon Sep 17 00:00:00 2001
From: jdeluyck <5451787+jdeluyck@users.noreply.github.com>
Date: Thu, 11 Jul 2019 16:53:44 +0200
Subject: [PATCH 6/7] Make sure we check for the right variables...

---
 _includes/masthead.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/_includes/masthead.html b/_includes/masthead.html
index e69fd6244f9e..108ea676599a 100644
--- a/_includes/masthead.html
+++ b/_includes/masthead.html
@@ -12,7 +12,7 @@
           <a class="site-logo" href="{{ '/' | relative_url }}"><img src="{{ logo_path | relative_url }}" alt=""></a>
         {% endunless %}
         <a class="site-title" href="{{ '/' | relative_url }}">{{ site.masthead_title | default: site.title }}
-        {% if site.subtitle %}<div class="site-subtitle">{{ site.description }}</div>{% endif %}
+        {% if site.description %}<div class="site-subtitle">{{ site.description }}</div>{% endif %}
 	</a>
         <ul class="visible-links">
           {%- for link in site.data.navigation.main -%}

From bcbf111413b27657e73c97f18597f6c412566bfc Mon Sep 17 00:00:00 2001
From: jdeluyck <5451787+jdeluyck@users.noreply.github.com>
Date: Thu, 11 Jul 2019 16:56:30 +0200
Subject: [PATCH 7/7] Brown paper bag - subtitle, not description

---
 _includes/masthead.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/_includes/masthead.html b/_includes/masthead.html
index 108ea676599a..8d28d5d86baf 100644
--- a/_includes/masthead.html
+++ b/_includes/masthead.html
@@ -12,7 +12,7 @@
           <a class="site-logo" href="{{ '/' | relative_url }}"><img src="{{ logo_path | relative_url }}" alt=""></a>
         {% endunless %}
         <a class="site-title" href="{{ '/' | relative_url }}">{{ site.masthead_title | default: site.title }}
-        {% if site.description %}<div class="site-subtitle">{{ site.description }}</div>{% endif %}
+        {% if site.subtitle %}<div class="site-subtitle">{{ site.subtitle }}</div>{% endif %}
 	</a>
         <ul class="visible-links">
           {%- for link in site.data.navigation.main -%}