From 64256a6f579c867bbc7c1b8350c02121130191c7 Mon Sep 17 00:00:00 2001 From: Jonathan Bobel Date: Fri, 25 Aug 2023 11:38:07 -0400 Subject: [PATCH] Removing govuk utility classes --- app/assets/error_pages/5xx.html | 2 +- .../partials/templates/guidance-formatting.html | 2 +- .../templates/guidance-personalisation.html | 2 +- .../templates/guidance-send-a-document.html | 2 +- app/templates/views/api/index.html | 4 ++-- .../views/conversations/conversation.html | 2 +- app/templates/views/cookies.html | 6 +++--- app/templates/views/edit-sms-template.html | 1 - app/templates/views/inbound-sms-admin.html | 2 +- .../views/organizations/add-organization.html | 2 +- app/templates/views/performance.html | 4 ++-- app/templates/views/pricing/billing-details.html | 16 ++++++++-------- app/templates/views/register-from-invite.html | 4 +--- .../views/register-from-org-invite.html | 4 +--- app/templates/views/register.html | 6 ++---- app/templates/views/send-test.html | 4 ++-- .../branding/email-branding-something-else.html | 2 +- .../views/service-settings/estimate-usage.html | 2 -- .../service-settings/set-inbound-number.html | 2 +- .../service-settings/set-service-setting.html | 1 - .../views/service-settings/sms-sender/add.html | 1 - .../views/service-settings/sms-sender/edit.html | 1 - app/templates/views/signedout.html | 2 +- app/templates/views/support/public.html | 6 +++--- .../views/templates/_template_list.html | 5 ++--- app/templates/views/templates/set-sender.html | 2 +- .../views/templates/set-template-sender.html | 2 +- .../disable-platform-admin-view.html | 2 +- paas-failwhale/index.html | 4 ++-- 29 files changed, 41 insertions(+), 54 deletions(-) diff --git a/app/assets/error_pages/5xx.html b/app/assets/error_pages/5xx.html index 4051845ca..e2cf9c959 100644 --- a/app/assets/error_pages/5xx.html +++ b/app/assets/error_pages/5xx.html @@ -69,7 +69,7 @@
-

+

Sorry, there is a problem with the service

diff --git a/app/templates/partials/templates/guidance-formatting.html b/app/templates/partials/templates/guidance-formatting.html index 9d4211af3..25a87bd3d 100644 --- a/app/templates/partials/templates/guidance-formatting.html +++ b/app/templates/partials/templates/guidance-formatting.html @@ -22,7 +22,7 @@ To add inset text, use a caret:

- {{ govukInsetText({"text": "^ You must tell us if your circumstances change", "classes": "govuk-!-margin-top-0"})}} + {{ govukInsetText({"text": "^ You must tell us if your circumstances change", "classes": ""})}}

To add a horizontal line, use three dashes: diff --git a/app/templates/partials/templates/guidance-personalisation.html b/app/templates/partials/templates/guidance-personalisation.html index 5d9f18f14..024825088 100644 --- a/app/templates/partials/templates/guidance-personalisation.html +++ b/app/templates/partials/templates/guidance-personalisation.html @@ -8,5 +8,5 @@

{{ govukInsetText({ "text": "Hello ((first name)), your reference is ((ref number))", - "classes": "govuk-!-margin-top-0"}) + "classes": ""}) }} diff --git a/app/templates/partials/templates/guidance-send-a-document.html b/app/templates/partials/templates/guidance-send-a-document.html index 140ec6b7a..c0f2ab1a4 100644 --- a/app/templates/partials/templates/guidance-send-a-document.html +++ b/app/templates/partials/templates/guidance-send-a-document.html @@ -8,7 +8,7 @@

{{ govukInsetText({ "text": "Download your document at: ((link_to_file))", - "classes": "govuk-!-margin-top-0 govuk-!-margin-bottom-3"}) + "classes": ""}) }} Next, use the API to upload your document. Follow the instructions to send a document by email in the API documentation. diff --git a/app/templates/views/api/index.html b/app/templates/views/api/index.html index fef6b6cec..8fa4d8d29 100644 --- a/app/templates/views/api/index.html +++ b/app/templates/views/api/index.html @@ -46,7 +46,7 @@
{% endif %} {% for notification in api_notifications.notifications %} -
+

@@ -64,7 +64,7 @@

-
+
{% for key in [ 'id', 'client_reference', 'notification_type', 'created_at', 'updated_at', 'sent_at', 'status' diff --git a/app/templates/views/conversations/conversation.html b/app/templates/views/conversations/conversation.html index 47de4a56d..b5cc82ede 100644 --- a/app/templates/views/conversations/conversation.html +++ b/app/templates/views/conversations/conversation.html @@ -16,7 +16,7 @@
-

+

{{ user_number }}

diff --git a/app/templates/views/cookies.html b/app/templates/views/cookies.html index 03a24b2d6..6534b099d 100644 --- a/app/templates/views/cookies.html +++ b/app/templates/views/cookies.html @@ -13,7 +13,7 @@
@@ -112,7 +112,7 @@
-

Do you want to accept analytics cookies?

+

Do you want to accept analytics cookies?

We use Javascript to set our analytics cookies. Unfortunately Javascript is not running on your browser, so you cannot change your settings. You can try:

  • reloading the page
    • @@ -121,7 +121,7 @@
-
+
Do you want to accept analytics cookies? diff --git a/app/templates/views/edit-sms-template.html b/app/templates/views/edit-sms-template.html index b184c799f..352d4a20d 100644 --- a/app/templates/views/edit-sms-template.html +++ b/app/templates/views/edit-sms-template.html @@ -44,7 +44,6 @@ 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 %} diff --git a/app/templates/views/inbound-sms-admin.html b/app/templates/views/inbound-sms-admin.html index 370abf3fb..2687feb79 100644 --- a/app/templates/views/inbound-sms-admin.html +++ b/app/templates/views/inbound-sms-admin.html @@ -48,7 +48,7 @@ Inbound SMS {% endif %} - {{ value.service.name }} + {{ value.service.name }} {% endfor %} diff --git a/app/templates/views/organizations/add-organization.html b/app/templates/views/organizations/add-organization.html index 4cda4f636..9c8d19030 100644 --- a/app/templates/views/organizations/add-organization.html +++ b/app/templates/views/organizations/add-organization.html @@ -19,7 +19,7 @@  
-
+
{% block beforeContent %}{% endblock %} {% block content %} {{ page_header('New organization') }} diff --git a/app/templates/views/performance.html b/app/templates/views/performance.html index 9cd6634e0..b7533044a 100644 --- a/app/templates/views/performance.html +++ b/app/templates/views/performance.html @@ -9,7 +9,7 @@ {% block maincolumn_content %} -
+
{{ page_header('Performance data') }}
@@ -25,7 +25,7 @@ total
-
+
{{ big_number( email_notifications|format_billions, diff --git a/app/templates/views/pricing/billing-details.html b/app/templates/views/pricing/billing-details.html index af8066c98..ac80c9e7f 100644 --- a/app/templates/views/pricing/billing-details.html +++ b/app/templates/views/pricing/billing-details.html @@ -19,7 +19,7 @@ Contact us if you need any other details.

-

+

Supplier details

@@ -50,14 +50,14 @@ VAT number -
+
{{ copy_to_clipboard( 'GB 88 88 010 80', thing='VAT number', ) }}
-

+

Bank details

@@ -82,7 +82,7 @@ Account number -
+
{{ copy_to_clipboard( billing_details['account_number'], thing='account number', @@ -93,7 +93,7 @@ Sort code -
+
{{ copy_to_clipboard( billing_details['sort_code'], thing='sort code', @@ -104,7 +104,7 @@

IBAN

-
+
{{ copy_to_clipboard( billing_details['IBAN'], thing='IBAN', @@ -115,14 +115,14 @@ Swift code -
+
{{ copy_to_clipboard( billing_details['swift'], thing='Swift code', ) }}
-

+

Invoice address

diff --git a/app/templates/views/register-from-invite.html b/app/templates/views/register-from-invite.html index bef9a6f13..589d30b94 100644 --- a/app/templates/views/register-from-invite.html +++ b/app/templates/views/register-from-invite.html @@ -25,17 +25,15 @@ Create an account
- {{ form.name(param_extensions={"classes": "govuk-!-width-three-quarters"}) }} + {{ form.name(param_extensions={}) }} {% if invited_user.auth_type == 'sms_auth' %}
{{ form.mobile_number(param_extensions={ - "classes": "govuk-!-width-three-quarters", "hint": {"text": "We’ll send you a security code by text message"} }) }}
{% endif %} {{ form.password(param_extensions={ - "classes": "govuk-!-width-three-quarters", "hint": {"text": "At least 8 characters"}, "autocomplete": "new-password" }) }} diff --git a/app/templates/views/register-from-org-invite.html b/app/templates/views/register-from-org-invite.html index 030ff5385..eaf60e77c 100644 --- a/app/templates/views/register-from-org-invite.html +++ b/app/templates/views/register-from-org-invite.html @@ -13,15 +13,13 @@ Create an account

Create an account

Your account will be created with this email: {{invited_org_user.email_address}}

{% call form_wrapper() %} - {{ form.name(param_extensions={"classes": "govuk-!-width-three-quarters"}) }} + {{ form.name(param_extensions={}) }}
{{ form.mobile_number(param_extensions={ - "classes": "govuk-!-width-three-quarters", "hint": {"text": "We’ll send you a security code by text message"} }) }}
{{ form.password(param_extensions={ - "classes": "govuk-!-width-three-quarters", "hint": {"text": "At least 8 characters"}, "autocomplete": "new-password" }) }} diff --git a/app/templates/views/register.html b/app/templates/views/register.html index ae30ee338..a7d36fa63 100644 --- a/app/templates/views/register.html +++ b/app/templates/views/register.html @@ -12,11 +12,10 @@ Create an account

Create an account

{% call form_wrapper(autocomplete=True) %} - {{ form.name(param_extensions={"classes": "govuk-!-width-three-quarters"}) }} + {{ form.name(param_extensions={}) }} {{ form.email_address( param_extensions={ "hint": {"text": "Must be from a public sector organization"}, - "classes": "govuk-!-width-three-quarters", "autocomplete": "email" }, error_message_with_html=True @@ -24,10 +23,9 @@ Create an account
{{ form.mobile_number(param_extensions={ "hint": {"text": "We’ll send you a security code by text message"}, - "classes": "govuk-!-width-three-quarters" }) }}
- {{ form.password(param_extensions={"hint": {"text": "At least 8 characters"}, "classes": "govuk-!-width-three-quarters", "autocomplete": "new-password"}) }} + {{ form.password(param_extensions={"hint": {"text": "At least 8 characters"}, "autocomplete": "new-password"}) }} {{form.auth_type}} {{ page_footer("Continue") }} {% endcall %} diff --git a/app/templates/views/send-test.html b/app/templates/views/send-test.html index 8c467b950..928a23320 100644 --- a/app/templates/views/send-test.html +++ b/app/templates/views/send-test.html @@ -30,10 +30,10 @@ {% if skip_link or link_to_upload %}
{% if link_to_upload %} - Upload a list of {{ 999|recipient_count_label(template.template_type) }} + Upload a list of {{ 999|recipient_count_label(template.template_type) }} {% endif %} {% if skip_link %} - {{ skip_link[0] }} + {{ skip_link[0] }} {% endif %}
{% endif %} diff --git a/app/templates/views/service-settings/branding/email-branding-something-else.html b/app/templates/views/service-settings/branding/email-branding-something-else.html index 1f9e07689..aedfaf207 100644 --- a/app/templates/views/service-settings/branding/email-branding-something-else.html +++ b/app/templates/views/service-settings/branding/email-branding-something-else.html @@ -21,7 +21,7 @@ {% block maincolumn_content %} - {% call form_wrapper(class="govuk-!-margin-top-3") %} + {% call form_wrapper() %} {{ form.something_else }}

We’ll email you when your branding is ready, or if we need any more information.

{{ page_footer('Request new branding') }} diff --git a/app/templates/views/service-settings/estimate-usage.html b/app/templates/views/service-settings/estimate-usage.html index 0fe447f25..03301edd2 100644 --- a/app/templates/views/service-settings/estimate-usage.html +++ b/app/templates/views/service-settings/estimate-usage.html @@ -28,11 +28,9 @@ {% call form_wrapper() %}
{{ form.volume_email(param_extensions={ - "classes": "govuk-!-width-one-half", "hint": {"text": "For example, 50,000"}, }) }} {{ form.volume_sms(param_extensions={ - "classes": "govuk-!-width-one-half", "hint": {"text": "For example, 50,000"}, }) }}
diff --git a/app/templates/views/service-settings/set-inbound-number.html b/app/templates/views/service-settings/set-inbound-number.html index 9919a8e3c..4cc70b598 100644 --- a/app/templates/views/service-settings/set-inbound-number.html +++ b/app/templates/views/service-settings/set-inbound-number.html @@ -23,7 +23,7 @@ {% elif no_available_numbers %}

No available inbound numbers

{% else %} - {% call form_wrapper(class="govuk-!-margin-top-3") %} + {% call form_wrapper() %} {{ form.inbound_number(param_extensions={ 'fieldset': { 'legend': { diff --git a/app/templates/views/service-settings/set-service-setting.html b/app/templates/views/service-settings/set-service-setting.html index 834155eaa..fcbc0fc07 100644 --- a/app/templates/views/service-settings/set-service-setting.html +++ b/app/templates/views/service-settings/set-service-setting.html @@ -18,7 +18,6 @@ {% call form_wrapper() %} {{ form.enabled(param_extensions={ "fieldset": { - "classes": "govuk-!-margin-top-3", "legend": { "isPageHeading": True, "classes": "govuk-fieldset__legend--l" diff --git a/app/templates/views/service-settings/sms-sender/add.html b/app/templates/views/service-settings/sms-sender/add.html index 54ce60d91..6345a4428 100644 --- a/app/templates/views/service-settings/sms-sender/add.html +++ b/app/templates/views/service-settings/sms-sender/add.html @@ -18,7 +18,6 @@ {% call form_wrapper() %} {{ form.sms_sender(param_extensions={ - "classes": "govuk-!-width-one-quarter", "hint": {"text": "Up to 11 characters, letters, numbers and spaces only"} }) }} {% if not first_sms_sender %} diff --git a/app/templates/views/service-settings/sms-sender/edit.html b/app/templates/views/service-settings/sms-sender/edit.html index b2a68c5fa..e6df8d12d 100644 --- a/app/templates/views/service-settings/sms-sender/edit.html +++ b/app/templates/views/service-settings/sms-sender/edit.html @@ -26,7 +26,6 @@

{% else %} {{ form.sms_sender(param_extensions={ - "classes": "govuk-!-width-one-quarter", "hint": {"text": "Up to 11 characters, letters, numbers and spaces only"} }) }} {% endif %} diff --git a/app/templates/views/signedout.html b/app/templates/views/signedout.html index 03d615300..5bde08e09 100644 --- a/app/templates/views/signedout.html +++ b/app/templates/views/signedout.html @@ -161,7 +161,7 @@ Notify.gov {{ govukButton({ "element": "a", "text": "Create an account", - "classes": "product-page-button button-container__button govuk-!-margin-right-3", + "classes": "product-page-button button-container__button", "href": url_for('main.register' ) }) }} or sign in if you’ve used diff --git a/app/templates/views/support/public.html b/app/templates/views/support/public.html index 02375e643..cbf212fc9 100644 --- a/app/templates/views/support/public.html +++ b/app/templates/views/support/public.html @@ -26,19 +26,19 @@ There are other pages on Notify.gov where you can get help:

-

+

Coronavirus (COVID-19)

Find guidance and support.

-

+

Contact the government

Ask about benefits, driving, transport, tax, and more.

-

+

Report internet scams and phishing

diff --git a/app/templates/views/templates/_template_list.html b/app/templates/views/templates/_template_list.html index ec7672eb1..49a23a0ee 100644 --- a/app/templates/views/templates/_template_list.html +++ b/app/templates/views/templates/_template_list.html @@ -21,8 +21,7 @@ {% endif %}

{% else %} -