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

@@ -20,7 +20,7 @@
<div class="user-list">
{% if not current_service.sms_senders %}
<div class="user-list-item">
<p class="govuk-body user-list-item-blank hint">You have not added any text message senders yet</p>
<p class="usa-body user-list-item-blank hint">You have not added any text message senders yet</p>
</div>
{% endif %}
{% for item in current_service.sms_senders_with_hints %}
@@ -53,8 +53,8 @@
</div>
{% if current_user.has_permissions('manage_service') %}
<div class="govuk-grid-row bottom-gutter">
<div class="govuk-grid-column-full">
<div class="grid-row bottom-gutter">
<div class="grid-col-12">
{{ usaButton({
"element": "a",
"text": "Add text message sender",