Merge branch 'main' of https://github.com/GSA/notifications-admin into 718-clean-up-components-section

# Conflicts:
#	app/templates/components/components/footer/_footer.scss
#	app/templates/components/components/hint/_hint.scss
#	app/templates/views/service-settings/data-retention.html
#	app/templates/views/service-settings/sms-senders.html
#	app/templates/views/two-factor-webauthn.html
#	app/templates/views/user-profile/security-keys.html

app/templates/views/email-not-received.html

@@ -7,8 +7,8 @@
 
 {% block maincolumn_content %}
 
-<div class="govuk-grid-row">
-  <div class="govuk-grid-column-two-thirds">
+<div class="grid-row">
+  <div class="grid-col-8">
     <h1 class="font-body-2xl margin-bottom-3">Resend email link</h1>
 
     <p>Emails sometimes take a few minutes to arrive. If you do not receive an email link, Notify can send you a new one.</p>
@@ -22,10 +22,10 @@
 
     <h2 class="font-body-lg">If your email address has changed</h2>
     <p>You’ll need to:</p>
-    <ul class="govuk-list govuk-list--bullet">
+    <ul class="usa-list usa-list--bullet">
       <li>find a member of your team who has permission to manage settings, team and usage</li>
       <li>ask them to change the email address for your account</li>
-      <li>select <span class="govuk-body govuk-!-font-weight-bold">Resend email link</span></li>
+      <li>select <span class="usa-body bold">Resend email link</span></li>
     </ul>
 
   </div>