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/manage-users/confirm-edit-user-email.html

@@ -17,8 +17,8 @@
 
 {{ page_header('Confirm change of email address') }}
 
-<div class="govuk-grid-row">
-  <div class="govuk-grid-column-full">
+<div class="grid-row">
+  <div class="grid-col-12">
   {% call form_wrapper() %}
     <p>New email address:</p>
     <div class="panel panel-border-wide bottom-gutter">

app/templates/views/manage-users/confirm-edit-user-mobile-number.html

@@ -16,8 +16,8 @@
 
 {{ page_header('Confirm change of mobile number') }}
 
-<div class="govuk-grid-row">
-  <div class="govuk-grid-column-full">
+<div class="grid-row">
+  <div class="grid-col-12">
   {% call form_wrapper() %}
     <p>New mobile number:</p>
     <div class="panel panel-border-wide bottom-gutter">

app/templates/views/manage-users/edit-user-mobile.html

@@ -17,8 +17,8 @@
   {{ page_header('Change team member’s mobile number') }}
 
   <p id="user_name">This will change the mobile number for {{ user.name }}.</p>
-  <div class="govuk-grid-row">
-    <div class="govuk-grid-column-three-quarters">
+  <div class="grid-row">
+    <div class="grid-col-9">
       {% call form_wrapper(class="extra-tracking") %}
         {{ form.mobile_number }}
         {{ page_footer('Save') }}

app/templates/views/manage-users/permissions.html

@@ -5,7 +5,7 @@
 {% if form.folder_permissions.all_template_folders %}
   {{ form.folder_permissions }}
 {% elif user and user.platform_admin %}
-  <p class="bottom-gutter govuk-body">
+  <p class="bottom-gutter usa-body">
     Platform admin users can access all template folders.
   </p>
 {% endif %}