From 6e4946f4277cd1180d8f6ece4ce867f9bb7042e0 Mon Sep 17 00:00:00 2001
From: Matt Chapman <chapabu101@gmail.com>
Date: Fri, 31 Jan 2020 13:43:07 +0000
Subject: [PATCH 1/4] Add contiional logic to contact card component.

---
 .../04-blocks/contact-card/contact-card.twig     | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/components/04-blocks/contact-card/contact-card.twig b/components/04-blocks/contact-card/contact-card.twig
index dc6d4ed..99b69ab 100644
--- a/components/04-blocks/contact-card/contact-card.twig
+++ b/components/04-blocks/contact-card/contact-card.twig
@@ -1,9 +1,17 @@
 <div class="ContactCard vcard">
     <div class="ContactCard-item">
-        <span class="fn org">{{contactOrg}}</span>,<br>
-        <span class="street-address">{{contactStreet}}</span>,<br>
-        <span class="locality">{{contactTown}}</span>,<br>
-        <span class="postal-code">{{contactPostcode}}</span>
+        {% if contactOrg %}
+            <span class="fn org">{{contactOrg}}</span>,<br>
+        {% endif %}
+        {% if contactStreet %}
+            <span class="street-address">{{contactStreet}}</span>,<br>
+        {% endif %}
+        {% if contactTown %}
+            <span class="locality">{{contactTown}}</span>,<br>
+        {% endif %}
+        {% if contactPostcode %}
+            <span class="postal-code">{{contactPostcode}}</span>
+        {% endif %}
         <div>
             <a class="MegaLink" href="https://www.google.com/maps/place/68+Middle+Street/@50.8210014,-0.143087,16z/data=!4m12!1m6!3m5!1s0x0:0xa4714ad834ee75d7!2s68+Middle+Street!8m2!3d50.8210794!4d-0.1430705!3m4!1s0x0:0xa4714ad834ee75d7!8m2!3d50.8210794!4d-0.1430705?hl=en-GB">Find us here.</a>
         </div>

From 52252eab55ce83b14b3c9e4a83883033a1fff643 Mon Sep 17 00:00:00 2001
From: Matt Chapman <chapabu101@gmail.com>
Date: Fri, 31 Jan 2020 21:20:34 +0000
Subject: [PATCH 2/4] Markup address card properly.

---
 .../04-blocks/contact-card/contact-card.twig  | 26 ++++++++++---------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/components/04-blocks/contact-card/contact-card.twig b/components/04-blocks/contact-card/contact-card.twig
index 99b69ab..a9e80a0 100644
--- a/components/04-blocks/contact-card/contact-card.twig
+++ b/components/04-blocks/contact-card/contact-card.twig
@@ -1,17 +1,19 @@
 <div class="ContactCard vcard">
     <div class="ContactCard-item">
-        {% if contactOrg %}
-            <span class="fn org">{{contactOrg}}</span>,<br>
-        {% endif %}
-        {% if contactStreet %}
-            <span class="street-address">{{contactStreet}}</span>,<br>
-        {% endif %}
-        {% if contactTown %}
-            <span class="locality">{{contactTown}}</span>,<br>
-        {% endif %}
-        {% if contactPostcode %}
-            <span class="postal-code">{{contactPostcode}}</span>
-        {% endif %}
+        <address  itemprop="address" itemscope itemtype="http://schema.org/PostalAddress">
+            {% if contactOrg %}
+                <span class="fn org">{{contactOrg}}</span>,<br>
+            {% endif %}
+            {% if contactStreet %}
+                <span class="street-address" itemprop="streetAddress">{{contactStreet}}</span>,<br>
+            {% endif %}
+            {% if contactTown %}
+                <span class="locality" itemprop="addressLocality">{{contactTown}}</span>,<br>
+            {% endif %}
+            {% if contactPostcode %}
+                <span class="postal-code" itemprop="postalCode">{{contactPostcode}}</span>
+            {% endif %}
+        </address>
         <div>
             <a class="MegaLink" href="https://www.google.com/maps/place/68+Middle+Street/@50.8210014,-0.143087,16z/data=!4m12!1m6!3m5!1s0x0:0xa4714ad834ee75d7!2s68+Middle+Street!8m2!3d50.8210794!4d-0.1430705!3m4!1s0x0:0xa4714ad834ee75d7!8m2!3d50.8210794!4d-0.1430705?hl=en-GB">Find us here.</a>
         </div>

From 20da8bf45ef525226d3b43a04881738311403b8d Mon Sep 17 00:00:00 2001
From: Matt Chapman <chapabu101@gmail.com>
Date: Fri, 31 Jan 2020 21:29:08 +0000
Subject: [PATCH 3/4] Remove italic text from address element.

---
 assets/sass/base/global.scss | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/assets/sass/base/global.scss b/assets/sass/base/global.scss
index b63770d..64ae1bf 100644
--- a/assets/sass/base/global.scss
+++ b/assets/sass/base/global.scss
@@ -1,4 +1,3 @@
-
 *,
 *::before,
 *::after {
@@ -83,6 +82,9 @@ svg:not(:root) {
     display: none;
 }
 
+address {
+    font-style: normal;
+}
 @media screen and (min-width: px2em(800px)) {
     body {
         @include font(18px, 32px);

From 692cc4942599f43a47d8da3c3774b7a22b941e74 Mon Sep 17 00:00:00 2001
From: Matt Chapman <chapabu101@gmail.com>
Date: Fri, 31 Jan 2020 21:30:24 +0000
Subject: [PATCH 4/4] Add a cheeky space

---
 assets/sass/base/global.scss | 1 +
 1 file changed, 1 insertion(+)

diff --git a/assets/sass/base/global.scss b/assets/sass/base/global.scss
index 64ae1bf..3e3ce0c 100644
--- a/assets/sass/base/global.scss
+++ b/assets/sass/base/global.scss
@@ -85,6 +85,7 @@ svg:not(:root) {
 address {
     font-style: normal;
 }
+
 @media screen and (min-width: px2em(800px)) {
     body {
         @include font(18px, 32px);