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

@@ -32,8 +32,8 @@
{% endif %}
{% call form_wrapper() %}
<div class="govuk-grid-row">
<div class="govuk-grid-column-two-thirds">
<div class="grid-row">
<div class="grid-col-8">
{{ form.name(param_extensions={
"classes": "",
"hint": {"text": "Your recipients will not see this"}
@@ -44,14 +44,13 @@
width='1-1',
hint=content_hint,
rows=5,
extra_form_group_classes='govuk-!-margin-bottom-2',
placeholder='Edit me! Check out the Personalization section below for details on cool ((stuff)) you can do with your messages!'
) }}
{% if current_user.platform_admin %}
{{ form.process_type }}
{% endif %}
</div>
<div class="govuk-grid-column-full">
<div class="grid-col-12">
<div class="template-content-count">
<div data-module="update-status" data-target="template_content" data-updates-url="{{ url_for('.count_content_length', service_id=current_service.id, template_type='sms') }}" aria-live="polite">
&nbsp;
@@ -62,7 +61,7 @@
After saving, you'll have the option to send 🚀
</p>
</div>
<div class="govuk-grid-column-full">
<div class="grid-col-12">
{% include "partials/templates/guidance-personalisation.html" %}
{% include "partials/templates/guidance-optional-content.html" %}
{% include "partials/templates/guidance-links.html" %}