From c2ff580167633a4e57280e26341e9a01f24d3630 Mon Sep 17 00:00:00 2001
From: Neil Martinsen-Burrell <neil.martinsen-burrell@gsa.gov>
Date: Thu, 26 Jan 2023 15:41:56 -0600
Subject: [PATCH 01/21] WIP styling

---
 .../_theme/_uswds-theme-custom-styles.scss    | 49 ++++++++--
 .../assets/sass/_theme/_uswds-theme.scss      | 11 ++-
 src/registrar/templates/base.html             | 10 +-
 src/registrar/templates/home.html             | 92 +++++++++++--------
 src/registrar/templates/includes/footer.html  |  2 +-
 5 files changed, 112 insertions(+), 52 deletions(-)

diff --git a/src/registrar/assets/sass/_theme/_uswds-theme-custom-styles.scss b/src/registrar/assets/sass/_theme/_uswds-theme-custom-styles.scss
index 9f2247363..7dd1a456f 100644
--- a/src/registrar/assets/sass/_theme/_uswds-theme-custom-styles.scss
+++ b/src/registrar/assets/sass/_theme/_uswds-theme-custom-styles.scss
@@ -29,9 +29,14 @@ $letter-space--xs: .0125em;
    @include sr-only;
  }
 
+ * {
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
+
  h1 {
   @include typeset('sans', '2xl', 2);
-  margin: 0 0 units(1);
+  margin: 0 0 units(2);
  }
 
  h2 {
@@ -43,7 +48,7 @@ $letter-space--xs: .0125em;
     margin-top: units(2);
   }
  }
- 
+
 .register-form-step h3 {
   color: color('primary-dark');
   letter-spacing: $letter-space--xs;
@@ -92,9 +97,9 @@ a.breadcrumb__back {
     .usa-icon {
        flex-shrink: 0;
        //align lock body to x-height
-       margin: units('2px') units(1) 0 0; 
+       margin: units('2px') units(1) 0 0;
     }
-  }  
+  }
 }
 
 .stepnav {
@@ -109,11 +114,41 @@ a.breadcrumb__back {
   font-weight: font-weight('semibold');
 }
 
-footer {
-  //Workaround because USWDS units jump from 10 to 15
-  margin-top: units(10) + units(2);
+section.dashboard {
+  background-color: color('white');
+  border: 1px solid color('base-lighter');
+  border-radius: 4px;
+  padding: 0 units(2) units(3);
+  margin-top: units(5);
+
+  h2 {
+    padding-bottom: units(3);
+  }
+
+  p {
+    margin-bottom: 0;
+  }
 }
 
+#wrapper {
+  background-color: color('primary-lightest');
+}
+
+main {
+  //Workaround because USWDS units jump from 10 to 15
+  padding-bottom: units(10) + units(2);
+  padding-top: units(5);
+}
+
+footer {
+  border-top: 1px solid color('primary-darker');
+}
+
+.usa-footer__secondary-section {
+  background-color: color('primary-lightest');
+}
+
+
 abbr[title] {
   // workaround for underlining abbr element
   border-bottom: none;
diff --git a/src/registrar/assets/sass/_theme/_uswds-theme.scss b/src/registrar/assets/sass/_theme/_uswds-theme.scss
index 715963528..3a3e9b09c 100644
--- a/src/registrar/assets/sass/_theme/_uswds-theme.scss
+++ b/src/registrar/assets/sass/_theme/_uswds-theme.scss
@@ -26,8 +26,15 @@ in the form $setting: value,
   /*----------------------------
   # Banner Settings
   -----------------------------*/
-  $theme-banner-background-color: "primary-darker",
-  $theme-banner-link-color: "primary-lighter",
+  $theme-banner-background-color: "primary-dark",
+  $theme-banner-link-color: default,
+
+  /*
+  # Footer Settings
+  */
+  $theme-identifier-background-color: 'primary-darker',
+  $theme-identifier-identity-domain-color: 'base-lighter',
+  $theme-identifier-secondary-link-color: 'base-lighter',
 
 
   /*----------------------------
diff --git a/src/registrar/templates/base.html b/src/registrar/templates/base.html
index 26b9f58d6..1a87457e0 100644
--- a/src/registrar/templates/base.html
+++ b/src/registrar/templates/base.html
@@ -128,11 +128,11 @@
       <div class="usa-navbar">
         {% block logo %}
         <div class="usa-logo" id="extended-logo">
-          <em class="usa-logo__text">
-            <a href="{% url 'home' %}" title="Home" aria-label="Home">
-              {% block site_name %}Home{% endblock %}
-            </a>
-          </em>
+           <img
+                src="{% static 'img/dottedgov-round.svg' %}"
+                alt="Home"
+                width="48px"
+              />
         </div>
         {% endblock %}
         <button type="button" class="usa-menu-btn">Menu</button>
diff --git a/src/registrar/templates/home.html b/src/registrar/templates/home.html
index 9b2531733..aecab7fc5 100644
--- a/src/registrar/templates/home.html
+++ b/src/registrar/templates/home.html
@@ -1,59 +1,77 @@
 {% extends 'base.html' %}
 
 {% block title %} Hello {% endblock %}
-{% block hero %}
-<section class="usa-hero">
-  <div class="usa-grid">
-    <div class="usa-hero-callout usa-section-dark">
-      <h1>
-        <span class="usa-hero-callout-alt">Welcome to the .gov registrar</span>
-      </h1>
-    </div>
-</section>
-{% endblock %}
 
 {% block content %}
 <main id="main-content" class="grid-container">
-<p>This is the .gov registrar.</p>
 
 {% if user.is_authenticated %}
+{# complete logged in page together here #}
 
-{% if domain_applications %}
-<h2>Your domain applications</h2>
-<table class="usa-table usa-table--borderless">
+<h1>Manage your domains</h2>
+
+<p><a href="{% url 'application:' %}" class="usa-button">Start a new domain request</a></p>
+
+<section class="dashboard">
+	<h2>Registered domains</h2>
+	{% if domains %}
+		{% for domain in domains %}
+		{{ domain }}
+		{% endfor %}
+	{% else %}
+		You don't have any registered domains yet
+	{% endif %}
+</section>
+
+<section class="dashboard">
+  <h2>Active domain requests</h2>
+  {% if domain_applications %}
+  <table class="usa-table usa-table--borderless">
   <caption class="sr-only">Your domain applications</caption>
   <thead>
     <tr>
-      <th>Name</th>
-      <th>Status</th>
+    <th>Name</th>
+    <th>Status</th>
     </tr>
   </thead>
   <tbody>
     {% for application in domain_applications %}
-      <tr>
-        <th>
-          <a href="{% url 'edit-application' application.pk %}">
-            {{ application.requested_domain.name|default:"New domain request" }}
-          </a>
-        </th>
-        <td>{{ application.status }}</td>
-      </tr>
+    <tr>
+      <th>
+      <a href="{% url 'edit-application' application.pk %}">
+        {{ application.requested_domain.name|default:"New domain request" }}
+      </a>
+      </th>
+      <td>{{ application.status }}</td>
+    </tr>
     {% endfor %}
   </tbody>
-</table>
+  </table>
+ {% else %}
+   <p>You don't have any active domain requests right now</p> 
+ {% endif %}
+
+<p><a href="{% url 'application:' %}" class="usa-button">Start a new domain request</a></p>
+</section>
+
+<section class="dashboard">
+  <h2>Archived domains</h2>
+  {% if archived_domains %}
+    {% for domain in archived_domains %}
+      {{ domain }}
+    {% endfor %}
+ {% else %}
+   <p>You don't have any archived domains</p> 
+ {% endif %}
+</section>
+{% else %} {# not user.is_authenticated #}
+{# complete logged out page here #}
+
+<p><a class="usa-button" href="{% url 'login' %}">
+Sign in
+</a></p>
+
 {% endif %}
 
-<p><a href="{% url 'application:' %}" class="usa-button">Apply</a></p>
-
-<p><a href="{% url 'edit-profile' %}">Edit profile</a></p>
-
-{% if user.is_staff %}
-<p><a href="{% url 'admin:index' %}">CISA admin panel</a></p>
-{% endif %}
-
-<p><a href="{% url 'logout' %}">Click here to log out.</a></p>
-{% else %}
-<p><a href="{% url 'login' %}">Click here to log in.</a></p>
-{% endif %}
 </main>
 {% endblock %}
diff --git a/src/registrar/templates/includes/footer.html b/src/registrar/templates/includes/footer.html
index 0f3e1a718..ffcc7a5b4 100644
--- a/src/registrar/templates/includes/footer.html
+++ b/src/registrar/templates/includes/footer.html
@@ -16,7 +16,7 @@
                 class="usa-footer__logo-img"
                 src="{% static 'img/dottedgov-round.svg' %}"
                 alt="dot gov registrar logo"
-                width="50px"
+                width="64px"
               />
             </div>
           </div>

From 5dd4da2d5fb3eb3d3000b4ff80cbe2f81f447faa Mon Sep 17 00:00:00 2001
From: Neil Martinsen-Burrell <neil.martinsen-burrell@gsa.gov>
Date: Fri, 27 Jan 2023 10:45:55 -0600
Subject: [PATCH 02/21] Add export domains section

---
 src/registrar/templates/home.html | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/registrar/templates/home.html b/src/registrar/templates/home.html
index aecab7fc5..0c8aa849d 100644
--- a/src/registrar/templates/home.html
+++ b/src/registrar/templates/home.html
@@ -64,6 +64,14 @@
    <p>You don't have any archived domains</p> 
  {% endif %}
 </section>
+
+<h2 class="padding-top-3"> Export domains</h2>
+<p>If you would like to analyze your list of domains further, you can download the list of domains and their statuses as csv file</p>
+<a href="{% url 'todo' %}" class="usa-button usa-button--outline">
+  Export domains as csv
+</a>
+
+
 {% else %} {# not user.is_authenticated #}
 {# complete logged out page here #}
 

From 69533a2f80cdaa7a908d81788702aeb08ed2fea5 Mon Sep 17 00:00:00 2001
From: Neil Martinsen-Burrell <neil.martinsen-burrell@gsa.gov>
Date: Fri, 27 Jan 2023 11:51:30 -0600
Subject: [PATCH 03/21] Sortable table and dashboard_view styling

---
 .../_theme/_uswds-theme-custom-styles.scss    |  2 +-
 src/registrar/templates/base.html             |  4 ++-
 src/registrar/templates/home.html             | 31 +++++++++++++++----
 src/registrar/views/index.py                  |  2 ++
 4 files changed, 31 insertions(+), 8 deletions(-)

diff --git a/src/registrar/assets/sass/_theme/_uswds-theme-custom-styles.scss b/src/registrar/assets/sass/_theme/_uswds-theme-custom-styles.scss
index 7dd1a456f..1ea01a119 100644
--- a/src/registrar/assets/sass/_theme/_uswds-theme-custom-styles.scss
+++ b/src/registrar/assets/sass/_theme/_uswds-theme-custom-styles.scss
@@ -130,7 +130,7 @@ section.dashboard {
   }
 }
 
-#wrapper {
+#wrapper.dashboard {
   background-color: color('primary-lightest');
 }
 
diff --git a/src/registrar/templates/base.html b/src/registrar/templates/base.html
index 1a87457e0..8bbd6206f 100644
--- a/src/registrar/templates/base.html
+++ b/src/registrar/templates/base.html
@@ -128,11 +128,13 @@
       <div class="usa-navbar">
         {% block logo %}
         <div class="usa-logo" id="extended-logo">
+           <a href="{% url 'home' %}">
            <img
                 src="{% static 'img/dottedgov-round.svg' %}"
                 alt="Home"
                 width="48px"
               />
+           </a>
         </div>
         {% endblock %}
         <button type="button" class="usa-menu-btn">Menu</button>
@@ -162,7 +164,7 @@
     </div>
   </header>
   {% endblock banner %}
-  <div id="wrapper">
+  <div id="wrapper" {% if dashboard_view %}class="dashboard"{% endif %}>
     {% block messages %}
     {% if messages %}
     <ul class="messages">
diff --git a/src/registrar/templates/home.html b/src/registrar/templates/home.html
index 0c8aa849d..103e9f192 100644
--- a/src/registrar/templates/home.html
+++ b/src/registrar/templates/home.html
@@ -1,5 +1,7 @@
 {% extends 'base.html' %}
 
+{% load static %}
+
 {% block title %} Hello {% endblock %}
 
 {% block content %}
@@ -30,19 +32,36 @@
   <caption class="sr-only">Your domain applications</caption>
   <thead>
     <tr>
-    <th>Name</th>
-    <th>Status</th>
+    <th data-sortable scope="col" role="columnheader">Domain name</th>
+	<th data-sortable scope="col" role="columnheader">Date created</th>
+    <th data-sortable scope="col" role="columnheader">Status</th>
+    <th></th>
     </tr>
   </thead>
   <tbody>
     {% for application in domain_applications %}
     <tr>
-      <th>
-      <a href="{% url 'edit-application' application.pk %}">
+      <th th scope="row" role="rowheader">
         {{ application.requested_domain.name|default:"New domain request" }}
-      </a>
       </th>
-      <td>{{ application.status }}</td>
+      <td data-sort-value="{{ application.created_at|date:"U" }}">{{ application.created_at|date }}</td>
+      <td>{{ application.status|title }}</td>
+      <td>
+        <a href="{% url 'edit-application' application.pk %}">
+		{% if application.status == "started" %}
+          <svg class="usa-icon" aria-hidden="true" focusable="false" role="img">
+          <use xlink:href="{%static 'img/sprite.svg'%}#edit"></use>
+          </svg>
+		  Edit
+
+		{% else %}
+          <svg class="usa-icon" aria-hidden="true" focusable="false" role="img">
+          <use xlink:href="{%static 'img/sprite.svg'%}#settings"></use>
+          </svg>
+		  Manage
+		{% endif %}
+      </a>
+	  </td>
     </tr>
     {% endfor %}
   </tbody>
diff --git a/src/registrar/views/index.py b/src/registrar/views/index.py
index 6d50b3948..1e3dd366b 100644
--- a/src/registrar/views/index.py
+++ b/src/registrar/views/index.py
@@ -7,6 +7,8 @@ def index(request):
     """This page is available to anyone without logging in."""
     context = {}
     if request.user.is_authenticated:
+        # the logged-in index view IS the dashboard
+        context["dashboard_view"] = True
         applications = DomainApplication.objects.filter(creator=request.user)
         context["domain_applications"] = applications
     return render(request, "home.html", context)

From c0c8b9cbf89ae8d686cae7f2d262a2f996e2e9f3 Mon Sep 17 00:00:00 2001
From: igorkorenfeld <igor.korenfeld@gsa.gov>
Date: Mon, 30 Jan 2023 14:39:18 -0500
Subject: [PATCH 04/21] Add accent colors and table color settings

---
 src/registrar/assets/sass/_theme/_uswds-theme.scss | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/src/registrar/assets/sass/_theme/_uswds-theme.scss b/src/registrar/assets/sass/_theme/_uswds-theme.scss
index 3a3e9b09c..ee514518a 100644
--- a/src/registrar/assets/sass/_theme/_uswds-theme.scss
+++ b/src/registrar/assets/sass/_theme/_uswds-theme.scss
@@ -94,6 +94,8 @@ in the form $setting: value,
   $theme-color-accent-cool: $dhs-light-blue-60,
   $theme-color-accent-cool-dark: $dhs-light-blue-70,
   $theme-color-accent-cool-light: $dhs-light-blue-40,
+  $theme-color-accent-cool-lighter: $dhs-light-blue-30,
+  $theme-color-accent-cool-lightest: $dhs-light-blue-15,
 
   /*---------------------------
   ## Error state
@@ -119,4 +121,14 @@ in the form $setting: value,
   ----------------------------*/ 
   $theme-input-line-height: 5,
 
+
+  /*---------------------------
+  # Component settings 
+  ----------------------------- 
+  ## Sorted Table
+  ----------------------------*/ 
+  $theme-table-sorted-header-background-color: "accent-cool-lighter",
+  $theme-table-sorted-background-color: "accent-cool-lightest",
+  $theme-table-sorted-icon-color: "primary-darker",
+  $theme-table-unsorted-icon-color: "primary",
 );

From bbcf39dd9c24a130b9a064fc0780b1bd9f16b752 Mon Sep 17 00:00:00 2001
From: igorkorenfeld <igor.korenfeld@gsa.gov>
Date: Mon, 30 Jan 2023 14:40:02 -0500
Subject: [PATCH 05/21] Adjust table design

---
 .../_theme/_uswds-theme-custom-styles.scss    | 52 +++++++++++++++++--
 1 file changed, 48 insertions(+), 4 deletions(-)

diff --git a/src/registrar/assets/sass/_theme/_uswds-theme-custom-styles.scss b/src/registrar/assets/sass/_theme/_uswds-theme-custom-styles.scss
index 1ea01a119..4a354eda1 100644
--- a/src/registrar/assets/sass/_theme/_uswds-theme-custom-styles.scss
+++ b/src/registrar/assets/sass/_theme/_uswds-theme-custom-styles.scss
@@ -114,6 +114,12 @@ a.breadcrumb__back {
   font-weight: font-weight('semibold');
 }
 
+/** ---- DASHBOARD ---- */
+
+#wrapper.dashboard {
+  background-color: color('primary-lightest');
+}
+
 section.dashboard {
   background-color: color('white');
   border: 1px solid color('base-lighter');
@@ -122,17 +128,55 @@ section.dashboard {
   margin-top: units(5);
 
   h2 {
-    padding-bottom: units(3);
+    margin-bottom: units(3);
   }
 
   p {
     margin-bottom: 0;
   }
+
+  .usa-table {
+    td, th {
+      border: 0; //reset border
+      border-bottom: 1px solid color('base-light');
+    }
+
+    thead th {
+      color: color('primary-darker');
+      border-bottom: 2px solid color('base-light');
+    }
+    
+    tbody tr:last-of-type {
+      td, th {
+        border-bottom: 0;
+      }
+    }
+  
+    td {
+      padding: units(2);
+    }
+
+    th:first-of-type {
+      padding-left: 0;
+    }
+
+    a, a:visited {
+      color: color('primary');
+    }
+
+    a {
+      display: flex;
+      align-item: flex-start;
+      
+      .usa-icon {
+        // align icon with x height
+        margin-top: units(0.5);
+        margin-right: units(0.5);
+      }
+    }
+  }
 }
 
-#wrapper.dashboard {
-  background-color: color('primary-lightest');
-}
 
 main {
   //Workaround because USWDS units jump from 10 to 15

From 5871431268a2c320aec7383b0182fa7c911ecf80 Mon Sep 17 00:00:00 2001
From: igorkorenfeld <igor.korenfeld@gsa.gov>
Date: Mon, 30 Jan 2023 15:41:20 -0500
Subject: [PATCH 06/21] Adjust dashboard column widths, table header

---
 src/registrar/templates/home.html | 153 ++++++++++++++++--------------
 1 file changed, 81 insertions(+), 72 deletions(-)

diff --git a/src/registrar/templates/home.html b/src/registrar/templates/home.html
index 103e9f192..3fc583434 100644
--- a/src/registrar/templates/home.html
+++ b/src/registrar/templates/home.html
@@ -6,90 +6,99 @@
 
 {% block content %}
 <main id="main-content" class="grid-container">
-
 {% if user.is_authenticated %}
 {# complete logged in page together here #}
 
-<h1>Manage your domains</h2>
+<div class="tablet:grid-offset-1">
+  <h1>Manage your domains</h2>
 
-<p><a href="{% url 'application:' %}" class="usa-button">Start a new domain request</a></p>
+  <p><a href="{% url 'application:' %}" class="usa-button">Start a new domain request</a></p>
 
-<section class="dashboard">
-	<h2>Registered domains</h2>
-	{% if domains %}
-		{% for domain in domains %}
-		{{ domain }}
-		{% endfor %}
-	{% else %}
-		You don't have any registered domains yet
-	{% endif %}
-</section>
 
-<section class="dashboard">
-  <h2>Active domain requests</h2>
-  {% if domain_applications %}
-  <table class="usa-table usa-table--borderless">
-  <caption class="sr-only">Your domain applications</caption>
-  <thead>
-    <tr>
-    <th data-sortable scope="col" role="columnheader">Domain name</th>
-	<th data-sortable scope="col" role="columnheader">Date created</th>
-    <th data-sortable scope="col" role="columnheader">Status</th>
-    <th></th>
-    </tr>
-  </thead>
-  <tbody>
-    {% for application in domain_applications %}
-    <tr>
-      <th th scope="row" role="rowheader">
-        {{ application.requested_domain.name|default:"New domain request" }}
-      </th>
-      <td data-sort-value="{{ application.created_at|date:"U" }}">{{ application.created_at|date }}</td>
-      <td>{{ application.status|title }}</td>
-      <td>
-        <a href="{% url 'edit-application' application.pk %}">
-		{% if application.status == "started" %}
-          <svg class="usa-icon" aria-hidden="true" focusable="false" role="img">
-          <use xlink:href="{%static 'img/sprite.svg'%}#edit"></use>
-          </svg>
-		  Edit
+  <div class="tablet:grid-col-10">
+    <section class="dashboard">
+      <h2>Registered domains</h2>
+      {% if domains %}
+        {% for domain in domains %}
+        {{ domain }}
+        {% endfor %}
+      {% else %}
+        You don't have any registered domains yet
+      {% endif %}
+    </section>
+  </div>
 
-		{% else %}
-          <svg class="usa-icon" aria-hidden="true" focusable="false" role="img">
-          <use xlink:href="{%static 'img/sprite.svg'%}#settings"></use>
-          </svg>
-		  Manage
-		{% endif %}
-      </a>
-	  </td>
-    </tr>
-    {% endfor %}
-  </tbody>
-  </table>
- {% else %}
-   <p>You don't have any active domain requests right now</p> 
- {% endif %}
+  <div class="tablet:grid-col-10">
+    <section class="dashboard">
+      <h2>Active domain requests</h2>
+      {% if domain_applications %}
+      <table class="usa-table usa-table--borderless">
+        <caption class="sr-only">Your domain applications</caption>
+        <thead>
+          <tr>
+            <th data-sortable scope="col" role="columnheader">Domain name</th>
+            <th data-sortable scope="col" role="columnheader">Date created</th>
+            <th data-sortable scope="col" role="columnheader">Status</th>
+            <th role="columnheader"><span class="usa-sr-only">Action</span></th>
+          </tr>
+        </thead>
+        <tbody>
+          {% for application in domain_applications %}
+          <tr>
+            <th th scope="row" role="rowheader">
+              {{ application.requested_domain.name|default:"New domain request" }}
+            </th>
+            <td data-sort-value="{{ application.created_at|date:"U" }}">{{ application.created_at|date }}</td>
+            <td>{{ application.status|title }}</td>
+            <td>
+              <a href="{% url 'edit-application' application.pk %}">
+                {% if application.status == "started" %}
+                <svg class="usa-icon" aria-hidden="true" focusable="false" role="img">
+                  <use xlink:href="{%static 'img/sprite.svg'%}#edit"></use>
+                </svg>
+                Edit <span class="usa-sr-only">{{application.requested_domain.name}} </span>
 
-<p><a href="{% url 'application:' %}" class="usa-button">Start a new domain request</a></p>
-</section>
+                {% else %}
+                <svg class="usa-icon" aria-hidden="true" focusable="false" role="img">
+                  <use xlink:href="{%static 'img/sprite.svg'%}#settings"></use>
+                </svg>
+                Manage <span class="usa-sr-only">{{application.requested_domain.name}} </span>
+                {% endif %}
+              </a>
+            </td>
+          </tr>
+          {% endfor %}
+        </tbody>
+      </table>
+      {% else %}
+      <p>You don't have any active domain requests right now</p> 
+      {% endif %}
+      <p><a href="{% url 'application:' %}" class="usa-button">Start a new domain request</a></p>
+    </section>
+  </div>
 
-<section class="dashboard">
-  <h2>Archived domains</h2>
-  {% if archived_domains %}
-    {% for domain in archived_domains %}
+  <div class="tablet:grid-col-10">
+    <section class="dashboard">
+      <h2>Archived domains</h2>
+      {% if archived_domains %}
+      {% for domain in archived_domains %}
       {{ domain }}
-    {% endfor %}
- {% else %}
-   <p>You don't have any archived domains</p> 
- {% endif %}
-</section>
+      {% endfor %}
+      {% else %}
+      <p>You don't have any archived domains</p> 
+      {% endif %}
+    </section>
+  </div>
 
-<h2 class="padding-top-3"> Export domains</h2>
-<p>If you would like to analyze your list of domains further, you can download the list of domains and their statuses as csv file</p>
-<a href="{% url 'todo' %}" class="usa-button usa-button--outline">
-  Export domains as csv
-</a>
+  <div class="tablet:grid-col-10">
+    <h2 class="padding-top-3"> Export domains</h2>
+    <p>If you would like to analyze your list of domains further, you can download the list of domains and their statuses as csv file</p>
+    <a href="{% url 'todo' %}" class="usa-button usa-button--outline">
+      Export domains as csv
+    </a>
+  </div>
 
+</div>
 
 {% else %} {# not user.is_authenticated #}
 {# complete logged out page here #}

From 6e7b578fc5db0edc5d7901399eb84844156f7a7b Mon Sep 17 00:00:00 2001
From: Neil Martinsen-Burrell <neil.martinsen-burrell@gsa.gov>
Date: Mon, 30 Jan 2023 15:39:07 -0600
Subject: [PATCH 07/21] Fix text in home page test

---
 src/registrar/tests/test_views.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/registrar/tests/test_views.py b/src/registrar/tests/test_views.py
index 76a93e064..a8fabbd8f 100644
--- a/src/registrar/tests/test_views.py
+++ b/src/registrar/tests/test_views.py
@@ -25,7 +25,7 @@ class TestViews(TestCase):
         """Home page should be available without a login."""
         response = self.client.get("/")
         self.assertContains(response, "registrar", status_code=200)
-        self.assertContains(response, "log in")
+        self.assertContains(response, "Sign in")
 
     def test_whoami_page_no_user(self):
         """Whoami page not accessible without a logged-in user."""

From a0e1ce7086bb725e7410e9aa6bc1c7a62b459f73 Mon Sep 17 00:00:00 2001
From: igorkorenfeld <igor.korenfeld@gsa.gov>
Date: Mon, 30 Jan 2023 18:23:29 -0500
Subject: [PATCH 08/21] WIP Add styling for mobile table

---
 .../_theme/_uswds-theme-custom-styles.scss    | 90 ++++++++++++-------
 src/registrar/templates/home.html             | 12 +--
 2 files changed, 66 insertions(+), 36 deletions(-)

diff --git a/src/registrar/assets/sass/_theme/_uswds-theme-custom-styles.scss b/src/registrar/assets/sass/_theme/_uswds-theme-custom-styles.scss
index 4a354eda1..c47465ffa 100644
--- a/src/registrar/assets/sass/_theme/_uswds-theme-custom-styles.scss
+++ b/src/registrar/assets/sass/_theme/_uswds-theme-custom-styles.scss
@@ -19,7 +19,8 @@ i.e.
 @include u-padding-right('05');
 ----------------------------------------
 */
-// USWDS tokens are a bit too coarse in their letter-spacing steps
+
+// Finer grained letterspacing adjustments
 $letter-space--xs: .0125em; 
 
 @use "uswds-core" as *;
@@ -37,6 +38,7 @@ $letter-space--xs: .0125em;
  h1 {
   @include typeset('sans', '2xl', 2);
   margin: 0 0 units(2);
+  color: color('primary-darker');
  }
 
  h2 {
@@ -56,13 +58,15 @@ $letter-space--xs: .0125em;
   margin-bottom: 0;
 }
 
-.register-form-step p {
+.register-form-step p,
+.dashboard p {
   @include typeset('sans', 'sm', 5);
   max-width: measure(5);
 
-  &:last-of-type {
-    margin-bottom: 0;
-  }
+  //TODO: Revisit
+  // &:last-of-type {
+  //   margin-bottom: 0;
+  // }
 }
 
 .register-form-step a {
@@ -120,6 +124,20 @@ a.breadcrumb__back {
   background-color: color('primary-lightest');
 }
 
+//TODO: Move into dashboard; Change color for table heads on mobile
+//check if better to use usa-table--sortable and usa-table--stacked as targets
+.usa-table--stacked tr th {
+  border-top: 1px solid pink;
+}
+.usa-table--stacked tr:first-child th:first-child {
+  border-top: none;
+}
+
+.usa-table--stacked tr {
+  border-bottom: none;
+  border-top: 2px solid color('base-light');
+  margin-top: units(2);
+}
 section.dashboard {
   background-color: color('white');
   border: 1px solid color('base-lighter');
@@ -136,29 +154,7 @@ section.dashboard {
   }
 
   .usa-table {
-    td, th {
-      border: 0; //reset border
-      border-bottom: 1px solid color('base-light');
-    }
-
-    thead th {
-      color: color('primary-darker');
-      border-bottom: 2px solid color('base-light');
-    }
-    
-    tbody tr:last-of-type {
-      td, th {
-        border-bottom: 0;
-      }
-    }
-  
-    td {
-      padding: units(2);
-    }
-
-    th:first-of-type {
-      padding-left: 0;
-    }
+    width: 100%;
 
     a, a:visited {
       color: color('primary');
@@ -166,14 +162,48 @@ section.dashboard {
 
     a {
       display: flex;
-      align-item: flex-start;
-      
+      align-items: flex-start;
+
       .usa-icon {
         // align icon with x height
         margin-top: units(0.5);
         margin-right: units(0.5);
       }
     }
+
+    td, th {
+      padding: units(2px) 0;
+      border: none;
+    }
+  }
+  
+  @include at-media(tablet) {
+    .usa-table {
+      td, th {
+        // border: none; //reset border
+        border-bottom: 1px solid color('base-light');
+      }
+
+      thead th {
+        color: color('primary-darker');
+        border-bottom: 2px solid color('base-light');
+      }
+
+      tbody tr:last-of-type {
+        td, th {
+          border-bottom: 0;
+        }
+      }
+
+      td {
+        padding: units(2);
+      }
+
+      th:first-of-type {
+        padding-left: 0;
+      }
+
+    }
   }
 }
 
diff --git a/src/registrar/templates/home.html b/src/registrar/templates/home.html
index 3fc583434..aa9954947 100644
--- a/src/registrar/templates/home.html
+++ b/src/registrar/templates/home.html
@@ -9,7 +9,7 @@
 {% if user.is_authenticated %}
 {# complete logged in page together here #}
 
-<div class="tablet:grid-offset-1">
+<div class="tablet:grid-offset-2">
   <h1>Manage your domains</h2>
 
   <p><a href="{% url 'application:' %}" class="usa-button">Start a new domain request</a></p>
@@ -23,7 +23,7 @@
         {{ domain }}
         {% endfor %}
       {% else %}
-        You don't have any registered domains yet
+        <p>You don't have any registered domains yet</p>
       {% endif %}
     </section>
   </div>
@@ -32,7 +32,7 @@
     <section class="dashboard">
       <h2>Active domain requests</h2>
       {% if domain_applications %}
-      <table class="usa-table usa-table--borderless">
+      <table class="usa-table usa-table--borderless usa-table--stacked">
         <caption class="sr-only">Your domain applications</caption>
         <thead>
           <tr>
@@ -45,11 +45,11 @@
         <tbody>
           {% for application in domain_applications %}
           <tr>
-            <th th scope="row" role="rowheader">
+            <th th scope="row" role="rowheader" data-label="Domain name">
               {{ application.requested_domain.name|default:"New domain request" }}
             </th>
-            <td data-sort-value="{{ application.created_at|date:"U" }}">{{ application.created_at|date }}</td>
-            <td>{{ application.status|title }}</td>
+            <td data-sort-value="{{ application.created_at|date:"U" }}" data-label="Date created">{{ application.created_at|date }}</td>
+            <td data-label="Status">{{ application.status|title }}</td>
             <td>
               <a href="{% url 'edit-application' application.pk %}">
                 {% if application.status == "started" %}

From c587b7484be65b898fbc9c73b860fa92548fab5f Mon Sep 17 00:00:00 2001
From: igorkorenfeld <igor.korenfeld@gsa.gov>
Date: Tue, 31 Jan 2023 14:14:23 -0500
Subject: [PATCH 09/21] Adjust table and page style for different screen widths

---
 .../_theme/_uswds-theme-custom-styles.scss    | 68 +++++++++++++------
 src/registrar/templates/home.html             | 12 ++--
 2 files changed, 52 insertions(+), 28 deletions(-)

diff --git a/src/registrar/assets/sass/_theme/_uswds-theme-custom-styles.scss b/src/registrar/assets/sass/_theme/_uswds-theme-custom-styles.scss
index c47465ffa..69e9ab6e8 100644
--- a/src/registrar/assets/sass/_theme/_uswds-theme-custom-styles.scss
+++ b/src/registrar/assets/sass/_theme/_uswds-theme-custom-styles.scss
@@ -124,29 +124,16 @@ a.breadcrumb__back {
   background-color: color('primary-lightest');
 }
 
-//TODO: Move into dashboard; Change color for table heads on mobile
-//check if better to use usa-table--sortable and usa-table--stacked as targets
-.usa-table--stacked tr th {
-  border-top: 1px solid pink;
-}
-.usa-table--stacked tr:first-child th:first-child {
-  border-top: none;
-}
 
-.usa-table--stacked tr {
-  border-bottom: none;
-  border-top: 2px solid color('base-light');
-  margin-top: units(2);
-}
 section.dashboard {
   background-color: color('white');
   border: 1px solid color('base-lighter');
   border-radius: 4px;
   padding: 0 units(2) units(3);
-  margin-top: units(5);
+  margin-top: units(3);
 
   h2 {
-    margin-bottom: units(3);
+    margin-bottom: units(2);
   }
 
   p {
@@ -156,14 +143,14 @@ section.dashboard {
   .usa-table {
     width: 100%;
 
-    a, a:visited {
-      color: color('primary');
-    }
-
     a {
       display: flex;
       align-items: flex-start;
+      color: color('primary');
 
+      &:visited {
+        color: color('primary');
+      }
       .usa-icon {
         // align icon with x height
         margin-top: units(0.5);
@@ -171,13 +158,47 @@ section.dashboard {
       }
     }
 
+  }
+
+  // Table on small mobile
+  .usa-table--stacked {
     td, th {
-      padding: units(2px) 0;
+      padding: units(1) units(2) units(2px) 0;
       border: none;
     }
+
+    tr:first-child th:first-child {
+      border-top: none;
+    }
+
+    tr {
+      border-bottom: none;
+      border-top: 2px solid color('base-light');
+      margin-top: units(2);
+
+      &:first-child {
+        margin-top: 0;
+      }
+    }
+
+    td[data-label]:before, 
+    th[data-label]:before {
+      color: color('primary-darker');
+      padding-bottom: units(2px);
+    }
   }
   
-  @include at-media(tablet) {
+  @include at-media(mobile-lg) {
+    margin-top: units(5);
+
+    h2 {
+      margin-bottom: units(3);
+    }
+
+    .usa-table tr {
+      border: none;
+    }
+
     .usa-table {
       td, th {
         // border: none; //reset border
@@ -195,7 +216,7 @@ section.dashboard {
         }
       }
 
-      td {
+      td, th {
         padding: units(2);
       }
 
@@ -203,6 +224,9 @@ section.dashboard {
         padding-left: 0;
       }
 
+      thead tr:first-child th:first-child {
+        border-top: none;
+      }
     }
   }
 }
diff --git a/src/registrar/templates/home.html b/src/registrar/templates/home.html
index aa9954947..a85dd54ec 100644
--- a/src/registrar/templates/home.html
+++ b/src/registrar/templates/home.html
@@ -9,13 +9,13 @@
 {% if user.is_authenticated %}
 {# complete logged in page together here #}
 
-<div class="tablet:grid-offset-2">
+<div class="tablet:grid-offset-1 desktop:grid-offset-2">
   <h1>Manage your domains</h2>
 
   <p><a href="{% url 'application:' %}" class="usa-button">Start a new domain request</a></p>
 
 
-  <div class="tablet:grid-col-10">
+  <div class="tablet:grid-col-11 desktop:grid-col-10">
     <section class="dashboard">
       <h2>Registered domains</h2>
       {% if domains %}
@@ -28,7 +28,7 @@
     </section>
   </div>
 
-  <div class="tablet:grid-col-10">
+  <div class="tablet:grid-col-11 desktop:grid-col-10">
     <section class="dashboard">
       <h2>Active domain requests</h2>
       {% if domain_applications %}
@@ -77,7 +77,7 @@
     </section>
   </div>
 
-  <div class="tablet:grid-col-10">
+  <div class="tablet:grid-col-11 desktop:grid-col-10">
     <section class="dashboard">
       <h2>Archived domains</h2>
       {% if archived_domains %}
@@ -90,8 +90,8 @@
     </section>
   </div>
 
-  <div class="tablet:grid-col-10">
-    <h2 class="padding-top-3"> Export domains</h2>
+  <div class="tablet:grid-col-11 desktop:grid-col-10">
+    <h2 class="padding-top-1 mobile-lg:padding-top-3"> Export domains</h2>
     <p>If you would like to analyze your list of domains further, you can download the list of domains and their statuses as csv file</p>
     <a href="{% url 'todo' %}" class="usa-button usa-button--outline">
       Export domains as csv

From 45ff32b62f8727b61bc2b30eac4aad73eeba4dbe Mon Sep 17 00:00:00 2001
From: igorkorenfeld <igor.korenfeld@gsa.gov>
Date: Tue, 31 Jan 2023 14:23:35 -0500
Subject: [PATCH 10/21] Remove commented out code

---
 .../assets/sass/_theme/_uswds-theme-custom-styles.scss        | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/registrar/assets/sass/_theme/_uswds-theme-custom-styles.scss b/src/registrar/assets/sass/_theme/_uswds-theme-custom-styles.scss
index 69e9ab6e8..a03369e3e 100644
--- a/src/registrar/assets/sass/_theme/_uswds-theme-custom-styles.scss
+++ b/src/registrar/assets/sass/_theme/_uswds-theme-custom-styles.scss
@@ -118,13 +118,13 @@ a.breadcrumb__back {
   font-weight: font-weight('semibold');
 }
 
+
 /** ---- DASHBOARD ---- */
 
 #wrapper.dashboard {
   background-color: color('primary-lightest');
 }
 
-
 section.dashboard {
   background-color: color('white');
   border: 1px solid color('base-lighter');
@@ -157,7 +157,6 @@ section.dashboard {
         margin-right: units(0.5);
       }
     }
-
   }
 
   // Table on small mobile
@@ -201,7 +200,6 @@ section.dashboard {
 
     .usa-table {
       td, th {
-        // border: none; //reset border
         border-bottom: 1px solid color('base-light');
       }
 

From 6f0af3d571b598a116aec8e114f922feaeca7c6d Mon Sep 17 00:00:00 2001
From: igorkorenfeld <igor.korenfeld@gsa.gov>
Date: Tue, 31 Jan 2023 14:33:46 -0500
Subject: [PATCH 11/21] Remove column wrapper divs, add class to sections
 directly

---
 src/registrar/templates/home.html | 143 ++++++++++++++----------------
 1 file changed, 68 insertions(+), 75 deletions(-)

diff --git a/src/registrar/templates/home.html b/src/registrar/templates/home.html
index a85dd54ec..87e12ea50 100644
--- a/src/registrar/templates/home.html
+++ b/src/registrar/templates/home.html
@@ -14,89 +14,82 @@
 
   <p><a href="{% url 'application:' %}" class="usa-button">Start a new domain request</a></p>
 
-
-  <div class="tablet:grid-col-11 desktop:grid-col-10">
-    <section class="dashboard">
-      <h2>Registered domains</h2>
-      {% if domains %}
-        {% for domain in domains %}
-        {{ domain }}
-        {% endfor %}
-      {% else %}
-        <p>You don't have any registered domains yet</p>
-      {% endif %}
-    </section>
-  </div>
-
-  <div class="tablet:grid-col-11 desktop:grid-col-10">
-    <section class="dashboard">
-      <h2>Active domain requests</h2>
-      {% if domain_applications %}
-      <table class="usa-table usa-table--borderless usa-table--stacked">
-        <caption class="sr-only">Your domain applications</caption>
-        <thead>
-          <tr>
-            <th data-sortable scope="col" role="columnheader">Domain name</th>
-            <th data-sortable scope="col" role="columnheader">Date created</th>
-            <th data-sortable scope="col" role="columnheader">Status</th>
-            <th role="columnheader"><span class="usa-sr-only">Action</span></th>
-          </tr>
-        </thead>
-        <tbody>
-          {% for application in domain_applications %}
-          <tr>
-            <th th scope="row" role="rowheader" data-label="Domain name">
-              {{ application.requested_domain.name|default:"New domain request" }}
-            </th>
-            <td data-sort-value="{{ application.created_at|date:"U" }}" data-label="Date created">{{ application.created_at|date }}</td>
-            <td data-label="Status">{{ application.status|title }}</td>
-            <td>
-              <a href="{% url 'edit-application' application.pk %}">
-                {% if application.status == "started" %}
-                <svg class="usa-icon" aria-hidden="true" focusable="false" role="img">
-                  <use xlink:href="{%static 'img/sprite.svg'%}#edit"></use>
-                </svg>
-                Edit <span class="usa-sr-only">{{application.requested_domain.name}} </span>
-
-                {% else %}
-                <svg class="usa-icon" aria-hidden="true" focusable="false" role="img">
-                  <use xlink:href="{%static 'img/sprite.svg'%}#settings"></use>
-                </svg>
-                Manage <span class="usa-sr-only">{{application.requested_domain.name}} </span>
-                {% endif %}
-              </a>
-            </td>
-          </tr>
-          {% endfor %}
-        </tbody>
-      </table>
-      {% else %}
-      <p>You don't have any active domain requests right now</p> 
-      {% endif %}
-      <p><a href="{% url 'application:' %}" class="usa-button">Start a new domain request</a></p>
-    </section>
-  </div>
-
-  <div class="tablet:grid-col-11 desktop:grid-col-10">
-    <section class="dashboard">
-      <h2>Archived domains</h2>
-      {% if archived_domains %}
-      {% for domain in archived_domains %}
+  <section class="dashboard tablet:grid-col-11 desktop:grid-col-10">
+    <h2>Registered domains</h2>
+    {% if domains %}
+      {% for domain in domains %}
       {{ domain }}
       {% endfor %}
-      {% else %}
-      <p>You don't have any archived domains</p> 
-      {% endif %}
-    </section>
-  </div>
+    {% else %}
+      <p>You don't have any registered domains yet</p>
+    {% endif %}
+  </section>
 
-  <div class="tablet:grid-col-11 desktop:grid-col-10">
+  <section class="dashboard tablet:grid-col-11 desktop:grid-col-10">
+    <h2>Active domain requests</h2>
+    {% if domain_applications %}
+    <table class="usa-table usa-table--borderless usa-table--stacked">
+      <caption class="sr-only">Your domain applications</caption>
+      <thead>
+        <tr>
+          <th data-sortable scope="col" role="columnheader">Domain name</th>
+          <th data-sortable scope="col" role="columnheader">Date created</th>
+          <th data-sortable scope="col" role="columnheader">Status</th>
+          <th role="columnheader"><span class="usa-sr-only">Action</span></th>
+        </tr>
+      </thead>
+      <tbody>
+        {% for application in domain_applications %}
+        <tr>
+          <th th scope="row" role="rowheader" data-label="Domain name">
+            {{ application.requested_domain.name|default:"New domain request" }}
+          </th>
+          <td data-sort-value="{{ application.created_at|date:"U" }}" data-label="Date created">{{ application.created_at|date }}</td>
+          <td data-label="Status">{{ application.status|title }}</td>
+          <td>
+            <a href="{% url 'edit-application' application.pk %}">
+              {% if application.status == "started" %}
+              <svg class="usa-icon" aria-hidden="true" focusable="false" role="img">
+                <use xlink:href="{%static 'img/sprite.svg'%}#edit"></use>
+              </svg>
+              Edit <span class="usa-sr-only">{{application.requested_domain.name}} </span>
+
+              {% else %}
+              <svg class="usa-icon" aria-hidden="true" focusable="false" role="img">
+                <use xlink:href="{%static 'img/sprite.svg'%}#settings"></use>
+              </svg>
+              Manage <span class="usa-sr-only">{{application.requested_domain.name}} </span>
+              {% endif %}
+            </a>
+          </td>
+        </tr>
+        {% endfor %}
+      </tbody>
+    </table>
+    {% else %}
+    <p>You don't have any active domain requests right now</p> 
+    {% endif %}
+    <p><a href="{% url 'application:' %}" class="usa-button">Start a new domain request</a></p>
+  </section>
+
+  <section class="dashboard tablet:grid-col-11 desktop:grid-col-10">
+    <h2>Archived domains</h2>
+    {% if archived_domains %}
+    {% for domain in archived_domains %}
+    {{ domain }}
+    {% endfor %}
+    {% else %}
+    <p>You don't have any archived domains</p> 
+    {% endif %}
+  </section>
+
+  <section class="tablet:grid-col-11 desktop:grid-col-10">
     <h2 class="padding-top-1 mobile-lg:padding-top-3"> Export domains</h2>
     <p>If you would like to analyze your list of domains further, you can download the list of domains and their statuses as csv file</p>
     <a href="{% url 'todo' %}" class="usa-button usa-button--outline">
       Export domains as csv
     </a>
-  </div>
+  </section>
 
 </div>
 

From 1daf97d0d852d3376e3f4632890d9f9c5da0bc13 Mon Sep 17 00:00:00 2001
From: Neil Martinsen-Burrell <neil.martinsen-burrell@gsa.gov>
Date: Tue, 31 Jan 2023 14:58:01 -0600
Subject: [PATCH 12/21] Fix test to account for sr-only

---
 src/registrar/tests/test_views.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/registrar/tests/test_views.py b/src/registrar/tests/test_views.py
index a8fabbd8f..b40fcc2dc 100644
--- a/src/registrar/tests/test_views.py
+++ b/src/registrar/tests/test_views.py
@@ -69,7 +69,8 @@ class LoggedInTests(TestWithUser):
             creator=self.user, requested_domain=site
         )
         response = self.client.get("/")
-        self.assertContains(response, "igorville.gov", count=1)
+        # count = 2 because it is also in screenreader content
+        self.assertContains(response, "igorville.gov", count=2)
         # clean up
         application.delete()
 

From 7209a1e533009ba6666f10355fdf3a346daa1e1b Mon Sep 17 00:00:00 2001
From: Seamus Johnston <seamus.johnston@gsa.gov>
Date: Wed, 1 Feb 2023 11:32:05 -0600
Subject: [PATCH 13/21] Bump npm package versions

---
 docs/developer/README.md |  27 +-
 src/package-lock.json    | 932 ++++++++++++++++++++-------------------
 src/package.json         |   2 +-
 3 files changed, 506 insertions(+), 455 deletions(-)

diff --git a/docs/developer/README.md b/docs/developer/README.md
index 59b28018b..91ac62b70 100644
--- a/docs/developer/README.md
+++ b/docs/developer/README.md
@@ -128,15 +128,36 @@ type
 docker-compose run owasp
 ```
 
-## USWDS and styling
-We use the U.S. Web Design System (USWDS) for building and styling our applications. Additionally, we utilize the [uswds-compile tool](https://designsystem.digital.gov/documentation/getting-started/developers/phase-two-compile/) from USWDS  to compile and package the static assets.
+# Images, stylesheets, and JavaScript
+
+We use the U.S. Web Design System (USWDS) for styling our applications.
+
+Static files (images, CSS stylesheets, JavaScripts, etc) are known as "assets".
+
+Assets are stored in `registrar/assets` during development and served from `registrar/public`. During deployment, assets are copied from `registrar/assets` into `registrar/public`. Any assets which need processing, such as USWDS Sass files, are processed before copying.
+
+We utilize the [uswds-compile tool](https://designsystem.digital.gov/documentation/getting-started/developers/phase-two-compile/) from USWDS to compile and package USWDS assets.
+
+## Making and view style changes
+
 When you run `docker-compose up` the `node` service in the container will begin to watch for changes in the `registrar/assets` folder, and will recompile once any changes are made.
+
 Within the `registrar/assets` folder, the `_theme` folder contains three files initially generated by `uswds-compile`:
 1. `_uswds-theme-custom-styles` contains all the custom styles created for this application
 2. `_uswds-theme` contains all the custom theme settings (e.g. primary colors, fonts, banner color, etc..)
 3. `styles.css` a entry point or index for the styles, forwards all of the other style files used in the project (i.e. the USWDS source code, the settings, and all custom stylesheets).
 
-You can also compile the sass at any time using `npx gulp compile`. Similarly, you can copy over other static assets (images and javascript files), using `npx gulp copyAssets`.
+You can also compile the **Sass** at any time using `npx gulp compile`. Similarly, you can copy over **other static assets** (images and javascript files), using `npx gulp copyAssets`.
+
+## Upgrading USWDS and other JavaScript packages
+
+Version numbers can be manually controlled in `package.json`. Edit that, if desired.
+
+Now run `docker-compose run node npm update`.
+
+Then run `docker-compose up` to recompile and recopy the assets.
+
+Examine the results in the running application (remember to empty your cache!) and commit `package.json` and `package-lock.json` if all is well.
 
 ## Finite State Machines
 
diff --git a/src/package-lock.json b/src/package-lock.json
index 38d7cd26b..18a5de770 100644
--- a/src/package-lock.json
+++ b/src/package-lock.json
@@ -9,7 +9,7 @@
       "version": "1.0.0",
       "license": "ISC",
       "dependencies": {
-        "@uswds/uswds": "^3.1.0",
+        "@uswds/uswds": "^3.3.0",
         "pa11y-ci": "^3.0.1",
         "sass": "^1.54.8"
       },
@@ -133,15 +133,15 @@
       "dev": true
     },
     "node_modules/@types/node": {
-      "version": "14.18.28",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-14.18.28.tgz",
-      "integrity": "sha512-CK2fnrQlIgKlCV3N2kM+Gznb5USlwA1KFX3rJVHmgVk6NJxFPuQ86pAcvKnu37IA4BGlSRz7sEE1lHL1aLZ/eQ==",
+      "version": "14.18.36",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-14.18.36.tgz",
+      "integrity": "sha512-FXKWbsJ6a1hIrRxv+FoukuHnGTgEzKYGi7kilfMae96AL9UNkPFNWJEEYWzdRI9ooIkbr4AKldyuSTLql06vLQ==",
       "devOptional": true
     },
     "node_modules/@types/vinyl": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/@types/vinyl/-/vinyl-2.0.6.tgz",
-      "integrity": "sha512-ayJ0iOCDNHnKpKTgBG6Q6JOnHTj9zFta+3j2b8Ejza0e4cvRyMn0ZoLEmbPrTHe5YYRlDYPvPWVdV4cTaRyH7g==",
+      "version": "2.0.7",
+      "resolved": "https://registry.npmjs.org/@types/vinyl/-/vinyl-2.0.7.tgz",
+      "integrity": "sha512-4UqPv+2567NhMQuMLdKAyK4yzrfCqwaTt6bLhHEs8PFcxbHILsrxaY63n4wgE/BRLDWDQeI+WcTmkXKExh9hQg==",
       "dev": true,
       "dependencies": {
         "@types/expect": "^1.20.4",
@@ -158,12 +158,12 @@
       }
     },
     "node_modules/@uswds/compile": {
-      "version": "1.0.0-beta.3",
-      "resolved": "https://registry.npmjs.org/@uswds/compile/-/compile-1.0.0-beta.3.tgz",
-      "integrity": "sha512-AJstXyYGsLvV3xRg+Soqwlxc2IXjelWDTCq5RtfsUPdGKUKKsIPjeUQX6R66gPwXryNx8xBjE5CyOn/o1mLbjw==",
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/@uswds/compile/-/compile-1.0.0.tgz",
+      "integrity": "sha512-dIAL2cr6K+QnSNr/fe7Y2Db06rkxMla5VtockxHF+CYcBl3DbJ8qbMn/kxouYDX5rgN0So2PbMAouzpM7uhyMA==",
       "dev": true,
       "dependencies": {
-        "autoprefixer": "10.4.7",
+        "autoprefixer": "10.4.13",
         "del": "6.0.0",
         "gulp": "4.0.2",
         "gulp-postcss": "9.0.1",
@@ -172,18 +172,17 @@
         "gulp-sass": "5.1.0",
         "gulp-sourcemaps": "3.0.0",
         "gulp-svgstore": "9.0.0",
-        "postcss": "8.4.8",
-        "postcss-csso": "5.0.1",
-        "sass-embedded": "1.50.1"
+        "postcss": "8.4.19",
+        "postcss-csso": "6.0.1",
+        "sass-embedded": "1.56.1"
       }
     },
     "node_modules/@uswds/uswds": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/@uswds/uswds/-/uswds-3.1.0.tgz",
-      "integrity": "sha512-6XTeaQD/ipc3x4713mud4Rrr+lRc4nJ1Qw5Oy35dbVEXuKr7DjN4EBoAkbze9OoV0UdmAIvoxolBF/UcpFVKOg==",
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/@uswds/uswds/-/uswds-3.3.0.tgz",
+      "integrity": "sha512-qiugkbwrO+eIIwi4lbEdH15LCHuAjfUMDRQNBBujakR99Ka3iqmrLpPllffdKaJJnnYkt75v0lltnJ5Nnd/obQ==",
       "dependencies": {
         "classlist-polyfill": "1.0.3",
-        "domready": "1.0.8",
         "object-assign": "4.1.1",
         "receptor": "1.0.0",
         "resolve-id-refs": "0.1.0"
@@ -642,10 +641,16 @@
       }
     },
     "node_modules/async-each": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/async-each/-/async-each-1.0.3.tgz",
-      "integrity": "sha512-z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ==",
-      "dev": true
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/async-each/-/async-each-1.0.5.tgz",
+      "integrity": "sha512-5QzqtU3BlagehwmdoqwaS2FBQF2P5eL6vFqXwNsb5jwoEsmtfAXg1ocFvW7I6/gGLFhBMKwcMwZuy7uv/Bo9jA==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://paulmillr.com/funding/"
+        }
+      ]
     },
     "node_modules/async-settle": {
       "version": "1.0.0",
@@ -672,9 +677,9 @@
       }
     },
     "node_modules/autoprefixer": {
-      "version": "10.4.7",
-      "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.7.tgz",
-      "integrity": "sha512-ypHju4Y2Oav95SipEcCcI5J7CGPuvz8oat7sUtYj3ClK44bldfvtvcxK6IEK++7rqB7YchDGzweZIBG+SD0ZAA==",
+      "version": "10.4.13",
+      "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.13.tgz",
+      "integrity": "sha512-49vKpMqcZYsJjwotvt4+h/BCjJVnhGwcLpDt5xkcaOG3eLrG/HUYLagrihYsQ+qrIBgIzX1Rw7a6L8I/ZA1Atg==",
       "dev": true,
       "funding": [
         {
@@ -687,8 +692,8 @@
         }
       ],
       "dependencies": {
-        "browserslist": "^4.20.3",
-        "caniuse-lite": "^1.0.30001335",
+        "browserslist": "^4.21.4",
+        "caniuse-lite": "^1.0.30001426",
         "fraction.js": "^4.2.0",
         "normalize-range": "^0.1.2",
         "picocolors": "^1.0.0",
@@ -705,9 +710,9 @@
       }
     },
     "node_modules/axe-core": {
-      "version": "4.4.3",
-      "resolved": "https://registry.npmjs.org/axe-core/-/axe-core-4.4.3.tgz",
-      "integrity": "sha512-32+ub6kkdhhWick/UjvEwRchgoetXqTK14INLqbGm5U2TzBkBNF3nQtLYm8ovxSkQWArjEQvftCKryjZaATu3w==",
+      "version": "4.6.3",
+      "resolved": "https://registry.npmjs.org/axe-core/-/axe-core-4.6.3.tgz",
+      "integrity": "sha512-/BQzOX780JhsxDnPpH4ZiyrJAzcd8AfzFPkv+89veFSr1rcMjuq2JDCwypKaPeB6ljHp9KjXhPpjgCvQlWYuqg==",
       "engines": {
         "node": ">=4"
       }
@@ -942,9 +947,9 @@
       }
     },
     "node_modules/browserslist": {
-      "version": "4.21.3",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.3.tgz",
-      "integrity": "sha512-898rgRXLAyRkM1GryrrBHGkqA5hlpkV5MhtZwg9QXeiyLUYs2k00Un05aX5l2/yJIOObYKOpS2JNo8nJDE7fWQ==",
+      "version": "4.21.5",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.5.tgz",
+      "integrity": "sha512-tUkiguQGW7S3IhB7N+c2MV/HZPSCPAAiYBZXLsBhFB/PCy6ZKKsZrmBayHV9fdGV/ARIfJ14NkxKzRDjvp7L6w==",
       "dev": true,
       "funding": [
         {
@@ -957,10 +962,10 @@
         }
       ],
       "dependencies": {
-        "caniuse-lite": "^1.0.30001370",
-        "electron-to-chromium": "^1.4.202",
-        "node-releases": "^2.0.6",
-        "update-browserslist-db": "^1.0.5"
+        "caniuse-lite": "^1.0.30001449",
+        "electron-to-chromium": "^1.4.284",
+        "node-releases": "^2.0.8",
+        "update-browserslist-db": "^1.0.10"
       },
       "bin": {
         "browserslist": "cli.js"
@@ -1007,12 +1012,15 @@
       }
     },
     "node_modules/buffer-equal": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/buffer-equal/-/buffer-equal-1.0.0.tgz",
-      "integrity": "sha512-tcBWO2Dl4e7Asr9hTGcpVrCe+F7DubpmqWCTbj4FHLmjqO2hIaC383acQubWtRJhdceqs5uBHs6Es+Sk//RKiQ==",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/buffer-equal/-/buffer-equal-1.0.1.tgz",
+      "integrity": "sha512-QoV3ptgEaQpvVwbXdSO39iqPQTCxSF7A5U99AxbHYqUdCizL/lH2Z0A2y6nbZucxMEOtNyZfG2s6gsVugGpKkg==",
       "dev": true,
       "engines": {
-        "node": ">=0.4.0"
+        "node": ">=0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
     "node_modules/buffer-from": {
@@ -1064,9 +1072,9 @@
       }
     },
     "node_modules/caniuse-lite": {
-      "version": "1.0.30001399",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001399.tgz",
-      "integrity": "sha512-4vQ90tMKS+FkvuVWS5/QY1+d805ODxZiKFzsU8o/RsVJz49ZSRR8EjykLJbqhzdPgadbX6wB538wOzle3JniRA==",
+      "version": "1.0.30001450",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001450.tgz",
+      "integrity": "sha512-qMBmvmQmFXaSxexkjjfMvD5rnDL0+m+dUMZKoDYsGG8iZN29RuYh9eRoMvKsT6uMAWlyUUGDEQGJJYjzCIO9ew==",
       "dev": true,
       "funding": [
         {
@@ -1080,9 +1088,9 @@
       ]
     },
     "node_modules/check-types": {
-      "version": "11.1.2",
-      "resolved": "https://registry.npmjs.org/check-types/-/check-types-11.1.2.tgz",
-      "integrity": "sha512-tzWzvgePgLORb9/3a0YenggReLKAIb2owL03H2Xdoe5pKcUyWRSEQ8xfCar8t2SIAuEDwtmx2da1YB52YuHQMQ=="
+      "version": "11.2.2",
+      "resolved": "https://registry.npmjs.org/check-types/-/check-types-11.2.2.tgz",
+      "integrity": "sha512-HBiYvXvn9Z70Z88XKjz3AEKd4HJhBXsa3j7xFnITAzoS8+q6eIGi8qDB8FKPBAjtuxjI/zFpwuiCb8oDtKOYrA=="
     },
     "node_modules/cheerio": {
       "version": "1.0.0-rc.12",
@@ -1166,13 +1174,9 @@
       }
     },
     "node_modules/chownr": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz",
-      "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      }
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz",
+      "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg=="
     },
     "node_modules/class-utils": {
       "version": "0.3.6",
@@ -1350,13 +1354,10 @@
       }
     },
     "node_modules/convert-source-map": {
-      "version": "1.8.0",
-      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.8.0.tgz",
-      "integrity": "sha512-+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA==",
-      "dev": true,
-      "dependencies": {
-        "safe-buffer": "~5.1.1"
-      }
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.9.0.tgz",
+      "integrity": "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==",
+      "dev": true
     },
     "node_modules/copy-descriptor": {
       "version": "0.1.1",
@@ -1410,16 +1411,17 @@
       }
     },
     "node_modules/css-tree": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.1.3.tgz",
-      "integrity": "sha512-tRpdppF7TRazZrjJ6v3stzv93qxRcSsFmW6cX0Zm2NVKpxE1WV1HblnghVv9TreireHkqI/VDEsfolRF1p6y7Q==",
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-2.2.1.tgz",
+      "integrity": "sha512-OA0mILzGc1kCOCSJerOeqDxDQ4HOh+G8NbOJFOTgOCzpw7fCBubk0fEyxp8AgOL/jvLgYA/uV0cMbe43ElF1JA==",
       "dev": true,
       "dependencies": {
-        "mdn-data": "2.0.14",
-        "source-map": "^0.6.1"
+        "mdn-data": "2.0.28",
+        "source-map-js": "^1.0.1"
       },
       "engines": {
-        "node": ">=8.0.0"
+        "node": "^10 || ^12.20.0 || ^14.13.0 || >=15.0.0",
+        "npm": ">=7.0.0"
       }
     },
     "node_modules/css-what": {
@@ -1434,15 +1436,16 @@
       }
     },
     "node_modules/csso": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/csso/-/csso-4.2.0.tgz",
-      "integrity": "sha512-wvlcdIbf6pwKEk7vHj8/Bkc0B4ylXZruLvOgs9doS5eOsOpuodOV2zJChSpkp+pRpYQLQMeF04nr3Z68Sta9jA==",
+      "version": "5.0.5",
+      "resolved": "https://registry.npmjs.org/csso/-/csso-5.0.5.tgz",
+      "integrity": "sha512-0LrrStPOdJj+SPCCrGhzryycLjwcgUSHBtxNA8aIDxf0GLsRh1cKYhB00Gd1lDOS4yGH69+SNn13+TWbVHETFQ==",
       "dev": true,
       "dependencies": {
-        "css-tree": "^1.1.2"
+        "css-tree": "~2.2.0"
       },
       "engines": {
-        "node": ">=8.0.0"
+        "node": "^10 || ^12.20.0 || ^14.13.0 || >=15.0.0",
+        "npm": ">=7.0.0"
       }
     },
     "node_modules/d": {
@@ -1637,11 +1640,6 @@
         "url": "https://github.com/fb55/domhandler?sponsor=1"
       }
     },
-    "node_modules/domready": {
-      "version": "1.0.8",
-      "resolved": "https://registry.npmjs.org/domready/-/domready-1.0.8.tgz",
-      "integrity": "sha512-uIzsOJUNk+AdGE9a6VDeessoMCzF8RrZvJCX/W8QtyfgdR6Uofn/MvRonih3OtCO79b2VDzDOymuiABrQ4z3XA=="
-    },
     "node_modules/domutils": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/domutils/-/domutils-3.0.1.tgz",
@@ -1690,9 +1688,9 @@
       }
     },
     "node_modules/electron-to-chromium": {
-      "version": "1.4.248",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.248.tgz",
-      "integrity": "sha512-qShjzEYpa57NnhbW2K+g+Fl+eNoDvQ7I+2MRwWnU6Z6F0HhXekzsECCLv+y2OJUsRodjqoSfwHkIX42VUFtUzg==",
+      "version": "1.4.284",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.284.tgz",
+      "integrity": "sha512-M8WEXFuKXMYMVr45fo8mq0wUrrJHheiKZf6BArTKk9ZBYCKJEOU5H8cdWgDT+qCVZf7Na4lVUaZsA+h6uA9+PA==",
       "dev": true
     },
     "node_modules/element-closest": {
@@ -2052,9 +2050,9 @@
       "dev": true
     },
     "node_modules/fastq": {
-      "version": "1.13.0",
-      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.13.0.tgz",
-      "integrity": "sha512-YpkpUnK8od0o1hmeSc7UUs/eB/vIPWJYjKck2QKIzAf71Vm1AAQ3EbuZB3g2JIy+pg+ERD0vqI79KyZiB2e2Nw==",
+      "version": "1.15.0",
+      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.15.0.tgz",
+      "integrity": "sha512-wBrocU2LCXXa+lWBt8RoIRD89Fi8OdABODa/kEnyeyjS5aZO5/GNvI5sEINADqP/h8M29UHTHUb53sUu5Ihqdw==",
       "dev": true,
       "dependencies": {
         "reusify": "^1.0.4"
@@ -2344,18 +2342,6 @@
       "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz",
       "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow=="
     },
-    "node_modules/fs-minipass": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz",
-      "integrity": "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==",
-      "dev": true,
-      "dependencies": {
-        "minipass": "^3.0.0"
-      },
-      "engines": {
-        "node": ">= 8"
-      }
-    },
     "node_modules/fs-mkdirp-stream": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/fs-mkdirp-stream/-/fs-mkdirp-stream-1.0.0.tgz",
@@ -2405,9 +2391,9 @@
       "dev": true
     },
     "node_modules/get-intrinsic": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.3.tgz",
-      "integrity": "sha512-QJVz1Tj7MS099PevUG5jvnt9tSkXN8K14dxQlikJuPt4uD9hHAHjLyLBiLR5zELelBdD9QNRAXZzsJx0WaDL9A==",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.0.tgz",
+      "integrity": "sha512-L049y6nFOuom5wGyRc3/gdTLO94dySVKRACj1RmJZBQXlbTMhtNIgkWkUHq+jYmZvKf14EW1EoJnnjbmoHij0Q==",
       "dev": true,
       "dependencies": {
         "function-bind": "^1.1.1",
@@ -2595,9 +2581,9 @@
       }
     },
     "node_modules/google-protobuf": {
-      "version": "3.21.0",
-      "resolved": "https://registry.npmjs.org/google-protobuf/-/google-protobuf-3.21.0.tgz",
-      "integrity": "sha512-byR7MBTK4tZ5PZEb+u5ZTzpt4SfrTxv5682MjPlHN16XeqgZE2/8HOIWeiXe8JKnT9OVbtBGhbq8mtvkK8cd5g==",
+      "version": "3.21.2",
+      "resolved": "https://registry.npmjs.org/google-protobuf/-/google-protobuf-3.21.2.tgz",
+      "integrity": "sha512-3MSOYFO5U9mPGikIYCzK0SaThypfGgS6bHqrUGXG3DPHCrb+txNqeEcns1W0lkGfk0rCyNXm7xB9rMxnCiZOoA==",
       "dev": true
     },
     "node_modules/graceful-fs": {
@@ -2965,18 +2951,18 @@
       ]
     },
     "node_modules/ignore": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.0.tgz",
-      "integrity": "sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==",
+      "version": "5.2.4",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.4.tgz",
+      "integrity": "sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ==",
       "dev": true,
       "engines": {
         "node": ">= 4"
       }
     },
     "node_modules/immutable": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/immutable/-/immutable-4.1.0.tgz",
-      "integrity": "sha512-oNkuqVTA8jqG1Q6c+UglTOD1xhC1BtjKI7XkCXRkZHrN5m18/XsnUp8Q89GkQO/z+0WjonSvl0FLhDYftp46nQ=="
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/immutable/-/immutable-4.2.2.tgz",
+      "integrity": "sha512-fTMKDwtbvO5tldky9QZ2fMX7slR0mYpY5nbnFWYp0fOzDhHqhgIw9KoYgxLWsoNTS9ZHGauHj18DTyEw6BK3Og=="
     },
     "node_modules/indent-string": {
       "version": "4.0.0",
@@ -3095,9 +3081,9 @@
       "dev": true
     },
     "node_modules/is-core-module": {
-      "version": "2.10.0",
-      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.10.0.tgz",
-      "integrity": "sha512-Erxj2n/LDAZ7H8WNJXd9tw38GYM3dv8rk8Zcs+jJuxYTW7sozH+SS8NtrSjVL1/vpLvWi1hxy96IzjJ3EHTJJg==",
+      "version": "2.11.0",
+      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.11.0.tgz",
+      "integrity": "sha512-RRjxlvLDkD1YJwDbroBHMb+cukurkDWNyHx7D3oNB5x9rb5ogcksMC5wHCadcXoo67gVr/+3GFySh3134zi6rw==",
       "dev": true,
       "dependencies": {
         "has": "^1.0.3"
@@ -3727,9 +3713,9 @@
       "integrity": "sha512-c4vLwYWyl+Ji+U43eU/G5FwxWd4ZH0ePUsFs5y0uwD9HUEFBXUQ1zUUan+78IpRD+y4pUfG0nAzNM292K7ItvA=="
     },
     "node_modules/mdn-data": {
-      "version": "2.0.14",
-      "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.14.tgz",
-      "integrity": "sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow==",
+      "version": "2.0.28",
+      "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.28.tgz",
+      "integrity": "sha512-aylIc7Z9y4yzHYAJNuESG3hfhC+0Ibp/MAMiaOZgNv4pmEdFyfZhhhny4MNiAfWdBQ1RQ2mfDWmM1x8SvGyp8g==",
       "dev": true
     },
     "node_modules/memoizee": {
@@ -3826,31 +3812,6 @@
         "node": "*"
       }
     },
-    "node_modules/minipass": {
-      "version": "3.3.4",
-      "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.4.tgz",
-      "integrity": "sha512-I9WPbWHCGu8W+6k1ZiGpPu0GkoKBeorkfKNuAFBNS1HNFJvke82sxvI5bzcCNpWPorkOO5QQ+zomzzwRxejXiw==",
-      "dev": true,
-      "dependencies": {
-        "yallist": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/minizlib": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz",
-      "integrity": "sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==",
-      "dev": true,
-      "dependencies": {
-        "minipass": "^3.0.0",
-        "yallist": "^4.0.0"
-      },
-      "engines": {
-        "node": ">= 8"
-      }
-    },
     "node_modules/mixin-deep": {
       "version": "1.3.2",
       "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.2.tgz",
@@ -3918,9 +3879,9 @@
       }
     },
     "node_modules/nan": {
-      "version": "2.16.0",
-      "resolved": "https://registry.npmjs.org/nan/-/nan-2.16.0.tgz",
-      "integrity": "sha512-UdAqHyFngu7TfQKsCBgAA6pWDkT8MAO7d0jyOecVhN5354xbLqdn8mV9Tat9gepAupm0bt2DbeaSC8vS52MuFA==",
+      "version": "2.17.0",
+      "resolved": "https://registry.npmjs.org/nan/-/nan-2.17.0.tgz",
+      "integrity": "sha512-2ZTgtl0nJsO0KQCjEpxcIr5D+Yv90plTitZt9JBfQvVJDS5seMl3FOvsh3+9CoYWXf/1l5OaZzzF6nDm4cagaQ==",
       "dev": true,
       "optional": true
     },
@@ -4062,9 +4023,9 @@
       "dev": true
     },
     "node_modules/node-fetch": {
-      "version": "2.6.7",
-      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz",
-      "integrity": "sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==",
+      "version": "2.6.9",
+      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.9.tgz",
+      "integrity": "sha512-DJm/CJkZkRjKKj4Zi4BsKVZh3ValV5IR5s7LVZnW+6YMh0W1BfNA8XSs6DLMGYlId5F3KnA70uu2qepcR08Qqg==",
       "dependencies": {
         "whatwg-url": "^5.0.0"
       },
@@ -4081,9 +4042,9 @@
       }
     },
     "node_modules/node-releases": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.6.tgz",
-      "integrity": "sha512-PiVXnNuFm5+iYkLBNeq5211hvO38y63T0i2KKh2KnUs3RpzJ+JtODFjkD8yjLwnDkTYF1eKXheUwdssR+NRZdg==",
+      "version": "2.0.9",
+      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.9.tgz",
+      "integrity": "sha512-2xfmOrRkGogbTK9R6Leda0DGiXeY3p2NJpy4+gNCffdUvV6mdEJnaDEic1i3Ec2djAo8jWYoJMR5PB0MSMpxUA==",
       "dev": true
     },
     "node_modules/node.extend": {
@@ -4520,9 +4481,9 @@
       }
     },
     "node_modules/parse5": {
-      "version": "7.1.1",
-      "resolved": "https://registry.npmjs.org/parse5/-/parse5-7.1.1.tgz",
-      "integrity": "sha512-kwpuwzB+px5WUg9pyK0IcK/shltJN5/OVhQagxhCQNtT9Y9QRZqNY2e1cmbu/paRh5LMnz/oVTVLBpjFmMZhSg==",
+      "version": "7.1.2",
+      "resolved": "https://registry.npmjs.org/parse5/-/parse5-7.1.2.tgz",
+      "integrity": "sha512-Czj1WaSVpaoj0wbhMzLmWD69anp2WH7FXMB9n1Sy8/ZFF9jolSQVMu1Ij5WIyGmcBmhk7EOndpO4mIpihVqAXw==",
       "dependencies": {
         "entities": "^4.4.0"
       },
@@ -4731,33 +4692,40 @@
       }
     },
     "node_modules/postcss": {
-      "version": "8.4.8",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.8.tgz",
-      "integrity": "sha512-2tXEqGxrjvAO6U+CJzDL2Fk2kPHTv1jQsYkSoMeOis2SsYaXRO2COxTdQp99cYvif9JTXaAk9lYGc3VhJt7JPQ==",
+      "version": "8.4.19",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.19.tgz",
+      "integrity": "sha512-h+pbPsyhlYj6N2ozBmHhHrs9DzGmbaarbLvWipMRO7RLS+v4onj26MPFXA5OBYFxyqYhUJK456SwDcY9H2/zsA==",
       "dev": true,
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/postcss/"
+        },
+        {
+          "type": "tidelift",
+          "url": "https://tidelift.com/funding/github/npm/postcss"
+        }
+      ],
       "dependencies": {
-        "nanoid": "^3.3.1",
+        "nanoid": "^3.3.4",
         "picocolors": "^1.0.0",
         "source-map-js": "^1.0.2"
       },
       "engines": {
         "node": "^10 || ^12 || >=14"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/postcss/"
       }
     },
     "node_modules/postcss-csso": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-csso/-/postcss-csso-5.0.1.tgz",
-      "integrity": "sha512-TI99uhhJK2L5IQXPuyNcT3XV9bffSvDPmNpHi5f+tBq+R/01ucgLsUCcTDcVNqKMxO28klI6NwgjrHrM99x9KA==",
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-csso/-/postcss-csso-6.0.1.tgz",
+      "integrity": "sha512-ZV4yEziMrx6CEiqabGLrDva0pMD7Fbw7yP+LzJvaynM4OJgTssGN6dHiMsJMJdpmNaLJltXVLsrb/5sxbFa8sA==",
       "dev": true,
       "dependencies": {
-        "csso": "^4.0.2"
+        "csso": "^5.0.5"
       },
       "engines": {
-        "node": ">=10.12.0"
+        "node": "^12.20.0 || ^14.13.0 || >=15.0.0",
+        "npm": ">=7.0.0"
       },
       "peerDependencies": {
         "postcss": "^8.0.0"
@@ -4880,7 +4848,7 @@
       "version": "9.1.1",
       "resolved": "https://registry.npmjs.org/puppeteer/-/puppeteer-9.1.1.tgz",
       "integrity": "sha512-W+nOulP2tYd/ZG99WuZC/I5ljjQQ7EUw/jQGcIb9eu8mDlZxNY2SgcJXTLG9h5gRvqA3uJOe4hZXYsd3EqioMw==",
-      "deprecated": "Version no longer supported. Upgrade to @latest",
+      "deprecated": "< 18.1.0 is no longer supported",
       "hasInstallScript": true,
       "dependencies": {
         "debug": "^4.1.0",
@@ -5441,9 +5409,9 @@
       }
     },
     "node_modules/rxjs": {
-      "version": "7.5.6",
-      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.5.6.tgz",
-      "integrity": "sha512-dnyv2/YsXhnm461G+R/Pe5bWP41Nm6LBXEYWI6eiFP4fiwx6WRI/CD0zbdVAudd9xwLEF2IDcKXLHit0FYjUzw==",
+      "version": "7.8.0",
+      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.0.tgz",
+      "integrity": "sha512-F2+gxDshqmIub1KdvZkaEfGDwLNpPvk9Fs6LD/MyQxNgMds/WH9OdDDXOmxUZpME+iSK3rQCctkL0DYyytUqMg==",
       "dev": true,
       "dependencies": {
         "tslib": "^2.1.0"
@@ -5464,9 +5432,9 @@
       }
     },
     "node_modules/sass": {
-      "version": "1.54.9",
-      "resolved": "https://registry.npmjs.org/sass/-/sass-1.54.9.tgz",
-      "integrity": "sha512-xb1hjASzEH+0L0WI9oFjqhRi51t/gagWnxLiwUNMltA0Ab6jIDkAacgKiGYKM9Jhy109osM7woEEai6SXeJo5Q==",
+      "version": "1.58.0",
+      "resolved": "https://registry.npmjs.org/sass/-/sass-1.58.0.tgz",
+      "integrity": "sha512-PiMJcP33DdKtZ/1jSjjqVIKihoDc6yWmYr9K/4r3fVVIEDAluD0q7XZiRKrNJcPK3qkLRF/79DND1H5q1LBjgg==",
       "dependencies": {
         "chokidar": ">=3.0.0 <4.0.0",
         "immutable": "^4.0.0",
@@ -5480,31 +5448,163 @@
       }
     },
     "node_modules/sass-embedded": {
-      "version": "1.50.1",
-      "resolved": "https://registry.npmjs.org/sass-embedded/-/sass-embedded-1.50.1.tgz",
-      "integrity": "sha512-Md9NUbCqaXVaAKfR/+/KxjWpkvS7TGohhlcFVccgtElcycebGcPWCBh6eZKoGD3s6R9rmu+6OP9CzS6Up8rAeA==",
+      "version": "1.56.1",
+      "resolved": "https://registry.npmjs.org/sass-embedded/-/sass-embedded-1.56.1.tgz",
+      "integrity": "sha512-8VuohdRoGfqVWgBNeC+iqek1KXIVWYcG6AOQ6rJvRUe08HbdPQgp0+fseDQX7E5UxaoM8wvU5VBwCbZvPwFZQw==",
       "dev": true,
-      "hasInstallScript": true,
       "dependencies": {
         "buffer-builder": "^0.2.0",
-        "extract-zip": "^2.0.1",
         "google-protobuf": "^3.11.4",
         "immutable": "^4.0.0",
-        "node-fetch": "^2.6.0",
         "rxjs": "^7.4.0",
-        "semver": "^7.3.5",
-        "shelljs": "^0.8.4",
-        "supports-color": "^8.1.1",
-        "tar": "^6.0.5"
+        "supports-color": "^8.1.1"
       },
+      "engines": {
+        "node": ">=14.0.0"
+      },
+      "optionalDependencies": {
+        "sass-embedded-darwin-arm64": "1.56.1",
+        "sass-embedded-darwin-x64": "1.56.1",
+        "sass-embedded-linux-arm": "1.56.1",
+        "sass-embedded-linux-arm64": "1.56.1",
+        "sass-embedded-linux-ia32": "1.56.1",
+        "sass-embedded-linux-x64": "1.56.1",
+        "sass-embedded-win32-ia32": "1.56.1",
+        "sass-embedded-win32-x64": "1.56.1"
+      }
+    },
+    "node_modules/sass-embedded-darwin-arm64": {
+      "version": "1.56.1",
+      "resolved": "https://registry.npmjs.org/sass-embedded-darwin-arm64/-/sass-embedded-darwin-arm64-1.56.1.tgz",
+      "integrity": "sha512-Y6us8rg7uwLtAzGiKDebAhFn98RLpW3u5Jnfbsvetlm/rDJ1fZg/roVXFttepLdVbYBjimVFTUaNuGxU3bWbBA==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">=14.0.0"
+      }
+    },
+    "node_modules/sass-embedded-darwin-x64": {
+      "version": "1.56.1",
+      "resolved": "https://registry.npmjs.org/sass-embedded-darwin-x64/-/sass-embedded-darwin-x64-1.56.1.tgz",
+      "integrity": "sha512-UypB3IREbreNNc+dG+L6hG5yoeTujKDCdmu38SSSS/zl9XBFTc8McX58SWapTJOUFK8G43CCimfB3r8FOcyNfA==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">=14.0.0"
+      }
+    },
+    "node_modules/sass-embedded-linux-arm": {
+      "version": "1.56.1",
+      "resolved": "https://registry.npmjs.org/sass-embedded-linux-arm/-/sass-embedded-linux-arm-1.56.1.tgz",
+      "integrity": "sha512-pXv+2HlMsjlk0g3dzuVhofuUNJZWUfWVe5xbbWHv+wrdH9kuui6WOyHDhSdUolPrRXOrdsG6Z4/Balr9wa1JWQ==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=14.0.0"
+      }
+    },
+    "node_modules/sass-embedded-linux-arm64": {
+      "version": "1.56.1",
+      "resolved": "https://registry.npmjs.org/sass-embedded-linux-arm64/-/sass-embedded-linux-arm64-1.56.1.tgz",
+      "integrity": "sha512-Ly2wk8EmhjXkBpNPM+yAygSxTVIBjQlf4cDAHYgsaDUIIvRSAKAe2CUmxJjik069Qmv54g+Ac7WF6k63c2CTNw==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=14.0.0"
+      }
+    },
+    "node_modules/sass-embedded-linux-ia32": {
+      "version": "1.56.1",
+      "resolved": "https://registry.npmjs.org/sass-embedded-linux-ia32/-/sass-embedded-linux-ia32-1.56.1.tgz",
+      "integrity": "sha512-cGmhnHdCbwJsQgsogwmlALzS/j8g+qQTiBuKBcXIWyFn4hLWo2BAr4Gm9vY5p+8aapcYrRQF9b0nwpFQcUScOg==",
+      "cpu": [
+        "ia32"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=14.0.0"
+      }
+    },
+    "node_modules/sass-embedded-linux-x64": {
+      "version": "1.56.1",
+      "resolved": "https://registry.npmjs.org/sass-embedded-linux-x64/-/sass-embedded-linux-x64-1.56.1.tgz",
+      "integrity": "sha512-yMXS37lP3abTI5ThuydOrLacSNz4Oo9+xlfQDR0pntrugdKzH7vHWK7T7Ynd+vGjVqFajUhI+VihP7vZlhhndw==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=14.0.0"
+      }
+    },
+    "node_modules/sass-embedded-win32-ia32": {
+      "version": "1.56.1",
+      "resolved": "https://registry.npmjs.org/sass-embedded-win32-ia32/-/sass-embedded-win32-ia32-1.56.1.tgz",
+      "integrity": "sha512-cjtuKc1O0F+yQZ8hLLYhalulEkBZ6HPdR/ys0l6hn7KTlrYooMyvZXbdU5KaB2lfK1WD29I0HefT8Em7d9cpfA==",
+      "cpu": [
+        "ia32"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=14.0.0"
+      }
+    },
+    "node_modules/sass-embedded-win32-x64": {
+      "version": "1.56.1",
+      "resolved": "https://registry.npmjs.org/sass-embedded-win32-x64/-/sass-embedded-win32-x64-1.56.1.tgz",
+      "integrity": "sha512-VxqwSluQdNBdBEx0p6N2dOrGPIEL3AcG62KuDJ4KD/rHPQgoCPiJvLa5MXKdVHC24tHgE2AYlirILS/iE/N1NQ==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "win32"
+      ],
       "engines": {
         "node": ">=14.0.0"
       }
     },
     "node_modules/sass/node_modules/anymatch": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz",
-      "integrity": "sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==",
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz",
+      "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==",
       "dependencies": {
         "normalize-path": "^3.0.0",
         "picomatch": "^2.0.4"
@@ -5624,9 +5724,9 @@
       }
     },
     "node_modules/semver": {
-      "version": "7.3.7",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz",
-      "integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==",
+      "version": "7.3.8",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
+      "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
       "dependencies": {
         "lru-cache": "^6.0.0"
       },
@@ -5682,23 +5782,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/shelljs": {
-      "version": "0.8.5",
-      "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.8.5.tgz",
-      "integrity": "sha512-TiwcRcrkhHvbrZbnRcFYMLl30Dfov3HKqzp5tO5b4pt6G/SezKcYhmDg15zXVBswHmctSAQKznqNW2LO5tTDow==",
-      "dev": true,
-      "dependencies": {
-        "glob": "^7.0.0",
-        "interpret": "^1.0.0",
-        "rechoir": "^0.6.2"
-      },
-      "bin": {
-        "shjs": "bin/shjs"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
     "node_modules/slash": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
@@ -6134,23 +6217,6 @@
         "es6-symbol": "^3.1.1"
       }
     },
-    "node_modules/tar": {
-      "version": "6.1.11",
-      "resolved": "https://registry.npmjs.org/tar/-/tar-6.1.11.tgz",
-      "integrity": "sha512-an/KZQzQUkZCkuoAA64hM92X0Urb6VpRhAFllDzz44U2mcD5scmT3zBc4VgVpkugF580+DQn8eAFSyoQt0tznA==",
-      "dev": true,
-      "dependencies": {
-        "chownr": "^2.0.0",
-        "fs-minipass": "^2.0.0",
-        "minipass": "^3.0.0",
-        "minizlib": "^2.1.1",
-        "mkdirp": "^1.0.3",
-        "yallist": "^4.0.0"
-      },
-      "engines": {
-        "node": ">= 10"
-      }
-    },
     "node_modules/tar-fs": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.1.tgz",
@@ -6162,11 +6228,6 @@
         "tar-stream": "^2.1.4"
       }
     },
-    "node_modules/tar-fs/node_modules/chownr": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz",
-      "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg=="
-    },
     "node_modules/tar-stream": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-2.2.0.tgz",
@@ -6195,18 +6256,6 @@
         "node": ">= 6"
       }
     },
-    "node_modules/tar/node_modules/mkdirp": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
-      "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
-      "dev": true,
-      "bin": {
-        "mkdirp": "bin/cmd.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
     "node_modules/textextensions": {
       "version": "3.3.0",
       "resolved": "https://registry.npmjs.org/textextensions/-/textextensions-3.3.0.tgz",
@@ -6448,9 +6497,9 @@
       "integrity": "sha512-c3zayb8/kWWpycWYg87P71E1S1ZL6b6IJxfb5fvsUgsf0S2MVGaDhDXXjDMpdCpfWXqptc+4mXwmiy1ypXqRAA=="
     },
     "node_modules/tslib": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz",
-      "integrity": "sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==",
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.0.tgz",
+      "integrity": "sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg==",
       "dev": true
     },
     "node_modules/type": {
@@ -6597,9 +6646,9 @@
       }
     },
     "node_modules/update-browserslist-db": {
-      "version": "1.0.9",
-      "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.9.tgz",
-      "integrity": "sha512-/xsqn21EGVdXI3EXSum1Yckj3ZVZugqyOZQ/CxYPBD/R+ko9NSUScf8tFF4dOKY+2pvSSJA/S+5B8s4Zr4kyvg==",
+      "version": "1.0.10",
+      "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.10.tgz",
+      "integrity": "sha512-OztqDenkfFkbSG+tRxBeAnCVPckDBcvibKd35yDONx6OU8N7sqgwc7rCbkJ/WcYtVRZ4ba68d6byhC21GFh7sQ==",
       "dev": true,
       "funding": [
         {
@@ -7047,15 +7096,15 @@
       "dev": true
     },
     "@types/node": {
-      "version": "14.18.28",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-14.18.28.tgz",
-      "integrity": "sha512-CK2fnrQlIgKlCV3N2kM+Gznb5USlwA1KFX3rJVHmgVk6NJxFPuQ86pAcvKnu37IA4BGlSRz7sEE1lHL1aLZ/eQ==",
+      "version": "14.18.36",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-14.18.36.tgz",
+      "integrity": "sha512-FXKWbsJ6a1hIrRxv+FoukuHnGTgEzKYGi7kilfMae96AL9UNkPFNWJEEYWzdRI9ooIkbr4AKldyuSTLql06vLQ==",
       "devOptional": true
     },
     "@types/vinyl": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/@types/vinyl/-/vinyl-2.0.6.tgz",
-      "integrity": "sha512-ayJ0iOCDNHnKpKTgBG6Q6JOnHTj9zFta+3j2b8Ejza0e4cvRyMn0ZoLEmbPrTHe5YYRlDYPvPWVdV4cTaRyH7g==",
+      "version": "2.0.7",
+      "resolved": "https://registry.npmjs.org/@types/vinyl/-/vinyl-2.0.7.tgz",
+      "integrity": "sha512-4UqPv+2567NhMQuMLdKAyK4yzrfCqwaTt6bLhHEs8PFcxbHILsrxaY63n4wgE/BRLDWDQeI+WcTmkXKExh9hQg==",
       "dev": true,
       "requires": {
         "@types/expect": "^1.20.4",
@@ -7072,12 +7121,12 @@
       }
     },
     "@uswds/compile": {
-      "version": "1.0.0-beta.3",
-      "resolved": "https://registry.npmjs.org/@uswds/compile/-/compile-1.0.0-beta.3.tgz",
-      "integrity": "sha512-AJstXyYGsLvV3xRg+Soqwlxc2IXjelWDTCq5RtfsUPdGKUKKsIPjeUQX6R66gPwXryNx8xBjE5CyOn/o1mLbjw==",
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/@uswds/compile/-/compile-1.0.0.tgz",
+      "integrity": "sha512-dIAL2cr6K+QnSNr/fe7Y2Db06rkxMla5VtockxHF+CYcBl3DbJ8qbMn/kxouYDX5rgN0So2PbMAouzpM7uhyMA==",
       "dev": true,
       "requires": {
-        "autoprefixer": "10.4.7",
+        "autoprefixer": "10.4.13",
         "del": "6.0.0",
         "gulp": "4.0.2",
         "gulp-postcss": "9.0.1",
@@ -7086,18 +7135,17 @@
         "gulp-sass": "5.1.0",
         "gulp-sourcemaps": "3.0.0",
         "gulp-svgstore": "9.0.0",
-        "postcss": "8.4.8",
-        "postcss-csso": "5.0.1",
-        "sass-embedded": "1.50.1"
+        "postcss": "8.4.19",
+        "postcss-csso": "6.0.1",
+        "sass-embedded": "1.56.1"
       }
     },
     "@uswds/uswds": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/@uswds/uswds/-/uswds-3.1.0.tgz",
-      "integrity": "sha512-6XTeaQD/ipc3x4713mud4Rrr+lRc4nJ1Qw5Oy35dbVEXuKr7DjN4EBoAkbze9OoV0UdmAIvoxolBF/UcpFVKOg==",
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/@uswds/uswds/-/uswds-3.3.0.tgz",
+      "integrity": "sha512-qiugkbwrO+eIIwi4lbEdH15LCHuAjfUMDRQNBBujakR99Ka3iqmrLpPllffdKaJJnnYkt75v0lltnJ5Nnd/obQ==",
       "requires": {
         "classlist-polyfill": "1.0.3",
-        "domready": "1.0.8",
         "object-assign": "4.1.1",
         "receptor": "1.0.0",
         "resolve-id-refs": "0.1.0"
@@ -7445,9 +7493,9 @@
       }
     },
     "async-each": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/async-each/-/async-each-1.0.3.tgz",
-      "integrity": "sha512-z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ==",
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/async-each/-/async-each-1.0.5.tgz",
+      "integrity": "sha512-5QzqtU3BlagehwmdoqwaS2FBQF2P5eL6vFqXwNsb5jwoEsmtfAXg1ocFvW7I6/gGLFhBMKwcMwZuy7uv/Bo9jA==",
       "dev": true
     },
     "async-settle": {
@@ -7466,13 +7514,13 @@
       "dev": true
     },
     "autoprefixer": {
-      "version": "10.4.7",
-      "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.7.tgz",
-      "integrity": "sha512-ypHju4Y2Oav95SipEcCcI5J7CGPuvz8oat7sUtYj3ClK44bldfvtvcxK6IEK++7rqB7YchDGzweZIBG+SD0ZAA==",
+      "version": "10.4.13",
+      "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.13.tgz",
+      "integrity": "sha512-49vKpMqcZYsJjwotvt4+h/BCjJVnhGwcLpDt5xkcaOG3eLrG/HUYLagrihYsQ+qrIBgIzX1Rw7a6L8I/ZA1Atg==",
       "dev": true,
       "requires": {
-        "browserslist": "^4.20.3",
-        "caniuse-lite": "^1.0.30001335",
+        "browserslist": "^4.21.4",
+        "caniuse-lite": "^1.0.30001426",
         "fraction.js": "^4.2.0",
         "normalize-range": "^0.1.2",
         "picocolors": "^1.0.0",
@@ -7480,9 +7528,9 @@
       }
     },
     "axe-core": {
-      "version": "4.4.3",
-      "resolved": "https://registry.npmjs.org/axe-core/-/axe-core-4.4.3.tgz",
-      "integrity": "sha512-32+ub6kkdhhWick/UjvEwRchgoetXqTK14INLqbGm5U2TzBkBNF3nQtLYm8ovxSkQWArjEQvftCKryjZaATu3w=="
+      "version": "4.6.3",
+      "resolved": "https://registry.npmjs.org/axe-core/-/axe-core-4.6.3.tgz",
+      "integrity": "sha512-/BQzOX780JhsxDnPpH4ZiyrJAzcd8AfzFPkv+89veFSr1rcMjuq2JDCwypKaPeB6ljHp9KjXhPpjgCvQlWYuqg=="
     },
     "bach": {
       "version": "1.2.0",
@@ -7665,15 +7713,15 @@
       }
     },
     "browserslist": {
-      "version": "4.21.3",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.3.tgz",
-      "integrity": "sha512-898rgRXLAyRkM1GryrrBHGkqA5hlpkV5MhtZwg9QXeiyLUYs2k00Un05aX5l2/yJIOObYKOpS2JNo8nJDE7fWQ==",
+      "version": "4.21.5",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.5.tgz",
+      "integrity": "sha512-tUkiguQGW7S3IhB7N+c2MV/HZPSCPAAiYBZXLsBhFB/PCy6ZKKsZrmBayHV9fdGV/ARIfJ14NkxKzRDjvp7L6w==",
       "dev": true,
       "requires": {
-        "caniuse-lite": "^1.0.30001370",
-        "electron-to-chromium": "^1.4.202",
-        "node-releases": "^2.0.6",
-        "update-browserslist-db": "^1.0.5"
+        "caniuse-lite": "^1.0.30001449",
+        "electron-to-chromium": "^1.4.284",
+        "node-releases": "^2.0.8",
+        "update-browserslist-db": "^1.0.10"
       }
     },
     "buffer": {
@@ -7697,9 +7745,9 @@
       "integrity": "sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ=="
     },
     "buffer-equal": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/buffer-equal/-/buffer-equal-1.0.0.tgz",
-      "integrity": "sha512-tcBWO2Dl4e7Asr9hTGcpVrCe+F7DubpmqWCTbj4FHLmjqO2hIaC383acQubWtRJhdceqs5uBHs6Es+Sk//RKiQ==",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/buffer-equal/-/buffer-equal-1.0.1.tgz",
+      "integrity": "sha512-QoV3ptgEaQpvVwbXdSO39iqPQTCxSF7A5U99AxbHYqUdCizL/lH2Z0A2y6nbZucxMEOtNyZfG2s6gsVugGpKkg==",
       "dev": true
     },
     "buffer-from": {
@@ -7742,15 +7790,15 @@
       "dev": true
     },
     "caniuse-lite": {
-      "version": "1.0.30001399",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001399.tgz",
-      "integrity": "sha512-4vQ90tMKS+FkvuVWS5/QY1+d805ODxZiKFzsU8o/RsVJz49ZSRR8EjykLJbqhzdPgadbX6wB538wOzle3JniRA==",
+      "version": "1.0.30001450",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001450.tgz",
+      "integrity": "sha512-qMBmvmQmFXaSxexkjjfMvD5rnDL0+m+dUMZKoDYsGG8iZN29RuYh9eRoMvKsT6uMAWlyUUGDEQGJJYjzCIO9ew==",
       "dev": true
     },
     "check-types": {
-      "version": "11.1.2",
-      "resolved": "https://registry.npmjs.org/check-types/-/check-types-11.1.2.tgz",
-      "integrity": "sha512-tzWzvgePgLORb9/3a0YenggReLKAIb2owL03H2Xdoe5pKcUyWRSEQ8xfCar8t2SIAuEDwtmx2da1YB52YuHQMQ=="
+      "version": "11.2.2",
+      "resolved": "https://registry.npmjs.org/check-types/-/check-types-11.2.2.tgz",
+      "integrity": "sha512-HBiYvXvn9Z70Z88XKjz3AEKd4HJhBXsa3j7xFnITAzoS8+q6eIGi8qDB8FKPBAjtuxjI/zFpwuiCb8oDtKOYrA=="
     },
     "cheerio": {
       "version": "1.0.0-rc.12",
@@ -7823,10 +7871,9 @@
       }
     },
     "chownr": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz",
-      "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==",
-      "dev": true
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz",
+      "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg=="
     },
     "class-utils": {
       "version": "0.3.6",
@@ -7970,13 +8017,10 @@
       }
     },
     "convert-source-map": {
-      "version": "1.8.0",
-      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.8.0.tgz",
-      "integrity": "sha512-+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA==",
-      "dev": true,
-      "requires": {
-        "safe-buffer": "~5.1.1"
-      }
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.9.0.tgz",
+      "integrity": "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==",
+      "dev": true
     },
     "copy-descriptor": {
       "version": "0.1.1",
@@ -8024,13 +8068,13 @@
       }
     },
     "css-tree": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.1.3.tgz",
-      "integrity": "sha512-tRpdppF7TRazZrjJ6v3stzv93qxRcSsFmW6cX0Zm2NVKpxE1WV1HblnghVv9TreireHkqI/VDEsfolRF1p6y7Q==",
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-2.2.1.tgz",
+      "integrity": "sha512-OA0mILzGc1kCOCSJerOeqDxDQ4HOh+G8NbOJFOTgOCzpw7fCBubk0fEyxp8AgOL/jvLgYA/uV0cMbe43ElF1JA==",
       "dev": true,
       "requires": {
-        "mdn-data": "2.0.14",
-        "source-map": "^0.6.1"
+        "mdn-data": "2.0.28",
+        "source-map-js": "^1.0.1"
       }
     },
     "css-what": {
@@ -8039,12 +8083,12 @@
       "integrity": "sha512-HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw=="
     },
     "csso": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/csso/-/csso-4.2.0.tgz",
-      "integrity": "sha512-wvlcdIbf6pwKEk7vHj8/Bkc0B4ylXZruLvOgs9doS5eOsOpuodOV2zJChSpkp+pRpYQLQMeF04nr3Z68Sta9jA==",
+      "version": "5.0.5",
+      "resolved": "https://registry.npmjs.org/csso/-/csso-5.0.5.tgz",
+      "integrity": "sha512-0LrrStPOdJj+SPCCrGhzryycLjwcgUSHBtxNA8aIDxf0GLsRh1cKYhB00Gd1lDOS4yGH69+SNn13+TWbVHETFQ==",
       "dev": true,
       "requires": {
-        "css-tree": "^1.1.2"
+        "css-tree": "~2.2.0"
       }
     },
     "d": {
@@ -8188,11 +8232,6 @@
         "domelementtype": "^2.3.0"
       }
     },
-    "domready": {
-      "version": "1.0.8",
-      "resolved": "https://registry.npmjs.org/domready/-/domready-1.0.8.tgz",
-      "integrity": "sha512-uIzsOJUNk+AdGE9a6VDeessoMCzF8RrZvJCX/W8QtyfgdR6Uofn/MvRonih3OtCO79b2VDzDOymuiABrQ4z3XA=="
-    },
     "domutils": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/domutils/-/domutils-3.0.1.tgz",
@@ -8237,9 +8276,9 @@
       }
     },
     "electron-to-chromium": {
-      "version": "1.4.248",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.248.tgz",
-      "integrity": "sha512-qShjzEYpa57NnhbW2K+g+Fl+eNoDvQ7I+2MRwWnU6Z6F0HhXekzsECCLv+y2OJUsRodjqoSfwHkIX42VUFtUzg==",
+      "version": "1.4.284",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.284.tgz",
+      "integrity": "sha512-M8WEXFuKXMYMVr45fo8mq0wUrrJHheiKZf6BArTKk9ZBYCKJEOU5H8cdWgDT+qCVZf7Na4lVUaZsA+h6uA9+PA==",
       "dev": true
     },
     "element-closest": {
@@ -8533,9 +8572,9 @@
       "dev": true
     },
     "fastq": {
-      "version": "1.13.0",
-      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.13.0.tgz",
-      "integrity": "sha512-YpkpUnK8od0o1hmeSc7UUs/eB/vIPWJYjKck2QKIzAf71Vm1AAQ3EbuZB3g2JIy+pg+ERD0vqI79KyZiB2e2Nw==",
+      "version": "1.15.0",
+      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.15.0.tgz",
+      "integrity": "sha512-wBrocU2LCXXa+lWBt8RoIRD89Fi8OdABODa/kEnyeyjS5aZO5/GNvI5sEINADqP/h8M29UHTHUb53sUu5Ihqdw==",
       "dev": true,
       "requires": {
         "reusify": "^1.0.4"
@@ -8765,15 +8804,6 @@
       "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz",
       "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow=="
     },
-    "fs-minipass": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz",
-      "integrity": "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==",
-      "dev": true,
-      "requires": {
-        "minipass": "^3.0.0"
-      }
-    },
     "fs-mkdirp-stream": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/fs-mkdirp-stream/-/fs-mkdirp-stream-1.0.0.tgz",
@@ -8812,9 +8842,9 @@
       "dev": true
     },
     "get-intrinsic": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.3.tgz",
-      "integrity": "sha512-QJVz1Tj7MS099PevUG5jvnt9tSkXN8K14dxQlikJuPt4uD9hHAHjLyLBiLR5zELelBdD9QNRAXZzsJx0WaDL9A==",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.0.tgz",
+      "integrity": "sha512-L049y6nFOuom5wGyRc3/gdTLO94dySVKRACj1RmJZBQXlbTMhtNIgkWkUHq+jYmZvKf14EW1EoJnnjbmoHij0Q==",
       "dev": true,
       "requires": {
         "function-bind": "^1.1.1",
@@ -8959,9 +8989,9 @@
       }
     },
     "google-protobuf": {
-      "version": "3.21.0",
-      "resolved": "https://registry.npmjs.org/google-protobuf/-/google-protobuf-3.21.0.tgz",
-      "integrity": "sha512-byR7MBTK4tZ5PZEb+u5ZTzpt4SfrTxv5682MjPlHN16XeqgZE2/8HOIWeiXe8JKnT9OVbtBGhbq8mtvkK8cd5g==",
+      "version": "3.21.2",
+      "resolved": "https://registry.npmjs.org/google-protobuf/-/google-protobuf-3.21.2.tgz",
+      "integrity": "sha512-3MSOYFO5U9mPGikIYCzK0SaThypfGgS6bHqrUGXG3DPHCrb+txNqeEcns1W0lkGfk0rCyNXm7xB9rMxnCiZOoA==",
       "dev": true
     },
     "graceful-fs": {
@@ -9229,15 +9259,15 @@
       "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA=="
     },
     "ignore": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.0.tgz",
-      "integrity": "sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==",
+      "version": "5.2.4",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.4.tgz",
+      "integrity": "sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ==",
       "dev": true
     },
     "immutable": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/immutable/-/immutable-4.1.0.tgz",
-      "integrity": "sha512-oNkuqVTA8jqG1Q6c+UglTOD1xhC1BtjKI7XkCXRkZHrN5m18/XsnUp8Q89GkQO/z+0WjonSvl0FLhDYftp46nQ=="
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/immutable/-/immutable-4.2.2.tgz",
+      "integrity": "sha512-fTMKDwtbvO5tldky9QZ2fMX7slR0mYpY5nbnFWYp0fOzDhHqhgIw9KoYgxLWsoNTS9ZHGauHj18DTyEw6BK3Og=="
     },
     "indent-string": {
       "version": "4.0.0",
@@ -9334,9 +9364,9 @@
       "dev": true
     },
     "is-core-module": {
-      "version": "2.10.0",
-      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.10.0.tgz",
-      "integrity": "sha512-Erxj2n/LDAZ7H8WNJXd9tw38GYM3dv8rk8Zcs+jJuxYTW7sozH+SS8NtrSjVL1/vpLvWi1hxy96IzjJ3EHTJJg==",
+      "version": "2.11.0",
+      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.11.0.tgz",
+      "integrity": "sha512-RRjxlvLDkD1YJwDbroBHMb+cukurkDWNyHx7D3oNB5x9rb5ogcksMC5wHCadcXoo67gVr/+3GFySh3134zi6rw==",
       "dev": true,
       "requires": {
         "has": "^1.0.3"
@@ -9829,9 +9859,9 @@
       "integrity": "sha512-c4vLwYWyl+Ji+U43eU/G5FwxWd4ZH0ePUsFs5y0uwD9HUEFBXUQ1zUUan+78IpRD+y4pUfG0nAzNM292K7ItvA=="
     },
     "mdn-data": {
-      "version": "2.0.14",
-      "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.14.tgz",
-      "integrity": "sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow==",
+      "version": "2.0.28",
+      "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.28.tgz",
+      "integrity": "sha512-aylIc7Z9y4yzHYAJNuESG3hfhC+0Ibp/MAMiaOZgNv4pmEdFyfZhhhny4MNiAfWdBQ1RQ2mfDWmM1x8SvGyp8g==",
       "dev": true
     },
     "memoizee": {
@@ -9909,25 +9939,6 @@
         "brace-expansion": "^1.1.7"
       }
     },
-    "minipass": {
-      "version": "3.3.4",
-      "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.4.tgz",
-      "integrity": "sha512-I9WPbWHCGu8W+6k1ZiGpPu0GkoKBeorkfKNuAFBNS1HNFJvke82sxvI5bzcCNpWPorkOO5QQ+zomzzwRxejXiw==",
-      "dev": true,
-      "requires": {
-        "yallist": "^4.0.0"
-      }
-    },
-    "minizlib": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz",
-      "integrity": "sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==",
-      "dev": true,
-      "requires": {
-        "minipass": "^3.0.0",
-        "yallist": "^4.0.0"
-      }
-    },
     "mixin-deep": {
       "version": "1.3.2",
       "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.2.tgz",
@@ -9981,9 +9992,9 @@
       "dev": true
     },
     "nan": {
-      "version": "2.16.0",
-      "resolved": "https://registry.npmjs.org/nan/-/nan-2.16.0.tgz",
-      "integrity": "sha512-UdAqHyFngu7TfQKsCBgAA6pWDkT8MAO7d0jyOecVhN5354xbLqdn8mV9Tat9gepAupm0bt2DbeaSC8vS52MuFA==",
+      "version": "2.17.0",
+      "resolved": "https://registry.npmjs.org/nan/-/nan-2.17.0.tgz",
+      "integrity": "sha512-2ZTgtl0nJsO0KQCjEpxcIr5D+Yv90plTitZt9JBfQvVJDS5seMl3FOvsh3+9CoYWXf/1l5OaZzzF6nDm4cagaQ==",
       "dev": true,
       "optional": true
     },
@@ -10094,17 +10105,17 @@
       "dev": true
     },
     "node-fetch": {
-      "version": "2.6.7",
-      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz",
-      "integrity": "sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==",
+      "version": "2.6.9",
+      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.9.tgz",
+      "integrity": "sha512-DJm/CJkZkRjKKj4Zi4BsKVZh3ValV5IR5s7LVZnW+6YMh0W1BfNA8XSs6DLMGYlId5F3KnA70uu2qepcR08Qqg==",
       "requires": {
         "whatwg-url": "^5.0.0"
       }
     },
     "node-releases": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.6.tgz",
-      "integrity": "sha512-PiVXnNuFm5+iYkLBNeq5211hvO38y63T0i2KKh2KnUs3RpzJ+JtODFjkD8yjLwnDkTYF1eKXheUwdssR+NRZdg==",
+      "version": "2.0.9",
+      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.9.tgz",
+      "integrity": "sha512-2xfmOrRkGogbTK9R6Leda0DGiXeY3p2NJpy4+gNCffdUvV6mdEJnaDEic1i3Ec2djAo8jWYoJMR5PB0MSMpxUA==",
       "dev": true
     },
     "node.extend": {
@@ -10432,9 +10443,9 @@
       "dev": true
     },
     "parse5": {
-      "version": "7.1.1",
-      "resolved": "https://registry.npmjs.org/parse5/-/parse5-7.1.1.tgz",
-      "integrity": "sha512-kwpuwzB+px5WUg9pyK0IcK/shltJN5/OVhQagxhCQNtT9Y9QRZqNY2e1cmbu/paRh5LMnz/oVTVLBpjFmMZhSg==",
+      "version": "7.1.2",
+      "resolved": "https://registry.npmjs.org/parse5/-/parse5-7.1.2.tgz",
+      "integrity": "sha512-Czj1WaSVpaoj0wbhMzLmWD69anp2WH7FXMB9n1Sy8/ZFF9jolSQVMu1Ij5WIyGmcBmhk7EOndpO4mIpihVqAXw==",
       "requires": {
         "entities": "^4.4.0"
       }
@@ -10588,23 +10599,23 @@
       "dev": true
     },
     "postcss": {
-      "version": "8.4.8",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.8.tgz",
-      "integrity": "sha512-2tXEqGxrjvAO6U+CJzDL2Fk2kPHTv1jQsYkSoMeOis2SsYaXRO2COxTdQp99cYvif9JTXaAk9lYGc3VhJt7JPQ==",
+      "version": "8.4.19",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.19.tgz",
+      "integrity": "sha512-h+pbPsyhlYj6N2ozBmHhHrs9DzGmbaarbLvWipMRO7RLS+v4onj26MPFXA5OBYFxyqYhUJK456SwDcY9H2/zsA==",
       "dev": true,
       "requires": {
-        "nanoid": "^3.3.1",
+        "nanoid": "^3.3.4",
         "picocolors": "^1.0.0",
         "source-map-js": "^1.0.2"
       }
     },
     "postcss-csso": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-csso/-/postcss-csso-5.0.1.tgz",
-      "integrity": "sha512-TI99uhhJK2L5IQXPuyNcT3XV9bffSvDPmNpHi5f+tBq+R/01ucgLsUCcTDcVNqKMxO28klI6NwgjrHrM99x9KA==",
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-csso/-/postcss-csso-6.0.1.tgz",
+      "integrity": "sha512-ZV4yEziMrx6CEiqabGLrDva0pMD7Fbw7yP+LzJvaynM4OJgTssGN6dHiMsJMJdpmNaLJltXVLsrb/5sxbFa8sA==",
       "dev": true,
       "requires": {
-        "csso": "^4.0.2"
+        "csso": "^5.0.5"
       }
     },
     "postcss-load-config": {
@@ -11118,9 +11129,9 @@
       }
     },
     "rxjs": {
-      "version": "7.5.6",
-      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.5.6.tgz",
-      "integrity": "sha512-dnyv2/YsXhnm461G+R/Pe5bWP41Nm6LBXEYWI6eiFP4fiwx6WRI/CD0zbdVAudd9xwLEF2IDcKXLHit0FYjUzw==",
+      "version": "7.8.0",
+      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.0.tgz",
+      "integrity": "sha512-F2+gxDshqmIub1KdvZkaEfGDwLNpPvk9Fs6LD/MyQxNgMds/WH9OdDDXOmxUZpME+iSK3rQCctkL0DYyytUqMg==",
       "dev": true,
       "requires": {
         "tslib": "^2.1.0"
@@ -11141,9 +11152,9 @@
       }
     },
     "sass": {
-      "version": "1.54.9",
-      "resolved": "https://registry.npmjs.org/sass/-/sass-1.54.9.tgz",
-      "integrity": "sha512-xb1hjASzEH+0L0WI9oFjqhRi51t/gagWnxLiwUNMltA0Ab6jIDkAacgKiGYKM9Jhy109osM7woEEai6SXeJo5Q==",
+      "version": "1.58.0",
+      "resolved": "https://registry.npmjs.org/sass/-/sass-1.58.0.tgz",
+      "integrity": "sha512-PiMJcP33DdKtZ/1jSjjqVIKihoDc6yWmYr9K/4r3fVVIEDAluD0q7XZiRKrNJcPK3qkLRF/79DND1H5q1LBjgg==",
       "requires": {
         "chokidar": ">=3.0.0 <4.0.0",
         "immutable": "^4.0.0",
@@ -11151,9 +11162,9 @@
       },
       "dependencies": {
         "anymatch": {
-          "version": "3.1.2",
-          "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz",
-          "integrity": "sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==",
+          "version": "3.1.3",
+          "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz",
+          "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==",
           "requires": {
             "normalize-path": "^3.0.0",
             "picomatch": "^2.0.4"
@@ -11233,27 +11244,86 @@
       }
     },
     "sass-embedded": {
-      "version": "1.50.1",
-      "resolved": "https://registry.npmjs.org/sass-embedded/-/sass-embedded-1.50.1.tgz",
-      "integrity": "sha512-Md9NUbCqaXVaAKfR/+/KxjWpkvS7TGohhlcFVccgtElcycebGcPWCBh6eZKoGD3s6R9rmu+6OP9CzS6Up8rAeA==",
+      "version": "1.56.1",
+      "resolved": "https://registry.npmjs.org/sass-embedded/-/sass-embedded-1.56.1.tgz",
+      "integrity": "sha512-8VuohdRoGfqVWgBNeC+iqek1KXIVWYcG6AOQ6rJvRUe08HbdPQgp0+fseDQX7E5UxaoM8wvU5VBwCbZvPwFZQw==",
       "dev": true,
       "requires": {
         "buffer-builder": "^0.2.0",
-        "extract-zip": "^2.0.1",
         "google-protobuf": "^3.11.4",
         "immutable": "^4.0.0",
-        "node-fetch": "^2.6.0",
         "rxjs": "^7.4.0",
-        "semver": "^7.3.5",
-        "shelljs": "^0.8.4",
-        "supports-color": "^8.1.1",
-        "tar": "^6.0.5"
+        "sass-embedded-darwin-arm64": "1.56.1",
+        "sass-embedded-darwin-x64": "1.56.1",
+        "sass-embedded-linux-arm": "1.56.1",
+        "sass-embedded-linux-arm64": "1.56.1",
+        "sass-embedded-linux-ia32": "1.56.1",
+        "sass-embedded-linux-x64": "1.56.1",
+        "sass-embedded-win32-ia32": "1.56.1",
+        "sass-embedded-win32-x64": "1.56.1",
+        "supports-color": "^8.1.1"
       }
     },
+    "sass-embedded-darwin-arm64": {
+      "version": "1.56.1",
+      "resolved": "https://registry.npmjs.org/sass-embedded-darwin-arm64/-/sass-embedded-darwin-arm64-1.56.1.tgz",
+      "integrity": "sha512-Y6us8rg7uwLtAzGiKDebAhFn98RLpW3u5Jnfbsvetlm/rDJ1fZg/roVXFttepLdVbYBjimVFTUaNuGxU3bWbBA==",
+      "dev": true,
+      "optional": true
+    },
+    "sass-embedded-darwin-x64": {
+      "version": "1.56.1",
+      "resolved": "https://registry.npmjs.org/sass-embedded-darwin-x64/-/sass-embedded-darwin-x64-1.56.1.tgz",
+      "integrity": "sha512-UypB3IREbreNNc+dG+L6hG5yoeTujKDCdmu38SSSS/zl9XBFTc8McX58SWapTJOUFK8G43CCimfB3r8FOcyNfA==",
+      "dev": true,
+      "optional": true
+    },
+    "sass-embedded-linux-arm": {
+      "version": "1.56.1",
+      "resolved": "https://registry.npmjs.org/sass-embedded-linux-arm/-/sass-embedded-linux-arm-1.56.1.tgz",
+      "integrity": "sha512-pXv+2HlMsjlk0g3dzuVhofuUNJZWUfWVe5xbbWHv+wrdH9kuui6WOyHDhSdUolPrRXOrdsG6Z4/Balr9wa1JWQ==",
+      "dev": true,
+      "optional": true
+    },
+    "sass-embedded-linux-arm64": {
+      "version": "1.56.1",
+      "resolved": "https://registry.npmjs.org/sass-embedded-linux-arm64/-/sass-embedded-linux-arm64-1.56.1.tgz",
+      "integrity": "sha512-Ly2wk8EmhjXkBpNPM+yAygSxTVIBjQlf4cDAHYgsaDUIIvRSAKAe2CUmxJjik069Qmv54g+Ac7WF6k63c2CTNw==",
+      "dev": true,
+      "optional": true
+    },
+    "sass-embedded-linux-ia32": {
+      "version": "1.56.1",
+      "resolved": "https://registry.npmjs.org/sass-embedded-linux-ia32/-/sass-embedded-linux-ia32-1.56.1.tgz",
+      "integrity": "sha512-cGmhnHdCbwJsQgsogwmlALzS/j8g+qQTiBuKBcXIWyFn4hLWo2BAr4Gm9vY5p+8aapcYrRQF9b0nwpFQcUScOg==",
+      "dev": true,
+      "optional": true
+    },
+    "sass-embedded-linux-x64": {
+      "version": "1.56.1",
+      "resolved": "https://registry.npmjs.org/sass-embedded-linux-x64/-/sass-embedded-linux-x64-1.56.1.tgz",
+      "integrity": "sha512-yMXS37lP3abTI5ThuydOrLacSNz4Oo9+xlfQDR0pntrugdKzH7vHWK7T7Ynd+vGjVqFajUhI+VihP7vZlhhndw==",
+      "dev": true,
+      "optional": true
+    },
+    "sass-embedded-win32-ia32": {
+      "version": "1.56.1",
+      "resolved": "https://registry.npmjs.org/sass-embedded-win32-ia32/-/sass-embedded-win32-ia32-1.56.1.tgz",
+      "integrity": "sha512-cjtuKc1O0F+yQZ8hLLYhalulEkBZ6HPdR/ys0l6hn7KTlrYooMyvZXbdU5KaB2lfK1WD29I0HefT8Em7d9cpfA==",
+      "dev": true,
+      "optional": true
+    },
+    "sass-embedded-win32-x64": {
+      "version": "1.56.1",
+      "resolved": "https://registry.npmjs.org/sass-embedded-win32-x64/-/sass-embedded-win32-x64-1.56.1.tgz",
+      "integrity": "sha512-VxqwSluQdNBdBEx0p6N2dOrGPIEL3AcG62KuDJ4KD/rHPQgoCPiJvLa5MXKdVHC24tHgE2AYlirILS/iE/N1NQ==",
+      "dev": true,
+      "optional": true
+    },
     "semver": {
-      "version": "7.3.7",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz",
-      "integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==",
+      "version": "7.3.8",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
+      "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
       "requires": {
         "lru-cache": "^6.0.0"
       }
@@ -11296,17 +11366,6 @@
         }
       }
     },
-    "shelljs": {
-      "version": "0.8.5",
-      "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.8.5.tgz",
-      "integrity": "sha512-TiwcRcrkhHvbrZbnRcFYMLl30Dfov3HKqzp5tO5b4pt6G/SezKcYhmDg15zXVBswHmctSAQKznqNW2LO5tTDow==",
-      "dev": true,
-      "requires": {
-        "glob": "^7.0.0",
-        "interpret": "^1.0.0",
-        "rechoir": "^0.6.2"
-      }
-    },
     "slash": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
@@ -11659,28 +11718,6 @@
         "es6-symbol": "^3.1.1"
       }
     },
-    "tar": {
-      "version": "6.1.11",
-      "resolved": "https://registry.npmjs.org/tar/-/tar-6.1.11.tgz",
-      "integrity": "sha512-an/KZQzQUkZCkuoAA64hM92X0Urb6VpRhAFllDzz44U2mcD5scmT3zBc4VgVpkugF580+DQn8eAFSyoQt0tznA==",
-      "dev": true,
-      "requires": {
-        "chownr": "^2.0.0",
-        "fs-minipass": "^2.0.0",
-        "minipass": "^3.0.0",
-        "minizlib": "^2.1.1",
-        "mkdirp": "^1.0.3",
-        "yallist": "^4.0.0"
-      },
-      "dependencies": {
-        "mkdirp": {
-          "version": "1.0.4",
-          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
-          "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
-          "dev": true
-        }
-      }
-    },
     "tar-fs": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.1.tgz",
@@ -11690,13 +11727,6 @@
         "mkdirp-classic": "^0.5.2",
         "pump": "^3.0.0",
         "tar-stream": "^2.1.4"
-      },
-      "dependencies": {
-        "chownr": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz",
-          "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg=="
-        }
       }
     },
     "tar-stream": {
@@ -11917,9 +11947,9 @@
       "integrity": "sha512-c3zayb8/kWWpycWYg87P71E1S1ZL6b6IJxfb5fvsUgsf0S2MVGaDhDXXjDMpdCpfWXqptc+4mXwmiy1ypXqRAA=="
     },
     "tslib": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz",
-      "integrity": "sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==",
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.0.tgz",
+      "integrity": "sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg==",
       "dev": true
     },
     "type": {
@@ -12042,9 +12072,9 @@
       "dev": true
     },
     "update-browserslist-db": {
-      "version": "1.0.9",
-      "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.9.tgz",
-      "integrity": "sha512-/xsqn21EGVdXI3EXSum1Yckj3ZVZugqyOZQ/CxYPBD/R+ko9NSUScf8tFF4dOKY+2pvSSJA/S+5B8s4Zr4kyvg==",
+      "version": "1.0.10",
+      "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.10.tgz",
+      "integrity": "sha512-OztqDenkfFkbSG+tRxBeAnCVPckDBcvibKd35yDONx6OU8N7sqgwc7rCbkJ/WcYtVRZ4ba68d6byhC21GFh7sQ==",
       "dev": true,
       "requires": {
         "escalade": "^3.1.1",
diff --git a/src/package.json b/src/package.json
index 1a82b8e09..274e0e282 100644
--- a/src/package.json
+++ b/src/package.json
@@ -10,7 +10,7 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@uswds/uswds": "^3.1.0",
+    "@uswds/uswds": "^3.3.0",
     "pa11y-ci": "^3.0.1",
     "sass": "^1.54.8"
   },

From bf54a4cf8f92bf57c89b56b069a9730a0c7f9001 Mon Sep 17 00:00:00 2001
From: Neil MartinsenBurrell <neil.martinsen-burrell@gsa.gov>
Date: Wed, 1 Feb 2023 13:07:13 -0600
Subject: [PATCH 14/21] Use a default for empty domain name

Co-authored-by: Seamus Johnston <seamus.johnston@gsa.gov>
---
 src/registrar/templates/home.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/registrar/templates/home.html b/src/registrar/templates/home.html
index 87e12ea50..9239853fb 100644
--- a/src/registrar/templates/home.html
+++ b/src/registrar/templates/home.html
@@ -52,7 +52,7 @@
               <svg class="usa-icon" aria-hidden="true" focusable="false" role="img">
                 <use xlink:href="{%static 'img/sprite.svg'%}#edit"></use>
               </svg>
-              Edit <span class="usa-sr-only">{{application.requested_domain.name}} </span>
+              Edit <span class="usa-sr-only">{{ application.requested_domain.name|default:"New domain request" }} </span>
 
               {% else %}
               <svg class="usa-icon" aria-hidden="true" focusable="false" role="img">

From 8fa761f4ab1d7ecfeed6a62ceb2462c8056d14f3 Mon Sep 17 00:00:00 2001
From: Neil Martinsen-Burrell <neil.martinsen-burrell@gsa.gov>
Date: Wed, 1 Feb 2023 13:54:11 -0600
Subject: [PATCH 15/21] Review feedback: live region, SVG width, etc.

---
 src/registrar/templates/home.html | 28 ++++++++++------------------
 1 file changed, 10 insertions(+), 18 deletions(-)

diff --git a/src/registrar/templates/home.html b/src/registrar/templates/home.html
index 9239853fb..65f904794 100644
--- a/src/registrar/templates/home.html
+++ b/src/registrar/templates/home.html
@@ -7,7 +7,7 @@
 {% block content %}
 <main id="main-content" class="grid-container">
 {% if user.is_authenticated %}
-{# complete logged in page together here #}
+{# the entire logged in page goes here #}
 
 <div class="tablet:grid-offset-1 desktop:grid-offset-2">
   <h1>Manage your domains</h2>
@@ -16,13 +16,7 @@
 
   <section class="dashboard tablet:grid-col-11 desktop:grid-col-10">
     <h2>Registered domains</h2>
-    {% if domains %}
-      {% for domain in domains %}
-      {{ domain }}
-      {% endfor %}
-    {% else %}
-      <p>You don't have any registered domains yet</p>
-    {% endif %}
+    <p>You don't have any registered domains yet</p>
   </section>
 
   <section class="dashboard tablet:grid-col-11 desktop:grid-col-10">
@@ -35,7 +29,7 @@
           <th data-sortable scope="col" role="columnheader">Domain name</th>
           <th data-sortable scope="col" role="columnheader">Date created</th>
           <th data-sortable scope="col" role="columnheader">Status</th>
-          <th role="columnheader"><span class="usa-sr-only">Action</span></th>
+          <th scope="col" role="columnheader"><span class="usa-sr-only">Action</span></th>
         </tr>
       </thead>
       <tbody>
@@ -49,13 +43,13 @@
           <td>
             <a href="{% url 'edit-application' application.pk %}">
               {% if application.status == "started" %}
-              <svg class="usa-icon" aria-hidden="true" focusable="false" role="img">
+              <svg class="usa-icon" aria-hidden="true" focusable="false" role="img" width="24">
                 <use xlink:href="{%static 'img/sprite.svg'%}#edit"></use>
               </svg>
               Edit <span class="usa-sr-only">{{ application.requested_domain.name|default:"New domain request" }} </span>
 
               {% else %}
-              <svg class="usa-icon" aria-hidden="true" focusable="false" role="img">
+              <svg class="usa-icon" aria-hidden="true" focusable="false" role="img" width="24">
                 <use xlink:href="{%static 'img/sprite.svg'%}#settings"></use>
               </svg>
               Manage <span class="usa-sr-only">{{application.requested_domain.name}} </span>
@@ -66,6 +60,10 @@
         {% endfor %}
       </tbody>
     </table>
+    <div
+      class="usa-sr-only usa-table__announcement-region"
+      aria-live="polite"
+    ></div>
     {% else %}
     <p>You don't have any active domain requests right now</p> 
     {% endif %}
@@ -74,13 +72,7 @@
 
   <section class="dashboard tablet:grid-col-11 desktop:grid-col-10">
     <h2>Archived domains</h2>
-    {% if archived_domains %}
-    {% for domain in archived_domains %}
-    {{ domain }}
-    {% endfor %}
-    {% else %}
     <p>You don't have any archived domains</p> 
-    {% endif %}
   </section>
 
   <section class="tablet:grid-col-11 desktop:grid-col-10">
@@ -94,7 +86,7 @@
 </div>
 
 {% else %} {# not user.is_authenticated #}
-{# complete logged out page here #}
+{# the entire logged out page goes here #}
 
 <p><a class="usa-button" href="{% url 'login' %}">
 Sign in

From 008c639d24653e8b96879540f45d47f1dabbb5cc Mon Sep 17 00:00:00 2001
From: igorkorenfeld <igor.korenfeld@gsa.gov>
Date: Wed, 1 Feb 2023 14:38:12 -0500
Subject: [PATCH 16/21] Adjust spacing and sizing to match figma closer

---
 .../_theme/_uswds-theme-custom-styles.scss    | 73 +++++++++++++++++--
 .../templates/application_dotgov_domain.html  |  2 +-
 .../templates/application_org_federal.html    |  2 +-
 .../templates/application_review.html         |  2 +-
 .../templates/includes/domain_example.html    |  2 -
 5 files changed, 68 insertions(+), 13 deletions(-)

diff --git a/src/registrar/assets/sass/_theme/_uswds-theme-custom-styles.scss b/src/registrar/assets/sass/_theme/_uswds-theme-custom-styles.scss
index a03369e3e..0cac4428f 100644
--- a/src/registrar/assets/sass/_theme/_uswds-theme-custom-styles.scss
+++ b/src/registrar/assets/sass/_theme/_uswds-theme-custom-styles.scss
@@ -45,21 +45,37 @@ $letter-space--xs: .0125em;
   font-weight: font-weight('semibold');
   line-height: line-height('heading', 3);
   margin: units(4) 0 units(1);
-
-  &:first-of-type {
-    margin-top: units(2);
-  }
  }
 
+ //Tighter spacing when H2 is immediatly after H1
+.register-form-step .usa-fieldset:first-of-type h2:first-of-type,
+.register-form-step h1 + h2 {
+  margin-top: units(1); 
+}
+
 .register-form-step h3 {
   color: color('primary-dark');
   letter-spacing: $letter-space--xs;
   margin-top: units(3);
   margin-bottom: 0;
+
+  + p {
+    margin-top: units(0.5);
+  }
+}
+
+.register-form-step h4 {
+  margin-bottom: 0;
+
+  + p { 
+    margin-top: units(0.5);
+  }
 }
 
 .register-form-step p,
-.dashboard p {
+.register-form-step .usa-list li,
+.dashboard p 
+{
   @include typeset('sans', 'sm', 5);
   max-width: measure(5);
 
@@ -77,6 +93,10 @@ $letter-space--xs: .0125em;
   }
 }
 
+.register-form-step .usa-label:first-of-type {
+  margin-top: units(1);
+}
+
 a.breadcrumb__back {
   display:flex;
   align-items: center;
@@ -114,8 +134,39 @@ a.breadcrumb__back {
   margin-top: units(1);
 }
 
+.domain_example {
+  p {
+    margin-bottom: 0;
+  }
+
+  .usa-list {
+    margin-top: units(0.5);
+  }
+} 
+
+.review__step {
+  margin-top: units(3);
+
+  &:first-of-type {
+    margin-top: units(4);
+  }
+}
+
+.review__step hr {
+  border: none; //reset
+  border-top: 1px solid color('primary-dark');
+  margin-top: 0;
+  margin-bottom: units(0.5);
+}
+
+.review__step__title a:visited {
+  color: color('primary');
+}
+
 .review__step__name {
+  color: color('primary-dark');
   font-weight: font-weight('semibold');
+  margin-bottom: units(0.5);
 }
 
 
@@ -123,6 +174,7 @@ a.breadcrumb__back {
 
 #wrapper.dashboard {
   background-color: color('primary-lightest');
+  padding-top: units(5);
 }
 
 section.dashboard {
@@ -231,9 +283,14 @@ section.dashboard {
 
 
 main {
-  //Workaround because USWDS units jump from 10 to 15
-  padding-bottom: units(10) + units(2);
-  padding-top: units(5);
+  ////Workaround because USWDS units jump from 10 to 15
+  //padding-bottom: units(10) + units(2);
+  //padding-top: units(5);
+}
+
+#wrapper {
+  padding-top: units(3);
+  padding-bottom: units(6) * 2 ; //Workaround because USWDS units jump from 10 to 15
 }
 
 footer {
diff --git a/src/registrar/templates/application_dotgov_domain.html b/src/registrar/templates/application_dotgov_domain.html
index 0c80a8692..247515b81 100644
--- a/src/registrar/templates/application_dotgov_domain.html
+++ b/src/registrar/templates/application_dotgov_domain.html
@@ -17,7 +17,7 @@
   <p>We’ll try to give you the domain you want. We first need to make sure your request meets our requirements. We’ll work with you to find the best domain for your organization.</p>
 
   <p>Here are a few domain examples for your type of organization.</p>
-  <div class="domain-example">
+  <div class="domain_example">
     {% include "includes/domain_example.html" %}
   </div>
 </div>
diff --git a/src/registrar/templates/application_org_federal.html b/src/registrar/templates/application_org_federal.html
index 26d84a864..934eac7bb 100644
--- a/src/registrar/templates/application_org_federal.html
+++ b/src/registrar/templates/application_org_federal.html
@@ -9,7 +9,7 @@
   <fieldset id="federal_type__fieldset" class="usa-fieldset">
     <legend>
         <h2>Which federal branch is your organization in?</h2>
-        <p class="margin-bottom-5">This question is required.</p>
+        <p>This question is required.</p>
     </legend>
     {% radio_buttons_by_value forms.0.federal_type as choices %}
     {% for choice in choices.values %}
diff --git a/src/registrar/templates/application_review.html b/src/registrar/templates/application_review.html
index ffbd42c59..810b02988 100644
--- a/src/registrar/templates/application_review.html
+++ b/src/registrar/templates/application_review.html
@@ -7,7 +7,7 @@
   {% csrf_token %}
 
   {% for step in steps.all|slice:":-1" %}
-  <section class="review__step margin-top-205">
+  <section class="review__step">
     <hr />
     <div class="review__step__title display-flex flex-justify"> 
       <div class="review__step__value">
diff --git a/src/registrar/templates/includes/domain_example.html b/src/registrar/templates/includes/domain_example.html
index ed9ee7504..591049412 100644
--- a/src/registrar/templates/includes/domain_example.html
+++ b/src/registrar/templates/includes/domain_example.html
@@ -8,12 +8,10 @@
 
   {% elif federal_type == 'judicial' %}
     <p><strong>Examples:</strong></p>
-    <p>
     <ul class="usa-list">
       <li> usprobation.gov </li>
       <li> ustaxcourt.gov </li>
     </ul>
-    </p>
 
   {% elif federal_type == 'legislative' %}
     <p><strong>Examples:</strong></p>

From 5d34c28abcc08273bd21418984e09d8770d6c634 Mon Sep 17 00:00:00 2001
From: Michelle Rago <60157596+michelle-rago@users.noreply.github.com>
Date: Wed, 1 Feb 2023 15:27:53 -0500
Subject: [PATCH 17/21] Remove DNS option from thank you page (#386)

Update application_done.html
---
 src/registrar/templates/application_done.html | 20 ++++++-------------
 1 file changed, 6 insertions(+), 14 deletions(-)

diff --git a/src/registrar/templates/application_done.html b/src/registrar/templates/application_done.html
index 70758baa6..b3b01adf9 100644
--- a/src/registrar/templates/application_done.html
+++ b/src/registrar/templates/application_done.html
@@ -3,7 +3,7 @@
 {% block title %}Thank you for your domain request{% endblock %}
 
 {% block content %}
-<h1>Thank you!</h1>
+<h1>Thank you</h1>
 
 <p>
 Thank you for your domain request. We'll email a copy of your request to you,
@@ -14,9 +14,11 @@ your authorizing official, and any contacts you added.</p>
 <ul>
 
     <li> We'll review your request. This could take up to two weeks. During
-        this review we'll verify that your organization is eligible for a .gov domain, that
-        your authorizing official approves your request, and that your domain
-        meets our naming requirements.
+        this review we'll verify that your <ul>
+    <li>Organization is eligible for a .gov domain</li>
+    <li>Authorizing official approves your request</li> 
+    <li>Domain meets our naming requirements</li>
+        </ul>
     </li>
 
     <li> You can <a href="{% url 'todo' %}"><del>check the
@@ -27,14 +29,4 @@ your authorizing official, and any contacts you added.</p>
         review.</li>
 </ul>
 
-<h2>Option to enter domain name server information</h2>
-
-<p>Before your domain can be used we'll need information about your
-domain name servers. If you have this information you can enter it now.
-If you don't have it, that's okay. You can enter it later on the
-<a href="{% url 'todo' %}"><del>manage your domains page</del></a>.
-</p>
-
-<p><a href="{% url 'todo' %}" class="usa-button">Enter DNS name servers</a></p>
-
 {% endblock %}

From 3f487a941d382a7578b7b95637b43fdf45504e80 Mon Sep 17 00:00:00 2001
From: igorkorenfeld <igor.korenfeld@gsa.gov>
Date: Thu, 2 Feb 2023 12:59:51 -0500
Subject: [PATCH 18/21] Change header and footer to closer match to get.gov,
 alignment adjustment

---
 .../_theme/_uswds-theme-custom-styles.scss    | 30 ++++++++++++-------
 src/registrar/templates/base.html             |  6 +---
 src/registrar/templates/includes/footer.html  |  2 +-
 3 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/src/registrar/assets/sass/_theme/_uswds-theme-custom-styles.scss b/src/registrar/assets/sass/_theme/_uswds-theme-custom-styles.scss
index 0cac4428f..d00fc1f5d 100644
--- a/src/registrar/assets/sass/_theme/_uswds-theme-custom-styles.scss
+++ b/src/registrar/assets/sass/_theme/_uswds-theme-custom-styles.scss
@@ -35,6 +35,19 @@ $letter-space--xs: .0125em;
   -moz-osx-font-smoothing: grayscale;
 }
 
+.usa-logo {
+  margin-top: units(2);
+}
+
+.usa-logo__text {
+  @include typeset('sans', 'xl', 2);
+  color: color('primary-darker');
+}
+
+.usa-nav__primary {
+  margin-top: units(1);
+}
+
  h1 {
   @include typeset('sans', '2xl', 2);
   margin: 0 0 units(2);
@@ -47,6 +60,11 @@ $letter-space--xs: .0125em;
   margin: units(4) 0 units(1);
  }
 
+.register-form-step > h1 {
+  //align to top of sidebar on first page of the form
+  margin-top: units(-1);
+}
+
  //Tighter spacing when H2 is immediatly after H1
 .register-form-step .usa-fieldset:first-of-type h2:first-of-type,
 .register-form-step h1 + h2 {
@@ -78,11 +96,6 @@ $letter-space--xs: .0125em;
 {
   @include typeset('sans', 'sm', 5);
   max-width: measure(5);
-
-  //TODO: Revisit
-  // &:last-of-type {
-  //   margin-bottom: 0;
-  // }
 }
 
 .register-form-step a {
@@ -282,17 +295,12 @@ section.dashboard {
 }
 
 
-main {
-  ////Workaround because USWDS units jump from 10 to 15
-  //padding-bottom: units(10) + units(2);
-  //padding-top: units(5);
-}
-
 #wrapper {
   padding-top: units(3);
   padding-bottom: units(6) * 2 ; //Workaround because USWDS units jump from 10 to 15
 }
 
+
 footer {
   border-top: 1px solid color('primary-darker');
 }
diff --git a/src/registrar/templates/base.html b/src/registrar/templates/base.html
index 8bbd6206f..c4b39dd78 100644
--- a/src/registrar/templates/base.html
+++ b/src/registrar/templates/base.html
@@ -129,11 +129,7 @@
         {% block logo %}
         <div class="usa-logo" id="extended-logo">
            <a href="{% url 'home' %}">
-           <img
-                src="{% static 'img/dottedgov-round.svg' %}"
-                alt="Home"
-                width="48px"
-              />
+           <strong class="usa-logo__text" >.gov </strong>
            </a>
         </div>
         {% endblock %}
diff --git a/src/registrar/templates/includes/footer.html b/src/registrar/templates/includes/footer.html
index ffcc7a5b4..4b5f0efbc 100644
--- a/src/registrar/templates/includes/footer.html
+++ b/src/registrar/templates/includes/footer.html
@@ -16,7 +16,7 @@
                 class="usa-footer__logo-img"
                 src="{% static 'img/dottedgov-round.svg' %}"
                 alt="dot gov registrar logo"
-                width="64px"
+                width="56px"
               />
             </div>
           </div>

From 3fc275bff8501a37f4dbab0d71169b539977d931 Mon Sep 17 00:00:00 2001
From: igorkorenfeld <igor.korenfeld@gsa.gov>
Date: Thu, 2 Feb 2023 13:06:04 -0500
Subject: [PATCH 19/21] Update tests to match dashboard

---
 src/registrar/tests/test_views.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/registrar/tests/test_views.py b/src/registrar/tests/test_views.py
index cbcaa9aec..e0886cd7d 100644
--- a/src/registrar/tests/test_views.py
+++ b/src/registrar/tests/test_views.py
@@ -25,7 +25,7 @@ class TestViews(TestCase):
         """Home page should be available without a login."""
         response = self.client.get("/")
         self.assertContains(response, "registrar", status_code=200)
-        self.assertContains(response, "log in")
+        self.assertContains(response, "Sign in")
 
     def test_whoami_page_no_user(self):
         """Whoami page not accessible without a logged-in user."""
@@ -69,7 +69,8 @@ class LoggedInTests(TestWithUser):
             creator=self.user, requested_domain=site
         )
         response = self.client.get("/")
-        self.assertContains(response, "igorville.gov", count=1)
+        # count = 2 because it is also in screenreader content
+        self.assertContains(response, "igorville.gov", count=2)
         # clean up
         application.delete()
 

From 6e001d6194ad66b2c369e76cb49083fce167ac2d Mon Sep 17 00:00:00 2001
From: Neil Martinsen-Burrell <neil.martinsen-burrell@gsa.gov>
Date: Thu, 2 Feb 2023 15:12:14 -0600
Subject: [PATCH 20/21] Review feedback: keep dashboard template separate

---
 src/registrar/templates/base.html           |  5 +++-
 src/registrar/templates/dashboard_base.html | 29 +++++++++++++++++++++
 src/registrar/templates/home.html           |  2 +-
 src/registrar/views/index.py                |  2 --
 4 files changed, 34 insertions(+), 4 deletions(-)
 create mode 100644 src/registrar/templates/dashboard_base.html

diff --git a/src/registrar/templates/base.html b/src/registrar/templates/base.html
index 8bbd6206f..5ad731345 100644
--- a/src/registrar/templates/base.html
+++ b/src/registrar/templates/base.html
@@ -164,7 +164,9 @@
     </div>
   </header>
   {% endblock banner %}
-  <div id="wrapper" {% if dashboard_view %}class="dashboard"{% endif %}>
+
+  {% block wrapper %}
+  <div id="wrapper">
     {% block messages %}
     {% if messages %}
     <ul class="messages">
@@ -186,6 +188,7 @@
 
     {% block content_bottom %}{% endblock %}
   </div>
+  {% endblock wrapper%}
 
   {% include "includes/footer.html" %}
   </div> <!-- /#wrapper -->
diff --git a/src/registrar/templates/dashboard_base.html b/src/registrar/templates/dashboard_base.html
new file mode 100644
index 000000000..27b5ea717
--- /dev/null
+++ b/src/registrar/templates/dashboard_base.html
@@ -0,0 +1,29 @@
+{% extends "base.html" %}
+
+{% block wrapper %}
+
+  <div id="wrapper" class="dashboard">
+    {% block messages %}
+    {% if messages %}
+    <ul class="messages">
+      {% for message in messages %}
+      <li{% if message.tags %} class="{{ message.tags }}" {% endif %}>
+        {{ message }}
+        </li>
+        {% endfor %}
+    </ul>
+    {% endif %}
+    {% endblock %}
+
+    {% block section_nav %}{% endblock %}
+
+      {% block hero %}{% endblock %}
+      {% block content %}{% endblock %}
+
+    <div role="complementary">{% block complementary %}{% endblock %}</div>
+
+    {% block content_bottom %}{% endblock %}
+  </div>
+
+
+{% endblock wrapper %}
diff --git a/src/registrar/templates/home.html b/src/registrar/templates/home.html
index 65f904794..0a753d25c 100644
--- a/src/registrar/templates/home.html
+++ b/src/registrar/templates/home.html
@@ -1,4 +1,4 @@
-{% extends 'base.html' %}
+{% extends 'dashboard_base.html' %}
 
 {% load static %}
 
diff --git a/src/registrar/views/index.py b/src/registrar/views/index.py
index 1e3dd366b..6d50b3948 100644
--- a/src/registrar/views/index.py
+++ b/src/registrar/views/index.py
@@ -7,8 +7,6 @@ def index(request):
     """This page is available to anyone without logging in."""
     context = {}
     if request.user.is_authenticated:
-        # the logged-in index view IS the dashboard
-        context["dashboard_view"] = True
         applications = DomainApplication.objects.filter(creator=request.user)
         context["domain_applications"] = applications
     return render(request, "home.html", context)

From e6e69b237ff999ca75988fe0c1c7ae5412b10814 Mon Sep 17 00:00:00 2001
From: Michelle Rago <60157596+michelle-rago@users.noreply.github.com>
Date: Fri, 3 Feb 2023 11:26:53 -0500
Subject: [PATCH 21/21] Update application.py (#388)

* Update application.py

* Update tribal government AO info

* Update application_current_sites.html
---
 src/registrar/templates/application_current_sites.html | 2 +-
 src/registrar/templates/includes/ao_example.html       | 3 ++-
 src/registrar/views/application.py                     | 6 +++---
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/registrar/templates/application_current_sites.html b/src/registrar/templates/application_current_sites.html
index 2d858353f..22e40f31f 100644
--- a/src/registrar/templates/application_current_sites.html
+++ b/src/registrar/templates/application_current_sites.html
@@ -10,7 +10,7 @@
     {{ forms.0.management_form }}
     {# TODO: aria-describedby to associate these instructions with the input! #}
     <p id="website_instructions">
-      Enter your organization’s public website, if you have one. For example, www.city.com.
+      Enter your organization’s current public website, if you have one. For example, www.city.com.
     </p>
     {% for form in forms.0 %}
       {% input_with_errors form.website %}
diff --git a/src/registrar/templates/includes/ao_example.html b/src/registrar/templates/includes/ao_example.html
index 4d6b5a301..fee5cfa24 100644
--- a/src/registrar/templates/includes/ao_example.html
+++ b/src/registrar/templates/includes/ao_example.html
@@ -44,6 +44,7 @@
   <p>Domain requests from state legislatures and courts must be authorized by an agency’s <strong>Chief Information Officer</strong> or <strong>highest-ranking executive</strong>.</p>
 
 {% elif organization_type == 'tribal' %}
-  <p>Domain requests from federally-recognized tribal governments must be authorized by <strong>the leader of the tribe</strong>, as recognized by the as noted by the <a href="https://www.bia.gov/service/tribal-leaders-directory" class="usa-link"> Bureau of Indian Affairs.</a></p>
+  <p>Domain requests from federally-recognized tribal governments must be authorized by the leader of the tribe, as recognized by the <a href="https://www.bia.gov/service/tribal-leaders-directory" class="usa-link">Bureau of Indian Affairs.</a></p>
+<p>Domain requests from state-recognized tribal governments must be authorized by the leader of the tribe, as determined by the state’s tribal recognition initiative.</p>
 
 {% endif %}
diff --git a/src/registrar/views/application.py b/src/registrar/views/application.py
index 401171842..5a1058e7a 100644
--- a/src/registrar/views/application.py
+++ b/src/registrar/views/application.py
@@ -70,10 +70,10 @@ class ApplicationWizard(LoginRequiredMixin, TemplateView):
     TITLES = {
         Step.ORGANIZATION_TYPE: _("Type of organization"),
         Step.TRIBAL_GOVERNMENT: _("Tribal government"),
-        Step.ORGANIZATION_FEDERAL: _("Type of organization — Federal"),
-        Step.ORGANIZATION_ELECTION: _("Type of organization — Election board"),
+        Step.ORGANIZATION_FEDERAL: _("Type of organization: Federal"),
+        Step.ORGANIZATION_ELECTION: _("Type of organization: Election office"),
         Step.ORGANIZATION_CONTACT: _("Organization name and mailing address"),
-        Step.TYPE_OF_WORK: _("Type of Work"),
+        Step.TYPE_OF_WORK: _("Type of work"),
         Step.AUTHORIZING_OFFICIAL: _("Authorizing official"),
         Step.CURRENT_SITES: _("Organization website"),
         Step.DOTGOV_DOMAIN: _(".gov domain"),