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

@@ -14,8 +14,8 @@
{% block maincolumn_content %}
{{ page_header('Out of hours emergencies')}}
<div class="govuk-grid-row">
<div class="govuk-grid-column-two-thirds">
<div class="grid-row">
<div class="grid-col-8">
<p>
First, check the
<a class="usa-link" href="https://status.notifications.service.gov.uk">system status page</a>.

View File

@@ -16,8 +16,8 @@
{% block maincolumn_content %}
{{ page_header(page_title) }}
<div class="govuk-grid-row">
<div class="govuk-grid-column-two-thirds">
<div class="grid-row">
<div class="grid-col-8">
{% if show_status_page_banner %}
<div class="panel panel-border-wide">
<p>

View File

@@ -28,8 +28,8 @@
{{ page_footer('Continue') }}
{% endcall %}
<div class="govuk-grid-row">
<div class="govuk-grid-column-two-thirds">
<div class="grid-row">
<div class="grid-col-8">
<h2 class="font-body-lg">Office hours</h2>
<p>Our office hours are 9:30am to 5:30pm, Monday to Friday.</p>
<p>When you report a problem in office hours, well aim to read it within 30 minutes and reply within one working day.</p>

View File

@@ -13,8 +13,8 @@
{% block maincolumn_content %}
<div class="govuk-grid-row">
<div class="govuk-grid-column-two-thirds">
<div class="grid-row">
<div class="grid-col-8">
{{ page_header('The Notify.gov service is for people who work in the government') }}
@@ -26,19 +26,19 @@
There are other pages on Notify.gov where you can get help:
</p>
<h2 class="govuk-heading-m govuk-!-margin-bottom-1">
<h2 class="govuk-heading-m">
<a class="usa-link" href="https://www.gov.uk/coronavirus">Coronavirus (COVID-19)</a>
</h2>
<p>
Find guidance and support.
</p>
<h2 class="govuk-heading-m govuk-!-margin-bottom-1">
<h2 class="govuk-heading-m">
<a class="usa-link" href="https://www.gov.uk/contact">Contact the government</a>
</h2>
<p>
Ask about benefits, driving, transport, tax, and more.
</p>
<h2 class="govuk-heading-m govuk-!-margin-bottom-1">
<h2 class="govuk-heading-m">
<a class="usa-link" href="https://www.gov.uk/report-suspicious-emails-websites-phishing">Report internet scams and phishing</a>
</h2>
<p>

View File

@@ -14,8 +14,8 @@
{% block maincolumn_content %}
<div class="govuk-grid-row">
<div class="govuk-grid-column-two-thirds">
<div class="grid-row">
<div class="grid-col-8">
{{ page_header(page_title) }}
{% call form_wrapper() %}
{{ form.severe }}