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

@@ -23,7 +23,7 @@
{% elif no_available_numbers %}
<p> No available inbound numbers </p>
{% else %}
{% call form_wrapper(class="govuk-!-margin-top-3") %}
{% call form_wrapper() %}
{{ form.inbound_number(param_extensions={
'fieldset': {
'legend': {