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

@@ -18,20 +18,20 @@
{{ 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.</p>
<p class="usa-body">Your service name should tell users what the message is about as well as who its from.</p>
<p class="govuk-body">You should only use an acronym or initialism if your users are already familiar with it.</p>
<p class="usa-body">You should only use an acronym or initialism if your users are already familiar with it.</p>
<div>
{% if current_service.prefix_sms %}
<p class="govuk-body">Users will see your service name at the start of every text message</p>
<p class="usa-body">Users will see your service name at the start of every text message</p>
{% else %}
<p class="govuk-body">Users will see your service name as your email sender name.</p>
<p class="usa-body">Users will see your service name as your email sender name.</p>
{% endif %}
</div>
<p class="govuk-body">The service name you enter here will appear at the beginning of each text message, unless you turn off this off in Settings > Start text message with service name.
<p class="usa-body">The service name you enter here will appear at the beginning of each text message, unless you turn off this off in Settings > Start text message with service name.
{% call form_wrapper() %}