From e0476981c03074564b0952d308c7d494021d6de2 Mon Sep 17 00:00:00 2001
From: Daniel Miranda <manieldiranda@gmail.com>
Date: Wed, 29 May 2024 15:33:22 -0700
Subject: [PATCH 01/13] Update Help Page "Notice" field from StreamBlock to
 Snippet (#12369)

* remove old notice field

* remove old notice_block template

* updated to use new HelpPageNotice snippet

* make text field required + tests

* updated to one migration file

* Updated migration file
---
 .../donate/factory/customblocks/__init__.py   |  2 -
 .../factory/customblocks/notice_block.py      | 20 ----
 .../networkapi/donate/factory/help_page.py    |  7 +-
 .../snippets}/__init__.py                     |  0
 .../factory/snippets/help_page_notice.py      | 22 +++++
 .../0011_update_donatehelppage_notice.py      | 68 +++++++++++++
 .../pagemodels/customblocks/notice_block.py   | 31 ------
 .../networkapi/donate/pagemodels/help_page.py | 13 +--
 .../networkapi/donate/snippets/__init__.py    |  0
 .../donate/snippets/help_page_notice.py       | 53 +++++++++++
 .../tests/customblocks/test_notice_block.py   | 95 -------------------
 .../donate/tests/snippets/__init__.py         |  0
 .../tests/snippets/test_help_page_notice.py   | 78 +++++++++++++++
 .../networkapi/donate/tests/test_help_page.py | 24 +++--
 .../networkapi/donate/wagtail_hooks.py        | 17 ++++
 .../help_page_notice.html}                    |  9 +-
 .../templates/donate/pages/help_page.html     |  4 +-
 17 files changed, 270 insertions(+), 173 deletions(-)
 delete mode 100644 network-api/networkapi/donate/factory/customblocks/__init__.py
 delete mode 100644 network-api/networkapi/donate/factory/customblocks/notice_block.py
 rename network-api/networkapi/donate/{tests/customblocks => factory/snippets}/__init__.py (100%)
 create mode 100644 network-api/networkapi/donate/factory/snippets/help_page_notice.py
 create mode 100644 network-api/networkapi/donate/migrations/0011_update_donatehelppage_notice.py
 delete mode 100644 network-api/networkapi/donate/pagemodels/customblocks/notice_block.py
 create mode 100644 network-api/networkapi/donate/snippets/__init__.py
 create mode 100644 network-api/networkapi/donate/snippets/help_page_notice.py
 delete mode 100644 network-api/networkapi/donate/tests/customblocks/test_notice_block.py
 create mode 100644 network-api/networkapi/donate/tests/snippets/__init__.py
 create mode 100644 network-api/networkapi/donate/tests/snippets/test_help_page_notice.py
 rename network-api/networkapi/templates/donate/{blocks/notice_block.html => fragments/help_page_notice.html} (56%)

diff --git a/network-api/networkapi/donate/factory/customblocks/__init__.py b/network-api/networkapi/donate/factory/customblocks/__init__.py
deleted file mode 100644
index 8c4ff296dbf..00000000000
--- a/network-api/networkapi/donate/factory/customblocks/__init__.py
+++ /dev/null
@@ -1,2 +0,0 @@
-# flake8: noqa
-from .notice_block import NoticeBlockFactory
diff --git a/network-api/networkapi/donate/factory/customblocks/notice_block.py b/network-api/networkapi/donate/factory/customblocks/notice_block.py
deleted file mode 100644
index 61f2d7c9899..00000000000
--- a/network-api/networkapi/donate/factory/customblocks/notice_block.py
+++ /dev/null
@@ -1,20 +0,0 @@
-import wagtail_factories
-from factory import Faker, LazyAttribute, SubFactory
-from wagtail.rich_text import RichText
-
-from networkapi.donate.pagemodels.customblocks.notice_block import NoticeBlock
-
-description_faker = Faker("paragraphs", nb=2)
-
-
-class NoticeBlockFactory(wagtail_factories.StructBlockFactory):
-    class Meta:
-        model = NoticeBlock
-        exclude = ("description_text",)
-
-    image = SubFactory(wagtail_factories.ImageChooserBlockFactory)
-    image_alt_text = Faker("sentence", nb_words=4)
-    text = LazyAttribute(lambda o: RichText("".join([f"<p>{p}</p>" for p in o.description_text])))
-
-    # Lazy Values
-    description_text = description_faker
diff --git a/network-api/networkapi/donate/factory/help_page.py b/network-api/networkapi/donate/factory/help_page.py
index b5c927b34f3..985a0e2da11 100644
--- a/network-api/networkapi/donate/factory/help_page.py
+++ b/network-api/networkapi/donate/factory/help_page.py
@@ -1,8 +1,7 @@
-import wagtail_factories
 from factory import Faker, SubFactory
 from wagtail_factories import PageFactory
 
-from networkapi.donate.factory.customblocks.notice_block import NoticeBlockFactory
+from networkapi.donate.factory.snippets.help_page_notice import HelpPageNoticeFactory
 from networkapi.donate.models import DonateHelpPage, DonateLandingPage
 from networkapi.utility.faker import StreamfieldProvider
 from networkapi.utility.faker.helpers import reseed
@@ -18,7 +17,7 @@ class Meta:
 
     title = Faker("sentence", nb_words=2)
     body = Faker("streamfield", fields=streamfield_fields)
-    notice = wagtail_factories.StreamFieldFactory({"notice": SubFactory(NoticeBlockFactory)})
+    notice = SubFactory(HelpPageNoticeFactory)
 
 
 def generate(seed):
@@ -26,4 +25,4 @@ def generate(seed):
 
     print("Generating a Help page")
     home_page = DonateLandingPage.objects.get(title="Donate Now")
-    DonateHelpPageFactory(parent=home_page, title="Donate Help", slug="help", notice__0="notice")
+    DonateHelpPageFactory(parent=home_page, title="Donate Help", slug="help")
diff --git a/network-api/networkapi/donate/tests/customblocks/__init__.py b/network-api/networkapi/donate/factory/snippets/__init__.py
similarity index 100%
rename from network-api/networkapi/donate/tests/customblocks/__init__.py
rename to network-api/networkapi/donate/factory/snippets/__init__.py
diff --git a/network-api/networkapi/donate/factory/snippets/help_page_notice.py b/network-api/networkapi/donate/factory/snippets/help_page_notice.py
new file mode 100644
index 00000000000..7ecce5f3952
--- /dev/null
+++ b/network-api/networkapi/donate/factory/snippets/help_page_notice.py
@@ -0,0 +1,22 @@
+import factory
+from factory import Faker, LazyAttribute
+from wagtail.rich_text import RichText
+from wagtail_factories import ImageFactory
+
+from networkapi.donate.snippets.help_page_notice import HelpPageNotice
+
+notice_text_contents = Faker("paragraph", nb_sentences=3, variable_nb_sentences=False)
+
+
+class HelpPageNoticeFactory(factory.django.DjangoModelFactory):
+    class Meta:
+        model = HelpPageNotice
+        exclude = ("notice_text",)
+
+    name = Faker("sentence", nb_words=3)
+    text = LazyAttribute(lambda o: RichText(f"<p>{o.notice_text}</p>"))
+    notice_image = factory.SubFactory(ImageFactory)
+    notice_image_alt_text = Faker("sentence", nb_words=4)
+
+    # Lazy Values
+    notice_text = notice_text_contents
diff --git a/network-api/networkapi/donate/migrations/0011_update_donatehelppage_notice.py b/network-api/networkapi/donate/migrations/0011_update_donatehelppage_notice.py
new file mode 100644
index 00000000000..01b06bde38f
--- /dev/null
+++ b/network-api/networkapi/donate/migrations/0011_update_donatehelppage_notice.py
@@ -0,0 +1,68 @@
+# Generated by Django 4.2.11 on 2024-05-22 22:22
+
+import uuid
+
+import django.db.models.deletion
+import wagtail.fields
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("donate", "0010_make_link_to_required_in_link_block"),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name="donatehelppage",
+            name="notice",
+        ),
+        migrations.CreateModel(
+            name="HelpPageNotice",
+            fields=[
+                ("id", models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name="ID")),
+                ("translation_key", models.UUIDField(default=uuid.uuid4, editable=False)),
+                ("name", models.CharField(help_text="What will this notice be called in the CMS?", max_length=50)),
+                ("text", wagtail.fields.RichTextField()),
+                (
+                    "notice_image_alt_text",
+                    models.CharField(blank=True, help_text="Image description (for screen readers).", max_length=50),
+                ),
+                (
+                    "locale",
+                    models.ForeignKey(
+                        editable=False,
+                        on_delete=django.db.models.deletion.PROTECT,
+                        related_name="+",
+                        to="wagtailcore.locale",
+                    ),
+                ),
+                (
+                    "notice_image",
+                    models.ForeignKey(
+                        blank=True,
+                        null=True,
+                        on_delete=django.db.models.deletion.SET_NULL,
+                        to="wagtailimages.image",
+                        verbose_name="Notice Image",
+                    ),
+                ),
+            ],
+            options={
+                "abstract": False,
+                "unique_together": {("translation_key", "locale")},
+            },
+        ),
+        migrations.AddField(
+            model_name="donatehelppage",
+            name="notice",
+            field=models.ForeignKey(
+                blank=True,
+                help_text="Optional notice that will render at the top of the page.",
+                null=True,
+                on_delete=django.db.models.deletion.SET_NULL,
+                to="donate.helppagenotice",
+            ),
+        ),
+    ]
diff --git a/network-api/networkapi/donate/pagemodels/customblocks/notice_block.py b/network-api/networkapi/donate/pagemodels/customblocks/notice_block.py
deleted file mode 100644
index 022fc110346..00000000000
--- a/network-api/networkapi/donate/pagemodels/customblocks/notice_block.py
+++ /dev/null
@@ -1,31 +0,0 @@
-from django.forms.utils import ErrorList
-from wagtail import blocks
-from wagtail.blocks.struct_block import StructBlockValidationError
-from wagtail.images.blocks import ImageChooserBlock
-
-from networkapi.wagtailpages.pagemodels.customblocks.base_rich_text_options import (
-    base_rich_text_options,
-)
-
-
-class NoticeBlock(blocks.StructBlock):
-    image = ImageChooserBlock(required=False)
-    image_alt_text = blocks.CharBlock(required=False, help_text="Image description (for screen readers).")
-    text = blocks.RichTextBlock(features=base_rich_text_options)
-
-    class Meta:
-        icon = "doc-full"
-        template = "donate/blocks/notice_block.html"
-
-    def clean(self, value):
-        cleaned_data = super().clean(value)
-        errors = {}
-
-        if cleaned_data["image"] and not cleaned_data["image_alt_text"]:
-            errors["image"] = ErrorList(["Image must include alt text."])
-        if cleaned_data["image_alt_text"] and not cleaned_data["image"]:
-            errors["image_alt_text"] = ErrorList(["Alt text must have an associated image."])
-        if errors:
-            raise StructBlockValidationError(block_errors=errors)
-
-        return cleaned_data
diff --git a/network-api/networkapi/donate/pagemodels/help_page.py b/network-api/networkapi/donate/pagemodels/help_page.py
index c4a32ed2f52..c7a7b4272fb 100644
--- a/network-api/networkapi/donate/pagemodels/help_page.py
+++ b/network-api/networkapi/donate/pagemodels/help_page.py
@@ -1,12 +1,13 @@
 from urllib.parse import urlencode
 
+from django.db import models
 from wagtail.admin.panels import FieldPanel
 from wagtail.fields import StreamField
 from wagtail.models import Page
 from wagtail_localize.fields import SynchronizedField, TranslatableField
 
 from networkapi.donate.models import BaseDonationPage
-from networkapi.donate.pagemodels.customblocks.notice_block import NoticeBlock
+from networkapi.donate.snippets.help_page_notice import HelpPageNotice
 from networkapi.wagtailpages.pagemodels.customblocks.base_fields import base_fields
 
 
@@ -19,12 +20,12 @@ class DonateHelpPage(BaseDonationPage):
 
     max_count = 1
 
-    notice = StreamField(
-        [("notice", NoticeBlock())],
-        help_text="Optional notice that will render at the top of the page.",
+    notice = models.ForeignKey(
+        HelpPageNotice,
+        null=True,
         blank=True,
-        max_num=1,
-        use_json_field=True,
+        on_delete=models.SET_NULL,
+        help_text="Optional notice that will render at the top of the page.",
     )
 
     body = StreamField(base_fields, blank=True, use_json_field=True)
diff --git a/network-api/networkapi/donate/snippets/__init__.py b/network-api/networkapi/donate/snippets/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/network-api/networkapi/donate/snippets/help_page_notice.py b/network-api/networkapi/donate/snippets/help_page_notice.py
new file mode 100644
index 00000000000..fd1bb3e2386
--- /dev/null
+++ b/network-api/networkapi/donate/snippets/help_page_notice.py
@@ -0,0 +1,53 @@
+from django.core.exceptions import ValidationError
+from django.db import models
+from wagtail.admin.panels import FieldPanel
+from wagtail.fields import RichTextField
+from wagtail.models import TranslatableMixin
+from wagtail_localize.fields import SynchronizedField, TranslatableField
+
+from networkapi.wagtailpages.pagemodels.customblocks.base_rich_text_options import (
+    base_rich_text_options,
+)
+
+
+class HelpPageNotice(TranslatableMixin, models.Model):
+    name = models.CharField(max_length=50, help_text="What will this notice be called in the CMS?")
+
+    text = RichTextField(
+        features=base_rich_text_options,
+        blank=False,
+    )
+    notice_image = models.ForeignKey(
+        "wagtailimages.Image",
+        null=True,
+        blank=True,
+        on_delete=models.SET_NULL,
+        verbose_name="Notice Image",
+    )
+    notice_image_alt_text = models.CharField(
+        max_length=50, blank=True, help_text="Image description (for screen readers)."
+    )
+
+    panels = [
+        FieldPanel("name"),
+        FieldPanel("text"),
+        FieldPanel("notice_image"),
+        FieldPanel("notice_image_alt_text"),
+    ]
+
+    translatable_fields = [
+        SynchronizedField("name"),
+        TranslatableField("text"),
+        SynchronizedField("notice_image"),
+        TranslatableField("notice_image_alt_text"),
+    ]
+
+    def __str__(self):
+        return self.name
+
+    def clean(self):
+        super().clean()
+        if self.notice_image and not self.notice_image_alt_text:
+            raise ValidationError({"notice_image_alt_text": "Image must include alt text."})
+        if self.notice_image_alt_text and not self.notice_image:
+            raise ValidationError({"notice_image": "Alt text must have an associated image."})
diff --git a/network-api/networkapi/donate/tests/customblocks/test_notice_block.py b/network-api/networkapi/donate/tests/customblocks/test_notice_block.py
deleted file mode 100644
index 2445dbf54d6..00000000000
--- a/network-api/networkapi/donate/tests/customblocks/test_notice_block.py
+++ /dev/null
@@ -1,95 +0,0 @@
-from django.test import TestCase
-from wagtail import rich_text
-from wagtail.blocks.struct_block import StructBlockValidationError
-from wagtail.images.tests.utils import Image, get_test_image_file
-
-from networkapi.donate.factory.customblocks.notice_block import NoticeBlockFactory
-from networkapi.donate.pagemodels.customblocks.notice_block import NoticeBlock
-
-
-class NoticeBlockTest(TestCase):
-    def setUp(self):
-        self.notice_block = NoticeBlock()
-
-    def test_notice_block_factory(self):
-        """
-        Testing that the factory can successfully create a valid NoticeBlock.
-        """
-        notice_block_factory_default_values = NoticeBlockFactory()
-
-        is_valid = self.notice_block.clean(notice_block_factory_default_values)
-
-        self.assertTrue(is_valid)
-
-    def test_valid_notice_block(self):
-        """
-        Testing that a notice block with all fields is valid.
-        """
-        value = {
-            "image": Image.objects.create(title="Test Image", file=get_test_image_file()),
-            "image_alt_text": "Alt text",
-            "text": rich_text.RichText("<p>Some content</p>"),
-        }
-
-        is_valid = self.notice_block.clean(value)
-
-        self.assertTrue(is_valid)
-
-    def test_image_without_alt_text_raises_error(self):
-        """
-        Testing that a notice block with an image but no alt text is invalid.
-        """
-        value = {
-            "image": Image.objects.create(title="Test Image", file=get_test_image_file()),
-            "image_alt_text": "",
-            "text": rich_text.RichText("<p>Some content</p>"),
-        }
-
-        with self.assertRaises(StructBlockValidationError) as catcher:
-            self.notice_block.clean(value)
-        exceptions = catcher.exception.as_json_data()["blockErrors"]
-        self.assertCountEqual(exceptions["image"]["messages"], ["Image must include alt text."])
-
-    def test_alt_text_without_image_raises_error(self):
-        """
-        Testing that a notice block with alt text but no image is invalid.
-        """
-        value = {
-            "image": None,
-            "image_alt_text": "Alt text",
-            "text": rich_text.RichText("<p>Some content</p>"),
-        }
-
-        with self.assertRaises(StructBlockValidationError) as catcher:
-            self.notice_block.clean(value)
-        exceptions = catcher.exception.as_json_data()["blockErrors"]
-        self.assertCountEqual(exceptions["image_alt_text"]["messages"], ["Alt text must have an associated image."])
-
-    def test_notice_text_field_is_required(self):
-        """
-        Testing that a notice block with no body text is invalid.
-        """
-        value = {
-            "image": Image.objects.create(title="Test Image", file=get_test_image_file()),
-            "image_alt_text": "Alt text",
-            "text": rich_text.RichText(""),
-        }
-
-        with self.assertRaises(StructBlockValidationError) as catcher:
-            self.notice_block.clean(value)
-        exceptions = catcher.exception.as_json_data()["blockErrors"]
-        self.assertCountEqual(exceptions["text"]["messages"], ["This field is required."])
-
-    def test_valid_block_without_image_and_alt_text(self):
-        """
-        Testing that a notice block with only text is valid.
-        """
-        value = {
-            "image": None,
-            "image_alt_text": "",
-            "text": rich_text.RichText("<p>Some content</p>"),
-        }
-
-        is_valid = self.notice_block.clean(value)
-
-        self.assertTrue(is_valid)
diff --git a/network-api/networkapi/donate/tests/snippets/__init__.py b/network-api/networkapi/donate/tests/snippets/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/network-api/networkapi/donate/tests/snippets/test_help_page_notice.py b/network-api/networkapi/donate/tests/snippets/test_help_page_notice.py
new file mode 100644
index 00000000000..16b3ea92e2b
--- /dev/null
+++ b/network-api/networkapi/donate/tests/snippets/test_help_page_notice.py
@@ -0,0 +1,78 @@
+from django.core.exceptions import ValidationError
+from django.test import TestCase
+
+from networkapi.donate.factory.snippets.help_page_notice import HelpPageNoticeFactory
+from networkapi.donate.snippets.help_page_notice import HelpPageNotice
+from networkapi.wagtailpages.factory.image_factory import ImageFactory
+
+
+class HelpPageNoticeTest(TestCase):
+    def setUp(self):
+        self.notice = HelpPageNotice()
+
+    def test_help_page_notice_factory(self):
+        """
+        Testing that the factory can successfully create a valid HelpPageNotice.
+        """
+        HelpPageNoticeFactory()
+
+    def test_valid_help_page_notice(self):
+        """
+        Testing that a HelpPageNotice with all fields is valid.
+        """
+        notice = HelpPageNotice(
+            name="Test Notice",
+            text="<p>Some content</p>",
+            notice_image=ImageFactory(),
+            notice_image_alt_text="Alt text",
+        )
+
+        # Clean should not raise any validation error
+        notice.full_clean()
+
+    def test_image_without_alt_text_raises_error(self):
+        """
+        Testing that a HelpPageNotice with an image but no alt text is invalid.
+        """
+        notice = HelpPageNotice(
+            name="Test Notice", text="<p>Some content</p>", notice_image=ImageFactory(), notice_image_alt_text=""
+        )
+
+        with self.assertRaises(ValidationError) as context:
+            notice.full_clean()
+        self.assertIn("Image must include alt text.", str(context.exception))
+
+    def test_alt_text_without_image_raises_error(self):
+        """
+        Testing that a HelpPageNotice with alt text but no image is invalid.
+        """
+        notice = HelpPageNotice(
+            name="Test Notice", text="<p>Some content</p>", notice_image=None, notice_image_alt_text="Alt text"
+        )
+
+        with self.assertRaises(ValidationError) as context:
+            notice.full_clean()
+        self.assertIn("Alt text must have an associated image.", str(context.exception))
+
+    def test_valid_notice_without_image_and_alt_text(self):
+        """
+        Testing that a HelpPageNotice with only text is valid.
+        """
+        notice = HelpPageNotice(
+            name="Test Notice", text="<p>Some content</p>", notice_image=None, notice_image_alt_text=""
+        )
+
+        # Clean should not raise any validation error
+        notice.full_clean()
+
+    def test_notice_text_field_is_required(self):
+        """
+        Testing that a HelpPageNotice with no body text is invalid.
+        """
+        notice = HelpPageNotice(
+            name="Test Notice", text="", notice_image=ImageFactory(), notice_image_alt_text="Alt text"
+        )
+
+        with self.assertRaises(ValidationError) as context:
+            notice.full_clean()
+        self.assertIn("This field cannot be blank.", str(context.exception))
diff --git a/network-api/networkapi/donate/tests/test_help_page.py b/network-api/networkapi/donate/tests/test_help_page.py
index 02835454aad..3d809b19570 100644
--- a/network-api/networkapi/donate/tests/test_help_page.py
+++ b/network-api/networkapi/donate/tests/test_help_page.py
@@ -2,6 +2,9 @@
 
 from networkapi.donate import models as pagemodels
 from networkapi.donate.factory import help_page as help_page_factories
+from networkapi.donate.factory.snippets import (
+    help_page_notice as help_page_notice_factories,
+)
 from networkapi.wagtailpages.tests import base as test_base
 
 
@@ -22,7 +25,6 @@ def setUpTestData(cls):
         )
         cls.donate_help_page = help_page_factories.DonateHelpPageFactory(
             parent=cls.donate_landing_page,
-            notice__0="notice",
         )
 
     def test_parent_page_types(self):
@@ -66,12 +68,6 @@ def test_template(self):
             template_name="donate/pages/help_page.html",
         )
 
-    def test_help_page_notice_field(self):
-        """
-        Asserts that a 'notice' block was created in the 'notice' field by the factory.
-        """
-        self.assertEqual(self.donate_help_page.notice[0].block_type, "notice")
-
     def test_thank_you_url(self):
         """
         Testing that the "thank_you_url" is correctly added to the page context.
@@ -94,3 +90,17 @@ def test_thank_you_url_with_existing_query_params(self):
         expected_thank_you_url = page_url + "&thank_you=true"
 
         self.assertEqual(response.context["thank_you_url"], expected_thank_you_url)
+
+    def test_page_displays_help_page_notice(self):
+        """
+        Test that the DonateHelpPage correctly displays the HelpPageNotice.
+        """
+        notice_text_content = "<p>Test Notice Content</p>"
+        help_page_notice = help_page_notice_factories.HelpPageNoticeFactory(text=notice_text_content)
+        self.donate_help_page.notice = help_page_notice
+        self.donate_help_page.save()
+
+        url = self.donate_help_page.get_url()
+        response = self.client.get(url)
+
+        self.assertContains(response, notice_text_content)
diff --git a/network-api/networkapi/donate/wagtail_hooks.py b/network-api/networkapi/donate/wagtail_hooks.py
index fea028a8097..8e4c997a2f4 100644
--- a/network-api/networkapi/donate/wagtail_hooks.py
+++ b/network-api/networkapi/donate/wagtail_hooks.py
@@ -3,6 +3,7 @@
 from wagtail.snippets.models import register_snippet
 from wagtail.snippets.views.snippets import SnippetViewSet, SnippetViewSetGroup
 
+from networkapi.donate.snippets.help_page_notice import HelpPageNotice
 from networkapi.donate_banner.models import DonateBanner
 from networkapi.wagtailcustomization.views.snippet_chooser import (
     DefaultLocaleSnippetChooserViewSet,
@@ -42,6 +43,21 @@ def register_donate_banner_chooser_viewset():
     )
 
 
+class HelpPageNoticeViewSet(SnippetViewSet):
+    model = HelpPageNotice
+    icon = "form"
+    menu_label = "Help Page Notices"
+    list_display = (
+        "name",
+        UpdatedAtColumn(),
+    )
+    search_fields = (
+        "name",
+        "text",
+    )
+    ordering = ("name",)
+
+
 class DonationModalSnippetViewSet(SnippetViewSet):
     model = DonationModal
     icon = "newspaper"
@@ -65,6 +81,7 @@ class DonateViewSetGroup(SnippetViewSetGroup):
     items = (
         DonateBannerViewSet,
         DonationModalSnippetViewSet,
+        HelpPageNoticeViewSet,
     )
     menu_icon = "heart"
     menu_label = "Donate"
diff --git a/network-api/networkapi/templates/donate/blocks/notice_block.html b/network-api/networkapi/templates/donate/fragments/help_page_notice.html
similarity index 56%
rename from network-api/networkapi/templates/donate/blocks/notice_block.html
rename to network-api/networkapi/templates/donate/fragments/help_page_notice.html
index 798d3b91caf..7f8aa4f8eed 100644
--- a/network-api/networkapi/templates/donate/blocks/notice_block.html
+++ b/network-api/networkapi/templates/donate/fragments/help_page_notice.html
@@ -1,14 +1,13 @@
-
 {% load l10n wagtailcore_tags wagtailimages_tags %}
 
 <div class="tw-py-4 tw-px-0 medium:tw-p-8 tw-my-24 tw-w-full tw-flex tw-flex-col large:tw-flex-row tw-items-start large:tw-items-center tw-border-t tw-border-b tw-border-black">
-    {% if value.image %}
+    {% if notice.notice_image %}
         <div class="tw-flex-shrink-0 tw-grow-0 tw-basis-24 tw-mr-4 medium:tw-mr-8">
-            {% image value.image fill-100x100-c100 format-jpeg as img %}
-            <img src="{{ img.url }}" alt="{{ value.image_alt_text }}" class="tw-w-full" width="{{ img.width|unlocalize }}" height="{{ img.height|unlocalize }}">
+            {% image notice.notice_image fill-100x100-c100 format-jpeg as img %}
+            <img src="{{ img.url }}" alt="{{ notice.image_alt_text }}" class="tw-w-full" width="{{ img.width|unlocalize }}" height="{{ img.height|unlocalize }}">
         </div>
     {% endif %}
     <div class="notice-block-text">
-        {{ value.text|richtext }}
+        {{ notice.text|richtext }}
     </div>
 </div>
diff --git a/network-api/networkapi/templates/donate/pages/help_page.html b/network-api/networkapi/templates/donate/pages/help_page.html
index 50e2e862177..910d4b84f9e 100644
--- a/network-api/networkapi/templates/donate/pages/help_page.html
+++ b/network-api/networkapi/templates/donate/pages/help_page.html
@@ -12,9 +12,7 @@
         <div class="cms donate-help-page-content">
             <h1 class="tw-h1-heading"> {{ page.title }} </h1>
             {% if page.notice %}
-                {% for block in page.notice %}
-                    {% include_block block %}
-                {% endfor %}
+                {% include "../fragments/help_page_notice.html" with notice=page.notice %}
             {% endif %}
             <p>
                 {% blocktrans with link="?form=donor-care-intake" trimmed %}

From 750f1d1348c8405f119ea0aa53bc9ccde057c67f Mon Sep 17 00:00:00 2001
From: Daniel Miranda <manieldiranda@gmail.com>
Date: Wed, 29 May 2024 17:48:30 -0700
Subject: [PATCH 02/13] updated NavMenu title field to be synchronized (#12347)

---
 network-api/networkapi/nav/models.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/network-api/networkapi/nav/models.py b/network-api/networkapi/nav/models.py
index 8b225254d9a..2d39c7d8c43 100644
--- a/network-api/networkapi/nav/models.py
+++ b/network-api/networkapi/nav/models.py
@@ -119,7 +119,7 @@ class NavMenu(
     base_form_class = NavMenuForm
 
     translatable_fields = [
-        TranslatableField("title"),
+        SynchronizedField("title"),
         TranslatableField("dropdowns"),
         SynchronizedField("enable_blog_dropdown"),
         TranslatableField("blog_button_label"),

From 659c7216cd60641f6f911a649c35f37eecbf71fc Mon Sep 17 00:00:00 2001
From: Mavis Ou <mmmavis@users.noreply.github.com>
Date: Thu, 30 May 2024 14:43:30 -0700
Subject: [PATCH 03/13] Ensure only one primary nav item is highlighted at any
 time & "Blog" is highlighted on blog pages (#12368)

* Ensure only one primary nav item is highlighted at any time

* improvement

* highlight a nav link only if the current page is identical to what the nav link points to

* fix linting

* removed this because we are now excluding child pages from the check

* updated tests

* highlight blog dropdown when on blog pages

* Added tests for check_if_blog_dropdown_can_be_active

* simplified code to reduce mypy's type check complaints

* fix

* add documentation
---
 .../networkapi/nav/templatetags/nav_tags.py   |  39 ++++---
 .../networkapi/nav/tests/test_templatetags.py | 103 +++++++++++++----
 .../fragments/blocks/nav/dropdown.html        |   6 +-
 .../fragments/nav/blog/blog-dropdown.html     |   7 +-
 .../js/common/template-js-handles/site-nav.js | 109 ++++++++++++++++++
 source/js/components/accordion/accordion.js   |   5 +-
 source/js/components/nav/desktop-dropdown.js  |   8 +-
 source/js/components/nav/mobile-dropdown.js   |   4 +-
 source/js/main.js                             |  14 +--
 tailwind-plugins/site-nav.js                  |  10 +-
 10 files changed, 237 insertions(+), 68 deletions(-)
 create mode 100644 source/js/common/template-js-handles/site-nav.js

diff --git a/network-api/networkapi/nav/templatetags/nav_tags.py b/network-api/networkapi/nav/templatetags/nav_tags.py
index 4eab8d238ff..9d90fe69906 100644
--- a/network-api/networkapi/nav/templatetags/nav_tags.py
+++ b/network-api/networkapi/nav/templatetags/nav_tags.py
@@ -1,6 +1,6 @@
 from django import template
 
-from networkapi.wagtailpages.models import Homepage
+from networkapi.wagtailpages.models import BlogIndexPage, BlogPage, Homepage
 
 register = template.Library()
 
@@ -28,7 +28,7 @@ def get_dropdown_id(**kwargs):
 
 
 @register.simple_tag(takes_context=True)
-def check_if_dropdown_is_active(context, dropdown_id):
+def check_if_dropdown_can_be_active(context, dropdown_id):
     # The page that user is currently visiting/requesting:
     page = context.get("page", None)
     if not page:
@@ -52,16 +52,29 @@ def check_if_dropdown_is_active(context, dropdown_id):
     if page.id in dropdowns_page_links[dropdown_id]["page_ids"]:
         return True
 
-    # If that didn't work, let's check if the page is a child of the dropdown's CTA button page link
-    dropdown_link_page_path = dropdowns_page_links[dropdown_id][dropdown_link_page_id]
-    if page.path.startswith(dropdown_link_page_path):
+    return False
+
+
+@register.simple_tag(takes_context=True)
+def check_if_blog_dropdown_can_be_active(context):
+    """
+    Check if the blog dropdown can be highlighted based on the current page.
+    Unlike other dropdowns, we don't need to check the current page against the dropdown's links.
+    For blog dropdown, all we need to check is if the current page is a blog index page or a blog page.
+    """
+
+    # The page that user is currently visiting/requesting:
+    page = context.get("page", None)
+    if not page:
+        return None
+
+    # Highlight the dropdown if the page is a blog index page (e.g., the main blog index or any blog topic page)
+    if isinstance(page, BlogIndexPage):
         return True
 
-    # Finally, let's check if the page is a child of any of the page links inside the dropdown
-    for id in dropdowns_page_links[dropdown_id]["page_ids"]:
-        link_path = dropdowns_page_links[dropdown_id][id]
-        if page.path.startswith(link_path):
-            return True
+    # Highlight the dropdown if the page is a blog page
+    if isinstance(page, BlogPage):
+        return True
 
     return False
 
@@ -86,11 +99,7 @@ def check_if_link_is_active(context, link):
     link_page = link["page"]
 
     # Check if the current page is the linked page
-    if page == link_page:
-        return True
-
-    # Check if the current page is a child of the linked page
-    if page.path.startswith(link_page.path):
+    if page.id == link_page.id:
         return True
 
     return False
diff --git a/network-api/networkapi/nav/tests/test_templatetags.py b/network-api/networkapi/nav/tests/test_templatetags.py
index 299df4af06e..c42ef077fec 100644
--- a/network-api/networkapi/nav/tests/test_templatetags.py
+++ b/network-api/networkapi/nav/tests/test_templatetags.py
@@ -4,6 +4,7 @@
 
 from networkapi.nav import factories as nav_factories
 from networkapi.nav.templatetags import nav_tags
+from networkapi.wagtailpages.factory import blog as blog_factories
 from networkapi.wagtailpages.tests import base as test_base
 
 
@@ -42,7 +43,7 @@ def test_get_dropdown_id_no_menu(self) -> None:
         self.assertIsNone(dropdown_id)
 
 
-class TestCheckIfDropdownIsActive(test_base.WagtailpagesTestCase):
+class TestCheckIfDropdownCanBeActive(test_base.WagtailpagesTestCase):
     def test_active_dropdown_check(self) -> None:
         # Create some pages:
         # pages ax linking to the first dropdown
@@ -104,43 +105,55 @@ def test_active_dropdown_check(self) -> None:
         dropdown_4_id = nav_tags.get_dropdown_id(menu=menu, idx=3)
 
         # For pages a1 and a2:
-        for page in [page_a1, page_a2, page_a3, page_a4]:
+        for page in [page_a1, page_a2]:
             with self.subTest(msg="Test {page}"):
                 context = {"page": page, "menu": menu}
                 # First dropdown should be active
-                self.assertTrue(nav_tags.check_if_dropdown_is_active(context, dropdown_1_id))
+                self.assertTrue(nav_tags.check_if_dropdown_can_be_active(context, dropdown_1_id))
                 # While other shouldn't be
-                self.assertFalse(nav_tags.check_if_dropdown_is_active(context, dropdown_2_id))
-                self.assertFalse(nav_tags.check_if_dropdown_is_active(context, dropdown_3_id))
-                self.assertFalse(nav_tags.check_if_dropdown_is_active(context, dropdown_4_id))
+                self.assertFalse(nav_tags.check_if_dropdown_can_be_active(context, dropdown_2_id))
+                self.assertFalse(nav_tags.check_if_dropdown_can_be_active(context, dropdown_3_id))
+                self.assertFalse(nav_tags.check_if_dropdown_can_be_active(context, dropdown_4_id))
+
+        # For pages a3 and a4:
+        for page in [page_a3, page_a4]:
+            with self.subTest(msg="Test {page}"):
+                context = {"page": page, "menu": menu}
+                # First dropdown should not be active since page_a3 and page_a4 are not included in the dropdown
+                # (they are child pages of the links in the dropdown):
+                self.assertFalse(nav_tags.check_if_dropdown_can_be_active(context, dropdown_1_id))
+                # The rest of the dropdowns should not be active either
+                self.assertFalse(nav_tags.check_if_dropdown_can_be_active(context, dropdown_2_id))
+                self.assertFalse(nav_tags.check_if_dropdown_can_be_active(context, dropdown_3_id))
+                self.assertFalse(nav_tags.check_if_dropdown_can_be_active(context, dropdown_4_id))
 
         # For pages b1, b2 and b3:
         for page in [page_b1, page_b2, page_b3]:
             with self.subTest(msg="Test {page}"):
                 context = {"page": page, "menu": menu}
                 # Second dropdown should be active
-                self.assertTrue(nav_tags.check_if_dropdown_is_active(context, dropdown_2_id))
+                self.assertTrue(nav_tags.check_if_dropdown_can_be_active(context, dropdown_2_id))
                 # While other shouldn't be
-                self.assertFalse(nav_tags.check_if_dropdown_is_active(context, dropdown_1_id))
-                self.assertFalse(nav_tags.check_if_dropdown_is_active(context, dropdown_3_id))
-                self.assertFalse(nav_tags.check_if_dropdown_is_active(context, dropdown_4_id))
+                self.assertFalse(nav_tags.check_if_dropdown_can_be_active(context, dropdown_1_id))
+                self.assertFalse(nav_tags.check_if_dropdown_can_be_active(context, dropdown_3_id))
+                self.assertFalse(nav_tags.check_if_dropdown_can_be_active(context, dropdown_4_id))
 
         # For page c:
         context = {"page": page_c, "menu": menu}
         # Third dropdown does not define a CMS button link (the button link is external)
         # Hence, all dropdowns are inactive
-        self.assertFalse(nav_tags.check_if_dropdown_is_active(context, dropdown_1_id))
-        self.assertFalse(nav_tags.check_if_dropdown_is_active(context, dropdown_2_id))
-        self.assertFalse(nav_tags.check_if_dropdown_is_active(context, dropdown_3_id))
-        self.assertFalse(nav_tags.check_if_dropdown_is_active(context, dropdown_4_id))
+        self.assertFalse(nav_tags.check_if_dropdown_can_be_active(context, dropdown_1_id))
+        self.assertFalse(nav_tags.check_if_dropdown_can_be_active(context, dropdown_2_id))
+        self.assertFalse(nav_tags.check_if_dropdown_can_be_active(context, dropdown_3_id))
+        self.assertFalse(nav_tags.check_if_dropdown_can_be_active(context, dropdown_4_id))
 
         # For page d:
         context = {"page": page_d, "menu": menu}
         # All should be inactive
-        self.assertFalse(nav_tags.check_if_dropdown_is_active(context, dropdown_1_id))
-        self.assertFalse(nav_tags.check_if_dropdown_is_active(context, dropdown_2_id))
-        self.assertFalse(nav_tags.check_if_dropdown_is_active(context, dropdown_3_id))
-        self.assertFalse(nav_tags.check_if_dropdown_is_active(context, dropdown_4_id))
+        self.assertFalse(nav_tags.check_if_dropdown_can_be_active(context, dropdown_1_id))
+        self.assertFalse(nav_tags.check_if_dropdown_can_be_active(context, dropdown_2_id))
+        self.assertFalse(nav_tags.check_if_dropdown_can_be_active(context, dropdown_3_id))
+        self.assertFalse(nav_tags.check_if_dropdown_can_be_active(context, dropdown_4_id))
 
     def test_homepage_should_never_be_marked_as_active(self):
         """The homepage shouldn't receive 'active' markings."""
@@ -155,7 +168,7 @@ def test_homepage_should_never_be_marked_as_active(self):
         # User is now on homepage
         context = {"page": self.homepage, "menu": menu}
         # Even though the homepage is part of the dropdown, it should not be marked as active:
-        self.assertFalse(nav_tags.check_if_dropdown_is_active(context, dropdown_1_id))
+        self.assertFalse(nav_tags.check_if_dropdown_can_be_active(context, dropdown_1_id))
 
     def test_returns_false_if_no_page(self) -> None:
         """If no page is passed, the function should return False."""
@@ -171,7 +184,7 @@ def test_returns_false_if_no_page(self) -> None:
         # No page is passed
         context = {"menu": menu}
         # Should return False
-        self.assertFalse(nav_tags.check_if_dropdown_is_active(context, dropdown_1_id))
+        self.assertFalse(nav_tags.check_if_dropdown_can_be_active(context, dropdown_1_id))
 
     def test_returns_false_if_no_menu(self) -> None:
         """If no page is passed, the function should return False."""
@@ -187,7 +200,47 @@ def test_returns_false_if_no_menu(self) -> None:
         # No page is passed
         context = {"page": page}
         # Should return False
-        self.assertFalse(nav_tags.check_if_dropdown_is_active(context, dropdown_1_id))
+        self.assertFalse(nav_tags.check_if_dropdown_can_be_active(context, dropdown_1_id))
+
+
+class TestCheckIfBlogDropdownCanBeActive(test_base.WagtailpagesTestCase):
+    def test_active_dropdown_check(self) -> None:
+        # Create some pages:
+
+        # homepage
+        page_homepage = self.homepage
+
+        # blog pages
+        page_blog_index = blog_factories.BlogIndexPageFactory(parent=page_homepage, title="Blog Index Page")
+        page_blog_topic = blog_factories.BlogIndexPageFactory(parent=page_homepage, title="Blog Topic Page")
+        page_blog_post = blog_factories.BlogPageFactory(parent=page_blog_index, title="Blog Post Page")
+
+        # more pages
+        page_a1 = wagtail_factories.PageFactory(parent=self.homepage, title="Page A1")
+        page_a2 = wagtail_factories.PageFactory(parent=page_a1, title="Page A2")
+
+        with self.subTest(msg="Test {page_blog_index}"):
+            self.assertTrue(nav_tags.check_if_blog_dropdown_can_be_active({"page": page_blog_index}))
+
+        with self.subTest(msg="Test {page_blog_topic}"):
+            blog_factories.BlogPageTopicFactory(name="Test Topic")
+            self.assertTrue(
+                nav_tags.check_if_blog_dropdown_can_be_active({"page": page_blog_topic, "index_title": "Test Topic"})
+            )
+
+        with self.subTest(msg="Test {page_blog_post}"):
+            self.assertTrue(nav_tags.check_if_blog_dropdown_can_be_active({"page": page_blog_post}))
+
+        # For non-blog pages:
+        for page in [page_homepage, page_a1, page_a2]:
+            with self.subTest(msg="Test {page}"):
+                self.assertFalse(nav_tags.check_if_blog_dropdown_can_be_active({"page": page}))
+
+    def test_returns_false_if_no_page(self) -> None:
+        """If no page is passed, the function should return False."""
+        # No page is passed
+        # Should return False
+        self.assertFalse(nav_tags.check_if_blog_dropdown_can_be_active({}))
 
 
 class TestCheckIfLinkIsActive(test_base.WagtailpagesTestCase):
@@ -226,8 +279,8 @@ def test_active_link_check(self) -> None:
         page_a1 = wagtail_factories.PageFactory(parent=page_a, title="Page A1")
         # User is now on page_a1
         context = {"page": page_a1, "menu": menu}
-        # page_a should be active since it's the parent of page_a1:
-        self.assertTrue(nav_tags.check_if_link_is_active(context, page_a_link))
+        # page_a_link should not be active since page_a1 is not an exact match of page_a (it's a child):
+        self.assertFalse(nav_tags.check_if_link_is_active(context, page_a_link))
         # page_b and page_c and page_d should not be active (not related to page_a):
         self.assertFalse(nav_tags.check_if_link_is_active(context, page_b_link))
         self.assertFalse(nav_tags.check_if_link_is_active(context, page_c_link))
@@ -238,8 +291,8 @@ def test_active_link_check(self) -> None:
         context = {"page": page_b1, "menu": menu}
         # page_a should not be active:
         self.assertFalse(nav_tags.check_if_link_is_active(context, page_a_link))
-        # page_b should be active since it's the parent of page_b1:
-        self.assertTrue(nav_tags.check_if_link_is_active(context, page_b_link))
+        # page_b_link should not be active since page_b1 is not an exact match of page_b (it's a child):
+        self.assertFalse(nav_tags.check_if_link_is_active(context, page_b_link))
         # page_c should not be active:
         self.assertFalse(nav_tags.check_if_link_is_active(context, page_c_link))
 
diff --git a/network-api/networkapi/templates/fragments/blocks/nav/dropdown.html b/network-api/networkapi/templates/fragments/blocks/nav/dropdown.html
index c8158c9e3d1..ee5cc215468 100644
--- a/network-api/networkapi/templates/fragments/blocks/nav/dropdown.html
+++ b/network-api/networkapi/templates/fragments/blocks/nav/dropdown.html
@@ -15,12 +15,14 @@
 
 {% get_dropdown_id menu=menu idx=forloop.counter0 as dropdown_id %}
 {% if dropdown_id %}
-    {% check_if_dropdown_is_active dropdown_id as is_dropdown_active %}
+    {% check_if_dropdown_can_be_active dropdown_id as can_dropdown_be_active %}
 {% endif %}
 
 <div class="tw-nav-{{ style }}-dropdown tw-flex tw-flex-col"
      {% block data_class_attribute %}data-{{ style }}-dropdown{% endblock data_class_attribute %}
-     data-is-wayfinding-active="{% if is_dropdown_active %}true{% else %}false{% endif %}"
+     data-dropdown-id="{{ dropdown_id }}"
+     data-can-wayfinding-be-active="{% block can_wayfinding_be_active %}{% if can_dropdown_be_active %}true{% else %}false{% endif %}{% endblock can_wayfinding_be_active %}"
+     data-should-wayfinding-be-active="false"
 >
     <button class="tw-btn {{ dropdown_selector_base }} tw-py-12 xlarge:tw-py-0 xlarge:tw-items-center xlarge:tw-h-full" data-accordion-button>
         <span class="xlarge:tw-py-12 tw-h5-heading tw-m-0 {{ title_base_typography }} {{ title_desktop_typography }} {{ title_underline }}">
diff --git a/network-api/networkapi/templates/fragments/nav/blog/blog-dropdown.html b/network-api/networkapi/templates/fragments/nav/blog/blog-dropdown.html
index d9b0dbaa32e..21a96e035d7 100644
--- a/network-api/networkapi/templates/fragments/nav/blog/blog-dropdown.html
+++ b/network-api/networkapi/templates/fragments/nav/blog/blog-dropdown.html
@@ -1,9 +1,14 @@
 {% extends "fragments/blocks/nav/dropdown.html" %}
 
-{% load i18n %}
+{% load i18n nav_tags %}
 
 {% block title %}{% trans "Blog" %}{% endblock title %}
 
+{% block can_wayfinding_be_active %}{% spaceless %}
+    {% check_if_blog_dropdown_can_be_active as blog_dropdown_can_be_active %}
+    {% if blog_dropdown_can_be_active %}true{% else %}false{% endif %}
+{% endspaceless %}{% endblock can_wayfinding_be_active %}
+
 {% block content_width %} xlarge:tw-w-{{ ncols }}/4 {% endblock content_width %}
 {% block grid_columns %}xlarge:tw-grid-cols-{{ ncols }} tw-has-featured-column{% endblock grid_columns %}
 
diff --git a/source/js/common/template-js-handles/site-nav.js b/source/js/common/template-js-handles/site-nav.js
new file mode 100644
index 00000000000..abf30bee44f
--- /dev/null
+++ b/source/js/common/template-js-handles/site-nav.js
@@ -0,0 +1,109 @@
+import Accordion from "../../components/accordion/accordion.js";
+import NavDesktopDropdown from "../../components/nav/desktop-dropdown.js";
+import NavMobileDropdown from "../../components/nav/mobile-dropdown.js";
+
+function initComponent(ComponentClass) {
+  const items = document.querySelectorAll(ComponentClass.selector());
+  items.forEach((item) => new ComponentClass(item));
+}
+
+/**
+ * SiteNav object for handling site navigation related functionality.
+ */
+let SiteNav = {
+  /**
+   * The session storage key to store the nav link clicked.
+   */
+  SESSION_STORAGE_KEY_NAV_LINK: "navLinkClicked",
+  /**
+   * The session storage key to store the dropdown id of the nav link clicked.
+   */
+  SESSION_STORAGE_KEY_DROPDOWN_ID: "navLinkDropdownId",
+  /**
+   * Initializes the SiteNav object
+   */
+  init() {
+    this.setupNavLinkEventHandlers();
+    this.findNavLinkClicked();
+
+    initComponent(Accordion);
+    initComponent(NavDesktopDropdown);
+    initComponent(NavMobileDropdown);
+  },
+  /**
+   * Set up the event handlers for the nav links in the nav dropdowns.
+   */
+  setupNavLinkEventHandlers() {
+    document
+      .querySelectorAll(
+        `.primary-nav-container [data-mobile-dropdown] a[href]:not([href=""]),
+         .primary-nav-container [data-desktop-dropdown] a[href]:not([href=""])`
+      )
+      .forEach((link) => {
+        link.addEventListener("click", (e) => {
+          e.preventDefault();
+
+          sessionStorage.setItem(
+            this.SESSION_STORAGE_KEY_NAV_LINK,
+            link.textContent
+          );
+          sessionStorage.setItem(
+            this.SESSION_STORAGE_KEY_DROPDOWN_ID,
+            link.closest("[data-dropdown-id]").dataset.dropdownId
+          );
+
+          // navigate to the clicked link
+          window.location.href = link.href;
+        });
+      });
+  },
+  /**
+   * Find the nav link that was clicked to get to the current page and
+   *   highlight the dropdown that nav link belongs to.
+   */
+  findNavLinkClicked() {
+    const navLinkClicked = sessionStorage.getItem(
+      this.SESSION_STORAGE_KEY_NAV_LINK
+    );
+    const navLinkDropdownId = sessionStorage.getItem(
+      this.SESSION_STORAGE_KEY_DROPDOWN_ID
+    );
+
+    if (navLinkClicked && navLinkDropdownId) {
+      // if we know what nav link the user clicked to get to the current page,
+      //     highlight the dropdown that nav link belongs to
+
+      // querySelectorAll because there are two dropdowns with the same dropdown id,
+      //     one for mobile nav, one for desktop nav
+      const dropdowns = document.querySelectorAll(
+        `.primary-nav-container [data-dropdown-id="${navLinkDropdownId}"]`
+      );
+
+      dropdowns.forEach((dropdown) => {
+        dropdown.dataset.shouldWayfindingBeActive = "true";
+      });
+    } else {
+      // highlight the first dropdown that has the matching wayfinding link
+
+      const mobileMatchingDropdown = document.querySelector(
+        `.primary-nav-container [data-mobile-dropdown][data-dropdown-id][data-can-wayfinding-be-active="true"]`
+      );
+      const desktopMatchingDropdown = document.querySelector(
+        `.primary-nav-container [data-desktop-dropdown][data-can-wayfinding-be-active="true"]`
+      );
+
+      if (mobileMatchingDropdown) {
+        mobileMatchingDropdown.dataset.shouldWayfindingBeActive = "true";
+      }
+
+      if (desktopMatchingDropdown) {
+        desktopMatchingDropdown.dataset.shouldWayfindingBeActive = "true";
+      }
+    }
+
+    sessionStorage.removeItem(this.SESSION_STORAGE_KEY_NAV_LINK);
+    sessionStorage.removeItem(this.SESSION_STORAGE_KEY_DROPDOWN_ID);
+  },
+};
+
+export default SiteNav;
diff --git a/source/js/components/accordion/accordion.js b/source/js/components/accordion/accordion.js
index c97e3111810..164cde6248f 100644
--- a/source/js/components/accordion/accordion.js
+++ b/source/js/components/accordion/accordion.js
@@ -9,9 +9,10 @@ class Accordion {
     this.content = this.accordion.querySelector("[data-accordion-content]");
     this.chevron = this.titleButton.querySelector("img");
     this.titleText = this.titleButton.querySelector("span");
-    this.isDropdownWayfindingActive = this.accordion.dataset.isWayfindingActive;
+    this.shouldWayfindingBeActive =
+      this.accordion.dataset.shouldWayfindingBeActive;
 
-    if (this.isDropdownWayfindingActive === "true") {
+    if (this.shouldWayfindingBeActive === "true") {
       this.addBaseWayfindingStyles();
     }
 
diff --git a/source/js/components/nav/desktop-dropdown.js b/source/js/components/nav/desktop-dropdown.js
index d16d40be920..a4852c95622 100644
--- a/source/js/components/nav/desktop-dropdown.js
+++ b/source/js/components/nav/desktop-dropdown.js
@@ -66,7 +66,7 @@ class NavDesktopDropdown extends Accordion {
     }
     this.siblings.forEach((sibling) => {
       const isSiblingDropdownWayfindingActive =
-        sibling.dataset.isWayfindingActive;
+        sibling.dataset.shouldWayfindingBeActive;
 
       sibling.classList.add("tw-grayed-out");
       if (isSiblingDropdownWayfindingActive === "true") {
@@ -100,9 +100,9 @@ class NavDesktopDropdown extends Accordion {
   }
 
   close() {
-    if (this.isDropdownWayfindingActive === undefined) {
-      this.isDropdownWayfindingActive =
-        this.accordion.dataset.isWayfindingActive;
+    if (this.shouldWayfindingBeActive === undefined) {
+      this.shouldWayfindingBeActive =
+        this.accordion.dataset.shouldWayfindingBeActive;
     }
 
     super.close();
diff --git a/source/js/components/nav/mobile-dropdown.js b/source/js/components/nav/mobile-dropdown.js
index 76b15472dec..5089ca77cf1 100644
--- a/source/js/components/nav/mobile-dropdown.js
+++ b/source/js/components/nav/mobile-dropdown.js
@@ -17,7 +17,7 @@ class NavMobileDropdown extends Accordion {
     super.open();
     this.content.style.height = `${this.content.scrollHeight}px`;
 
-    if (this.isDropdownWayfindingActive === "true") {
+    if (this.shouldWayfindingBeActive === "true") {
       this.accordion.classList.add("tw-border-s-0");
     }
   }
@@ -26,7 +26,7 @@ class NavMobileDropdown extends Accordion {
     super.close();
     this.content.style.height = "0";
 
-    if (this.isDropdownWayfindingActive === "true") {
+    if (this.shouldWayfindingBeActive === "true") {
       this.accordion.classList.remove("tw-border-s-0");
     }
   }
diff --git a/source/js/main.js b/source/js/main.js
index 0a136b7b040..b42d024ad24 100644
--- a/source/js/main.js
+++ b/source/js/main.js
@@ -38,9 +38,7 @@ import { initYoutubeRegretsAccordions } from "./foundation/pages/youtube-regrets
 import { initYouTubeRegretsRecommendationsPieChart } from "./foundation/pages/youtube-regrets/recommendations-pie-chart";
 import { initYoutubeRegretsCarousel } from "./foundation/pages/youtube-regrets/carousel";
 import { initYoutubeRegretsLocomotiveScroll } from "./foundation/pages/youtube-regrets/locomotive-scroll";
-import Accordion from "./components/accordion/accordion.js";
-import NavDesktopDropdown from "./components/nav/desktop-dropdown.js";
-import NavMobileDropdown from "./components/nav/mobile-dropdown.js";
+import SiteNav from "./common/template-js-handles/site-nav.js";
 
 // Initializing component a11y browser console logging
 if (process.env.NODE_ENV === "development") {
@@ -56,11 +54,6 @@ let env, networkSiteURL;
 // until all the React stuff is _actually_ done.
 const apps = [];
 
-function initComponent(ComponentClass) {
-  const items = document.querySelectorAll(ComponentClass.selector());
-  items.forEach((item) => new ComponentClass(item));
-}
-
 let main = {
   init() {
     injectMultipageNav();
@@ -69,10 +62,7 @@ let main = {
     EmbedTypeform.init();
     Dropdowns.init();
     FoundationCarousels.init();
-
-    initComponent(Accordion);
-    initComponent(NavDesktopDropdown);
-    initComponent(NavMobileDropdown);
+    SiteNav.init();
 
     this.fetchEnv((envData) => {
       env = envData;
diff --git a/tailwind-plugins/site-nav.js b/tailwind-plugins/site-nav.js
index 4935376a773..bb8c2e8e255 100644
--- a/tailwind-plugins/site-nav.js
+++ b/tailwind-plugins/site-nav.js
@@ -5,7 +5,7 @@ function shared(theme) {
 
   return {
     ".nav-mobile-dropdown": {
-      "&[data-is-wayfinding-active='true']": {
+      "&[data-should-wayfinding-be-active='true']": {
         borderInlineStartWidth: theme("borderWidth.4"),
         borderColor: theme("colors.gray.60"),
         "[data-accordion-button]": {
@@ -52,17 +52,17 @@ function shared(theme) {
             borderBottomWidth: theme("borderWidth.6"),
             borderBottomColor: "transparent",
             color: "black",
-            "[data-is-wayfinding-active='true']&": {
+            "[data-should-wayfinding-be-active='true']&": {
               borderBottomColor: "black",
             },
-            "[data-is-wayfinding-active='true'].highlighted&": {
+            "[data-should-wayfinding-be-active='true'].highlighted&": {
               borderBottomColor: "black !important",
               color: "black !important",
             },
-            "[data-is-wayfinding-active].grayed-out&": {
+            "[data-should-wayfinding-be-active].grayed-out&": {
               color: `${theme("colors.gray.40")} !important`,
             },
-            "[data-is-wayfinding-active='true'].grayed-out&": {
+            "[data-should-wayfinding-be-active='true'].grayed-out&": {
               borderBottomColor: `${theme("colors.gray.40")} !important`,
             },
           },

From e77575d805b0e2636259298dc892aa0ff6bce6d5 Mon Sep 17 00:00:00 2001
From: Mavis Ou <mmmavis@users.noreply.github.com>
Date: Thu, 30 May 2024 17:49:34 -0700
Subject: [PATCH 04/13] More descriptive error messages for 'inv copy-stage-db'
 and 'inv copy-prod-db' (#12405)

---
 copy-db.js | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/copy-db.js b/copy-db.js
index c584760d88d..fbad12e234d 100644
--- a/copy-db.js
+++ b/copy-db.js
@@ -13,6 +13,13 @@ if (APP === STAGE_APP) {
   );
 }
 
+if (!isLoggedInToHeroku()) {
+  console.log(
+    "You are not logged into Heroku. Make sure you have the Heroku CLI installed. Run `heroku login` and try again."
+  );
+  process.exit(1);
+}
+
 const HEROKU_OUTPUT = run(`heroku config:get DATABASE_URL -a ${APP}`);
 const HEROKU_TEXT = HEROKU_OUTPUT.toString().replaceAll(`\n`, ` `);
 const URL_START = HEROKU_TEXT.indexOf(`postgres://`);
@@ -71,6 +78,15 @@ function stopContainers() {
   }
 }
 
+function isLoggedInToHeroku() {
+  try {
+    execSync("heroku whoami");
+    return true;
+  } catch (error) {
+    return false;
+  }
+}
+
 // ======================== //
 //  Our script starts here  //
 // ======================== //

From 2629ad3c59232cea19044b4b21440ea806ac10d4 Mon Sep 17 00:00:00 2001
From: Mavis Ou <mmmavis@users.noreply.github.com>
Date: Thu, 30 May 2024 20:22:27 -0700
Subject: [PATCH 05/13] [Nav] Removed the Tailwind class that forced
 capitalization on words (#12350)

---
 .../networkapi/templates/fragments/blocks/nav/dropdown.html     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/network-api/networkapi/templates/fragments/blocks/nav/dropdown.html b/network-api/networkapi/templates/fragments/blocks/nav/dropdown.html
index ee5cc215468..3928ed69a25 100644
--- a/network-api/networkapi/templates/fragments/blocks/nav/dropdown.html
+++ b/network-api/networkapi/templates/fragments/blocks/nav/dropdown.html
@@ -8,7 +8,7 @@
 {% comment %} 40 (5rem) is the height of the navbar {% endcomment %}
 {% fragment as content_desktop_positioning %}xlarge:tw-fixed xlarge:tw-top-40 xlarge:tw-left-0 xlarge:tw-right-0 xlarge:tw-mx-auto{% endfragment %}
 
-{% fragment as title_base_typography %}tw-font-sans tw-font-bold tw-text-xl tw-capitalize tw-text-black{% endfragment %}
+{% fragment as title_base_typography %}tw-font-sans tw-font-bold tw-text-xl tw-text-black{% endfragment %}
 {% fragment as title_desktop_typography %}xlarge:tw-text-lg{% endfragment %}
 {% comment %} 2.5rem for half the navbar's height, 14px for half the title's line height, 6px for the title bottom border and 1 px for the dropdown border:{% endcomment %}
 {% fragment as title_underline %}xlarge:tw-h-full xlarge:tw-pt-[calc(2.5rem-14px)] xlarge:tw-pb-[calc(2.5rem-14px-6px+1px)]{% endfragment %}

From fcb5f0327e9252fbb9e22230f94394b548e7dd06 Mon Sep 17 00:00:00 2001
From: Rob DiVincenzo <rob@mozillafoundation.org>
Date: Fri, 31 May 2024 11:17:04 -0400
Subject: [PATCH 06/13] Add Custom Privacy Text Option to CTAs (#12293)

* Update CTA model to add richtext privacy_text

* Update templates to take advantage of new privacy_text when referencing a cta, or provide empty string if default

* Create new privacy notice js module

* Update newsletter signup component to render custom privacy text or default privacy text if no custom privacy text found

* CSS tweak to sync formassembly styling of richtext custom privacy text on petition pages

* Change to quotes

* Though not necessary to abstract to form-specific-style.js, we can reduce duplicate code a bit

* linting

* additional formatting

* Fix richtext filter

* Move tailwind classes to formassembly override scss

* Move conditional block and remove duplicate line

* Add data-cta-privacy-notice attribute or empty where possible, single quote for rich text filter

* Switch to | escape

* Remove stray quote, update migration to account for merge with main

* Move label logic to privacy-notice.jsx

* Update documentation for formassembly
---
 ...wsletter_signup_with_background_block.html |  3 +-
 .../templates/partials/mozfest_footer.html    |  6 ++--
 .../buyersguide/pni_newsletter_box.html       |  1 +
 .../templates/fragments/footer.html           |  1 +
 .../templates/fragments/primary_nav.html      |  1 +
 ...ignup_privacy_notice_cta_privacy_notice.py | 30 +++++++++++++++++
 .../wagtailpages/pagemodels/campaigns.py      |  9 ++++++
 .../wagtailpages/bannered_campaign_page.html  |  3 +-
 .../blocks/blog_newsletter_signup_block.html  |  1 +
 .../blocks/newsletter_signup_block.html       |  1 +
 .../fragments/formassembly_body.html          |  9 ++++--
 .../fragments/newsletter-signup-box.html      |  1 +
 .../wagtailpages/fragments/take_action.html   |  1 +
 .../pages/youtube_regrets_reporter_page.html  |  1 +
 .../wagtailpages/tags/cta/petition.html       |  2 +-
 .../wagtailpages/tags/cta/signup.html         |  5 +--
 .../atoms/privacy-notice.jsx                  | 32 +++++++++++++++++++
 .../organisms/default-layout-signup.jsx       | 14 ++++++--
 source/sass/formassembly-override.scss        |  9 ++++++
 19 files changed, 117 insertions(+), 13 deletions(-)
 create mode 100644 network-api/networkapi/wagtailpages/migrations/0137_blogsignup_privacy_notice_cta_privacy_notice.py
 create mode 100644 source/js/components/newsletter-signup/atoms/privacy-notice.jsx

diff --git a/network-api/networkapi/mozfest/templates/fragments/blocks/newsletter_signup_with_background_block.html b/network-api/networkapi/mozfest/templates/fragments/blocks/newsletter_signup_with_background_block.html
index d178da17463..9fc9d8fe781 100644
--- a/network-api/networkapi/mozfest/templates/fragments/blocks/newsletter_signup_with_background_block.html
+++ b/network-api/networkapi/mozfest/templates/fragments/blocks/newsletter_signup_with_background_block.html
@@ -1,5 +1,5 @@
 
-{% load i18n l10n static wagtailimages_tags %}
+{% load i18n l10n static wagtailcore_tags wagtailimages_tags %}
 
 {% block block_content %}
     <div class="tw-mx-8 large:tw-mx-0 tw-my-16 large:tw-my-20">
@@ -16,6 +16,7 @@
                             data-signup-id="{{ snippet_localized.id }}"
                             data-cta-header="{{ snippet_localized.header | escape }}"
                             data-cta-description="{{ snippet_localized.description | escape }}"
+                            data-cta-privacy-notice="{{ snippet_localized.privacy_notice | escape }}"
                             data-ask-name="{{ snippet_localized.ask_name }}"
                             data-button-cta-event="newsletter-signup">
                         </div>
diff --git a/network-api/networkapi/mozfest/templates/partials/mozfest_footer.html b/network-api/networkapi/mozfest/templates/partials/mozfest_footer.html
index 191b6a25bfa..493a0eb9f3c 100644
--- a/network-api/networkapi/mozfest/templates/partials/mozfest_footer.html
+++ b/network-api/networkapi/mozfest/templates/partials/mozfest_footer.html
@@ -1,6 +1,6 @@
 {% extends "fragments/footer.html" %}
 
-{% load i18n l10n static %}
+{% load wagtailcore_tags i18n l10n static %}
 
 {% block footer_donate %}
     <!-- nothing right now -->
@@ -17,7 +17,9 @@
                 data-signup-id="{{ localized_footer_signup.id }}"
                 data-button-text="{% trans "Sign up" context "Submit button for newsletter signup form" %}"
                 data-cta-header="{{ localized_footer_signup.header | escape }}"
-                data-cta-description="{{ localized_footer_signup.description | escape }}">
+                data-cta-description="{{ localized_footer_signup.description | escape }}"
+                data-cta-privacy-notice="{{ localized_footer_signup.privacy_notice | escape }}"
+            >
             </div>
         {% endwith %}
 
diff --git a/network-api/networkapi/templates/fragments/buyersguide/pni_newsletter_box.html b/network-api/networkapi/templates/fragments/buyersguide/pni_newsletter_box.html
index 2843e3f2778..07cd732a76d 100644
--- a/network-api/networkapi/templates/fragments/buyersguide/pni_newsletter_box.html
+++ b/network-api/networkapi/templates/fragments/buyersguide/pni_newsletter_box.html
@@ -14,5 +14,6 @@
          data-button-text="{% trans "Sign up" context "Submit button for newsletter signup form" %}"
          data-cta-header="{{ cta_header|default:_("Help shape the future of the web for the public good.") }}"
          data-cta-description="<p class='tw-mb-12'>{{ cta_description|default:_("Join our Mozilla News email list to get action alerts & internet tips right to your inbox.") }}</p>"
+         data-cta-privacy-notice=""
     ></div>
 </div>
diff --git a/network-api/networkapi/templates/fragments/footer.html b/network-api/networkapi/templates/fragments/footer.html
index 0b11610c5d9..1fa027f913a 100644
--- a/network-api/networkapi/templates/fragments/footer.html
+++ b/network-api/networkapi/templates/fragments/footer.html
@@ -21,6 +21,7 @@
                                  data-button-text="{% trans "Sign up" context "Submit button for newsletter signup form" %}"
                                  data-cta-header="{% trans "Help shape the future of the web for the public good." %}"
                                  data-cta-description="<p>{% trans "Join our <b>Mozilla News</b> email list to get action alerts & internet tips right to your inbox." %}</p>"
+                                 data-cta-privacy-notice=""
                             >
                             </div>
                             <a class="logo tw-block tw-my-24 medium:tw-my-0" href="https://foundation.mozilla.org" aria-label="{% trans 'Return to Homepage' %}"><img src="{% static "_images/mozilla-block-white.svg" %}" alt="{% trans 'Mozilla Foundation' %}" width="96"></a>
diff --git a/network-api/networkapi/templates/fragments/primary_nav.html b/network-api/networkapi/templates/fragments/primary_nav.html
index 1f662354957..5fd859a4ad9 100644
--- a/network-api/networkapi/templates/fragments/primary_nav.html
+++ b/network-api/networkapi/templates/fragments/primary_nav.html
@@ -88,6 +88,7 @@
                      data-button-text="{% trans "Sign up" context "Submit button for newsletter signup form" %}"
                      data-cta-header="{% trans "Help shape the future of the web for the public good." %}"
                      data-cta-description="<p>{% trans "Join our <b>Mozilla News</b> email list to get action alerts & internet tips right to your inbox." %}</p>"
+                     data-cta-privacy-notice=""
                 ></div>
                 <div class="text-center mt-3 d-lg-none">
                     <button class="tw-btn form-dismiss">{% trans "No thanks" %}</button>
diff --git a/network-api/networkapi/wagtailpages/migrations/0137_blogsignup_privacy_notice_cta_privacy_notice.py b/network-api/networkapi/wagtailpages/migrations/0137_blogsignup_privacy_notice_cta_privacy_notice.py
new file mode 100644
index 00000000000..8624aace8f1
--- /dev/null
+++ b/network-api/networkapi/wagtailpages/migrations/0137_blogsignup_privacy_notice_cta_privacy_notice.py
@@ -0,0 +1,30 @@
+# Generated by Django 4.2.11 on 2024-05-28 18:33
+
+import wagtail.fields
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("wagtailpages", "0136_alter_donationmodal_body_richtext"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="blogsignup",
+            name="privacy_notice",
+            field=wagtail.fields.RichTextField(
+                blank=True,
+                help_text="This optional privacy notice field will overwrite the default privacy notice text. If this field is left blank, the default privacy notice text is used.",
+            ),
+        ),
+        migrations.AddField(
+            model_name="cta",
+            name="privacy_notice",
+            field=wagtail.fields.RichTextField(
+                blank=True,
+                help_text="This optional privacy notice field will overwrite the default privacy notice text. If this field is left blank, the default privacy notice text is used.",
+            ),
+        ),
+    ]
diff --git a/network-api/networkapi/wagtailpages/pagemodels/campaigns.py b/network-api/networkapi/wagtailpages/pagemodels/campaigns.py
index fc2d3953472..f311b00d20c 100644
--- a/network-api/networkapi/wagtailpages/pagemodels/campaigns.py
+++ b/network-api/networkapi/wagtailpages/pagemodels/campaigns.py
@@ -12,6 +12,7 @@
 
 from ..utils import get_content_related_by_tag, get_page_tree_information
 from .base import PrimaryPage
+from .customblocks.base_rich_text_options import base_rich_text_options
 from .mixin.foundation_metadata import FoundationMetadataPageMixin
 from .modular import MiniSiteNameSpace
 
@@ -31,6 +32,13 @@ class CTABase(models.Model):
 
     description = RichTextField(help_text="Body (richtext) of component", blank=True)
 
+    privacy_notice = RichTextField(
+        help_text="This optional privacy notice field will overwrite the default privacy notice text. "
+        "If this field is left blank, the default privacy notice text is used.",
+        features=base_rich_text_options,
+        blank=True,
+    )
+
     newsletter = models.CharField(
         max_length=100,
         help_text="The (pre-existing) newsletter to sign up for",
@@ -41,6 +49,7 @@ class CTABase(models.Model):
         TranslatableField("name"),
         TranslatableField("header"),
         TranslatableField("description"),
+        TranslatableField("privacy_notice"),
         SynchronizedField("newsletter"),
     ]
 
diff --git a/network-api/networkapi/wagtailpages/templates/wagtailpages/bannered_campaign_page.html b/network-api/networkapi/wagtailpages/templates/wagtailpages/bannered_campaign_page.html
index ee046230cdc..806fc93ad00 100644
--- a/network-api/networkapi/wagtailpages/templates/wagtailpages/bannered_campaign_page.html
+++ b/network-api/networkapi/wagtailpages/templates/wagtailpages/bannered_campaign_page.html
@@ -72,7 +72,8 @@
                                     data-signup-id="{{ localized_signup.id }}"
                                     data-cta-header="{{ localized_signup.header | escape }}"
                                     data-cta-description="{{ localized_signup.description | escape }}"
-                                    data-ask-name="{{ localized_signup.ask_name }}">
+                                    data-ask-name="{{ localized_signup.ask_name }}"
+                                    data-cta-privacy-notice="{{ localized_signup.privacy_notice|escape }}">
                                 </div>
                             {% endwith %}
                         {% endif %}
diff --git a/network-api/networkapi/wagtailpages/templates/wagtailpages/blocks/blog_newsletter_signup_block.html b/network-api/networkapi/wagtailpages/templates/wagtailpages/blocks/blog_newsletter_signup_block.html
index cc6732fd7e4..0804ac45e44 100644
--- a/network-api/networkapi/wagtailpages/templates/wagtailpages/blocks/blog_newsletter_signup_block.html
+++ b/network-api/networkapi/wagtailpages/templates/wagtailpages/blocks/blog_newsletter_signup_block.html
@@ -12,5 +12,6 @@
          data-button-text="{% trans "Sign up" context "Submit button for newsletter signup form" %}"
          data-cta-header="{{ self.signup.header | escape }}"
          data-cta-description="{{ self.signup.description | escape }}"
+         data-cta-privacy-notice="{{ self.signup.privacy_notice | escape }}"
     ></div>
 {% endblock block_content %}
diff --git a/network-api/networkapi/wagtailpages/templates/wagtailpages/blocks/newsletter_signup_block.html b/network-api/networkapi/wagtailpages/templates/wagtailpages/blocks/newsletter_signup_block.html
index cf694d91fbc..74ecad58aa3 100644
--- a/network-api/networkapi/wagtailpages/templates/wagtailpages/blocks/newsletter_signup_block.html
+++ b/network-api/networkapi/wagtailpages/templates/wagtailpages/blocks/newsletter_signup_block.html
@@ -14,6 +14,7 @@
             data-signup-id="{{ self.signup.id | unlocalize }}"
             data-cta-header="{{ self.signup.header | escape }}"
             data-cta-description="{{ self.signup.description | escape }}"
+            data-cta-privacy-notice="{{ self.signup.privacy_notice | escape }}"
             data-ask-name="{{ self.signup.ask_name }}"
             data-button-cta-event="newsletter-signup"
         ></div>
diff --git a/network-api/networkapi/wagtailpages/templates/wagtailpages/fragments/formassembly_body.html b/network-api/networkapi/wagtailpages/templates/wagtailpages/fragments/formassembly_body.html
index 77acbadb885..50aa47d1fd9 100644
--- a/network-api/networkapi/wagtailpages/templates/wagtailpages/fragments/formassembly_body.html
+++ b/network-api/networkapi/wagtailpages/templates/wagtailpages/fragments/formassembly_body.html
@@ -1,4 +1,4 @@
-{% load i18n %}
+{% load i18n wagtailcore_tags %}
 
 {% comment %}
 *** IMPORTANT ***
@@ -13,7 +13,7 @@
     - Go to petition.html and look for this line {% include "../../fragments/formassembly_body.html"
     - Update the variable names to they match the new FormAssembly field names
     - Plug in those variables into corresponding form fields in formassembly_body.html
-
+    
 4. If form field names are changed:
     (Field ref: https://mozillafoundation.tfaforms.net/forms/builder/5.0.0/9 and click on "OUTLINE" tab)
     - Update the bottom section of formassembly_override.scss to reflect new field names
@@ -39,6 +39,9 @@
 
 9. Update the revision note on the next line. Revision number can be found on https://mozillafoundation.tfaforms.net/versions/index/9
 
+10. Update the privacy_notice value to include an {%if %} tag and default value
+    - {% if privacy_notice %}{% blocktrans with privacy_notice=privacy_notice|richtext %}{{ privacy_notice }}{% endblocktrans %}{% else %}{% blocktrans with link="https://www.mozilla.org/privacy/websites/" %}I’m okay with Mozilla handling my info as explained in this <a href="{{ link }}" target="_blank">Privacy Notice</a>.{% endblocktrans %}{% endif %}
+
 The code snippet below is based on FormAssembly form revision #32
 
 *** NOTE ***
@@ -318,7 +321,7 @@
                 </div>
             {% endif %}
             <div class="oneField field-container-D  labelsAbove  " id="tfa_492-D" role="group" aria-labelledby="tfa_492-L" data-tfa-labelledby="-L tfa_492-L" aria-required="true">
-                <label id="tfa_492-L" class="label preField" aria-label="Privacy Agreement  required">Privacy Agreement</label><br><div class="inputWrapper"><span id="tfa_492" class="choices vertical required" aria-required="true"><span class="oneChoice"><input type="checkbox" value="tfa_493" class="calc-DefaultName" id="tfa_493" name="tfa_493" aria-labelledby="tfa_493-L" data-tfa-labelledby="tfa_492-L tfa_493-L"><label class="label reqMark postField" id="tfa_493-L" for="tfa_493"><span class="input-checkbox-faux"></span>{% blocktrans with link="https://www.mozilla.org/privacy/websites/" %}I’m okay with Mozilla handling my info as explained in this <a href="{{ link }}" target="_blank">Privacy Notice</a>.{% endblocktrans %}</label></span></span></div>
+                <label id="tfa_492-L" class="label preField" aria-label="Privacy Agreement  required">Privacy Agreement</label><br><div class="inputWrapper"><span id="tfa_492" class="choices vertical required" aria-required="true"><span class="oneChoice"><input type="checkbox" value="tfa_493" class="calc-DefaultName" id="tfa_493" name="tfa_493" aria-labelledby="tfa_493-L" data-tfa-labelledby="tfa_492-L tfa_493-L"><label class="label reqMark postField" id="tfa_493-L" for="tfa_493"><span class="input-checkbox-faux"></span>{% if privacy_notice %}{% blocktrans with privacy_notice=privacy_notice|richtext %}{{ privacy_notice }}{% endblocktrans %}{% else %}{% blocktrans with link="https://www.mozilla.org/privacy/websites/" %}I’m okay with Mozilla handling my info as explained in this <a href="{{ link }}" target="_blank">Privacy Notice</a>.{% endblocktrans %}{% endif %}</label></span></span></div>
             </div>
             <div class="oneField field-container-D    " id="tfa_494-D" role="group" aria-labelledby="tfa_494-L" data-tfa-labelledby="-L tfa_494-L">
                 <label id="tfa_494-L" class="label preField ">Email Subscription</label><br><div class="inputWrapper"><span id="tfa_494" class="choices vertical "><span class="oneChoice"><input type="checkbox" value="tfa_495" class="" id="tfa_495" name="tfa_495" aria-labelledby="tfa_495-L" data-tfa-labelledby="tfa_494-L tfa_495-L"><label class="label postField" id="tfa_495-L" for="tfa_495"><span class="input-checkbox-faux"></span>{% trans "Yes, I want to receive email updates about Mozilla’s campaigns." %}</label></span></span></div>
diff --git a/network-api/networkapi/wagtailpages/templates/wagtailpages/fragments/newsletter-signup-box.html b/network-api/networkapi/wagtailpages/templates/wagtailpages/fragments/newsletter-signup-box.html
index 8588904f348..bb04711c3bf 100644
--- a/network-api/networkapi/wagtailpages/templates/wagtailpages/fragments/newsletter-signup-box.html
+++ b/network-api/networkapi/wagtailpages/templates/wagtailpages/fragments/newsletter-signup-box.html
@@ -8,6 +8,7 @@
          data-button-text="{% trans "Subscribe" context "Submit button for newsletter signup form" %}"
          data-cta-header="{% trans "Subscribe to our newsletter" %}"
          data-cta-description="<p class='tw-mb-12'>{% trans "Help shape the future of the web for the public good. Join our Mozilla News email list to get action alerts & internet tips right to your inbox." %}</p>"
+         data-cta-privacy-notice=""
     ></div>
     {% if show_socials %}
         <div class="tw-hidden medium:tw-block">
diff --git a/network-api/networkapi/wagtailpages/templates/wagtailpages/fragments/take_action.html b/network-api/networkapi/wagtailpages/templates/wagtailpages/fragments/take_action.html
index 62c75021cf9..75b1f57aa85 100644
--- a/network-api/networkapi/wagtailpages/templates/wagtailpages/fragments/take_action.html
+++ b/network-api/networkapi/wagtailpages/templates/wagtailpages/fragments/take_action.html
@@ -35,6 +35,7 @@ <h2 class="take-action-title tw-mb-12">{{ page.take_action_title }}</h2>
                      data-button-text="{% trans "Sign up" context "Submit button for newsletter signup form" %}"
                      data-cta-header="{% trans "Help shape the future of the web for the public good." %}"
                      data-cta-description="<p>{% trans "Join our <b>Mozilla News</b> email list to get action alerts & internet tips right to your inbox." %}</p>"
+                     data-cta-privacy-notice=""
                 >
                 </div>
             </div>
diff --git a/network-api/networkapi/wagtailpages/templates/wagtailpages/pages/youtube_regrets_reporter_page.html b/network-api/networkapi/wagtailpages/templates/wagtailpages/pages/youtube_regrets_reporter_page.html
index 1a9c4eb0160..b0bf16c57d7 100644
--- a/network-api/networkapi/wagtailpages/templates/wagtailpages/pages/youtube_regrets_reporter_page.html
+++ b/network-api/networkapi/wagtailpages/templates/wagtailpages/pages/youtube_regrets_reporter_page.html
@@ -81,6 +81,7 @@ <h2 class="tw-h2-heading">{% trans "With the RegretsReporter extension, you can
                      data-button-text="{% trans "Sign up" context "Submit button for newsletter signup form" %}"
                      data-cta-header="{% trans "To stay updated on this campaign and our other work, sign up for Mozilla’s newsletter." %}"
                      data-cta-description=""
+                     data-cta-privacy-notice=""
                 >
                 </div>
             </div>
diff --git a/network-api/networkapi/wagtailpages/templates/wagtailpages/tags/cta/petition.html b/network-api/networkapi/wagtailpages/templates/wagtailpages/tags/cta/petition.html
index 9f3041f2578..6b52e36c8c3 100644
--- a/network-api/networkapi/wagtailpages/templates/wagtailpages/tags/cta/petition.html
+++ b/network-api/networkapi/wagtailpages/templates/wagtailpages/tags/cta/petition.html
@@ -29,7 +29,7 @@ <h5 class="tw-h5-heading">{{ cta.header | escape }}</h5>
             We are inncluding tfa_* in the variable name to make it clear where the value should be plugged in.
             For field name reference, see https://mozillafoundation.tfaforms.net/forms/definition/9
         {% endcomment %}
-        {% include "../../fragments/formassembly_body.html" with csp_nonce=csp_nonce show_country_field=cta.show_country_field show_postal_code_field=cta.show_postal_code_field show_comment_field=cta.show_comment_field campaign_id_tfa_1=cta.campaign_id source_url_tfa_498=source_url lang_tfa_499=LANGUAGE_CODE thank_you_url_tfa_500=thank_you_url %}
+        {% include "../../fragments/formassembly_body.html" with csp_nonce=csp_nonce show_country_field=cta.show_country_field show_postal_code_field=cta.show_postal_code_field show_comment_field=cta.show_comment_field campaign_id_tfa_1=cta.campaign_id source_url_tfa_498=source_url lang_tfa_499=LANGUAGE_CODE thank_you_url_tfa_500=thank_you_url privacy_notice=cta.privacy_notice %}
         <link rel="stylesheet" href="{% static "_css/formassembly-override.compiled.css" %}">
     {% else %}
         <div
diff --git a/network-api/networkapi/wagtailpages/templates/wagtailpages/tags/cta/signup.html b/network-api/networkapi/wagtailpages/templates/wagtailpages/tags/cta/signup.html
index 7c22e394bd8..200250e8140 100644
--- a/network-api/networkapi/wagtailpages/templates/wagtailpages/tags/cta/signup.html
+++ b/network-api/networkapi/wagtailpages/templates/wagtailpages/tags/cta/signup.html
@@ -1,4 +1,4 @@
-{% load i18n %}
+{% load wagtailcore_tags i18n %}
 
 <div
     class="newsletter-signup-module mb-5"
@@ -10,5 +10,6 @@
     {% if cta.header %}
         data-cta-header="{{ cta.header | escape }}"
     {% endif %}
-    data-cta-description="{{ cta.description | escape }}">
+    data-cta-description="{{ cta.description | escape }}"
+    data-cta-privacy-notice="{{ cta.privacy_notice | escape }}">
 </div>
diff --git a/source/js/components/newsletter-signup/atoms/privacy-notice.jsx b/source/js/components/newsletter-signup/atoms/privacy-notice.jsx
new file mode 100644
index 00000000000..8142f84c35a
--- /dev/null
+++ b/source/js/components/newsletter-signup/atoms/privacy-notice.jsx
@@ -0,0 +1,32 @@
+import React from "react";
+import { getText } from "../../petition/locales";
+import PropTypes from "prop-types";
+
+const PrivacyNotice = ({ content, classes }) => {
+  //[TODO] Investigate removing the legacy richtext template which renders an empty rich-text div wrapper
+  // Jira TP1-601 / Github Issue #12285 https://github.com/MozillaFoundation/foundation.mozilla.org/issues/12285
+  if (!content || content == "<div class='rich-text'></div>") {
+    content = getText(
+      `I'm okay with Mozilla handling my info as explained in this Privacy Notice`
+    );
+  }
+  if (typeof content === "string") {
+    return (
+      <span
+        dangerouslySetInnerHTML={{
+          __html: content,
+        }}
+        className={classes}
+      />
+    );
+  }
+
+  return <span className={classes}>{content}</span>;
+};
+
+PrivacyNotice.propTypes = {
+  content: PropTypes.oneOfType([PropTypes.string, PropTypes.node]).isRequired,
+  classes: PropTypes.string,
+};
+
+export default PrivacyNotice;
diff --git a/source/js/components/newsletter-signup/organisms/default-layout-signup.jsx b/source/js/components/newsletter-signup/organisms/default-layout-signup.jsx
index c879282f027..7979025bdf1 100644
--- a/source/js/components/newsletter-signup/organisms/default-layout-signup.jsx
+++ b/source/js/components/newsletter-signup/organisms/default-layout-signup.jsx
@@ -3,6 +3,7 @@ import PropTypes from "prop-types";
 import classNames from "classnames";
 import Heading from "../atoms/heading.jsx";
 import Description from "../atoms/description.jsx";
+import PrivacyNotice from "../atoms/privacy-notice.jsx";
 import InputText from "../atoms/input-text.jsx";
 import Select from "../atoms/select.jsx";
 import InputCheckboxWithLabel from "../molecules/input-checkbox-with-label.jsx";
@@ -156,6 +157,15 @@ class DefaultSignupForm extends Component {
     );
   }
 
+  renderPrivacyNotice() {
+    return (
+      <PrivacyNotice
+        content={this.props.ctaPrivacyNotice}
+        classes="[&_p]:tw-body-small"
+      />
+    );
+  }
+
   renderAPIErrorMessage() {
     if (!this.props.apiError) return null;
 
@@ -265,9 +275,7 @@ class DefaultSignupForm extends Component {
       <InputCheckboxWithLabel
         id={this.ids[name]}
         name={name}
-        label={getText(
-          `I'm okay with Mozilla handling my info as explained in this Privacy Notice`
-        )}
+        label={this.renderPrivacyNotice()}
         value={this.getFormFieldValue(name)}
         checked={this.getFormFieldValue(name) === "true"}
         onChange={(event) => this.handlePrivacyChange(event)}
diff --git a/source/sass/formassembly-override.scss b/source/sass/formassembly-override.scss
index 6de054a1a05..4d060d375b4 100644
--- a/source/sass/formassembly-override.scss
+++ b/source/sass/formassembly-override.scss
@@ -23,6 +23,15 @@ $input-font-size: 1.25rem !important;
       label {
         font-family: $font-family-sans-serif;
         margin-bottom: 0;
+        .rich-text {
+          display: inline-block;
+          p {
+            display: inline-block;
+            //match styling for richtext fields like privacy_notice
+            color: #444;
+            font-size: 16px;
+          }
+        }
       }
     }
 

From f7ed1056ee98a8a41a8c4ed554d1e599c35d11ed Mon Sep 17 00:00:00 2001
From: AdalbertoMoz <adalberto@mozillafoundation.org>
Date: Fri, 31 May 2024 15:12:56 -0600
Subject: [PATCH 07/13] Localise Featured Video Post on the Blog Index

---
 .../wagtailpages/pagemodels/blog/blog_index.py       | 11 +++++++++++
 .../templates/wagtailpages/blog_index_page.html      | 12 +++++++-----
 2 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/network-api/networkapi/wagtailpages/pagemodels/blog/blog_index.py b/network-api/networkapi/wagtailpages/pagemodels/blog/blog_index.py
index 063b113dbe7..559a1725cea 100644
--- a/network-api/networkapi/wagtailpages/pagemodels/blog/blog_index.py
+++ b/network-api/networkapi/wagtailpages/pagemodels/blog/blog_index.py
@@ -511,3 +511,14 @@ def localised_featured_pages(self):
             "featured_pages_relationship__sort_order"
         )
         return localize_queryset(featured_blog_pages, preserve_order=True)
+
+    @property
+    def localised_featured_video_post(self):
+        featured_post = self.featured_video_post.first()
+
+        if not featured_post:
+            return None
+
+        featured_post.blog_page = featured_post.blog_page.localized
+
+        return featured_post
diff --git a/network-api/networkapi/wagtailpages/templates/wagtailpages/blog_index_page.html b/network-api/networkapi/wagtailpages/templates/wagtailpages/blog_index_page.html
index 23be5bd6f1a..5639066ceaf 100644
--- a/network-api/networkapi/wagtailpages/templates/wagtailpages/blog_index_page.html
+++ b/network-api/networkapi/wagtailpages/templates/wagtailpages/blog_index_page.html
@@ -64,11 +64,13 @@ <h1 class="tw-h1-heading tw-mb-0 tw-mt-2 tw-pt-4">
                     {% endif %}
                 {% endfor %}
 
-                {% for video_post in page.specific.featured_video_post.all %}
-                    <div class="tw-col-span-12 tw-pt-12 {{ divider_classes }}">
-                        {% include "fragments/blog_index_feature.html" with blog_page=video_post.blog_page video_url=video_post.video_url %}
-                    </div>
-                {% endfor %}
+                {% if page.localised_featured_video_post %}
+                    {% with localized_post=page.localised_featured_video_post %}
+                        <div class="tw-col-span-12 tw-pt-12 {{ divider_classes }}">
+                            {% include "fragments/blog_index_feature.html" with blog_page=localized_post.blog_page video_url=localized_post.video_url %}
+                        </div>
+                    {% endwith %}
+                {% endif %}
 
             {% endwith %}
         </div>

From ea9c3d3b1119e8ae3368406f106e69999705410a Mon Sep 17 00:00:00 2001
From: Rob DiVincenzo <rob@mozillafoundation.org>
Date: Tue, 4 Jun 2024 01:58:38 -0400
Subject: [PATCH 08/13] Adjust uneven block spacing for mozfest (#12373)

* Remove extra spacing from image feature block

* Remove extra spacing from carousel text block

* Remove auto paragraph spacer portion of #11862, opting for manual spacer blocks instead

---------

Co-authored-by: Daniel Miranda <manieldiranda@gmail.com>
---
 .../templates/fragments/blocks/carousel_text_block.html  | 2 +-
 .../mozfest/templates/mozfest/mozfest_homepage.html      | 4 ----
 .../mozfest/templates/mozfest/mozfest_landing_page.html  | 4 ----
 .../mozfest/templates/partials/streamfield.html          | 7 -------
 .../mozfest/templates/partials/streamfield_spacer.html   | 9 ---------
 .../wagtailpages/blocks/image_feature_block.html         | 2 +-
 6 files changed, 2 insertions(+), 26 deletions(-)
 delete mode 100644 network-api/networkapi/mozfest/templates/partials/streamfield_spacer.html

diff --git a/network-api/networkapi/mozfest/templates/fragments/blocks/carousel_text_block.html b/network-api/networkapi/mozfest/templates/fragments/blocks/carousel_text_block.html
index 02ffbaf3994..b2e4d69a036 100644
--- a/network-api/networkapi/mozfest/templates/fragments/blocks/carousel_text_block.html
+++ b/network-api/networkapi/mozfest/templates/fragments/blocks/carousel_text_block.html
@@ -1,7 +1,7 @@
 {% load wagtailcore_tags wagtailimages_tags %}
 
 {% block block_content %}
-    <div class="tw-bg-black tw-dark tw-pb-16 tw-pt-20 large:tw-pt-40">
+    <div class="tw-bg-black tw-dark tw-pb-16 tw-pt-16 large:tw-pt-18">
         <div class="tw-container">
             <div class="tw-row tw-body">
                 <div class="tw-px-16 tw-w-full xlarge:tw-w-6/12">
diff --git a/network-api/networkapi/mozfest/templates/mozfest/mozfest_homepage.html b/network-api/networkapi/mozfest/templates/mozfest/mozfest_homepage.html
index a41181cfdb7..ada108c9dda 100644
--- a/network-api/networkapi/mozfest/templates/mozfest/mozfest_homepage.html
+++ b/network-api/networkapi/mozfest/templates/mozfest/mozfest_homepage.html
@@ -15,10 +15,6 @@
     {% include "partials/primary_hero.html" with page=page %}
 {% endblock %}
 
-{% block streamfield %}
-    {% include "partials/streamfield_spacer.html" %}
-{% endblock streamfield %}
-
 {% block bootstrap_width %}col-lg-12{% endblock bootstrap_width %}
 
 {% block footer_block %}
diff --git a/network-api/networkapi/mozfest/templates/mozfest/mozfest_landing_page.html b/network-api/networkapi/mozfest/templates/mozfest/mozfest_landing_page.html
index 0afbb989723..06486a599af 100644
--- a/network-api/networkapi/mozfest/templates/mozfest/mozfest_landing_page.html
+++ b/network-api/networkapi/mozfest/templates/mozfest/mozfest_landing_page.html
@@ -15,10 +15,6 @@
     {% include "partials/primary_hero.html" with page=page %}
 {% endblock hero_guts %}
 
-{% block streamfield %}
-    {% include "partials/streamfield_spacer.html" %}
-{% endblock streamfield %}
-
 {% block bootstrap_width %}col-lg-12{% endblock bootstrap_width %}
 
 {% block footer_block %}
diff --git a/network-api/networkapi/mozfest/templates/partials/streamfield.html b/network-api/networkapi/mozfest/templates/partials/streamfield.html
index 4c4ffaa429c..e90f5c8b889 100644
--- a/network-api/networkapi/mozfest/templates/partials/streamfield.html
+++ b/network-api/networkapi/mozfest/templates/partials/streamfield.html
@@ -1,12 +1,5 @@
 {% load wagtailcore_tags %}
 
 {% for block in page.body %}
-    {# optionally render a pre and post paragraph spacer for landing_page / homepage page types with dark sections #}
-    {% if block.block_type == 'paragraph' %}
-        {% block pre_paragraph_spacer %}{% endblock pre_paragraph_spacer %}
-    {% endif %}
     {% include_block block with parent_page=page %}
-    {% if block.block_type == 'paragraph' %}
-        {% block post_paragraph_spacer %}{% endblock post_paragraph_spacer %}
-    {% endif %}
 {% endfor %}
\ No newline at end of file
diff --git a/network-api/networkapi/mozfest/templates/partials/streamfield_spacer.html b/network-api/networkapi/mozfest/templates/partials/streamfield_spacer.html
deleted file mode 100644
index 139660a2b01..00000000000
--- a/network-api/networkapi/mozfest/templates/partials/streamfield_spacer.html
+++ /dev/null
@@ -1,9 +0,0 @@
-{% extends "./streamfield.html" %}
-
-{% block pre_paragraph_spacer %}
-    <div class="tw-mt-16 large:tw-mt-18"></div>
-{% endblock pre_paragraph_spacer %}
-
-{% block post_paragraph_spacer %}
-    <div class="tw-mt-8 large:tw-mt-10"></div>
-{% endblock post_paragraph_spacer %}
\ No newline at end of file
diff --git a/network-api/networkapi/wagtailpages/templates/wagtailpages/blocks/image_feature_block.html b/network-api/networkapi/wagtailpages/templates/wagtailpages/blocks/image_feature_block.html
index 24e50d616d7..32e60603069 100644
--- a/network-api/networkapi/wagtailpages/templates/wagtailpages/blocks/image_feature_block.html
+++ b/network-api/networkapi/wagtailpages/templates/wagtailpages/blocks/image_feature_block.html
@@ -2,7 +2,7 @@
 {% load wagtailcore_tags wagtailimages_tags %}
 
 {% block block_content %}
-    <section class="tw-bg-white tw-mb-24">
+    <section class="tw-bg-white">
         <div class="tw-container">
             <div class="tw-row">
                 <div class="xlarge:tw-min-h-[400px] medium:tw-mb-24 tw-w-full">

From ba385d7834b73140e0e6e3d04799688a6f5c1de1 Mon Sep 17 00:00:00 2001
From: Adalberto Vazquez <adalberto@mozillafoundation.org>
Date: Wed, 5 Jun 2024 09:56:03 -0600
Subject: [PATCH 09/13] Remove .localized and .specific properties inside the
 blog_index_feature template (#12428)

* Remove .localized property inside the blog_index_feature template

* Remove .specific property inside the blog_index_feature template
---
 .../templates/fragments/blog_index_feature.html           | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/network-api/networkapi/templates/fragments/blog_index_feature.html b/network-api/networkapi/templates/fragments/blog_index_feature.html
index 5969dca9e73..36a09f3b6b9 100644
--- a/network-api/networkapi/templates/fragments/blog_index_feature.html
+++ b/network-api/networkapi/templates/fragments/blog_index_feature.html
@@ -5,15 +5,15 @@
     <div class="tw-h-full tw-flex tw-flex-col tw-col-span-12 tw-justify-between large:tw-col-span-4 large:tw-py-0 {% if content_left %} large:tw-pl-6 {% else %} large:tw-pr-6 {% endif %}">
         <div>
             <div class="tw-flex tw-flex-wrap">
-                {% include "wagtailpages/fragments/blog_topics.html" with topics=blog_page.specific.topics.all video_post=True published_date=blog_page.first_published_at %}
+                {% include "wagtailpages/fragments/blog_topics.html" with topics=blog_page.topics.all video_post=True published_date=blog_page.first_published_at %}
                 {% if video_url %}
                     <img src="{% static "_images/video-icon.svg" %}" alt="{% trans "video" context "icon description for screen readers" %}" class="tw-h-8 tw-w-8 tw-mr-4 tw-my-2">
                 {% endif %}
                 <span class="tw-h6-heading tw-text-gray-40 tw-py-2 tw-mb-0">{{ blog_page.first_published_at|date:"DATE_FORMAT" }}</span>
             </div>
             <a href="{% pageurl blog_page %}" class="tw-group tw-block hover:tw-no-underline">
-                <h1 class="tw-h4-heading medium:tw-h1-heading medium:tw-text-[34px] tw-mt-2 tw-mb-4 group-hover:tw-underline">{{ blog_page.localized.title }}</h1>
-                <p class="tw-body tw-line-clamp-3 medium:tw-line-clamp-none">{{ blog_page.localized.get_meta_description }}</p>
+                <h1 class="tw-h4-heading medium:tw-h1-heading medium:tw-text-[34px] tw-mt-2 tw-mb-4 group-hover:tw-underline">{{ blog_page.title }}</h1>
+                <p class="tw-body tw-line-clamp-3 medium:tw-line-clamp-none">{{ blog_page.get_meta_description }}</p>
             </a>
         </div>
         <div>
@@ -39,7 +39,7 @@ <h1 class="tw-h4-heading medium:tw-h1-heading medium:tw-text-[34px] tw-mt-2 tw-m
         {% else %}
             <div class="tw-w-full tw-h-full">
                 <a href="{% pageurl blog_page %}">
-                    {% image blog_page.localized.specific.get_meta_image fill-1200x628 class='tw-h-full tw-w-full tw-object-contain tw-object-top' %}
+                    {% image blog_page.get_meta_image fill-1200x628 class='tw-h-full tw-w-full tw-object-contain tw-object-top' %}
                 </a>
             </div>
         {% endif %}

From cad74788983425de2d22681ca414449a0b0d7b3d Mon Sep 17 00:00:00 2001
From: Rob DiVincenzo <rob@mozillafoundation.org>
Date: Thu, 6 Jun 2024 15:34:47 -0400
Subject: [PATCH 10/13] Remove fonts from sass build workflow (#12429)

* Update build script

* Move fonts files

* Update font file includes
---
 .../templates/donate/pages/base.html          |   2 +-
 .../networkapi/templates/pages/base.html      |   2 +-
 .../templates/pages/buyersguide/base.html     |   2 +-
 .../templates/pattern_library_base.html       |   2 +-
 .../templates/wagtailadmin/404.html           |   2 +-
 .../pages/dear_internet_page.html             |   2 +-
 .../youtube_regrets_reporter_extension.html   |   2 +-
 .../youtube_regrets_2021.html                 |   2 +-
 .../youtube_regrets_2022.html                 |   2 +-
 .../pages/youtube_regrets_base.html           |   2 +-
 .../pages/youtube_regrets_page.html           |   2 +-
 .../pages/youtube_regrets_reporter_page.html  |   2 +-
 package.json                                  |  11 +-
 .../nunito-sans.scss => fonts/css/base.css}   | 265 +++++++++++++++---
 .../caveat.scss => fonts/css/caveat.css}      |  15 +-
 .../changa.scss => fonts/css/changa.css}      |  31 +-
 ...B2QRah7pcpNvOx-pjfJ9eIGpYT5Kmgq3s84t.woff2 | Bin
 ...fYB2QRah7pcpNvOx-pjfJ9eIWpYT5Kmgq3sw.woff2 | Bin
 ...B2QRah7pcpNvOx-pjfJ9eIipYT5Kmgq3s84t.woff2 | Bin
 ...B2QRah7pcpNvOx-pjfJ9eIupYT5Kmgq3s84t.woff2 | Bin
 ...VOUcOarRPgnNGooxCZ62xcjLj8TlaxZKJa5UE.woff | Bin
 ...YuVOUcOarRPgnNGooxCZ62xcjfj8TlaxZKJaw.woff | Bin
 ...VOUcOarRPgnNGooxCZ62xcjnj8TlaxZKJa5UE.woff | Bin
 .../Changa/2-cm9JNi2YuVOUckY5y-eOz1paFD.woff2 | Bin
 .../Changa/2-cm9JNi2YuVOUckZpy-eOz1pQ.woff2   | Bin
 .../Changa/2-cm9JNi2YuVOUckaJy-eOz1paFD.woff2 | Bin
 ...V9wNvrwlNstMKW3Y6K5WMwd-1aLZx3lE4-Hw.woff2 | Bin
 ...V9wNvrwlNstMKW3Y6K5WMwd-RaLZx3lE4-Hw.woff2 | Bin
 ...V9wNvrwlNstMKW3Y6K5WMwd-ZaLZx3lE4-Hw.woff2 | Bin
 ...V9wNvrwlNstMKW3Y6K5WMwd-daLZx3lE4-Hw.woff2 | Bin
 ...EOvV9wNvrwlNstMKW3Y6K5WMwd-laLZx3lE4.woff2 | Bin
 ...n64CL7U8upHZIbMV51Q42ptCp7t1R-tQKr51.woff2 | Bin
 ...CL7U8upHZIbMV51Q42ptCp7t4R-tQKr51pE8.woff2 | Bin
 ...CL7U8upHZIbMV51Q42ptCp7t6R-tQKr51pE8.woff2 | Bin
 ...CL7U8upHZIbMV51Q42ptCp7t7R-tQKr51pE8.woff2 | Bin
 ...CL7U8upHZIbMV51Q42ptCp7txR-tQKr51pE8.woff2 | Bin
 ...dFa4ZfeM_74wlPZtksIFaj8K8VSMdFJ6dZX9.woff2 | Bin
 .../dFa4ZfeM_74wlPZtksIFaj8K_1SMdFJ6dQ.woff2  | Bin
 ...a5ZfeM_74wlPZtksIFYoEf6H2pW3pwfa3Efg.woff2 | Bin
 .../dFa5ZfeM_74wlPZtksIFYoEf6HOpW3pwfa0.woff2 | Bin
 ...a5ZfeM_74wlPZtksIFYpEY6H2pW3pwfa3Efg.woff2 | Bin
 .../dFa5ZfeM_74wlPZtksIFYpEY6HOpW3pwfa0.woff2 | Bin
 ...a5ZfeM_74wlPZtksIFYskZ6H2pW3pwfa3Efg.woff2 | Bin
 .../dFa5ZfeM_74wlPZtksIFYskZ6HOpW3pwfa0.woff2 | Bin
 ...a5ZfeM_74wlPZtksIFYuUe6H2pW3pwfa3Efg.woff2 | Bin
 .../dFa5ZfeM_74wlPZtksIFYuUe6HOpW3pwfa0.woff2 | Bin
 .../dFa6ZfeM_74wlPZtksIFajQ6_V6LVlBKdA.woff2  | Bin
 .../dFa6ZfeM_74wlPZtksIFajo6_V6LVlA.woff2     | Bin
 ...ZfeM_74wlPZtksIFaj8CIHCZV3B3X6_0f1Nk.woff2 | Bin
 ...anZfeM_74wlPZtksIFaj8CIHCZWXB3X6_0fw.woff2 | Bin
 ...ZfeM_74wlPZtksIFaj8CVHaZV3B3X6_0f1Nk.woff2 | Bin
 ...anZfeM_74wlPZtksIFaj8CVHaZWXB3X6_0fw.woff2 | Bin
 source/sass/font-faces/zilla-slab.scss        | 170 -----------
 source/sass/fonts.scss                        |   2 -
 54 files changed, 270 insertions(+), 248 deletions(-)
 rename source/{sass/font-faces/nunito-sans.scss => fonts/css/base.css} (50%)
 rename source/{sass/font-faces/caveat.scss => fonts/css/caveat.css} (70%)
 rename source/{sass/font-faces/changa.scss => fonts/css/changa.css} (82%)
 rename source/fonts/{ => fonts}/Caveat/WnznHAc5bAfYB2QRah7pcpNvOx-pjfJ9eIGpYT5Kmgq3s84t.woff2 (100%)
 rename source/fonts/{ => fonts}/Caveat/WnznHAc5bAfYB2QRah7pcpNvOx-pjfJ9eIWpYT5Kmgq3sw.woff2 (100%)
 rename source/fonts/{ => fonts}/Caveat/WnznHAc5bAfYB2QRah7pcpNvOx-pjfJ9eIipYT5Kmgq3s84t.woff2 (100%)
 rename source/fonts/{ => fonts}/Caveat/WnznHAc5bAfYB2QRah7pcpNvOx-pjfJ9eIupYT5Kmgq3s84t.woff2 (100%)
 rename source/fonts/{ => fonts}/Changa/2-c79JNi2YuVOUcOarRPgnNGooxCZ62xcjLj8TlaxZKJa5UE.woff (100%)
 rename source/fonts/{ => fonts}/Changa/2-c79JNi2YuVOUcOarRPgnNGooxCZ62xcjfj8TlaxZKJaw.woff (100%)
 rename source/fonts/{ => fonts}/Changa/2-c79JNi2YuVOUcOarRPgnNGooxCZ62xcjnj8TlaxZKJa5UE.woff (100%)
 rename source/fonts/{ => fonts}/Changa/2-cm9JNi2YuVOUckY5y-eOz1paFD.woff2 (100%)
 rename source/fonts/{ => fonts}/Changa/2-cm9JNi2YuVOUckZpy-eOz1pQ.woff2 (100%)
 rename source/fonts/{ => fonts}/Changa/2-cm9JNi2YuVOUckaJy-eOz1paFD.woff2 (100%)
 rename source/fonts/{ => fonts}/Nunito_Sans/pe0RMImSLYBIv1o4X1M8cce4OdVisMz5nZRqy6cmmmU3t2FQWEAEOvV9wNvrwlNstMKW3Y6K5WMwd-1aLZx3lE4-Hw.woff2 (100%)
 rename source/fonts/{ => fonts}/Nunito_Sans/pe0RMImSLYBIv1o4X1M8cce4OdVisMz5nZRqy6cmmmU3t2FQWEAEOvV9wNvrwlNstMKW3Y6K5WMwd-RaLZx3lE4-Hw.woff2 (100%)
 rename source/fonts/{ => fonts}/Nunito_Sans/pe0RMImSLYBIv1o4X1M8cce4OdVisMz5nZRqy6cmmmU3t2FQWEAEOvV9wNvrwlNstMKW3Y6K5WMwd-ZaLZx3lE4-Hw.woff2 (100%)
 rename source/fonts/{ => fonts}/Nunito_Sans/pe0RMImSLYBIv1o4X1M8cce4OdVisMz5nZRqy6cmmmU3t2FQWEAEOvV9wNvrwlNstMKW3Y6K5WMwd-daLZx3lE4-Hw.woff2 (100%)
 rename source/fonts/{ => fonts}/Nunito_Sans/pe0RMImSLYBIv1o4X1M8cce4OdVisMz5nZRqy6cmmmU3t2FQWEAEOvV9wNvrwlNstMKW3Y6K5WMwd-laLZx3lE4.woff2 (100%)
 rename source/fonts/{ => fonts}/Nunito_Sans/pe0TMImSLYBIv1o4X1M8ce2xCx3yop4tQpF_MeTm0lfGWVpNn64CL7U8upHZIbMV51Q42ptCp7t1R-tQKr51.woff2 (100%)
 rename source/fonts/{ => fonts}/Nunito_Sans/pe0TMImSLYBIv1o4X1M8ce2xCx3yop4tQpF_MeTm0lfGWVpNn64CL7U8upHZIbMV51Q42ptCp7t4R-tQKr51pE8.woff2 (100%)
 rename source/fonts/{ => fonts}/Nunito_Sans/pe0TMImSLYBIv1o4X1M8ce2xCx3yop4tQpF_MeTm0lfGWVpNn64CL7U8upHZIbMV51Q42ptCp7t6R-tQKr51pE8.woff2 (100%)
 rename source/fonts/{ => fonts}/Nunito_Sans/pe0TMImSLYBIv1o4X1M8ce2xCx3yop4tQpF_MeTm0lfGWVpNn64CL7U8upHZIbMV51Q42ptCp7t7R-tQKr51pE8.woff2 (100%)
 rename source/fonts/{ => fonts}/Nunito_Sans/pe0TMImSLYBIv1o4X1M8ce2xCx3yop4tQpF_MeTm0lfGWVpNn64CL7U8upHZIbMV51Q42ptCp7txR-tQKr51pE8.woff2 (100%)
 rename source/fonts/{ => fonts}/Zilla_Slab/dFa4ZfeM_74wlPZtksIFaj8K8VSMdFJ6dZX9.woff2 (100%)
 rename source/fonts/{ => fonts}/Zilla_Slab/dFa4ZfeM_74wlPZtksIFaj8K_1SMdFJ6dQ.woff2 (100%)
 rename source/fonts/{ => fonts}/Zilla_Slab/dFa5ZfeM_74wlPZtksIFYoEf6H2pW3pwfa3Efg.woff2 (100%)
 rename source/fonts/{ => fonts}/Zilla_Slab/dFa5ZfeM_74wlPZtksIFYoEf6HOpW3pwfa0.woff2 (100%)
 rename source/fonts/{ => fonts}/Zilla_Slab/dFa5ZfeM_74wlPZtksIFYpEY6H2pW3pwfa3Efg.woff2 (100%)
 rename source/fonts/{ => fonts}/Zilla_Slab/dFa5ZfeM_74wlPZtksIFYpEY6HOpW3pwfa0.woff2 (100%)
 rename source/fonts/{ => fonts}/Zilla_Slab/dFa5ZfeM_74wlPZtksIFYskZ6H2pW3pwfa3Efg.woff2 (100%)
 rename source/fonts/{ => fonts}/Zilla_Slab/dFa5ZfeM_74wlPZtksIFYskZ6HOpW3pwfa0.woff2 (100%)
 rename source/fonts/{ => fonts}/Zilla_Slab/dFa5ZfeM_74wlPZtksIFYuUe6H2pW3pwfa3Efg.woff2 (100%)
 rename source/fonts/{ => fonts}/Zilla_Slab/dFa5ZfeM_74wlPZtksIFYuUe6HOpW3pwfa0.woff2 (100%)
 rename source/fonts/{ => fonts}/Zilla_Slab/dFa6ZfeM_74wlPZtksIFajQ6_V6LVlBKdA.woff2 (100%)
 rename source/fonts/{ => fonts}/Zilla_Slab/dFa6ZfeM_74wlPZtksIFajo6_V6LVlA.woff2 (100%)
 rename source/fonts/{ => fonts}/Zilla_Slab/dFanZfeM_74wlPZtksIFaj8CIHCZV3B3X6_0f1Nk.woff2 (100%)
 rename source/fonts/{ => fonts}/Zilla_Slab/dFanZfeM_74wlPZtksIFaj8CIHCZWXB3X6_0fw.woff2 (100%)
 rename source/fonts/{ => fonts}/Zilla_Slab/dFanZfeM_74wlPZtksIFaj8CVHaZV3B3X6_0f1Nk.woff2 (100%)
 rename source/fonts/{ => fonts}/Zilla_Slab/dFanZfeM_74wlPZtksIFaj8CVHaZWXB3X6_0fw.woff2 (100%)
 delete mode 100644 source/sass/font-faces/zilla-slab.scss
 delete mode 100644 source/sass/fonts.scss

diff --git a/network-api/networkapi/templates/donate/pages/base.html b/network-api/networkapi/templates/donate/pages/base.html
index 989535de40d..f6dc8469ce3 100644
--- a/network-api/networkapi/templates/donate/pages/base.html
+++ b/network-api/networkapi/templates/donate/pages/base.html
@@ -5,7 +5,7 @@
 
 {% block stylesheets %}
     <link rel="stylesheet" href="{% static "_css/donate.compiled.css" %}">
-    <link rel="stylesheet" href="{% static "_css/fonts.compiled.css" %}">
+    <link rel="stylesheet" href="{% static "_fonts/css/base.min.css" %}">
     {% if debug %}<link rel="stylesheet" href="{% static "_css/tailwind.compiled.css" %}">{% endif %}
 {% endblock %}
 
diff --git a/network-api/networkapi/templates/pages/base.html b/network-api/networkapi/templates/pages/base.html
index 98243eb9909..2fd23e578ea 100644
--- a/network-api/networkapi/templates/pages/base.html
+++ b/network-api/networkapi/templates/pages/base.html
@@ -64,7 +64,7 @@
 
         {% block stylesheets %}
             <link rel="stylesheet" href="{% static "_css/main.compiled.css" %}">
-            <link rel="stylesheet" href="{% static "_css/fonts.compiled.css" %}">
+            <link rel="stylesheet" href="{% static "_fonts/css/base.min.css" %}">
         {% endblock %}
 
         {% block extended_head %}{% endblock %}
diff --git a/network-api/networkapi/templates/pages/buyersguide/base.html b/network-api/networkapi/templates/pages/buyersguide/base.html
index c1d72d59d27..1e2397dec69 100644
--- a/network-api/networkapi/templates/pages/buyersguide/base.html
+++ b/network-api/networkapi/templates/pages/buyersguide/base.html
@@ -39,7 +39,7 @@
 {% block stylesheets %}
     {% if debug %}<link rel="stylesheet" href="{% static "_css/tailwind.compiled.css" %}">{% endif %}
     <link rel="stylesheet" href="{% static "_css/buyers-guide.compiled.css" %}">
-    <link rel="stylesheet" href="{% static "_css/fonts.compiled.css" %}">
+    <link rel="stylesheet" href="{% static "_fonts/css/base.min.css" %}">
 {% endblock %}
 
 {% block extended_head %}{% endblock %}
diff --git a/network-api/networkapi/templates/pattern_library_base.html b/network-api/networkapi/templates/pattern_library_base.html
index 2f5b35e95d6..eb81920dd9c 100644
--- a/network-api/networkapi/templates/pattern_library_base.html
+++ b/network-api/networkapi/templates/pattern_library_base.html
@@ -17,7 +17,7 @@
 
         {% block stylesheets %}
             <link rel="stylesheet" href="{% static "_css/main.compiled.css" %}">
-            <link rel="stylesheet" href="{% static "_css/fonts.compiled.css" %}">
+            <link rel="stylesheet" href="{% static "_fonts/css/base.min.css" %}">
             {% if debug %}<link rel="stylesheet" href="{% static "_css/tailwind.compiled.css" %}">{% endif %}
         {% endblock %}
     </head>
diff --git a/network-api/networkapi/wagtailcustomization/templates/wagtailadmin/404.html b/network-api/networkapi/wagtailcustomization/templates/wagtailadmin/404.html
index 41031aae3b0..5e8d7b362fc 100644
--- a/network-api/networkapi/wagtailcustomization/templates/wagtailadmin/404.html
+++ b/network-api/networkapi/wagtailcustomization/templates/wagtailadmin/404.html
@@ -13,7 +13,7 @@
     <!-- our app's additional CSS -->
     <link rel="stylesheet" href="{% static "_css/main.compiled.css" %}">
     <link rel="stylesheet" href="{% static 'wagtailadmin/css/layouts/404-additionals.css' %}" />
-    <link rel="stylesheet" href="{% static "_css/fonts.compiled.css" %}">
+    <link rel="stylesheet" href="{% static "_fonts/css/base.min.css" %}">
 {% endblock %}
 
 
diff --git a/network-api/networkapi/wagtailpages/templates/wagtailpages/pages/dear_internet_page.html b/network-api/networkapi/wagtailpages/templates/wagtailpages/pages/dear_internet_page.html
index 4033bab4f21..6c7906078f8 100644
--- a/network-api/networkapi/wagtailpages/templates/wagtailpages/pages/dear_internet_page.html
+++ b/network-api/networkapi/wagtailpages/templates/wagtailpages/pages/dear_internet_page.html
@@ -4,7 +4,7 @@
 {% block body_id %}dear-internet{% endblock %}
 
 {% block extended_head %}
-    <link rel="stylesheet" href="{% static "_css/fonts.caveat.compiled.css" %}">
+    <link rel="stylesheet" href="{% static "_fonts/css/caveat.min.css" %}">
 {% endblock %}
 
 {% block content %}
diff --git a/network-api/networkapi/wagtailpages/templates/wagtailpages/pages/regrets-reporter-landing-page/youtube_regrets_reporter_extension.html b/network-api/networkapi/wagtailpages/templates/wagtailpages/pages/regrets-reporter-landing-page/youtube_regrets_reporter_extension.html
index 62e67eee199..788a6813083 100644
--- a/network-api/networkapi/wagtailpages/templates/wagtailpages/pages/regrets-reporter-landing-page/youtube_regrets_reporter_extension.html
+++ b/network-api/networkapi/wagtailpages/templates/wagtailpages/pages/regrets-reporter-landing-page/youtube_regrets_reporter_extension.html
@@ -4,7 +4,7 @@
 {% block body_id %}youtube-regrets-reporter-extension{% endblock %}
 
 {% block extended_head %}
-    <link rel="stylesheet" href="{% static "_css/fonts.changa.compiled.css" %}">
+    <link rel="stylesheet" href="{% static "_fonts/css/changa.min.css" %}">
     <script src="https://c.shpg.org/352/sp.js"></script>
 {% endblock %}
 
diff --git a/network-api/networkapi/wagtailpages/templates/wagtailpages/pages/youtube-regrets-2021/youtube_regrets_2021.html b/network-api/networkapi/wagtailpages/templates/wagtailpages/pages/youtube-regrets-2021/youtube_regrets_2021.html
index 462ef95195d..b433e49cabe 100644
--- a/network-api/networkapi/wagtailpages/templates/wagtailpages/pages/youtube-regrets-2021/youtube_regrets_2021.html
+++ b/network-api/networkapi/wagtailpages/templates/wagtailpages/pages/youtube-regrets-2021/youtube_regrets_2021.html
@@ -5,7 +5,7 @@
 {% block bodyclass %}youtube-regrets-2021 youtube-regrets-shared{% endblock %}
 
 {% block extended_head %}
-    <link rel="stylesheet" href="{% static "_css/fonts.changa.compiled.css" %}">
+    <link rel="stylesheet" href="{% static "_fonts/css/changa.min.css" %}">
 {% endblock %}
 
 {# Empty header; Do not add <header role="banner"> to the page #}
diff --git a/network-api/networkapi/wagtailpages/templates/wagtailpages/pages/youtube-regrets-2022/youtube_regrets_2022.html b/network-api/networkapi/wagtailpages/templates/wagtailpages/pages/youtube-regrets-2022/youtube_regrets_2022.html
index a6c2f5c7c4a..f9359ae9ea6 100644
--- a/network-api/networkapi/wagtailpages/templates/wagtailpages/pages/youtube-regrets-2022/youtube_regrets_2022.html
+++ b/network-api/networkapi/wagtailpages/templates/wagtailpages/pages/youtube-regrets-2022/youtube_regrets_2022.html
@@ -5,7 +5,7 @@
 {% block bodyclass %}youtube-regrets-2022 youtube-regrets-shared{% endblock %}
 
 {% block extended_head %}
-    <link rel="stylesheet" href="{% static "_css/fonts.changa.compiled.css" %}">
+    <link rel="stylesheet" href="{% static "_fonts/css/changa.min.css" %}">
 {% endblock %}
 
 {# Empty header; Do not add <header role="banner"> to the page #}
diff --git a/network-api/networkapi/wagtailpages/templates/wagtailpages/pages/youtube_regrets_base.html b/network-api/networkapi/wagtailpages/templates/wagtailpages/pages/youtube_regrets_base.html
index e44cc0e46ef..cb7275cc3ea 100644
--- a/network-api/networkapi/wagtailpages/templates/wagtailpages/pages/youtube_regrets_base.html
+++ b/network-api/networkapi/wagtailpages/templates/wagtailpages/pages/youtube_regrets_base.html
@@ -5,7 +5,7 @@
 {% block bodyclass %}has-regrets-intro{% endblock %}
 
 {% block extended_head %}
-    <link rel="stylesheet" href="{% static "_css/fonts.changa.compiled.css" %}">
+    <link rel="stylesheet" href="{% static "_fonts/css/changa.min.css" %}">
 {% endblock %}
 
 {# Empty header; Do not add <header role="banner"> to the page #}
diff --git a/network-api/networkapi/wagtailpages/templates/wagtailpages/pages/youtube_regrets_page.html b/network-api/networkapi/wagtailpages/templates/wagtailpages/pages/youtube_regrets_page.html
index 3b41db849e0..8df4ef442f5 100644
--- a/network-api/networkapi/wagtailpages/templates/wagtailpages/pages/youtube_regrets_page.html
+++ b/network-api/networkapi/wagtailpages/templates/wagtailpages/pages/youtube_regrets_page.html
@@ -4,7 +4,7 @@
 {% block body_id %}youtube-regrets{% endblock %}
 
 {% block extended_head %}
-    <link rel="stylesheet" href="{% static "_css/fonts.changa.compiled.css" %}">
+    <link rel="stylesheet" href="{% static "_fonts/css/changa.min.css" %}">
 {% endblock %}
 
 {% block intro_stationary_wrapper %}
diff --git a/network-api/networkapi/wagtailpages/templates/wagtailpages/pages/youtube_regrets_reporter_page.html b/network-api/networkapi/wagtailpages/templates/wagtailpages/pages/youtube_regrets_reporter_page.html
index b0bf16c57d7..b17d44579ee 100644
--- a/network-api/networkapi/wagtailpages/templates/wagtailpages/pages/youtube_regrets_reporter_page.html
+++ b/network-api/networkapi/wagtailpages/templates/wagtailpages/pages/youtube_regrets_reporter_page.html
@@ -4,7 +4,7 @@
 {% block body_id %}youtube-regrets-reporter{% endblock %}
 
 {% block extended_head %}
-    <link rel="stylesheet" href="{% static "_css/fonts.changa.compiled.css" %}">
+    <link rel="stylesheet" href="{% static "_fonts/css/changa.min.css" %}">
 {% endblock %}
 
 {% block intro_stationary_wrapper %}
diff --git a/package.json b/package.json
index 6ecd3801ac6..5c3e9d698e0 100644
--- a/package.json
+++ b/package.json
@@ -14,15 +14,17 @@
     "build:images": "shx rm -rf network-api/networkapi/frontend/_images && shx cp -r source/images network-api/networkapi/frontend/_images",
     "build:js:dev": "node esbuild.config.js -- --node-env development",
     "build:js:prod": "node esbuild.config.js -- --node-env production",
+    "build:fonts": "run-p build:fonts:fonts && run-p build:fonts:css",
+    "build:fonts:fonts": "shx rm -rf network-api/networkapi/frontend/_fonts && cp -r source/fonts network-api/networkapi/frontend/_fonts",
+    "build:fonts:css": "run-p build:fonts:css:**",
+    "build:fonts:css:base": "sass --style=compressed source/fonts/css/base.css network-api/networkapi/frontend/_fonts/css/base.min.css && shx rm network-api/networkapi/frontend/_fonts/css/base.css",
+    "build:fonts:css:caveat": "sass --style=compressed source/fonts/css/caveat.css network-api/networkapi/frontend/_fonts/css/caveat.min.css && shx rm network-api/networkapi/frontend/_fonts/css/caveat.css",
+    "build:fonts:css:changa": "sass --style=compressed source/fonts/css/changa.css network-api/networkapi/frontend/_fonts/css/changa.min.css && shx rm network-api/networkapi/frontend/_fonts/css/changa.css",
     "build:css": "run-p build:css:file:**",
     "build:css:file:main": "sass source/sass/main.scss network-api/networkapi/temp/frontend/_css/main.compiled.css",
-    "build:css:file:fonts": "sass source/sass/fonts.scss network-api/networkapi/temp/frontend/_css/fonts.compiled.css",
-    "build:css:file:fonts:caveat": "sass source/sass/font-faces/caveat.scss network-api/networkapi/temp/frontend/_css/fonts.caveat.compiled.css",
-    "build:css:file:fonts:changa": "sass source/sass/font-faces/changa.scss network-api/networkapi/temp/frontend/_css/fonts.changa.compiled.css",
     "build:css:file:bg": "sass source/sass/buyers-guide/bg-main.scss network-api/networkapi/temp/frontend/_css/buyers-guide.compiled.css",
     "build:css:file:donate": "sass source/sass/donate/donate-main.scss network-api/networkapi/temp/frontend/_css/donate.compiled.css",
     "build:css:file:formassembly": "sass source/sass/formassembly-override.scss network-api/networkapi/temp/frontend/_css/formassembly-override.compiled.css",
-    "build:fonts": "shx rm -rf network-api/networkapi/frontend/_fonts && cp -r source/fonts network-api/networkapi/frontend/_fonts",
     "docker:up": "docker-compose up",
     "docker:down": "docker-compose down",
     "fix": "run-s fix:*",
@@ -64,7 +66,6 @@
     "sync": "browser-sync start --proxy \"localhost:8000\" --reload-debounce 50 --files \"./network-api/networkapi/**/*.html\" \"./network-api/networkapi/frontend/_css/*.css\" \"./network-api/networkapi/frontend/_js/*.js\"",
     "test": "npm run lint",
     "watch": "run-s build:clean && run-p build:common && run-p build:js:dev postcss:watch watch:**",
-    "watch:fonts": "chokidar \"source/fonts/**/*\" -c \"npm run build:fonts\"",
     "watch:images": "chokidar \"source/images/**/*\" -c \"npm run build:images\"",
     "watch:scss": "chokidar \"source/**/*.scss\" -c \"npm run build:css\""
   },
diff --git a/source/sass/font-faces/nunito-sans.scss b/source/fonts/css/base.css
similarity index 50%
rename from source/sass/font-faces/nunito-sans.scss
rename to source/fonts/css/base.css
index bc774252193..007e1cf606f 100644
--- a/source/sass/font-faces/nunito-sans.scss
+++ b/source/fonts/css/base.css
@@ -1,4 +1,7 @@
-//Source: https://fonts.googleapis.com/css?family=Nunito+Sans:400,300,600,700,300i,800,900,400i
+/*
+Nunito Sans
+Source: https://fonts.googleapis.com/css?family=Nunito+Sans:400,300,600,700,300i,800,900,400i 
+*/
 
 /* cyrillic-ext */
 @font-face {
@@ -6,7 +9,7 @@
   font-style: italic;
   font-weight: 300;
   font-stretch: 100%;
-  src: url("../_fonts/Nunito_Sans/pe0RMImSLYBIv1o4X1M8cce4OdVisMz5nZRqy6cmmmU3t2FQWEAEOvV9wNvrwlNstMKW3Y6K5WMwd-RaLZx3lE4-Hw.woff2")
+  src: url("../fonts/Nunito_Sans/pe0RMImSLYBIv1o4X1M8cce4OdVisMz5nZRqy6cmmmU3t2FQWEAEOvV9wNvrwlNstMKW3Y6K5WMwd-RaLZx3lE4-Hw.woff2")
     format("woff2");
   unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F,
     U+FE2E-FE2F;
@@ -17,7 +20,7 @@
   font-style: italic;
   font-weight: 300;
   font-stretch: 100%;
-  src: url("../_fonts/Nunito_Sans/pe0RMImSLYBIv1o4X1M8cce4OdVisMz5nZRqy6cmmmU3t2FQWEAEOvV9wNvrwlNstMKW3Y6K5WMwd-1aLZx3lE4-Hw.woff2")
+  src: url("../fonts/Nunito_Sans/pe0RMImSLYBIv1o4X1M8cce4OdVisMz5nZRqy6cmmmU3t2FQWEAEOvV9wNvrwlNstMKW3Y6K5WMwd-1aLZx3lE4-Hw.woff2")
     format("woff2");
   unicode-range: U+0301, U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
 }
@@ -27,7 +30,7 @@
   font-style: italic;
   font-weight: 300;
   font-stretch: 100%;
-  src: url("../_fonts/Nunito_Sans/pe0RMImSLYBIv1o4X1M8cce4OdVisMz5nZRqy6cmmmU3t2FQWEAEOvV9wNvrwlNstMKW3Y6K5WMwd-ZaLZx3lE4-Hw.woff2")
+  src: url("../fonts/Nunito_Sans/pe0RMImSLYBIv1o4X1M8cce4OdVisMz5nZRqy6cmmmU3t2FQWEAEOvV9wNvrwlNstMKW3Y6K5WMwd-ZaLZx3lE4-Hw.woff2")
     format("woff2");
   unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1,
     U+01AF-01B0, U+0300-0301, U+0303-0304, U+0308-0309, U+0323, U+0329,
@@ -39,7 +42,7 @@
   font-style: italic;
   font-weight: 300;
   font-stretch: 100%;
-  src: url("../_fonts/Nunito_Sans/pe0RMImSLYBIv1o4X1M8cce4OdVisMz5nZRqy6cmmmU3t2FQWEAEOvV9wNvrwlNstMKW3Y6K5WMwd-daLZx3lE4-Hw.woff2")
+  src: url("../fonts/Nunito_Sans/pe0RMImSLYBIv1o4X1M8cce4OdVisMz5nZRqy6cmmmU3t2FQWEAEOvV9wNvrwlNstMKW3Y6K5WMwd-daLZx3lE4-Hw.woff2")
     format("woff2");
   unicode-range: U+0100-02AF, U+0304, U+0308, U+0329, U+1E00-1E9F, U+1EF2-1EFF,
     U+2020, U+20A0-20AB, U+20AD-20C0, U+2113, U+2C60-2C7F, U+A720-A7FF;
@@ -50,7 +53,7 @@
   font-style: italic;
   font-weight: 300;
   font-stretch: 100%;
-  src: url("../_fonts/Nunito_Sans/pe0RMImSLYBIv1o4X1M8cce4OdVisMz5nZRqy6cmmmU3t2FQWEAEOvV9wNvrwlNstMKW3Y6K5WMwd-laLZx3lE4.woff2")
+  src: url("../fonts/Nunito_Sans/pe0RMImSLYBIv1o4X1M8cce4OdVisMz5nZRqy6cmmmU3t2FQWEAEOvV9wNvrwlNstMKW3Y6K5WMwd-laLZx3lE4.woff2")
     format("woff2");
   unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA,
     U+02DC, U+0304, U+0308, U+0329, U+2000-206F, U+2074, U+20AC, U+2122, U+2191,
@@ -62,7 +65,7 @@
   font-style: italic;
   font-weight: 400;
   font-stretch: 100%;
-  src: url("../_fonts/Nunito_Sans/pe0RMImSLYBIv1o4X1M8cce4OdVisMz5nZRqy6cmmmU3t2FQWEAEOvV9wNvrwlNstMKW3Y6K5WMwd-RaLZx3lE4-Hw.woff2")
+  src: url("../fonts/Nunito_Sans/pe0RMImSLYBIv1o4X1M8cce4OdVisMz5nZRqy6cmmmU3t2FQWEAEOvV9wNvrwlNstMKW3Y6K5WMwd-RaLZx3lE4-Hw.woff2")
     format("woff2");
   unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F,
     U+FE2E-FE2F;
@@ -73,7 +76,7 @@
   font-style: italic;
   font-weight: 400;
   font-stretch: 100%;
-  src: url("../_fonts/Nunito_Sans/pe0RMImSLYBIv1o4X1M8cce4OdVisMz5nZRqy6cmmmU3t2FQWEAEOvV9wNvrwlNstMKW3Y6K5WMwd-1aLZx3lE4-Hw.woff2")
+  src: url("../fonts/Nunito_Sans/pe0RMImSLYBIv1o4X1M8cce4OdVisMz5nZRqy6cmmmU3t2FQWEAEOvV9wNvrwlNstMKW3Y6K5WMwd-1aLZx3lE4-Hw.woff2")
     format("woff2");
   unicode-range: U+0301, U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
 }
@@ -83,7 +86,7 @@
   font-style: italic;
   font-weight: 400;
   font-stretch: 100%;
-  src: url("../_fonts/Nunito_Sans/pe0RMImSLYBIv1o4X1M8cce4OdVisMz5nZRqy6cmmmU3t2FQWEAEOvV9wNvrwlNstMKW3Y6K5WMwd-ZaLZx3lE4-Hw.woff2")
+  src: url("../fonts/Nunito_Sans/pe0RMImSLYBIv1o4X1M8cce4OdVisMz5nZRqy6cmmmU3t2FQWEAEOvV9wNvrwlNstMKW3Y6K5WMwd-ZaLZx3lE4-Hw.woff2")
     format("woff2");
   unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1,
     U+01AF-01B0, U+0300-0301, U+0303-0304, U+0308-0309, U+0323, U+0329,
@@ -95,7 +98,7 @@
   font-style: italic;
   font-weight: 400;
   font-stretch: 100%;
-  src: url("../_fonts/Nunito_Sans/pe0RMImSLYBIv1o4X1M8cce4OdVisMz5nZRqy6cmmmU3t2FQWEAEOvV9wNvrwlNstMKW3Y6K5WMwd-daLZx3lE4-Hw.woff2")
+  src: url("../fonts/Nunito_Sans/pe0RMImSLYBIv1o4X1M8cce4OdVisMz5nZRqy6cmmmU3t2FQWEAEOvV9wNvrwlNstMKW3Y6K5WMwd-daLZx3lE4-Hw.woff2")
     format("woff2");
   unicode-range: U+0100-02AF, U+0304, U+0308, U+0329, U+1E00-1E9F, U+1EF2-1EFF,
     U+2020, U+20A0-20AB, U+20AD-20C0, U+2113, U+2C60-2C7F, U+A720-A7FF;
@@ -106,7 +109,7 @@
   font-style: italic;
   font-weight: 400;
   font-stretch: 100%;
-  src: url("../_fonts/Nunito_Sans/pe0RMImSLYBIv1o4X1M8cce4OdVisMz5nZRqy6cmmmU3t2FQWEAEOvV9wNvrwlNstMKW3Y6K5WMwd-laLZx3lE4.woff2")
+  src: url("../fonts/Nunito_Sans/pe0RMImSLYBIv1o4X1M8cce4OdVisMz5nZRqy6cmmmU3t2FQWEAEOvV9wNvrwlNstMKW3Y6K5WMwd-laLZx3lE4.woff2")
     format("woff2");
   unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA,
     U+02DC, U+0304, U+0308, U+0329, U+2000-206F, U+2074, U+20AC, U+2122, U+2191,
@@ -118,7 +121,7 @@
   font-style: normal;
   font-weight: 300;
   font-stretch: 100%;
-  src: url("../_fonts/Nunito_Sans/pe0TMImSLYBIv1o4X1M8ce2xCx3yop4tQpF_MeTm0lfGWVpNn64CL7U8upHZIbMV51Q42ptCp7t4R-tQKr51pE8.woff2")
+  src: url("../fonts/Nunito_Sans/pe0TMImSLYBIv1o4X1M8ce2xCx3yop4tQpF_MeTm0lfGWVpNn64CL7U8upHZIbMV51Q42ptCp7t4R-tQKr51pE8.woff2")
     format("woff2");
   unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F,
     U+FE2E-FE2F;
@@ -129,7 +132,7 @@
   font-style: normal;
   font-weight: 300;
   font-stretch: 100%;
-  src: url("../_fonts/Nunito_Sans/pe0TMImSLYBIv1o4X1M8ce2xCx3yop4tQpF_MeTm0lfGWVpNn64CL7U8upHZIbMV51Q42ptCp7txR-tQKr51pE8.woff2")
+  src: url("../fonts/Nunito_Sans/pe0TMImSLYBIv1o4X1M8ce2xCx3yop4tQpF_MeTm0lfGWVpNn64CL7U8upHZIbMV51Q42ptCp7txR-tQKr51pE8.woff2")
     format("woff2");
   unicode-range: U+0301, U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
 }
@@ -139,7 +142,7 @@
   font-style: normal;
   font-weight: 300;
   font-stretch: 100%;
-  src: url("../_fonts/Nunito_Sans/pe0TMImSLYBIv1o4X1M8ce2xCx3yop4tQpF_MeTm0lfGWVpNn64CL7U8upHZIbMV51Q42ptCp7t6R-tQKr51pE8.woff2")
+  src: url("../fonts/Nunito_Sans/pe0TMImSLYBIv1o4X1M8ce2xCx3yop4tQpF_MeTm0lfGWVpNn64CL7U8upHZIbMV51Q42ptCp7t6R-tQKr51pE8.woff2")
     format("woff2");
   unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1,
     U+01AF-01B0, U+0300-0301, U+0303-0304, U+0308-0309, U+0323, U+0329,
@@ -151,7 +154,7 @@
   font-style: normal;
   font-weight: 300;
   font-stretch: 100%;
-  src: url("../_fonts/Nunito_Sans/pe0TMImSLYBIv1o4X1M8ce2xCx3yop4tQpF_MeTm0lfGWVpNn64CL7U8upHZIbMV51Q42ptCp7t7R-tQKr51pE8.woff2")
+  src: url("../fonts/Nunito_Sans/pe0TMImSLYBIv1o4X1M8ce2xCx3yop4tQpF_MeTm0lfGWVpNn64CL7U8upHZIbMV51Q42ptCp7t7R-tQKr51pE8.woff2")
     format("woff2");
   unicode-range: U+0100-02AF, U+0304, U+0308, U+0329, U+1E00-1E9F, U+1EF2-1EFF,
     U+2020, U+20A0-20AB, U+20AD-20C0, U+2113, U+2C60-2C7F, U+A720-A7FF;
@@ -162,7 +165,7 @@
   font-style: normal;
   font-weight: 300;
   font-stretch: 100%;
-  src: url("../_fonts/Nunito_Sans/pe0TMImSLYBIv1o4X1M8ce2xCx3yop4tQpF_MeTm0lfGWVpNn64CL7U8upHZIbMV51Q42ptCp7t1R-tQKr51.woff2")
+  src: url("../fonts/Nunito_Sans/pe0TMImSLYBIv1o4X1M8ce2xCx3yop4tQpF_MeTm0lfGWVpNn64CL7U8upHZIbMV51Q42ptCp7t1R-tQKr51.woff2")
     format("woff2");
   unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA,
     U+02DC, U+0304, U+0308, U+0329, U+2000-206F, U+2074, U+20AC, U+2122, U+2191,
@@ -174,7 +177,7 @@
   font-style: normal;
   font-weight: 400;
   font-stretch: 100%;
-  src: url("../_fonts/Nunito_Sans/pe0TMImSLYBIv1o4X1M8ce2xCx3yop4tQpF_MeTm0lfGWVpNn64CL7U8upHZIbMV51Q42ptCp7t4R-tQKr51pE8.woff2")
+  src: url("../fonts/Nunito_Sans/pe0TMImSLYBIv1o4X1M8ce2xCx3yop4tQpF_MeTm0lfGWVpNn64CL7U8upHZIbMV51Q42ptCp7t4R-tQKr51pE8.woff2")
     format("woff2");
   unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F,
     U+FE2E-FE2F;
@@ -185,7 +188,7 @@
   font-style: normal;
   font-weight: 400;
   font-stretch: 100%;
-  src: url("../_fonts/Nunito_Sans/pe0TMImSLYBIv1o4X1M8ce2xCx3yop4tQpF_MeTm0lfGWVpNn64CL7U8upHZIbMV51Q42ptCp7txR-tQKr51pE8.woff2")
+  src: url("../fonts/Nunito_Sans/pe0TMImSLYBIv1o4X1M8ce2xCx3yop4tQpF_MeTm0lfGWVpNn64CL7U8upHZIbMV51Q42ptCp7txR-tQKr51pE8.woff2")
     format("woff2");
   unicode-range: U+0301, U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
 }
@@ -195,7 +198,7 @@
   font-style: normal;
   font-weight: 400;
   font-stretch: 100%;
-  src: url("../_fonts/Nunito_Sans/pe0TMImSLYBIv1o4X1M8ce2xCx3yop4tQpF_MeTm0lfGWVpNn64CL7U8upHZIbMV51Q42ptCp7t6R-tQKr51pE8.woff2")
+  src: url("../fonts/Nunito_Sans/pe0TMImSLYBIv1o4X1M8ce2xCx3yop4tQpF_MeTm0lfGWVpNn64CL7U8upHZIbMV51Q42ptCp7t6R-tQKr51pE8.woff2")
     format("woff2");
   unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1,
     U+01AF-01B0, U+0300-0301, U+0303-0304, U+0308-0309, U+0323, U+0329,
@@ -207,7 +210,7 @@
   font-style: normal;
   font-weight: 400;
   font-stretch: 100%;
-  src: url("../_fonts/Nunito_Sans/pe0TMImSLYBIv1o4X1M8ce2xCx3yop4tQpF_MeTm0lfGWVpNn64CL7U8upHZIbMV51Q42ptCp7t7R-tQKr51pE8.woff2")
+  src: url("../fonts/Nunito_Sans/pe0TMImSLYBIv1o4X1M8ce2xCx3yop4tQpF_MeTm0lfGWVpNn64CL7U8upHZIbMV51Q42ptCp7t7R-tQKr51pE8.woff2")
     format("woff2");
   unicode-range: U+0100-02AF, U+0304, U+0308, U+0329, U+1E00-1E9F, U+1EF2-1EFF,
     U+2020, U+20A0-20AB, U+20AD-20C0, U+2113, U+2C60-2C7F, U+A720-A7FF;
@@ -218,7 +221,7 @@
   font-style: normal;
   font-weight: 400;
   font-stretch: 100%;
-  src: url("../_fonts/Nunito_Sans/pe0TMImSLYBIv1o4X1M8ce2xCx3yop4tQpF_MeTm0lfGWVpNn64CL7U8upHZIbMV51Q42ptCp7t1R-tQKr51.woff2")
+  src: url("../fonts/Nunito_Sans/pe0TMImSLYBIv1o4X1M8ce2xCx3yop4tQpF_MeTm0lfGWVpNn64CL7U8upHZIbMV51Q42ptCp7t1R-tQKr51.woff2")
     format("woff2");
   unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA,
     U+02DC, U+0304, U+0308, U+0329, U+2000-206F, U+2074, U+20AC, U+2122, U+2191,
@@ -230,7 +233,7 @@
   font-style: normal;
   font-weight: 600;
   font-stretch: 100%;
-  src: url("../_fonts/Nunito_Sans/pe0TMImSLYBIv1o4X1M8ce2xCx3yop4tQpF_MeTm0lfGWVpNn64CL7U8upHZIbMV51Q42ptCp7t4R-tQKr51pE8.woff2")
+  src: url("../fonts/Nunito_Sans/pe0TMImSLYBIv1o4X1M8ce2xCx3yop4tQpF_MeTm0lfGWVpNn64CL7U8upHZIbMV51Q42ptCp7t4R-tQKr51pE8.woff2")
     format("woff2");
   unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F,
     U+FE2E-FE2F;
@@ -241,7 +244,7 @@
   font-style: normal;
   font-weight: 600;
   font-stretch: 100%;
-  src: url("../_fonts/Nunito_Sans/pe0TMImSLYBIv1o4X1M8ce2xCx3yop4tQpF_MeTm0lfGWVpNn64CL7U8upHZIbMV51Q42ptCp7txR-tQKr51pE8.woff2")
+  src: url("../fonts/Nunito_Sans/pe0TMImSLYBIv1o4X1M8ce2xCx3yop4tQpF_MeTm0lfGWVpNn64CL7U8upHZIbMV51Q42ptCp7txR-tQKr51pE8.woff2")
     format("woff2");
   unicode-range: U+0301, U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
 }
@@ -251,7 +254,7 @@
   font-style: normal;
   font-weight: 600;
   font-stretch: 100%;
-  src: url("../_fonts/Nunito_Sans/pe0TMImSLYBIv1o4X1M8ce2xCx3yop4tQpF_MeTm0lfGWVpNn64CL7U8upHZIbMV51Q42ptCp7t6R-tQKr51pE8.woff2")
+  src: url("../fonts/Nunito_Sans/pe0TMImSLYBIv1o4X1M8ce2xCx3yop4tQpF_MeTm0lfGWVpNn64CL7U8upHZIbMV51Q42ptCp7t6R-tQKr51pE8.woff2")
     format("woff2");
   unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1,
     U+01AF-01B0, U+0300-0301, U+0303-0304, U+0308-0309, U+0323, U+0329,
@@ -263,7 +266,7 @@
   font-style: normal;
   font-weight: 600;
   font-stretch: 100%;
-  src: url("../_fonts/Nunito_Sans/pe0TMImSLYBIv1o4X1M8ce2xCx3yop4tQpF_MeTm0lfGWVpNn64CL7U8upHZIbMV51Q42ptCp7t7R-tQKr51pE8.woff2")
+  src: url("../fonts/Nunito_Sans/pe0TMImSLYBIv1o4X1M8ce2xCx3yop4tQpF_MeTm0lfGWVpNn64CL7U8upHZIbMV51Q42ptCp7t7R-tQKr51pE8.woff2")
     format("woff2");
   unicode-range: U+0100-02AF, U+0304, U+0308, U+0329, U+1E00-1E9F, U+1EF2-1EFF,
     U+2020, U+20A0-20AB, U+20AD-20C0, U+2113, U+2C60-2C7F, U+A720-A7FF;
@@ -274,7 +277,7 @@
   font-style: normal;
   font-weight: 600;
   font-stretch: 100%;
-  src: url("../_fonts/Nunito_Sans/pe0TMImSLYBIv1o4X1M8ce2xCx3yop4tQpF_MeTm0lfGWVpNn64CL7U8upHZIbMV51Q42ptCp7t1R-tQKr51.woff2")
+  src: url("../fonts/Nunito_Sans/pe0TMImSLYBIv1o4X1M8ce2xCx3yop4tQpF_MeTm0lfGWVpNn64CL7U8upHZIbMV51Q42ptCp7t1R-tQKr51.woff2")
     format("woff2");
   unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA,
     U+02DC, U+0304, U+0308, U+0329, U+2000-206F, U+2074, U+20AC, U+2122, U+2191,
@@ -286,7 +289,7 @@
   font-style: normal;
   font-weight: 700;
   font-stretch: 100%;
-  src: url("../_fonts/Nunito_Sans/pe0TMImSLYBIv1o4X1M8ce2xCx3yop4tQpF_MeTm0lfGWVpNn64CL7U8upHZIbMV51Q42ptCp7t4R-tQKr51pE8.woff2")
+  src: url("../fonts/Nunito_Sans/pe0TMImSLYBIv1o4X1M8ce2xCx3yop4tQpF_MeTm0lfGWVpNn64CL7U8upHZIbMV51Q42ptCp7t4R-tQKr51pE8.woff2")
     format("woff2");
   unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F,
     U+FE2E-FE2F;
@@ -297,7 +300,7 @@
   font-style: normal;
   font-weight: 700;
   font-stretch: 100%;
-  src: url("../_fonts/Nunito_Sans/pe0TMImSLYBIv1o4X1M8ce2xCx3yop4tQpF_MeTm0lfGWVpNn64CL7U8upHZIbMV51Q42ptCp7txR-tQKr51pE8.woff2")
+  src: url("../fonts/Nunito_Sans/pe0TMImSLYBIv1o4X1M8ce2xCx3yop4tQpF_MeTm0lfGWVpNn64CL7U8upHZIbMV51Q42ptCp7txR-tQKr51pE8.woff2")
     format("woff2");
   unicode-range: U+0301, U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
 }
@@ -307,7 +310,7 @@
   font-style: normal;
   font-weight: 700;
   font-stretch: 100%;
-  src: url("../_fonts/Nunito_Sans/pe0TMImSLYBIv1o4X1M8ce2xCx3yop4tQpF_MeTm0lfGWVpNn64CL7U8upHZIbMV51Q42ptCp7t6R-tQKr51pE8.woff2")
+  src: url("../fonts/Nunito_Sans/pe0TMImSLYBIv1o4X1M8ce2xCx3yop4tQpF_MeTm0lfGWVpNn64CL7U8upHZIbMV51Q42ptCp7t6R-tQKr51pE8.woff2")
     format("woff2");
   unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1,
     U+01AF-01B0, U+0300-0301, U+0303-0304, U+0308-0309, U+0323, U+0329,
@@ -319,7 +322,7 @@
   font-style: normal;
   font-weight: 700;
   font-stretch: 100%;
-  src: url("../_fonts/Nunito_Sans/pe0TMImSLYBIv1o4X1M8ce2xCx3yop4tQpF_MeTm0lfGWVpNn64CL7U8upHZIbMV51Q42ptCp7t7R-tQKr51pE8.woff2")
+  src: url("../fonts/Nunito_Sans/pe0TMImSLYBIv1o4X1M8ce2xCx3yop4tQpF_MeTm0lfGWVpNn64CL7U8upHZIbMV51Q42ptCp7t7R-tQKr51pE8.woff2")
     format("woff2");
   unicode-range: U+0100-02AF, U+0304, U+0308, U+0329, U+1E00-1E9F, U+1EF2-1EFF,
     U+2020, U+20A0-20AB, U+20AD-20C0, U+2113, U+2C60-2C7F, U+A720-A7FF;
@@ -330,7 +333,7 @@
   font-style: normal;
   font-weight: 700;
   font-stretch: 100%;
-  src: url("../_fonts/Nunito_Sans/pe0TMImSLYBIv1o4X1M8ce2xCx3yop4tQpF_MeTm0lfGWVpNn64CL7U8upHZIbMV51Q42ptCp7t1R-tQKr51.woff2")
+  src: url("../fonts/Nunito_Sans/pe0TMImSLYBIv1o4X1M8ce2xCx3yop4tQpF_MeTm0lfGWVpNn64CL7U8upHZIbMV51Q42ptCp7t1R-tQKr51.woff2")
     format("woff2");
   unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA,
     U+02DC, U+0304, U+0308, U+0329, U+2000-206F, U+2074, U+20AC, U+2122, U+2191,
@@ -342,7 +345,7 @@
   font-style: normal;
   font-weight: 800;
   font-stretch: 100%;
-  src: url("../_fonts/Nunito_Sans/pe0TMImSLYBIv1o4X1M8ce2xCx3yop4tQpF_MeTm0lfGWVpNn64CL7U8upHZIbMV51Q42ptCp7t4R-tQKr51pE8.woff2")
+  src: url("../fonts/Nunito_Sans/pe0TMImSLYBIv1o4X1M8ce2xCx3yop4tQpF_MeTm0lfGWVpNn64CL7U8upHZIbMV51Q42ptCp7t4R-tQKr51pE8.woff2")
     format("woff2");
   unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F,
     U+FE2E-FE2F;
@@ -353,7 +356,7 @@
   font-style: normal;
   font-weight: 800;
   font-stretch: 100%;
-  src: url("../_fonts/Nunito_Sans/pe0TMImSLYBIv1o4X1M8ce2xCx3yop4tQpF_MeTm0lfGWVpNn64CL7U8upHZIbMV51Q42ptCp7txR-tQKr51pE8.woff2")
+  src: url("../fonts/Nunito_Sans/pe0TMImSLYBIv1o4X1M8ce2xCx3yop4tQpF_MeTm0lfGWVpNn64CL7U8upHZIbMV51Q42ptCp7txR-tQKr51pE8.woff2")
     format("woff2");
   unicode-range: U+0301, U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
 }
@@ -363,7 +366,7 @@
   font-style: normal;
   font-weight: 800;
   font-stretch: 100%;
-  src: url("../_fonts/Nunito_Sans/pe0TMImSLYBIv1o4X1M8ce2xCx3yop4tQpF_MeTm0lfGWVpNn64CL7U8upHZIbMV51Q42ptCp7t6R-tQKr51pE8.woff2")
+  src: url("../fonts/Nunito_Sans/pe0TMImSLYBIv1o4X1M8ce2xCx3yop4tQpF_MeTm0lfGWVpNn64CL7U8upHZIbMV51Q42ptCp7t6R-tQKr51pE8.woff2")
     format("woff2");
   unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1,
     U+01AF-01B0, U+0300-0301, U+0303-0304, U+0308-0309, U+0323, U+0329,
@@ -375,7 +378,7 @@
   font-style: normal;
   font-weight: 800;
   font-stretch: 100%;
-  src: url("../_fonts/Nunito_Sans/pe0TMImSLYBIv1o4X1M8ce2xCx3yop4tQpF_MeTm0lfGWVpNn64CL7U8upHZIbMV51Q42ptCp7t7R-tQKr51pE8.woff2")
+  src: url("../fonts/Nunito_Sans/pe0TMImSLYBIv1o4X1M8ce2xCx3yop4tQpF_MeTm0lfGWVpNn64CL7U8upHZIbMV51Q42ptCp7t7R-tQKr51pE8.woff2")
     format("woff2");
   unicode-range: U+0100-02AF, U+0304, U+0308, U+0329, U+1E00-1E9F, U+1EF2-1EFF,
     U+2020, U+20A0-20AB, U+20AD-20C0, U+2113, U+2C60-2C7F, U+A720-A7FF;
@@ -386,7 +389,7 @@
   font-style: normal;
   font-weight: 800;
   font-stretch: 100%;
-  src: url("../_fonts/Nunito_Sans/pe0TMImSLYBIv1o4X1M8ce2xCx3yop4tQpF_MeTm0lfGWVpNn64CL7U8upHZIbMV51Q42ptCp7t1R-tQKr51.woff2")
+  src: url("../fonts/Nunito_Sans/pe0TMImSLYBIv1o4X1M8ce2xCx3yop4tQpF_MeTm0lfGWVpNn64CL7U8upHZIbMV51Q42ptCp7t1R-tQKr51.woff2")
     format("woff2");
   unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA,
     U+02DC, U+0304, U+0308, U+0329, U+2000-206F, U+2074, U+20AC, U+2122, U+2191,
@@ -398,7 +401,7 @@
   font-style: normal;
   font-weight: 900;
   font-stretch: 100%;
-  src: url("../_fonts/Nunito_Sans/pe0TMImSLYBIv1o4X1M8ce2xCx3yop4tQpF_MeTm0lfGWVpNn64CL7U8upHZIbMV51Q42ptCp7t4R-tQKr51pE8.woff2")
+  src: url("../fonts/Nunito_Sans/pe0TMImSLYBIv1o4X1M8ce2xCx3yop4tQpF_MeTm0lfGWVpNn64CL7U8upHZIbMV51Q42ptCp7t4R-tQKr51pE8.woff2")
     format("woff2");
   unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F,
     U+FE2E-FE2F;
@@ -409,7 +412,7 @@
   font-style: normal;
   font-weight: 900;
   font-stretch: 100%;
-  src: url("../_fonts/Nunito_Sans/pe0TMImSLYBIv1o4X1M8ce2xCx3yop4tQpF_MeTm0lfGWVpNn64CL7U8upHZIbMV51Q42ptCp7txR-tQKr51pE8.woff2")
+  src: url("../fonts/Nunito_Sans/pe0TMImSLYBIv1o4X1M8ce2xCx3yop4tQpF_MeTm0lfGWVpNn64CL7U8upHZIbMV51Q42ptCp7txR-tQKr51pE8.woff2")
     format("woff2");
   unicode-range: U+0301, U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
 }
@@ -419,7 +422,7 @@
   font-style: normal;
   font-weight: 900;
   font-stretch: 100%;
-  src: url("../_fonts/Nunito_Sans/pe0TMImSLYBIv1o4X1M8ce2xCx3yop4tQpF_MeTm0lfGWVpNn64CL7U8upHZIbMV51Q42ptCp7t6R-tQKr51pE8.woff2")
+  src: url("../fonts/Nunito_Sans/pe0TMImSLYBIv1o4X1M8ce2xCx3yop4tQpF_MeTm0lfGWVpNn64CL7U8upHZIbMV51Q42ptCp7t6R-tQKr51pE8.woff2")
     format("woff2");
   unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1,
     U+01AF-01B0, U+0300-0301, U+0303-0304, U+0308-0309, U+0323, U+0329,
@@ -431,7 +434,7 @@
   font-style: normal;
   font-weight: 900;
   font-stretch: 100%;
-  src: url("../_fonts/Nunito_Sans/pe0TMImSLYBIv1o4X1M8ce2xCx3yop4tQpF_MeTm0lfGWVpNn64CL7U8upHZIbMV51Q42ptCp7t7R-tQKr51pE8.woff2")
+  src: url("../fonts/Nunito_Sans/pe0TMImSLYBIv1o4X1M8ce2xCx3yop4tQpF_MeTm0lfGWVpNn64CL7U8upHZIbMV51Q42ptCp7t7R-tQKr51pE8.woff2")
     format("woff2");
   unicode-range: U+0100-02AF, U+0304, U+0308, U+0329, U+1E00-1E9F, U+1EF2-1EFF,
     U+2020, U+20A0-20AB, U+20AD-20C0, U+2113, U+2C60-2C7F, U+A720-A7FF;
@@ -442,7 +445,187 @@
   font-style: normal;
   font-weight: 900;
   font-stretch: 100%;
-  src: url("../_fonts/Nunito_Sans/pe0TMImSLYBIv1o4X1M8ce2xCx3yop4tQpF_MeTm0lfGWVpNn64CL7U8upHZIbMV51Q42ptCp7t1R-tQKr51.woff2")
+  src: url("../fonts/Nunito_Sans/pe0TMImSLYBIv1o4X1M8ce2xCx3yop4tQpF_MeTm0lfGWVpNn64CL7U8upHZIbMV51Q42ptCp7t1R-tQKr51.woff2")
+    format("woff2");
+  unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA,
+    U+02DC, U+0304, U+0308, U+0329, U+2000-206F, U+2074, U+20AC, U+2122, U+2191,
+    U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
+
+
+
+
+
+
+
+
+/*
+Zilla Slab
+Source: https://fonts.googleapis.com/css?family=Zilla+Slab:300,400,500,600,700,300i,400i,600i
+*/
+/* latin-ext */
+@font-face {
+  font-family: "Zilla Slab";
+  font-style: italic;
+  font-weight: 300;
+  src: url("../fonts/Zilla_Slab/dFanZfeM_74wlPZtksIFaj8CVHaZV3B3X6_0f1Nk.woff2")
+    format("woff2");
+  unicode-range: U+0100-02AF, U+0304, U+0308, U+0329, U+1E00-1E9F, U+1EF2-1EFF,
+    U+2020, U+20A0-20AB, U+20AD-20C0, U+2113, U+2C60-2C7F, U+A720-A7FF;
+}
+/* latin */
+@font-face {
+  font-family: "Zilla Slab";
+  font-style: italic;
+  font-weight: 300;
+  src: url("../fonts/Zilla_Slab/dFanZfeM_74wlPZtksIFaj8CVHaZWXB3X6_0fw.woff2")
+    format("woff2");
+  unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA,
+    U+02DC, U+0304, U+0308, U+0329, U+2000-206F, U+2074, U+20AC, U+2122, U+2191,
+    U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
+/* latin-ext */
+@font-face {
+  font-family: "Zilla Slab";
+  font-style: italic;
+  font-weight: 400;
+  src: url("../fonts/Zilla_Slab/dFa4ZfeM_74wlPZtksIFaj8K8VSMdFJ6dZX9.woff2")
+    format("woff2");
+  unicode-range: U+0100-02AF, U+0304, U+0308, U+0329, U+1E00-1E9F, U+1EF2-1EFF,
+    U+2020, U+20A0-20AB, U+20AD-20C0, U+2113, U+2C60-2C7F, U+A720-A7FF;
+}
+/* latin */
+@font-face {
+  font-family: "Zilla Slab";
+  font-style: italic;
+  font-weight: 400;
+  src: url("../fonts/Zilla_Slab/dFa4ZfeM_74wlPZtksIFaj8K_1SMdFJ6dQ.woff2")
+    format("woff2");
+  unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA,
+    U+02DC, U+0304, U+0308, U+0329, U+2000-206F, U+2074, U+20AC, U+2122, U+2191,
+    U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
+/* latin-ext */
+@font-face {
+  font-family: "Zilla Slab";
+  font-style: normal;
+  font-weight: 500;
+  src: url("../fonts/Zilla_Slab/dFa5ZfeM_74wlPZtksIFYskZ6H2pW3pwfa3Efg.woff2")
+    format("woff2");
+  unicode-range: U+0100-02AF, U+0304, U+0308, U+0329, U+1E00-1E9F, U+1EF2-1EFF,
+    U+2020, U+20A0-20AB, U+20AD-20C0, U+2113, U+2C60-2C7F, U+A720-A7FF;
+}
+/* latin */
+@font-face {
+  font-family: "Zilla Slab";
+  font-style: normal;
+  font-weight: 500;
+  src: url("../fonts/Zilla_Slab/dFa5ZfeM_74wlPZtksIFYskZ6HOpW3pwfa0.woff2")
+    format("woff2");
+  unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA,
+    U+02DC, U+0304, U+0308, U+0329, U+2000-206F, U+2074, U+20AC, U+2122, U+2191,
+    U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
+/* latin-ext */
+@font-face {
+  font-family: "Zilla Slab";
+  font-style: italic;
+  font-weight: 600;
+  src: url("../fonts/Zilla_Slab/dFanZfeM_74wlPZtksIFaj8CIHCZV3B3X6_0f1Nk.woff2")
+    format("woff2");
+  unicode-range: U+0100-02AF, U+0304, U+0308, U+0329, U+1E00-1E9F, U+1EF2-1EFF,
+    U+2020, U+20A0-20AB, U+20AD-20C0, U+2113, U+2C60-2C7F, U+A720-A7FF;
+}
+/* latin */
+@font-face {
+  font-family: "Zilla Slab";
+  font-style: italic;
+  font-weight: 600;
+  src: url("../fonts/Zilla_Slab/dFanZfeM_74wlPZtksIFaj8CIHCZWXB3X6_0fw.woff2")
+    format("woff2");
+  unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA,
+    U+02DC, U+0304, U+0308, U+0329, U+2000-206F, U+2074, U+20AC, U+2122, U+2191,
+    U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
+/* latin-ext */
+@font-face {
+  font-family: "Zilla Slab";
+  font-style: normal;
+  font-weight: 300;
+  src: url("../fonts/Zilla_Slab/dFa5ZfeM_74wlPZtksIFYpEY6H2pW3pwfa3Efg.woff2")
+    format("woff2");
+  unicode-range: U+0100-02AF, U+0304, U+0308, U+0329, U+1E00-1E9F, U+1EF2-1EFF,
+    U+2020, U+20A0-20AB, U+20AD-20C0, U+2113, U+2C60-2C7F, U+A720-A7FF;
+}
+/* latin */
+@font-face {
+  font-family: "Zilla Slab";
+  font-style: normal;
+  font-weight: 300;
+  src: url("../fonts/Zilla_Slab/dFa5ZfeM_74wlPZtksIFYpEY6HOpW3pwfa0.woff2")
+    format("woff2");
+  unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA,
+    U+02DC, U+0304, U+0308, U+0329, U+2000-206F, U+2074, U+20AC, U+2122, U+2191,
+    U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
+/* latin-ext */
+@font-face {
+  font-family: "Zilla Slab";
+  font-style: normal;
+  font-weight: 400;
+  src: url("../fonts/Zilla_Slab/dFa6ZfeM_74wlPZtksIFajQ6_V6LVlBKdA.woff2")
+    format("woff2");
+  unicode-range: U+0100-02AF, U+0304, U+0308, U+0329, U+1E00-1E9F, U+1EF2-1EFF,
+    U+2020, U+20A0-20AB, U+20AD-20C0, U+2113, U+2C60-2C7F, U+A720-A7FF;
+}
+/* latin */
+@font-face {
+  font-family: "Zilla Slab";
+  font-style: normal;
+  font-weight: 400;
+  src: url("../fonts/Zilla_Slab/dFa6ZfeM_74wlPZtksIFajo6_V6LVlA.woff2")
+    format("woff2");
+  unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA,
+    U+02DC, U+0304, U+0308, U+0329, U+2000-206F, U+2074, U+20AC, U+2122, U+2191,
+    U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
+/* latin-ext */
+@font-face {
+  font-family: "Zilla Slab";
+  font-style: normal;
+  font-weight: 600;
+  src: url("../fonts/Zilla_Slab/dFa5ZfeM_74wlPZtksIFYuUe6H2pW3pwfa3Efg.woff2")
+    format("woff2");
+  unicode-range: U+0100-02AF, U+0304, U+0308, U+0329, U+1E00-1E9F, U+1EF2-1EFF,
+    U+2020, U+20A0-20AB, U+20AD-20C0, U+2113, U+2C60-2C7F, U+A720-A7FF;
+}
+/* latin */
+@font-face {
+  font-family: "Zilla Slab";
+  font-style: normal;
+  font-weight: 600;
+  src: url("../fonts/Zilla_Slab/dFa5ZfeM_74wlPZtksIFYuUe6HOpW3pwfa0.woff2")
+    format("woff2");
+  unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA,
+    U+02DC, U+0304, U+0308, U+0329, U+2000-206F, U+2074, U+20AC, U+2122, U+2191,
+    U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
+/* latin-ext */
+@font-face {
+  font-family: "Zilla Slab";
+  font-style: normal;
+  font-weight: 700;
+  src: url("../fonts/Zilla_Slab/dFa5ZfeM_74wlPZtksIFYoEf6H2pW3pwfa3Efg.woff2")
+    format("woff2");
+  unicode-range: U+0100-02AF, U+0304, U+0308, U+0329, U+1E00-1E9F, U+1EF2-1EFF,
+    U+2020, U+20A0-20AB, U+20AD-20C0, U+2113, U+2C60-2C7F, U+A720-A7FF;
+}
+/* latin */
+@font-face {
+  font-family: "Zilla Slab";
+  font-style: normal;
+  font-weight: 700;
+  src: url("../fonts/Zilla_Slab/dFa5ZfeM_74wlPZtksIFYoEf6HOpW3pwfa0.woff2")
     format("woff2");
   unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA,
     U+02DC, U+0304, U+0308, U+0329, U+2000-206F, U+2074, U+20AC, U+2122, U+2191,
diff --git a/source/sass/font-faces/caveat.scss b/source/fonts/css/caveat.css
similarity index 70%
rename from source/sass/font-faces/caveat.scss
rename to source/fonts/css/caveat.css
index 77fc58518aa..b5c9328baff 100644
--- a/source/sass/font-faces/caveat.scss
+++ b/source/fonts/css/caveat.css
@@ -1,5 +1,8 @@
-//For use on Dear Internet page
-//Source: https://fonts.googleapis.com/css2?family=Caveat&display=swap
+/*
+Caveat
+For use on Dear Internet page
+Source: https://fonts.googleapis.com/css2?family=Caveat&display=swap
+*/
 
 /* cyrillic-ext */
 @font-face {
@@ -7,7 +10,7 @@
   font-style: normal;
   font-weight: 400;
   font-display: swap;
-  src: url("../_fonts/Caveat/WnznHAc5bAfYB2QRah7pcpNvOx-pjfJ9eIipYT5Kmgq3s84t.woff2")
+  src: url("../fonts/Caveat/WnznHAc5bAfYB2QRah7pcpNvOx-pjfJ9eIipYT5Kmgq3s84t.woff2")
     format("woff2");
   unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F,
     U+FE2E-FE2F;
@@ -18,7 +21,7 @@
   font-style: normal;
   font-weight: 400;
   font-display: swap;
-  src: url("../_fonts/Caveat/WnznHAc5bAfYB2QRah7pcpNvOx-pjfJ9eIGpYT5Kmgq3s84t.woff2")
+  src: url("../fonts/Caveat/WnznHAc5bAfYB2QRah7pcpNvOx-pjfJ9eIGpYT5Kmgq3s84t.woff2")
     format("woff2");
   unicode-range: U+0301, U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
 }
@@ -28,7 +31,7 @@
   font-style: normal;
   font-weight: 400;
   font-display: swap;
-  src: url("../_fonts/Caveat/WnznHAc5bAfYB2QRah7pcpNvOx-pjfJ9eIupYT5Kmgq3s84t.woff2")
+  src: url("../fonts/Caveat/WnznHAc5bAfYB2QRah7pcpNvOx-pjfJ9eIupYT5Kmgq3s84t.woff2")
     format("woff2");
   unicode-range: U+0100-02AF, U+0304, U+0308, U+0329, U+1E00-1E9F, U+1EF2-1EFF,
     U+2020, U+20A0-20AB, U+20AD-20C0, U+2113, U+2C60-2C7F, U+A720-A7FF;
@@ -39,7 +42,7 @@
   font-style: normal;
   font-weight: 400;
   font-display: swap;
-  src: url("../_fonts/Caveat/WnznHAc5bAfYB2QRah7pcpNvOx-pjfJ9eIWpYT5Kmgq3sw.woff2")
+  src: url("../fonts/Caveat/WnznHAc5bAfYB2QRah7pcpNvOx-pjfJ9eIWpYT5Kmgq3sw.woff2")
     format("woff2");
   unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA,
     U+02DC, U+0304, U+0308, U+0329, U+2000-206F, U+2074, U+20AC, U+2122, U+2191,
diff --git a/source/sass/font-faces/changa.scss b/source/fonts/css/changa.css
similarity index 82%
rename from source/sass/font-faces/changa.scss
rename to source/fonts/css/changa.css
index 71efb50aef8..36b1b00ad1c 100644
--- a/source/sass/font-faces/changa.scss
+++ b/source/fonts/css/changa.css
@@ -1,5 +1,8 @@
-//For use on YouTube Regrets Reporter
-//Source: https://fonts.googleapis.com/css2?family=Changa:wght@600;700&display=swap
+/*
+Changa
+For use on YouTube Regrets Reporter
+Source: https://fonts.googleapis.com/css2?family=Changa:wght@600;700&display=swap
+*/
 
 /* arabic */
 @font-face {
@@ -7,7 +10,7 @@
   font-style: normal;
   font-weight: 600;
   font-display: swap;
-  src: url("../_fonts/Changa/2-cm9JNi2YuVOUckY5y-eOz1paFD.woff2")
+  src: url("../fonts/Changa/2-cm9JNi2YuVOUckY5y-eOz1paFD.woff2")
     format("woff2");
   unicode-range: U+0600-06FF, U+0750-077F, U+0870-088E, U+0890-0891, U+0898-08E1,
     U+08E3-08FF, U+200C-200E, U+2010-2011, U+204F, U+2E41, U+FB50-FDFF,
@@ -25,7 +28,7 @@
   font-style: normal;
   font-weight: 600;
   font-display: swap;
-  src: url("../_fonts/Changa/2-cm9JNi2YuVOUckaJy-eOz1paFD.woff2")
+  src: url("../fonts/Changa/2-cm9JNi2YuVOUckaJy-eOz1paFD.woff2")
     format("woff2");
   unicode-range: U+0100-02AF, U+0304, U+0308, U+0329, U+1E00-1E9F, U+1EF2-1EFF,
     U+2020, U+20A0-20AB, U+20AD-20C0, U+2113, U+2C60-2C7F, U+A720-A7FF;
@@ -36,7 +39,7 @@
   font-style: normal;
   font-weight: 600;
   font-display: swap;
-  src: url("../_fonts/Changa/2-cm9JNi2YuVOUckZpy-eOz1pQ.woff2") format("woff2");
+  src: url("../fonts/Changa/2-cm9JNi2YuVOUckZpy-eOz1pQ.woff2") format("woff2");
   unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA,
     U+02DC, U+0304, U+0308, U+0329, U+2000-206F, U+2074, U+20AC, U+2122, U+2191,
     U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
@@ -47,7 +50,7 @@
   font-style: normal;
   font-weight: 700;
   font-display: swap;
-  src: url("../_fonts/Changa/2-cm9JNi2YuVOUckY5y-eOz1paFD.woff2")
+  src: url("../fonts/Changa/2-cm9JNi2YuVOUckY5y-eOz1paFD.woff2")
     format("woff2");
   unicode-range: U+0600-06FF, U+0750-077F, U+0870-088E, U+0890-0891, U+0898-08E1,
     U+08E3-08FF, U+200C-200E, U+2010-2011, U+204F, U+2E41, U+FB50-FDFF,
@@ -65,7 +68,7 @@
   font-style: normal;
   font-weight: 700;
   font-display: swap;
-  src: url("../_fonts/Changa/2-cm9JNi2YuVOUckaJy-eOz1paFD.woff2")
+  src: url("../fonts/Changa/2-cm9JNi2YuVOUckaJy-eOz1paFD.woff2")
     format("woff2");
   unicode-range: U+0100-02AF, U+0304, U+0308, U+0329, U+1E00-1E9F, U+1EF2-1EFF,
     U+2020, U+20A0-20AB, U+20AD-20C0, U+2113, U+2C60-2C7F, U+A720-A7FF;
@@ -76,20 +79,24 @@
   font-style: normal;
   font-weight: 700;
   font-display: swap;
-  src: url("../_fonts/Changa/2-cm9JNi2YuVOUckZpy-eOz1pQ.woff2") format("woff2");
+  src: url("../fonts/Changa/2-cm9JNi2YuVOUckZpy-eOz1pQ.woff2") format("woff2");
   unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA,
     U+02DC, U+0304, U+0308, U+0329, U+2000-206F, U+2074, U+20AC, U+2122, U+2191,
     U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
 }
 
-//Source: https://fonts.googleapis.com/css?family=Changa
+/* 
+Changa
+For use on YouTube Regrets Reporter
+Source: https://fonts.googleapis.com/css?family=Changa
+*/
 
 /* arabic */
 @font-face {
   font-family: "Changa";
   font-style: normal;
   font-weight: 400;
-  src: url("../_fonts/Changa/2-c79JNi2YuVOUcOarRPgnNGooxCZ62xcjLj8TlaxZKJa5UE.woff")
+  src: url("../fonts/Changa/2-c79JNi2YuVOUcOarRPgnNGooxCZ62xcjLj8TlaxZKJa5UE.woff")
     format("woff");
   unicode-range: U+0600-06FF, U+0750-077F, U+0870-088E, U+0890-0891, U+0898-08E1,
     U+08E3-08FF, U+200C-200E, U+2010-2011, U+204F, U+2E41, U+FB50-FDFF,
@@ -106,7 +113,7 @@
   font-family: "Changa";
   font-style: normal;
   font-weight: 400;
-  src: url("../_fonts/Changa/2-c79JNi2YuVOUcOarRPgnNGooxCZ62xcjnj8TlaxZKJa5UE.woff")
+  src: url("../fonts/Changa/2-c79JNi2YuVOUcOarRPgnNGooxCZ62xcjnj8TlaxZKJa5UE.woff")
     format("woff");
   unicode-range: U+0100-02AF, U+0304, U+0308, U+0329, U+1E00-1E9F, U+1EF2-1EFF,
     U+2020, U+20A0-20AB, U+20AD-20C0, U+2113, U+2C60-2C7F, U+A720-A7FF;
@@ -116,7 +123,7 @@
   font-family: "Changa";
   font-style: normal;
   font-weight: 400;
-  src: url("../_fonts/Changa/2-c79JNi2YuVOUcOarRPgnNGooxCZ62xcjfj8TlaxZKJaw.woff")
+  src: url("../fonts/Changa/2-c79JNi2YuVOUcOarRPgnNGooxCZ62xcjfj8TlaxZKJaw.woff")
     format("woff");
   unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA,
     U+02DC, U+0304, U+0308, U+0329, U+2000-206F, U+2074, U+20AC, U+2122, U+2191,
diff --git a/source/fonts/Caveat/WnznHAc5bAfYB2QRah7pcpNvOx-pjfJ9eIGpYT5Kmgq3s84t.woff2 b/source/fonts/fonts/Caveat/WnznHAc5bAfYB2QRah7pcpNvOx-pjfJ9eIGpYT5Kmgq3s84t.woff2
similarity index 100%
rename from source/fonts/Caveat/WnznHAc5bAfYB2QRah7pcpNvOx-pjfJ9eIGpYT5Kmgq3s84t.woff2
rename to source/fonts/fonts/Caveat/WnznHAc5bAfYB2QRah7pcpNvOx-pjfJ9eIGpYT5Kmgq3s84t.woff2
diff --git a/source/fonts/Caveat/WnznHAc5bAfYB2QRah7pcpNvOx-pjfJ9eIWpYT5Kmgq3sw.woff2 b/source/fonts/fonts/Caveat/WnznHAc5bAfYB2QRah7pcpNvOx-pjfJ9eIWpYT5Kmgq3sw.woff2
similarity index 100%
rename from source/fonts/Caveat/WnznHAc5bAfYB2QRah7pcpNvOx-pjfJ9eIWpYT5Kmgq3sw.woff2
rename to source/fonts/fonts/Caveat/WnznHAc5bAfYB2QRah7pcpNvOx-pjfJ9eIWpYT5Kmgq3sw.woff2
diff --git a/source/fonts/Caveat/WnznHAc5bAfYB2QRah7pcpNvOx-pjfJ9eIipYT5Kmgq3s84t.woff2 b/source/fonts/fonts/Caveat/WnznHAc5bAfYB2QRah7pcpNvOx-pjfJ9eIipYT5Kmgq3s84t.woff2
similarity index 100%
rename from source/fonts/Caveat/WnznHAc5bAfYB2QRah7pcpNvOx-pjfJ9eIipYT5Kmgq3s84t.woff2
rename to source/fonts/fonts/Caveat/WnznHAc5bAfYB2QRah7pcpNvOx-pjfJ9eIipYT5Kmgq3s84t.woff2
diff --git a/source/fonts/Caveat/WnznHAc5bAfYB2QRah7pcpNvOx-pjfJ9eIupYT5Kmgq3s84t.woff2 b/source/fonts/fonts/Caveat/WnznHAc5bAfYB2QRah7pcpNvOx-pjfJ9eIupYT5Kmgq3s84t.woff2
similarity index 100%
rename from source/fonts/Caveat/WnznHAc5bAfYB2QRah7pcpNvOx-pjfJ9eIupYT5Kmgq3s84t.woff2
rename to source/fonts/fonts/Caveat/WnznHAc5bAfYB2QRah7pcpNvOx-pjfJ9eIupYT5Kmgq3s84t.woff2
diff --git a/source/fonts/Changa/2-c79JNi2YuVOUcOarRPgnNGooxCZ62xcjLj8TlaxZKJa5UE.woff b/source/fonts/fonts/Changa/2-c79JNi2YuVOUcOarRPgnNGooxCZ62xcjLj8TlaxZKJa5UE.woff
similarity index 100%
rename from source/fonts/Changa/2-c79JNi2YuVOUcOarRPgnNGooxCZ62xcjLj8TlaxZKJa5UE.woff
rename to source/fonts/fonts/Changa/2-c79JNi2YuVOUcOarRPgnNGooxCZ62xcjLj8TlaxZKJa5UE.woff
diff --git a/source/fonts/Changa/2-c79JNi2YuVOUcOarRPgnNGooxCZ62xcjfj8TlaxZKJaw.woff b/source/fonts/fonts/Changa/2-c79JNi2YuVOUcOarRPgnNGooxCZ62xcjfj8TlaxZKJaw.woff
similarity index 100%
rename from source/fonts/Changa/2-c79JNi2YuVOUcOarRPgnNGooxCZ62xcjfj8TlaxZKJaw.woff
rename to source/fonts/fonts/Changa/2-c79JNi2YuVOUcOarRPgnNGooxCZ62xcjfj8TlaxZKJaw.woff
diff --git a/source/fonts/Changa/2-c79JNi2YuVOUcOarRPgnNGooxCZ62xcjnj8TlaxZKJa5UE.woff b/source/fonts/fonts/Changa/2-c79JNi2YuVOUcOarRPgnNGooxCZ62xcjnj8TlaxZKJa5UE.woff
similarity index 100%
rename from source/fonts/Changa/2-c79JNi2YuVOUcOarRPgnNGooxCZ62xcjnj8TlaxZKJa5UE.woff
rename to source/fonts/fonts/Changa/2-c79JNi2YuVOUcOarRPgnNGooxCZ62xcjnj8TlaxZKJa5UE.woff
diff --git a/source/fonts/Changa/2-cm9JNi2YuVOUckY5y-eOz1paFD.woff2 b/source/fonts/fonts/Changa/2-cm9JNi2YuVOUckY5y-eOz1paFD.woff2
similarity index 100%
rename from source/fonts/Changa/2-cm9JNi2YuVOUckY5y-eOz1paFD.woff2
rename to source/fonts/fonts/Changa/2-cm9JNi2YuVOUckY5y-eOz1paFD.woff2
diff --git a/source/fonts/Changa/2-cm9JNi2YuVOUckZpy-eOz1pQ.woff2 b/source/fonts/fonts/Changa/2-cm9JNi2YuVOUckZpy-eOz1pQ.woff2
similarity index 100%
rename from source/fonts/Changa/2-cm9JNi2YuVOUckZpy-eOz1pQ.woff2
rename to source/fonts/fonts/Changa/2-cm9JNi2YuVOUckZpy-eOz1pQ.woff2
diff --git a/source/fonts/Changa/2-cm9JNi2YuVOUckaJy-eOz1paFD.woff2 b/source/fonts/fonts/Changa/2-cm9JNi2YuVOUckaJy-eOz1paFD.woff2
similarity index 100%
rename from source/fonts/Changa/2-cm9JNi2YuVOUckaJy-eOz1paFD.woff2
rename to source/fonts/fonts/Changa/2-cm9JNi2YuVOUckaJy-eOz1paFD.woff2
diff --git a/source/fonts/Nunito_Sans/pe0RMImSLYBIv1o4X1M8cce4OdVisMz5nZRqy6cmmmU3t2FQWEAEOvV9wNvrwlNstMKW3Y6K5WMwd-1aLZx3lE4-Hw.woff2 b/source/fonts/fonts/Nunito_Sans/pe0RMImSLYBIv1o4X1M8cce4OdVisMz5nZRqy6cmmmU3t2FQWEAEOvV9wNvrwlNstMKW3Y6K5WMwd-1aLZx3lE4-Hw.woff2
similarity index 100%
rename from source/fonts/Nunito_Sans/pe0RMImSLYBIv1o4X1M8cce4OdVisMz5nZRqy6cmmmU3t2FQWEAEOvV9wNvrwlNstMKW3Y6K5WMwd-1aLZx3lE4-Hw.woff2
rename to source/fonts/fonts/Nunito_Sans/pe0RMImSLYBIv1o4X1M8cce4OdVisMz5nZRqy6cmmmU3t2FQWEAEOvV9wNvrwlNstMKW3Y6K5WMwd-1aLZx3lE4-Hw.woff2
diff --git a/source/fonts/Nunito_Sans/pe0RMImSLYBIv1o4X1M8cce4OdVisMz5nZRqy6cmmmU3t2FQWEAEOvV9wNvrwlNstMKW3Y6K5WMwd-RaLZx3lE4-Hw.woff2 b/source/fonts/fonts/Nunito_Sans/pe0RMImSLYBIv1o4X1M8cce4OdVisMz5nZRqy6cmmmU3t2FQWEAEOvV9wNvrwlNstMKW3Y6K5WMwd-RaLZx3lE4-Hw.woff2
similarity index 100%
rename from source/fonts/Nunito_Sans/pe0RMImSLYBIv1o4X1M8cce4OdVisMz5nZRqy6cmmmU3t2FQWEAEOvV9wNvrwlNstMKW3Y6K5WMwd-RaLZx3lE4-Hw.woff2
rename to source/fonts/fonts/Nunito_Sans/pe0RMImSLYBIv1o4X1M8cce4OdVisMz5nZRqy6cmmmU3t2FQWEAEOvV9wNvrwlNstMKW3Y6K5WMwd-RaLZx3lE4-Hw.woff2
diff --git a/source/fonts/Nunito_Sans/pe0RMImSLYBIv1o4X1M8cce4OdVisMz5nZRqy6cmmmU3t2FQWEAEOvV9wNvrwlNstMKW3Y6K5WMwd-ZaLZx3lE4-Hw.woff2 b/source/fonts/fonts/Nunito_Sans/pe0RMImSLYBIv1o4X1M8cce4OdVisMz5nZRqy6cmmmU3t2FQWEAEOvV9wNvrwlNstMKW3Y6K5WMwd-ZaLZx3lE4-Hw.woff2
similarity index 100%
rename from source/fonts/Nunito_Sans/pe0RMImSLYBIv1o4X1M8cce4OdVisMz5nZRqy6cmmmU3t2FQWEAEOvV9wNvrwlNstMKW3Y6K5WMwd-ZaLZx3lE4-Hw.woff2
rename to source/fonts/fonts/Nunito_Sans/pe0RMImSLYBIv1o4X1M8cce4OdVisMz5nZRqy6cmmmU3t2FQWEAEOvV9wNvrwlNstMKW3Y6K5WMwd-ZaLZx3lE4-Hw.woff2
diff --git a/source/fonts/Nunito_Sans/pe0RMImSLYBIv1o4X1M8cce4OdVisMz5nZRqy6cmmmU3t2FQWEAEOvV9wNvrwlNstMKW3Y6K5WMwd-daLZx3lE4-Hw.woff2 b/source/fonts/fonts/Nunito_Sans/pe0RMImSLYBIv1o4X1M8cce4OdVisMz5nZRqy6cmmmU3t2FQWEAEOvV9wNvrwlNstMKW3Y6K5WMwd-daLZx3lE4-Hw.woff2
similarity index 100%
rename from source/fonts/Nunito_Sans/pe0RMImSLYBIv1o4X1M8cce4OdVisMz5nZRqy6cmmmU3t2FQWEAEOvV9wNvrwlNstMKW3Y6K5WMwd-daLZx3lE4-Hw.woff2
rename to source/fonts/fonts/Nunito_Sans/pe0RMImSLYBIv1o4X1M8cce4OdVisMz5nZRqy6cmmmU3t2FQWEAEOvV9wNvrwlNstMKW3Y6K5WMwd-daLZx3lE4-Hw.woff2
diff --git a/source/fonts/Nunito_Sans/pe0RMImSLYBIv1o4X1M8cce4OdVisMz5nZRqy6cmmmU3t2FQWEAEOvV9wNvrwlNstMKW3Y6K5WMwd-laLZx3lE4.woff2 b/source/fonts/fonts/Nunito_Sans/pe0RMImSLYBIv1o4X1M8cce4OdVisMz5nZRqy6cmmmU3t2FQWEAEOvV9wNvrwlNstMKW3Y6K5WMwd-laLZx3lE4.woff2
similarity index 100%
rename from source/fonts/Nunito_Sans/pe0RMImSLYBIv1o4X1M8cce4OdVisMz5nZRqy6cmmmU3t2FQWEAEOvV9wNvrwlNstMKW3Y6K5WMwd-laLZx3lE4.woff2
rename to source/fonts/fonts/Nunito_Sans/pe0RMImSLYBIv1o4X1M8cce4OdVisMz5nZRqy6cmmmU3t2FQWEAEOvV9wNvrwlNstMKW3Y6K5WMwd-laLZx3lE4.woff2
diff --git a/source/fonts/Nunito_Sans/pe0TMImSLYBIv1o4X1M8ce2xCx3yop4tQpF_MeTm0lfGWVpNn64CL7U8upHZIbMV51Q42ptCp7t1R-tQKr51.woff2 b/source/fonts/fonts/Nunito_Sans/pe0TMImSLYBIv1o4X1M8ce2xCx3yop4tQpF_MeTm0lfGWVpNn64CL7U8upHZIbMV51Q42ptCp7t1R-tQKr51.woff2
similarity index 100%
rename from source/fonts/Nunito_Sans/pe0TMImSLYBIv1o4X1M8ce2xCx3yop4tQpF_MeTm0lfGWVpNn64CL7U8upHZIbMV51Q42ptCp7t1R-tQKr51.woff2
rename to source/fonts/fonts/Nunito_Sans/pe0TMImSLYBIv1o4X1M8ce2xCx3yop4tQpF_MeTm0lfGWVpNn64CL7U8upHZIbMV51Q42ptCp7t1R-tQKr51.woff2
diff --git a/source/fonts/Nunito_Sans/pe0TMImSLYBIv1o4X1M8ce2xCx3yop4tQpF_MeTm0lfGWVpNn64CL7U8upHZIbMV51Q42ptCp7t4R-tQKr51pE8.woff2 b/source/fonts/fonts/Nunito_Sans/pe0TMImSLYBIv1o4X1M8ce2xCx3yop4tQpF_MeTm0lfGWVpNn64CL7U8upHZIbMV51Q42ptCp7t4R-tQKr51pE8.woff2
similarity index 100%
rename from source/fonts/Nunito_Sans/pe0TMImSLYBIv1o4X1M8ce2xCx3yop4tQpF_MeTm0lfGWVpNn64CL7U8upHZIbMV51Q42ptCp7t4R-tQKr51pE8.woff2
rename to source/fonts/fonts/Nunito_Sans/pe0TMImSLYBIv1o4X1M8ce2xCx3yop4tQpF_MeTm0lfGWVpNn64CL7U8upHZIbMV51Q42ptCp7t4R-tQKr51pE8.woff2
diff --git a/source/fonts/Nunito_Sans/pe0TMImSLYBIv1o4X1M8ce2xCx3yop4tQpF_MeTm0lfGWVpNn64CL7U8upHZIbMV51Q42ptCp7t6R-tQKr51pE8.woff2 b/source/fonts/fonts/Nunito_Sans/pe0TMImSLYBIv1o4X1M8ce2xCx3yop4tQpF_MeTm0lfGWVpNn64CL7U8upHZIbMV51Q42ptCp7t6R-tQKr51pE8.woff2
similarity index 100%
rename from source/fonts/Nunito_Sans/pe0TMImSLYBIv1o4X1M8ce2xCx3yop4tQpF_MeTm0lfGWVpNn64CL7U8upHZIbMV51Q42ptCp7t6R-tQKr51pE8.woff2
rename to source/fonts/fonts/Nunito_Sans/pe0TMImSLYBIv1o4X1M8ce2xCx3yop4tQpF_MeTm0lfGWVpNn64CL7U8upHZIbMV51Q42ptCp7t6R-tQKr51pE8.woff2
diff --git a/source/fonts/Nunito_Sans/pe0TMImSLYBIv1o4X1M8ce2xCx3yop4tQpF_MeTm0lfGWVpNn64CL7U8upHZIbMV51Q42ptCp7t7R-tQKr51pE8.woff2 b/source/fonts/fonts/Nunito_Sans/pe0TMImSLYBIv1o4X1M8ce2xCx3yop4tQpF_MeTm0lfGWVpNn64CL7U8upHZIbMV51Q42ptCp7t7R-tQKr51pE8.woff2
similarity index 100%
rename from source/fonts/Nunito_Sans/pe0TMImSLYBIv1o4X1M8ce2xCx3yop4tQpF_MeTm0lfGWVpNn64CL7U8upHZIbMV51Q42ptCp7t7R-tQKr51pE8.woff2
rename to source/fonts/fonts/Nunito_Sans/pe0TMImSLYBIv1o4X1M8ce2xCx3yop4tQpF_MeTm0lfGWVpNn64CL7U8upHZIbMV51Q42ptCp7t7R-tQKr51pE8.woff2
diff --git a/source/fonts/Nunito_Sans/pe0TMImSLYBIv1o4X1M8ce2xCx3yop4tQpF_MeTm0lfGWVpNn64CL7U8upHZIbMV51Q42ptCp7txR-tQKr51pE8.woff2 b/source/fonts/fonts/Nunito_Sans/pe0TMImSLYBIv1o4X1M8ce2xCx3yop4tQpF_MeTm0lfGWVpNn64CL7U8upHZIbMV51Q42ptCp7txR-tQKr51pE8.woff2
similarity index 100%
rename from source/fonts/Nunito_Sans/pe0TMImSLYBIv1o4X1M8ce2xCx3yop4tQpF_MeTm0lfGWVpNn64CL7U8upHZIbMV51Q42ptCp7txR-tQKr51pE8.woff2
rename to source/fonts/fonts/Nunito_Sans/pe0TMImSLYBIv1o4X1M8ce2xCx3yop4tQpF_MeTm0lfGWVpNn64CL7U8upHZIbMV51Q42ptCp7txR-tQKr51pE8.woff2
diff --git a/source/fonts/Zilla_Slab/dFa4ZfeM_74wlPZtksIFaj8K8VSMdFJ6dZX9.woff2 b/source/fonts/fonts/Zilla_Slab/dFa4ZfeM_74wlPZtksIFaj8K8VSMdFJ6dZX9.woff2
similarity index 100%
rename from source/fonts/Zilla_Slab/dFa4ZfeM_74wlPZtksIFaj8K8VSMdFJ6dZX9.woff2
rename to source/fonts/fonts/Zilla_Slab/dFa4ZfeM_74wlPZtksIFaj8K8VSMdFJ6dZX9.woff2
diff --git a/source/fonts/Zilla_Slab/dFa4ZfeM_74wlPZtksIFaj8K_1SMdFJ6dQ.woff2 b/source/fonts/fonts/Zilla_Slab/dFa4ZfeM_74wlPZtksIFaj8K_1SMdFJ6dQ.woff2
similarity index 100%
rename from source/fonts/Zilla_Slab/dFa4ZfeM_74wlPZtksIFaj8K_1SMdFJ6dQ.woff2
rename to source/fonts/fonts/Zilla_Slab/dFa4ZfeM_74wlPZtksIFaj8K_1SMdFJ6dQ.woff2
diff --git a/source/fonts/Zilla_Slab/dFa5ZfeM_74wlPZtksIFYoEf6H2pW3pwfa3Efg.woff2 b/source/fonts/fonts/Zilla_Slab/dFa5ZfeM_74wlPZtksIFYoEf6H2pW3pwfa3Efg.woff2
similarity index 100%
rename from source/fonts/Zilla_Slab/dFa5ZfeM_74wlPZtksIFYoEf6H2pW3pwfa3Efg.woff2
rename to source/fonts/fonts/Zilla_Slab/dFa5ZfeM_74wlPZtksIFYoEf6H2pW3pwfa3Efg.woff2
diff --git a/source/fonts/Zilla_Slab/dFa5ZfeM_74wlPZtksIFYoEf6HOpW3pwfa0.woff2 b/source/fonts/fonts/Zilla_Slab/dFa5ZfeM_74wlPZtksIFYoEf6HOpW3pwfa0.woff2
similarity index 100%
rename from source/fonts/Zilla_Slab/dFa5ZfeM_74wlPZtksIFYoEf6HOpW3pwfa0.woff2
rename to source/fonts/fonts/Zilla_Slab/dFa5ZfeM_74wlPZtksIFYoEf6HOpW3pwfa0.woff2
diff --git a/source/fonts/Zilla_Slab/dFa5ZfeM_74wlPZtksIFYpEY6H2pW3pwfa3Efg.woff2 b/source/fonts/fonts/Zilla_Slab/dFa5ZfeM_74wlPZtksIFYpEY6H2pW3pwfa3Efg.woff2
similarity index 100%
rename from source/fonts/Zilla_Slab/dFa5ZfeM_74wlPZtksIFYpEY6H2pW3pwfa3Efg.woff2
rename to source/fonts/fonts/Zilla_Slab/dFa5ZfeM_74wlPZtksIFYpEY6H2pW3pwfa3Efg.woff2
diff --git a/source/fonts/Zilla_Slab/dFa5ZfeM_74wlPZtksIFYpEY6HOpW3pwfa0.woff2 b/source/fonts/fonts/Zilla_Slab/dFa5ZfeM_74wlPZtksIFYpEY6HOpW3pwfa0.woff2
similarity index 100%
rename from source/fonts/Zilla_Slab/dFa5ZfeM_74wlPZtksIFYpEY6HOpW3pwfa0.woff2
rename to source/fonts/fonts/Zilla_Slab/dFa5ZfeM_74wlPZtksIFYpEY6HOpW3pwfa0.woff2
diff --git a/source/fonts/Zilla_Slab/dFa5ZfeM_74wlPZtksIFYskZ6H2pW3pwfa3Efg.woff2 b/source/fonts/fonts/Zilla_Slab/dFa5ZfeM_74wlPZtksIFYskZ6H2pW3pwfa3Efg.woff2
similarity index 100%
rename from source/fonts/Zilla_Slab/dFa5ZfeM_74wlPZtksIFYskZ6H2pW3pwfa3Efg.woff2
rename to source/fonts/fonts/Zilla_Slab/dFa5ZfeM_74wlPZtksIFYskZ6H2pW3pwfa3Efg.woff2
diff --git a/source/fonts/Zilla_Slab/dFa5ZfeM_74wlPZtksIFYskZ6HOpW3pwfa0.woff2 b/source/fonts/fonts/Zilla_Slab/dFa5ZfeM_74wlPZtksIFYskZ6HOpW3pwfa0.woff2
similarity index 100%
rename from source/fonts/Zilla_Slab/dFa5ZfeM_74wlPZtksIFYskZ6HOpW3pwfa0.woff2
rename to source/fonts/fonts/Zilla_Slab/dFa5ZfeM_74wlPZtksIFYskZ6HOpW3pwfa0.woff2
diff --git a/source/fonts/Zilla_Slab/dFa5ZfeM_74wlPZtksIFYuUe6H2pW3pwfa3Efg.woff2 b/source/fonts/fonts/Zilla_Slab/dFa5ZfeM_74wlPZtksIFYuUe6H2pW3pwfa3Efg.woff2
similarity index 100%
rename from source/fonts/Zilla_Slab/dFa5ZfeM_74wlPZtksIFYuUe6H2pW3pwfa3Efg.woff2
rename to source/fonts/fonts/Zilla_Slab/dFa5ZfeM_74wlPZtksIFYuUe6H2pW3pwfa3Efg.woff2
diff --git a/source/fonts/Zilla_Slab/dFa5ZfeM_74wlPZtksIFYuUe6HOpW3pwfa0.woff2 b/source/fonts/fonts/Zilla_Slab/dFa5ZfeM_74wlPZtksIFYuUe6HOpW3pwfa0.woff2
similarity index 100%
rename from source/fonts/Zilla_Slab/dFa5ZfeM_74wlPZtksIFYuUe6HOpW3pwfa0.woff2
rename to source/fonts/fonts/Zilla_Slab/dFa5ZfeM_74wlPZtksIFYuUe6HOpW3pwfa0.woff2
diff --git a/source/fonts/Zilla_Slab/dFa6ZfeM_74wlPZtksIFajQ6_V6LVlBKdA.woff2 b/source/fonts/fonts/Zilla_Slab/dFa6ZfeM_74wlPZtksIFajQ6_V6LVlBKdA.woff2
similarity index 100%
rename from source/fonts/Zilla_Slab/dFa6ZfeM_74wlPZtksIFajQ6_V6LVlBKdA.woff2
rename to source/fonts/fonts/Zilla_Slab/dFa6ZfeM_74wlPZtksIFajQ6_V6LVlBKdA.woff2
diff --git a/source/fonts/Zilla_Slab/dFa6ZfeM_74wlPZtksIFajo6_V6LVlA.woff2 b/source/fonts/fonts/Zilla_Slab/dFa6ZfeM_74wlPZtksIFajo6_V6LVlA.woff2
similarity index 100%
rename from source/fonts/Zilla_Slab/dFa6ZfeM_74wlPZtksIFajo6_V6LVlA.woff2
rename to source/fonts/fonts/Zilla_Slab/dFa6ZfeM_74wlPZtksIFajo6_V6LVlA.woff2
diff --git a/source/fonts/Zilla_Slab/dFanZfeM_74wlPZtksIFaj8CIHCZV3B3X6_0f1Nk.woff2 b/source/fonts/fonts/Zilla_Slab/dFanZfeM_74wlPZtksIFaj8CIHCZV3B3X6_0f1Nk.woff2
similarity index 100%
rename from source/fonts/Zilla_Slab/dFanZfeM_74wlPZtksIFaj8CIHCZV3B3X6_0f1Nk.woff2
rename to source/fonts/fonts/Zilla_Slab/dFanZfeM_74wlPZtksIFaj8CIHCZV3B3X6_0f1Nk.woff2
diff --git a/source/fonts/Zilla_Slab/dFanZfeM_74wlPZtksIFaj8CIHCZWXB3X6_0fw.woff2 b/source/fonts/fonts/Zilla_Slab/dFanZfeM_74wlPZtksIFaj8CIHCZWXB3X6_0fw.woff2
similarity index 100%
rename from source/fonts/Zilla_Slab/dFanZfeM_74wlPZtksIFaj8CIHCZWXB3X6_0fw.woff2
rename to source/fonts/fonts/Zilla_Slab/dFanZfeM_74wlPZtksIFaj8CIHCZWXB3X6_0fw.woff2
diff --git a/source/fonts/Zilla_Slab/dFanZfeM_74wlPZtksIFaj8CVHaZV3B3X6_0f1Nk.woff2 b/source/fonts/fonts/Zilla_Slab/dFanZfeM_74wlPZtksIFaj8CVHaZV3B3X6_0f1Nk.woff2
similarity index 100%
rename from source/fonts/Zilla_Slab/dFanZfeM_74wlPZtksIFaj8CVHaZV3B3X6_0f1Nk.woff2
rename to source/fonts/fonts/Zilla_Slab/dFanZfeM_74wlPZtksIFaj8CVHaZV3B3X6_0f1Nk.woff2
diff --git a/source/fonts/Zilla_Slab/dFanZfeM_74wlPZtksIFaj8CVHaZWXB3X6_0fw.woff2 b/source/fonts/fonts/Zilla_Slab/dFanZfeM_74wlPZtksIFaj8CVHaZWXB3X6_0fw.woff2
similarity index 100%
rename from source/fonts/Zilla_Slab/dFanZfeM_74wlPZtksIFaj8CVHaZWXB3X6_0fw.woff2
rename to source/fonts/fonts/Zilla_Slab/dFanZfeM_74wlPZtksIFaj8CVHaZWXB3X6_0fw.woff2
diff --git a/source/sass/font-faces/zilla-slab.scss b/source/sass/font-faces/zilla-slab.scss
deleted file mode 100644
index e49a2e72b3b..00000000000
--- a/source/sass/font-faces/zilla-slab.scss
+++ /dev/null
@@ -1,170 +0,0 @@
-//Source: https://fonts.googleapis.com/css?family=Zilla+Slab:300,400,500,600,700,300i,400i,600i
-
-/* latin-ext */
-@font-face {
-  font-family: "Zilla Slab";
-  font-style: italic;
-  font-weight: 300;
-  src: url("../_fonts/Zilla_Slab/dFanZfeM_74wlPZtksIFaj8CVHaZV3B3X6_0f1Nk.woff2")
-    format("woff2");
-  unicode-range: U+0100-02AF, U+0304, U+0308, U+0329, U+1E00-1E9F, U+1EF2-1EFF,
-    U+2020, U+20A0-20AB, U+20AD-20C0, U+2113, U+2C60-2C7F, U+A720-A7FF;
-}
-/* latin */
-@font-face {
-  font-family: "Zilla Slab";
-  font-style: italic;
-  font-weight: 300;
-  src: url("../_fonts/Zilla_Slab/dFanZfeM_74wlPZtksIFaj8CVHaZWXB3X6_0fw.woff2")
-    format("woff2");
-  unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA,
-    U+02DC, U+0304, U+0308, U+0329, U+2000-206F, U+2074, U+20AC, U+2122, U+2191,
-    U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
-}
-/* latin-ext */
-@font-face {
-  font-family: "Zilla Slab";
-  font-style: italic;
-  font-weight: 400;
-  src: url("../_fonts/Zilla_Slab/dFa4ZfeM_74wlPZtksIFaj8K8VSMdFJ6dZX9.woff2")
-    format("woff2");
-  unicode-range: U+0100-02AF, U+0304, U+0308, U+0329, U+1E00-1E9F, U+1EF2-1EFF,
-    U+2020, U+20A0-20AB, U+20AD-20C0, U+2113, U+2C60-2C7F, U+A720-A7FF;
-}
-/* latin */
-@font-face {
-  font-family: "Zilla Slab";
-  font-style: italic;
-  font-weight: 400;
-  src: url("../_fonts/Zilla_Slab/dFa4ZfeM_74wlPZtksIFaj8K_1SMdFJ6dQ.woff2")
-    format("woff2");
-  unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA,
-    U+02DC, U+0304, U+0308, U+0329, U+2000-206F, U+2074, U+20AC, U+2122, U+2191,
-    U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
-}
-/* latin-ext */
-@font-face {
-  font-family: "Zilla Slab";
-  font-style: normal;
-  font-weight: 500;
-  src: url("../_fonts/Zilla_Slab/dFa5ZfeM_74wlPZtksIFYskZ6H2pW3pwfa3Efg.woff2")
-    format("woff2");
-  unicode-range: U+0100-02AF, U+0304, U+0308, U+0329, U+1E00-1E9F, U+1EF2-1EFF,
-    U+2020, U+20A0-20AB, U+20AD-20C0, U+2113, U+2C60-2C7F, U+A720-A7FF;
-}
-/* latin */
-@font-face {
-  font-family: "Zilla Slab";
-  font-style: normal;
-  font-weight: 500;
-  src: url("../_fonts/Zilla_Slab/dFa5ZfeM_74wlPZtksIFYskZ6HOpW3pwfa0.woff2")
-    format("woff2");
-  unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA,
-    U+02DC, U+0304, U+0308, U+0329, U+2000-206F, U+2074, U+20AC, U+2122, U+2191,
-    U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
-}
-/* latin-ext */
-@font-face {
-  font-family: "Zilla Slab";
-  font-style: italic;
-  font-weight: 600;
-  src: url("../_fonts/Zilla_Slab/dFanZfeM_74wlPZtksIFaj8CIHCZV3B3X6_0f1Nk.woff2")
-    format("woff2");
-  unicode-range: U+0100-02AF, U+0304, U+0308, U+0329, U+1E00-1E9F, U+1EF2-1EFF,
-    U+2020, U+20A0-20AB, U+20AD-20C0, U+2113, U+2C60-2C7F, U+A720-A7FF;
-}
-/* latin */
-@font-face {
-  font-family: "Zilla Slab";
-  font-style: italic;
-  font-weight: 600;
-  src: url("../_fonts/Zilla_Slab/dFanZfeM_74wlPZtksIFaj8CIHCZWXB3X6_0fw.woff2")
-    format("woff2");
-  unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA,
-    U+02DC, U+0304, U+0308, U+0329, U+2000-206F, U+2074, U+20AC, U+2122, U+2191,
-    U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
-}
-/* latin-ext */
-@font-face {
-  font-family: "Zilla Slab";
-  font-style: normal;
-  font-weight: 300;
-  src: url("../_fonts/Zilla_Slab/dFa5ZfeM_74wlPZtksIFYpEY6H2pW3pwfa3Efg.woff2")
-    format("woff2");
-  unicode-range: U+0100-02AF, U+0304, U+0308, U+0329, U+1E00-1E9F, U+1EF2-1EFF,
-    U+2020, U+20A0-20AB, U+20AD-20C0, U+2113, U+2C60-2C7F, U+A720-A7FF;
-}
-/* latin */
-@font-face {
-  font-family: "Zilla Slab";
-  font-style: normal;
-  font-weight: 300;
-  src: url("../_fonts/Zilla_Slab/dFa5ZfeM_74wlPZtksIFYpEY6HOpW3pwfa0.woff2")
-    format("woff2");
-  unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA,
-    U+02DC, U+0304, U+0308, U+0329, U+2000-206F, U+2074, U+20AC, U+2122, U+2191,
-    U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
-}
-/* latin-ext */
-@font-face {
-  font-family: "Zilla Slab";
-  font-style: normal;
-  font-weight: 400;
-  src: url("../_fonts/Zilla_Slab/dFa6ZfeM_74wlPZtksIFajQ6_V6LVlBKdA.woff2")
-    format("woff2");
-  unicode-range: U+0100-02AF, U+0304, U+0308, U+0329, U+1E00-1E9F, U+1EF2-1EFF,
-    U+2020, U+20A0-20AB, U+20AD-20C0, U+2113, U+2C60-2C7F, U+A720-A7FF;
-}
-/* latin */
-@font-face {
-  font-family: "Zilla Slab";
-  font-style: normal;
-  font-weight: 400;
-  src: url("../_fonts/Zilla_Slab/dFa6ZfeM_74wlPZtksIFajo6_V6LVlA.woff2")
-    format("woff2");
-  unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA,
-    U+02DC, U+0304, U+0308, U+0329, U+2000-206F, U+2074, U+20AC, U+2122, U+2191,
-    U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
-}
-/* latin-ext */
-@font-face {
-  font-family: "Zilla Slab";
-  font-style: normal;
-  font-weight: 600;
-  src: url("../_fonts/Zilla_Slab/dFa5ZfeM_74wlPZtksIFYuUe6H2pW3pwfa3Efg.woff2")
-    format("woff2");
-  unicode-range: U+0100-02AF, U+0304, U+0308, U+0329, U+1E00-1E9F, U+1EF2-1EFF,
-    U+2020, U+20A0-20AB, U+20AD-20C0, U+2113, U+2C60-2C7F, U+A720-A7FF;
-}
-/* latin */
-@font-face {
-  font-family: "Zilla Slab";
-  font-style: normal;
-  font-weight: 600;
-  src: url("../_fonts/Zilla_Slab/dFa5ZfeM_74wlPZtksIFYuUe6HOpW3pwfa0.woff2")
-    format("woff2");
-  unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA,
-    U+02DC, U+0304, U+0308, U+0329, U+2000-206F, U+2074, U+20AC, U+2122, U+2191,
-    U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
-}
-/* latin-ext */
-@font-face {
-  font-family: "Zilla Slab";
-  font-style: normal;
-  font-weight: 700;
-  src: url("../_fonts/Zilla_Slab/dFa5ZfeM_74wlPZtksIFYoEf6H2pW3pwfa3Efg.woff2")
-    format("woff2");
-  unicode-range: U+0100-02AF, U+0304, U+0308, U+0329, U+1E00-1E9F, U+1EF2-1EFF,
-    U+2020, U+20A0-20AB, U+20AD-20C0, U+2113, U+2C60-2C7F, U+A720-A7FF;
-}
-/* latin */
-@font-face {
-  font-family: "Zilla Slab";
-  font-style: normal;
-  font-weight: 700;
-  src: url("../_fonts/Zilla_Slab/dFa5ZfeM_74wlPZtksIFYoEf6HOpW3pwfa0.woff2")
-    format("woff2");
-  unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA,
-    U+02DC, U+0304, U+0308, U+0329, U+2000-206F, U+2074, U+20AC, U+2122, U+2191,
-    U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
-}
diff --git a/source/sass/fonts.scss b/source/sass/fonts.scss
deleted file mode 100644
index 852fd651171..00000000000
--- a/source/sass/fonts.scss
+++ /dev/null
@@ -1,2 +0,0 @@
-@import "./font-faces/nunito-sans";
-@import "./font-faces/zilla-slab";

From 67bfafa42eff1051da722d96640e8546c50a5755 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 6 Jun 2024 17:24:25 -0600
Subject: [PATCH 11/13] Bump faker from 25.0.1 to 25.6.0 (#12452)

Bumps [faker](https://github.com/joke2k/faker) from 25.0.1 to 25.6.0.
- [Release notes](https://github.com/joke2k/faker/releases)
- [Changelog](https://github.com/joke2k/faker/blob/master/CHANGELOG.md)
- [Commits](https://github.com/joke2k/faker/compare/v25.0.1...v25.6.0)

---
updated-dependencies:
- dependency-name: faker
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index 51891665d1e..a12942c39c3 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -117,7 +117,7 @@ factory-boy==3.3.0
     # via
     #   -r requirements.in
     #   wagtail-factories
-faker==25.0.1
+faker==25.6.0
     # via
     #   -r requirements.in
     #   factory-boy

From 221cc5e4366832fc8c271b7ffa9b3597c8025c87 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 6 Jun 2024 17:52:58 -0600
Subject: [PATCH 12/13] Bump requests from 2.31.0 to 2.32.3 (#12415)

Bumps [requests](https://github.com/psf/requests) from 2.31.0 to 2.32.3.
- [Release notes](https://github.com/psf/requests/releases)
- [Changelog](https://github.com/psf/requests/blob/main/HISTORY.md)
- [Commits](https://github.com/psf/requests/compare/v2.31.0...v2.32.3)

---
updated-dependencies:
- dependency-name: requests
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index a12942c39c3..be415c46603 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -195,7 +195,7 @@ pyyaml==6.0.1
     # via django-pattern-library
 redis==4.5.4
     # via django-redis
-requests==2.31.0
+requests==2.32.3
     # via
     #   -r requirements.in
     #   basket-client

From b00338b3165d226d872ce66810a7ef2ad535fead Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 7 Jun 2024 00:25:25 +0000
Subject: [PATCH 13/13] Bump pytest from 8.1.1 to 8.2.2 (#12453)

Bumps [pytest](https://github.com/pytest-dev/pytest) from 8.1.1 to 8.2.2.
- [Release notes](https://github.com/pytest-dev/pytest/releases)
- [Changelog](https://github.com/pytest-dev/pytest/blob/main/CHANGELOG.rst)
- [Commits](https://github.com/pytest-dev/pytest/compare/8.1.1...8.2.2)

---
updated-dependencies:
- dependency-name: pytest
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 dev-requirements.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-requirements.txt b/dev-requirements.txt
index cf2cc350b6b..4f04bd57abb 100644
--- a/dev-requirements.txt
+++ b/dev-requirements.txt
@@ -72,7 +72,7 @@ pathspec==0.11.1
     #   djlint
 platformdirs==2.5.3
     # via black
-pluggy==1.4.0
+pluggy==1.5.0
     # via pytest
 ptvsd==4.3.2
     # via -r dev-requirements.in
@@ -80,7 +80,7 @@ pycodestyle==2.11.0
     # via flake8
 pyflakes==3.2.0
     # via flake8
-pytest==8.1.1
+pytest==8.2.2
     # via
     #   -r dev-requirements.in
     #   pytest-cov