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

@@ -1,7 +1,7 @@
{% from "components/big-number.html" import big_number_with_status %}
<div class="govuk-grid-row bottom-gutter">
<div class="govuk-grid-column-one-half">
<div class="grid-row bottom-gutter">
<div class="grid-col-6">
{{ big_number_with_status(
global_stats.email.delivered + global_stats.email.failed,
global_stats.email.delivered|message_count_label('email'),
@@ -11,7 +11,7 @@
smaller=True
) }}
</div>
<div class="govuk-grid-column-one-half">
<div class="grid-col-6">
{{ big_number_with_status(
global_stats.sms.delivered + global_stats.sms.failed,
global_stats.sms.delivered|message_count_label('sms'),

View File

@@ -30,9 +30,9 @@
"open": form.errors | convert_to_boolean
}) }}
<div class="govuk-grid-row bottom-gutter">
<div class="grid-row bottom-gutter">
{% for noti_type in global_stats %}
<div class="govuk-grid-column-one-half">
<div class="grid-col-6">
{{ big_number_simple(
noti_type.black_box.number,
noti_type.black_box.number|message_count_label(noti_type.black_box.notification_type)
@@ -51,9 +51,9 @@
{% endfor %}
</div>
<div class="govuk-grid-row bottom-gutter">
<div class="grid-row bottom-gutter">
{% for noti_type in global_stats %}
<div class="govuk-grid-column-one-half">
<div class="grid-col-6">
<div class="bordered-text-box">
<span class="big-number-number">{{ "{:,}".format(noti_type.test_data.number) }}</span>
{{ noti_type.test_data.label }}

View File

@@ -23,7 +23,7 @@
{% call row() %}
{% call field(border=False, colspan=3) %}
<a href="{{ url_for('main.service_dashboard', service_id=service['id']) }}" class="file-list-filename-large usa-link govuk-!-padding-bottom-4">{{ service['name'] }}</a>
<a href="{{ url_for('main.service_dashboard', service_id=service['id']) }}" class="file-list-filename-large usa-link">{{ service['name'] }}</a>
{% if not service['active'] %}
<span class="heading-medium hint">&ensp;Archived</span>
{% endif %}

View File

@@ -10,7 +10,7 @@
Summary
</h1>
<p class="govuk-body">
<p class="usa-body">
<a class="usa-link" href="{{ url_for('main.platform_admin') }}">Load summary</a>
</p>