From 00456276fd86dc371ee1378a06c155ca1b77d4a2 Mon Sep 17 00:00:00 2001
From: Simon Fessehaye <fessehay@ualberta.ca>
Date: Thu, 16 Sep 2021 14:29:02 -0700
Subject: [PATCH 1/3] 7374 - Added Category Bubbles

---
 .../wagtailpages/templates/buyersguide/product_page.html        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/network-api/networkapi/wagtailpages/templates/buyersguide/product_page.html b/network-api/networkapi/wagtailpages/templates/buyersguide/product_page.html
index f34234aaac2..6c6383ae608 100644
--- a/network-api/networkapi/wagtailpages/templates/buyersguide/product_page.html
+++ b/network-api/networkapi/wagtailpages/templates/buyersguide/product_page.html
@@ -49,7 +49,7 @@
 
     <div class="bg-white py-3 py-md-4 px-md-5 {{section_class}}">
       <div class="row intro mb-4">
-        <div class="tw-flex tw-space-x-2 tw-flex-wrap tw-px-4 tw-mb-4">
+        <div class="tw-flex tw-space-x-2 tw-flex-wrap tw-px-4">
           {% for cat in product.product_categories.all %}
             {% with category=cat.category %}
               {% localizedroutablepageurl home_page 'category-view' category.slug as cat_url %}

From 13b79ad846ea79aac169343a987cc90e67e60b37 Mon Sep 17 00:00:00 2001
From: Simon Fessehaye <fessehay@ualberta.ca>
Date: Mon, 20 Sep 2021 13:35:35 -0700
Subject: [PATCH 2/3] Added padding

---
 .../wagtailpages/templates/buyersguide/product_page.html        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/network-api/networkapi/wagtailpages/templates/buyersguide/product_page.html b/network-api/networkapi/wagtailpages/templates/buyersguide/product_page.html
index 6c6383ae608..f34234aaac2 100644
--- a/network-api/networkapi/wagtailpages/templates/buyersguide/product_page.html
+++ b/network-api/networkapi/wagtailpages/templates/buyersguide/product_page.html
@@ -49,7 +49,7 @@
 
     <div class="bg-white py-3 py-md-4 px-md-5 {{section_class}}">
       <div class="row intro mb-4">
-        <div class="tw-flex tw-space-x-2 tw-flex-wrap tw-px-4">
+        <div class="tw-flex tw-space-x-2 tw-flex-wrap tw-px-4 tw-mb-4">
           {% for cat in product.product_categories.all %}
             {% with category=cat.category %}
               {% localizedroutablepageurl home_page 'category-view' category.slug as cat_url %}

From f3543cb8077b35f25b126760a58d5963f237aa9e Mon Sep 17 00:00:00 2001
From: Simon Fessehaye <fessehay@ualberta.ca>
Date: Wed, 22 Sep 2021 23:57:34 -0700
Subject: [PATCH 3/3] 7387-update typesetting styling

---
 .../wagtailpages/templates/buyersguide/product_page.html    | 6 +++---
 .../templates/fragments/product_criterion_primary_info.html | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/network-api/networkapi/wagtailpages/templates/buyersguide/product_page.html b/network-api/networkapi/wagtailpages/templates/buyersguide/product_page.html
index f34234aaac2..8f49f9821f4 100644
--- a/network-api/networkapi/wagtailpages/templates/buyersguide/product_page.html
+++ b/network-api/networkapi/wagtailpages/templates/buyersguide/product_page.html
@@ -103,7 +103,7 @@ <h2 class="h3-heading">{% trans "Privacy" %}</h2>
 
           {% if product.product_type == 'general' %}
           <section class="criterion">
-            <h3 class="pni-product-smaller-body-bold mb-1 mb-md-2">{% trans "Can it snoop on me?" %}</h3>
+            <h3 class="tw-mb-4 tw-font-zilla tw-text-2xl tw-leading-7">{% trans "Can it snoop on me?" %}</h3>
             <div class="row">
               {% trans "Camera"          as camera %}
               {% trans "Microphone"      as microphone %}
@@ -124,7 +124,7 @@ <h3 class="pni-product-smaller-body-bold mb-1 mb-md-2">{% trans "Can it snoop on
 
 
           <section class="criterion">
-            <h3 class="pni-product-smaller-body-bold mb-1 mb-md-2">{% trans "What is required to sign up?" %}</h3>
+            <h3 class="tw-mb-4 tw-font-zilla tw-text-2xl tw-leading-7">{% trans "What is required to sign up?" %}</h3>
 
             <div class="row">
               {% trans "Email"               as email %}
@@ -149,7 +149,7 @@ <h3 class="pni-product-smaller-body-bold mb-1 mb-md-2">{% trans "What is require
 
 
           <section class="criterion">
-            <h3 class="pni-product-smaller-body-bold mb-1 mb-md-2">{% trans "What data does it collect?" %}</h3>
+            <h3 class="tw-mb-4 tw-font-zilla tw-text-2xl tw-leading-7">{% trans "What data does it collect?" %}</h3>
 
             <div class="row">
               {% trans "Personal"      as personal_data_collected %}
diff --git a/network-api/networkapi/wagtailpages/templates/fragments/product_criterion_primary_info.html b/network-api/networkapi/wagtailpages/templates/fragments/product_criterion_primary_info.html
index b2a684729a8..ce5e55d731a 100644
--- a/network-api/networkapi/wagtailpages/templates/fragments/product_criterion_primary_info.html
+++ b/network-api/networkapi/wagtailpages/templates/fragments/product_criterion_primary_info.html
@@ -1,7 +1,7 @@
 {% load i18n static %}
 
 <div class="primary-info">
-  <h3 class="pni-product-smaller-body-bold">{{ label }}</h3>
+  <h3 class="tw-mb-4 tw-font-zilla tw-text-2xl tw-leading-7">{{ label }}</h3>
 
   <p class="rating pni-product-smaller-body mb-0">
     {% if value == "CD" %}