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
This commit is contained in:
Jonathan Bobel
2023-08-31 12:06:55 -04:00
186 changed files with 3619 additions and 16898 deletions

View File

@@ -14,8 +14,8 @@
{% block platform_admin_content %}
<div class="govuk-grid-row">
<div class="govuk-grid-column-five-sixths">
<div class="grid-row">
<div class="grid-col-10">
{{ page_header('Set auth type for ' + user.name) }}
{% call form_wrapper() %}

View File

@@ -6,8 +6,8 @@
{% endblock %}
{% block platform_admin_content %}
<div class="govuk-grid-row bottom-gutter">
<div class="govuk-grid-column-full">
<div class="grid-row bottom-gutter">
<div class="grid-col-12">
<h1 class="font-body-2xl margin-bottom-3">
{{ user.name }}
</h1>