- Removed links to the gov uk stylesheets

- Deleted /stylesheets folder
- Removed sass build from gulpfile
- Changed gov links to usa links
- Changed other govuk styles, like breadcrumbs
- Changed name of uk_components file to us_components
- Fixed a few tests that broke on account of the changes
This commit is contained in:
Jonathan Bobel
2023-08-08 16:19:17 -04:00
parent 9c384c1183
commit 348e29fb40
354 changed files with 449 additions and 5979 deletions

View File

@@ -1,6 +1,6 @@
{% extends "withnav_template.html" %}
{% from "components/form.html" import form_wrapper %}
{% from "components/uk_components/back-link/macro.njk" import govukBackLink %}
{% from "components/us_components/back-link/macro.njk" import govukBackLink %}
{% from "components/page-footer.html" import page_footer %}
{% from "components/page-header.html" import page_header %}
@@ -22,7 +22,7 @@
<p>
You cannot use Notify.gov branding if your organization is
<a class="govuk-link govuk-link--no-visited-state"
<a class="usa-link"
href="https://www.gov.uk/government/publications/govuk-proposition/govuk-proposition#organizations-independent-from-government">independent
from government</a>.
</p>

View File

@@ -1,6 +1,6 @@
{% extends "withnav_template.html" %}
{% from "components/form.html" import form_wrapper %}
{% from "components/uk_components/back-link/macro.njk" import govukBackLink %}
{% from "components/us_components/back-link/macro.njk" import govukBackLink %}
{% from "components/page-footer.html" import page_footer %}
{% from "components/page-header.html" import page_header %}
{% from "components/branding-preview.html" import email_branding_preview %}
@@ -31,7 +31,7 @@
<p>
You cannot use Notify.gov branding if your organization is
<a class="govuk-link govuk-link--no-visited-state"
<a class="usa-link"
href="https://www.gov.uk/government/publications/govuk-proposition/govuk-proposition#organizations-independent-from-government">independent
from government</a>.
</p>

View File

@@ -29,7 +29,7 @@
<p>Make sure youre allowed to use NHS branding.</p>
<p>
If youre not sure, <a class="govuk-link govuk-link--no-visited-state" href="https://www.england.nhs.uk/nhsidentity/identity-guidelines/who-can-use-the-nhs-identity/">check the guidance on the NHS website</a>.
If youre not sure, <a class="usa-link" href="https://www.england.nhs.uk/nhsidentity/identity-guidelines/who-can-use-the-nhs-identity/">check the guidance on the NHS website</a>.
</p>
{% call form_wrapper() %}

View File

@@ -5,7 +5,7 @@
{% from "components/page-header.html" import page_header %}
{% from "components/page-footer.html" import page_footer %}
{% from "components/form.html" import form_wrapper %}
{% from "components/uk_components/back-link/macro.njk" import govukBackLink %}
{% from "components/us_components/back-link/macro.njk" import govukBackLink %}
{% from "components/branding-preview.html" import email_branding_preview %}
{% block service_page_title %}

View File

@@ -1,6 +1,6 @@
{% extends "withnav_template.html" %}
{% from "components/form.html" import form_wrapper %}
{% from "components/uk_components/back-link/macro.njk" import govukBackLink %}
{% from "components/us_components/back-link/macro.njk" import govukBackLink %}
{% from "components/page-footer.html" import page_footer %}
{% from "components/page-header.html" import page_header %}

View File

@@ -1,9 +1,9 @@
{% extends "withnav_template.html" %}
{% from "components/form.html" import form_wrapper %}
{% from "components/uk_components/back-link/macro.njk" import govukBackLink %}
{% from "components/us_components/back-link/macro.njk" import govukBackLink %}
{% from "components/page-footer.html" import page_footer %}
{% from "components/textbox.html" import textbox %}
{% from "components/uk_components/textarea/macro.njk" import govukTextarea %}
{% from "components/us_components/textarea/macro.njk" import govukTextarea %}
{% block service_page_title %}
Describe the branding you want

View File

@@ -2,7 +2,7 @@
{% from "components/page-header.html" import page_header %}
{% from "components/page-footer.html" import page_footer %}
{% from "components/form.html" import form_wrapper %}
{% from "components/uk_components/back-link/macro.njk" import govukBackLink %}
{% from "components/us_components/back-link/macro.njk" import govukBackLink %}
{% block service_page_title %}
{{ heading }}

View File

@@ -1,6 +1,6 @@
{% extends "withnav_template.html" %}
{% from "components/table.html" import mapping_table, row_group, row, text_field, edit_field, field, boolean_field, list_table with context %}
{% from "components/uk_components/button/macro.njk" import govukButton %}
{% from "components/us_components/button/macro.njk" import govukButton %}
{% block service_page_title %}
Data retention

View File

@@ -2,7 +2,7 @@
{% from "components/page-header.html" import page_header %}
{% from "components/page-footer.html" import page_footer %}
{% from "components/form.html" import form_wrapper %}
{% from "components/uk_components/back-link/macro.njk" import govukBackLink %}
{% from "components/us_components/back-link/macro.njk" import govukBackLink %}
{% block service_page_title %}
Set data retention

View File

@@ -2,7 +2,7 @@
{% from "components/page-header.html" import page_header %}
{% from "components/page-footer.html" import page_footer %}
{% from "components/form.html" import form_wrapper %}
{% from "components/uk_components/back-link/macro.njk" import govukBackLink %}
{% from "components/us_components/back-link/macro.njk" import govukBackLink %}
{% block service_page_title %}
Set data retention

View File

@@ -3,7 +3,7 @@
{% from "components/page-header.html" import page_header %}
{% from "components/page-footer.html" import page_footer %}
{% from "components/form.html" import form_wrapper %}
{% from "components/uk_components/back-link/macro.njk" import govukBackLink %}
{% from "components/us_components/back-link/macro.njk" import govukBackLink %}
{% from "components/textbox.html" import textbox %}
{% block service_page_title %}

View File

@@ -3,7 +3,7 @@
{% from "components/page-footer.html" import page_footer %}
{% from "components/form.html" import form_wrapper %}
{% from "components/textbox.html" import textbox %}
{% from "components/uk_components/back-link/macro.njk" import govukBackLink %}
{% from "components/us_components/back-link/macro.njk" import govukBackLink %}
{% block service_page_title %}
Edit service notes

View File

@@ -1,7 +1,7 @@
{% from "components/banner.html" import banner, banner_wrapper %}
{% from "components/page-footer.html" import page_footer %}
{% from "components/form.html" import form_wrapper %}
{% from "components/uk_components/button/macro.njk" import govukButton %}
{% from "components/us_components/button/macro.njk" import govukButton %}
<div class="ajax-block-container">
{% if verification_status == "pending" %}
@@ -13,7 +13,7 @@
</p>
<p class="js-hidden govuk-body">
<a class="govuk-link govuk-link--no-visited-state" href="{{ url_for('main.service_verify_reply_to_address', service_id=service_id, notification_id=notification_id, is_default=is_default, replace=replace) }}">Refresh</a>
<a class="usa-link" href="{{ url_for('main.service_verify_reply_to_address', service_id=service_id, notification_id=notification_id, is_default=is_default, replace=replace) }}">Refresh</a>
</p>
{% elif verification_status == "success" %}
{{ banner("{} is ready to use".format(reply_to_email_address), type='default', with_tick=True) }}

View File

@@ -2,7 +2,7 @@
{% from "components/page-header.html" import page_header %}
{% from "components/page-footer.html" import page_footer %}
{% from "components/form.html" import form_wrapper %}
{% from "components/uk_components/back-link/macro.njk" import govukBackLink %}
{% from "components/us_components/back-link/macro.njk" import govukBackLink %}
{% block service_page_title %}
Add reply-to email address

View File

@@ -3,7 +3,7 @@
{% from "components/page-header.html" import page_header %}
{% from "components/page-footer.html" import page_footer %}
{% from "components/form.html" import form_wrapper %}
{% from "components/uk_components/back-link/macro.njk" import govukBackLink %}
{% from "components/us_components/back-link/macro.njk" import govukBackLink %}
{% block service_page_title %}
Change reply-to email address

View File

@@ -3,7 +3,7 @@
{% from "components/page-footer.html" import page_footer %}
{% from "components/form.html" import form_wrapper %}
{% from "components/ajax-block.html" import ajax_block %}
{% from "components/uk_components/back-link/macro.njk" import govukBackLink %}
{% from "components/us_components/back-link/macro.njk" import govukBackLink %}
{% block service_page_title %}
{{ verb }} email reply-to address

View File

@@ -2,8 +2,8 @@
{% from "components/copy-to-clipboard.html" import copy_to_clipboard %}
{% from "components/page-header.html" import page_header %}
{% from "components/table.html" import row_group, row, text_field, edit_field, field, boolean_field, list_table with context %}
{% from "components/uk_components/button/macro.njk" import govukButton %}
{% from "components/uk_components/back-link/macro.njk" import govukBackLink %}
{% from "components/us_components/button/macro.njk" import govukButton %}
{% from "components/us_components/back-link/macro.njk" import govukBackLink %}
{% block service_page_title %}
Reply-to email addresses
@@ -37,7 +37,7 @@
</div>
<div class="govuk-grid-column-one-quarter">
{% if current_user.has_permissions('manage_service') %}
<a class="govuk-link govuk-link--no-visited-state user-list-edit-link"href="{{ url_for('.service_edit_email_reply_to', service_id =current_service.id, reply_to_email_id = item.id) }}">
<a class="usa-link user-list-edit-link" href="{{ url_for('.service_edit_email_reply_to', service_id =current_service.id, reply_to_email_id = item.id) }}">
Change<span class="usa-sr-only"> {{ item.email_address }}</span>
</a>
{% endif %}

View File

@@ -3,7 +3,7 @@
{% from "components/form.html" import form_wrapper %}
{% from "components/page-header.html" import page_header %}
{% from "components/page-footer.html" import page_footer %}
{% from "components/uk_components/back-link/macro.njk" import govukBackLink %}
{% from "components/us_components/back-link/macro.njk" import govukBackLink %}
{% block service_page_title %}
Tell us how many messages you expect to send

View File

@@ -3,7 +3,7 @@
{% from "components/page-footer.html" import sticky_page_footer %}
{% from "components/live-search.html" import live_search %}
{% from "components/form.html" import form_wrapper %}
{% from "components/uk_components/back-link/macro.njk" import govukBackLink %}
{% from "components/us_components/back-link/macro.njk" import govukBackLink %}
{% set page_title = "Link service to organization" %}

View File

@@ -3,7 +3,7 @@
{% from "components/page-header.html" import page_header %}
{% from "components/page-footer.html" import page_footer %}
{% from "components/form.html" import form_wrapper %}
{% from "components/uk_components/back-link/macro.njk" import govukBackLink %}
{% from "components/us_components/back-link/macro.njk" import govukBackLink %}
{% block service_page_title %}
Change your service name

View File

@@ -3,7 +3,7 @@
{% from "components/page-header.html" import page_header %}
{% from "components/page-footer.html" import page_footer %}
{% from "components/form.html" import form_wrapper %}
{% from "components/uk_components/back-link/macro.njk" import govukBackLink %}
{% from "components/us_components/back-link/macro.njk" import govukBackLink %}
{% block service_page_title %}
Change your service name

View File

@@ -1,6 +1,6 @@
{% extends "withnav_template.html" %}
{% from "components/form.html" import form_wrapper %}
{% from "components/uk_components/button/macro.njk" import govukButton %}
{% from "components/us_components/button/macro.njk" import govukButton %}
{% from "components/branding-preview.html" import email_branding_preview %}
{% block service_page_title %}

View File

@@ -3,7 +3,7 @@
{% from "components/page-header.html" import page_header %}
{% from "components/page-footer.html" import page_footer %}
{% from "components/task-list.html" import task_list_wrapper, task_list_item %}
{% from "components/uk_components/back-link/macro.njk" import govukBackLink %}
{% from "components/us_components/back-link/macro.njk" import govukBackLink %}
{% block service_page_title %}
Before you request to go live
@@ -64,7 +64,7 @@
When we receive your request well get back to you within one working day.
</p>
<p class="bottom-gutter">
By requesting to go live youre agreeing to our <a class="govuk-link govuk-link--no-visited-state" href="{{ url_for('.terms') }}">terms of use</a>.
By requesting to go live youre agreeing to our <a class="usa-link" href="{{ url_for('.terms') }}">terms of use</a>.
</p>
{% call form_wrapper() %}
{{ page_footer('Request to go live') }}

View File

@@ -4,7 +4,7 @@
{% from "components/radios.html" import radio %}
{% from "components/select-input.html" import select_wrapper %}
{% from "components/form.html" import form_wrapper %}
{% from "components/uk_components/back-link/macro.njk" import govukBackLink %}
{% from "components/us_components/back-link/macro.njk" import govukBackLink %}
{% block service_page_title %}
Send files by email
@@ -22,7 +22,7 @@
This is an API-only feature.
</p>
<p>
To send a file by email, follow the instructions in our <a class="govuk-link govuk-link--no-visited-state" href={{ url_for('main.documentation') }}>API documentation</a>.
To send a file by email, follow the instructions in our <a class="usa-link" href={{ url_for('main.documentation') }}>API documentation</a>.
</p>
<h2 class="font-body-lg">{% if contact_details %}Change contact details for{% else %}Add contact details to{% endif %} the file download page</h2>
<p>

View File

@@ -19,7 +19,7 @@
</p>
<p>
<a class="govuk-link govuk-link--no-visited-state" href="{{ url_for('.choose_account') }}">Switch service</a>
<a class="usa-link" href="{{ url_for('.choose_account') }}">Switch service</a>
if you want to make a different service live.
</p>

View File

@@ -1,7 +1,7 @@
{% extends "withnav_template.html" %}
{% from "components/page-header.html" import page_header %}
{% from "components/page-footer.html" import page_footer %}
{% from "components/uk_components/back-link/macro.njk" import govukBackLink %}
{% from "components/us_components/back-link/macro.njk" import govukBackLink %}
{% block service_page_title %}
Sign-in method
@@ -25,7 +25,7 @@
or an email link.
</p>
<p>
You can <a class="govuk-link govuk-link--no-visited-state" href="{{ url_for('.manage_users', service_id=current_service.id) }}">set the sign-in method for individual team members</a>.
You can <a class="usa-link" href="{{ url_for('.manage_users', service_id=current_service.id) }}">set the sign-in method for individual team members</a>.
</p>
{% else %}
<p class="heading-small bottom-gutter-2-3">
@@ -35,7 +35,7 @@
Your team members sign in with a text message code.
</p>
<p>
<a class="govuk-link govuk-link--no-visited-state" href="{{ url_for('.support') }}">Contact us</a> if signing in with a text message is a problem for your team.
<a class="usa-link" href="{{ url_for('.support') }}">Contact us</a> if signing in with a text message is a problem for your team.
</p>
{% endif %}
</div>

View File

@@ -3,7 +3,7 @@
{% from "components/page-footer.html" import page_footer, sticky_page_footer %}
{% from "components/live-search.html" import live_search %}
{% from "components/form.html" import form_wrapper %}
{% from "components/uk_components/back-link/macro.njk" import govukBackLink %}
{% from "components/us_components/back-link/macro.njk" import govukBackLink %}
{% set page_title = "Set email branding" %}

View File

@@ -2,7 +2,7 @@
{% from "components/form.html" import form_wrapper %}
{% from "components/page-header.html" import page_header %}
{% from "components/page-footer.html" import page_footer %}
{% from "components/uk_components/back-link/macro.njk" import govukBackLink %}
{% from "components/us_components/back-link/macro.njk" import govukBackLink %}
{% block service_page_title %}
Send emails

View File

@@ -2,7 +2,7 @@
{% from "components/page-header.html" import page_header %}
{% from "components/page-footer.html" import page_footer %}
{% from "components/form.html" import form_wrapper %}
{% from "components/uk_components/back-link/macro.njk" import govukBackLink %}
{% from "components/us_components/back-link/macro.njk" import govukBackLink %}
{% block service_page_title %}
Free text message allowance

View File

@@ -2,7 +2,7 @@
{% from "components/page-header.html" import page_header %}
{% from "components/page-footer.html" import sticky_page_footer %}
{% from "components/form.html" import form_wrapper %}
{% from "components/uk_components/back-link/macro.njk" import govukBackLink %}
{% from "components/us_components/back-link/macro.njk" import govukBackLink %}
{% set page_title = 'Set inbound number' %}

View File

@@ -1,7 +1,7 @@
{% extends "withnav_template.html" %}
{% from "components/page-header.html" import page_header %}
{% from "components/page-footer.html" import page_footer %}
{% from "components/uk_components/back-link/macro.njk" import govukBackLink %}
{% from "components/us_components/back-link/macro.njk" import govukBackLink %}
{% block service_page_title %}
Receive text messages
@@ -24,17 +24,17 @@
You can still send text messages from a sender name if you need to, but users will not be able to reply to those messages.
</p>
<p>
<a class="govuk-link govuk-link--no-visited-state" href="{{ url_for('.support') }}">Contact us</a> if you want to switch this feature off.
<a class="usa-link" href="{{ url_for('.support') }}">Contact us</a> if you want to switch this feature off.
</p>
{% if current_user.has_permissions('manage_api_keys') %}
<p>
You can set up callbacks for received text messages on the
<a class="govuk-link govuk-link--no-visited-state" href="{{ url_for('.api_callbacks', service_id=current_service.id) }}">API integration page</a>.
<a class="usa-link" href="{{ url_for('.api_callbacks', service_id=current_service.id) }}">API integration page</a>.
</p>
{% endif %}
{% else %}
<p>
<a class="govuk-link govuk-link--no-visited-state" href="{{ url_for('.support') }}">Contact us</a> if you want to be able to receive text messages from your users.
<a class="usa-link" href="{{ url_for('.support') }}">Contact us</a> if you want to be able to receive text messages from your users.
</p>
<p>
Well create a unique phone number for your service that they can reply to.

View File

@@ -2,7 +2,7 @@
{% from "components/page-header.html" import page_header %}
{% from "components/page-footer.html" import page_footer %}
{% from "components/form.html" import form_wrapper %}
{% from "components/uk_components/back-link/macro.njk" import govukBackLink %}
{% from "components/us_components/back-link/macro.njk" import govukBackLink %}
{% block service_page_title %}
Send international text messages
@@ -21,7 +21,7 @@
Messages to international mobile numbers are charged at 1, 2, or
3 times the cost of messages to US mobile numbers.</p>
<p>
See <a class="govuk-link govuk-link--no-visited-state" href="{{ url_for(".pricing") }}">pricing</a> for the list
See <a class="usa-link" href="{{ url_for(".pricing") }}">pricing</a> for the list
of rates.
</p>
{% call form_wrapper() %}

View File

@@ -2,7 +2,7 @@
{% from "components/page-header.html" import page_header %}
{% from "components/page-footer.html" import page_footer %}
{% from "components/form.html" import form_wrapper %}
{% from "components/uk_components/back-link/macro.njk" import govukBackLink %}
{% from "components/us_components/back-link/macro.njk" import govukBackLink %}
{% block service_page_title %}
Daily message limit

View File

@@ -2,7 +2,7 @@
{% from "components/page-header.html" import page_header %}
{% from "components/page-footer.html" import page_footer %}
{% from "components/form.html" import form_wrapper %}
{% from "components/uk_components/back-link/macro.njk" import govukBackLink %}
{% from "components/us_components/back-link/macro.njk" import govukBackLink %}
{% block service_page_title %}
Rate limit

View File

@@ -1,7 +1,7 @@
{% extends "withnav_template.html" %}
{% from "components/page-footer.html" import page_footer %}
{% from "components/form.html" import form_wrapper %}
{% from "components/uk_components/back-link/macro.njk" import govukBackLink %}
{% from "components/us_components/back-link/macro.njk" import govukBackLink %}
{% block service_page_title %}
{{ title }}

View File

@@ -2,7 +2,7 @@
{% from "components/form.html" import form_wrapper %}
{% from "components/page-header.html" import page_header %}
{% from "components/page-footer.html" import page_footer %}
{% from "components/uk_components/back-link/macro.njk" import govukBackLink %}
{% from "components/us_components/back-link/macro.njk" import govukBackLink %}
{% block service_page_title %}
Send text messages
@@ -27,7 +27,7 @@
after your free allowance.
</p> -->
<p>
See <a class="govuk-link govuk-link--no-visited-state" href="{{ url_for(".pricing") }}">pricing</a> for more details.
See <a class="usa-link" href="{{ url_for(".pricing") }}">pricing</a> for more details.
</p>
{% call form_wrapper() %}
{{ form.enabled }}

View File

@@ -2,7 +2,7 @@
{% from "components/page-header.html" import page_header %}
{% from "components/page-footer.html" import page_footer %}
{% from "components/form.html" import form_wrapper %}
{% from "components/uk_components/back-link/macro.njk" import govukBackLink %}
{% from "components/us_components/back-link/macro.njk" import govukBackLink %}
{% block service_page_title %}
Start text messages with service name

View File

@@ -2,7 +2,7 @@
{% from "components/page-header.html" import page_header %}
{% from "components/page-footer.html" import page_footer %}
{% from "components/form.html" import form_wrapper %}
{% from "components/uk_components/back-link/macro.njk" import govukBackLink %}
{% from "components/us_components/back-link/macro.njk" import govukBackLink %}
{% block service_page_title %}
Add text message sender

View File

@@ -3,7 +3,7 @@
{% from "components/page-header.html" import page_header %}
{% from "components/page-footer.html" import page_footer %}
{% from "components/form.html" import form_wrapper %}
{% from "components/uk_components/back-link/macro.njk" import govukBackLink %}
{% from "components/us_components/back-link/macro.njk" import govukBackLink %}
{% block service_page_title %}
Change text message sender

View File

@@ -2,8 +2,8 @@
{% from "components/copy-to-clipboard.html" import copy_to_clipboard %}
{% from "components/page-header.html" import page_header %}
{% from "components/table.html" import row_group, row, text_field, edit_field, field, boolean_field, list_table with context%}
{% from "components/uk_components/button/macro.njk" import govukButton %}
{% from "components/uk_components/back-link/macro.njk" import govukBackLink %}
{% from "components/us_components/button/macro.njk" import govukButton %}
{% from "components/us_components/back-link/macro.njk" import govukBackLink %}
{% block service_page_title %}
Text message senders