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

@@ -16,8 +16,8 @@
{{ page_header('Change your service name') }}
<p class="govuk-body">Your service name should tell users what the message is about as well as who its from. For example:</p>
<ul class="govuk-list govuk-list--bullet">
<p class="usa-body">Your service name should tell users what the message is about as well as who its from. For example:</p>
<ul class="usa-list usa-list--bullet">
<li>School admissions - {{ current_service.organization.name or current_user.default_organization.name }}</li>
<li>Electoral services - {{ current_service.organization.name or current_user.default_organization.name }}</li>
<li>Blue Badge - {{ current_service.organization.name or current_user.default_organization.name }}</li>