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/edit-email-template.html

@@ -20,8 +20,8 @@
     {{ page_header('{} email template'.format(heading_action)) }}
 
     {% call form_wrapper() %}
-      <div class="govuk-grid-row">
-        <div class="govuk-grid-column-five-sixths">
+      <div class="grid-row">
+        <div class="grid-col-10">
           {{ form.name(param_extensions={
             "classes": "",
             "hint": {"text": "Your recipients will not see this"}
@@ -35,7 +35,7 @@
             'Save'
           ) }}
         </div>
-        <div class="govuk-grid-column-full">
+        <div class="grid-col-12">
           {% include "partials/templates/guidance-formatting.html" %}
           {% include "partials/templates/guidance-personalisation.html" %}
           {% include "partials/templates/guidance-optional-content.html" %}