darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-08-16 20:49:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

Removing govuk utility classes

Browse Source
This commit is contained in:
Jonathan Bobel
2023-08-25 11:38:07 -04:00
parent 8ea03c9da6
commit 64256a6f57
29 changed files with 41 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/error_pages/5xx.html
View File

@@ -69,7 +69,7 @@
<main class="govuk-main-wrapper" id="main-content" role="main">
<div class="grid-row">
<div class="grid-col-12">
<h1 class="govuk-heading-l govuk-!-padding-top-7">
<h1 class="govuk-heading-l">
Sorry, there is a problem with the service
</h1>
<p class="govuk-body">

2
app/templates/partials/templates/guidance-formatting.html
View File

@@ -22,7 +22,7 @@
To add inset text, use a caret:
</p>
<div>
{{ 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": ""})}}
</div>
<p class="bottom-gutter-1-3">
To add a horizontal line, use three dashes:

2
app/templates/partials/templates/guidance-personalisation.html
View File

@@ -8,5 +8,5 @@
</p>
{{ govukInsetText({
"text": "Hello ((first name)), your reference is ((ref number))",
"classes": "govuk-!-margin-top-0"})
"classes": ""})
}}

2
app/templates/partials/templates/guidance-send-a-document.html
View File

@@ -8,7 +8,7 @@
</p>
{{ 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 <a class="usa-link" href="{{ url_for('main.documentation') }}">API documentation</a>.

4
app/templates/views/api/index.html
View File

@@ -46,7 +46,7 @@
</div>
{% endif %}
{% for notification in api_notifications.notifications %}
<details class="api-notifications-item govuk-details govuk-!-margin-bottom-0" data-module="govuk-details">
<details class="api-notifications-item govuk-details" data-module="govuk-details">
<summary class="govuk-details__summary govuk-clearfix api-notifications-item__heading">
<h3>
<span class="govuk-details__summary-text">
@@ -64,7 +64,7 @@
</span>
</h3>
</summary>
<div class="govuk-details__text api-notifications-item__data govuk-!-padding-top-0">
<div class="govuk-details__text api-notifications-item__data">
<dl id="notification-{{ notification.id }}">
{% for key in [
'id', 'client_reference', 'notification_type', 'created_at', 'updated_at', 'sent_at', 'status'

2
app/templates/views/conversations/conversation.html
View File

@@ -16,7 +16,7 @@
<div class="dashboard">
<div class="bottom-gutter js-stick-at-top-when-scrolling">
<h1 class="heading-large govuk-!-margin-top-0">
<h1 class="heading-large">
{{ user_number }}
</h1>
</div>

6
app/templates/views/cookies.html
View File

@@ -13,7 +13,7 @@
<div class="grid-col-8">
<div class="cookie-settings__confirmation banner banner-with-tick" data-cookie-confirmation="true" role="group" tabindex="-1">
<h2 class="banner-title">Your cookie settings were saved</h2>
<a class="govuk_link cookie-settings__prev-page govuk-!-margin-top-1" href="#" data-module="track-click" data-track-category="cookieSettings" data-track-action="Back to previous page">
<a class="govuk_link cookie-settings__prev-page" href="#" data-module="track-click" data-track-category="cookieSettings" data-track-action="Back to previous page">
Go back to the page you were looking at
</a>
</div>
@@ -112,7 +112,7 @@
</tbody>
</table>
<div class="cookie-settings__no-js">
<h2 class="govuk-heading-s govuk-!-margin-top-6">Do you want to accept analytics cookies?</h2>
<h2 class="govuk-heading-s">Do you want to accept analytics cookies?</h2>
<p>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:</p>
<ul class="govuk-list govuk-list--bullet">
<li>reloading the page</li>
@@ -121,7 +121,7 @@
</div>
<div class="cookie-settings__form-wrapper">
<form data-module="cookie-settings">
<div class="usa-form-group govuk-!-margin-top-6">
<div class="usa-form-group">
<fieldset class="govuk-fieldset" aria-describedby="changed-name-hint">
<legend class="govuk-fieldset__legend govuk-fieldset__legend--s">
Do you want to accept analytics cookies?

1
app/templates/views/edit-sms-template.html
View File

@@ -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 %}

2
app/templates/views/inbound-sms-admin.html
View File

@@ -48,7 +48,7 @@ Inbound SMS
{% endif %}
</td>
<td>
<a href="{{ url_for('main.service_dashboard', service_id=value.service.id) }}" class="usa-link govuk-!-font-size-24 bold">{{ value.service.name }}</a>
<a href="{{ url_for('main.service_dashboard', service_id=value.service.id) }}" class="usa-link bold">{{ value.service.name }}</a>
</td>
</tr>
{% endfor %}

2
app/templates/views/organizations/add-organization.html
View File

@@ -19,7 +19,7 @@
&nbsp;
</div>
<div class="grid-col-9">
<main class="govuk-main-wrapper column-main govuk-!-padding-top-0 govuk-!-padding-bottom-0" id="main-content" role="main" >
<main class="govuk-main-wrapper column-main" id="main-content" role="main" >
{% block beforeContent %}{% endblock %}
{% block content %}
{{ page_header('New organization') }}

4
app/templates/views/performance.html
View File

@@ -9,7 +9,7 @@
{% block maincolumn_content %}
<div class="grid-row govuk-!-margin-bottom-8">
<div class="grid-row">
<div class="grid-col-8">
{{ page_header('Performance data') }}
</div>
@@ -25,7 +25,7 @@
total
</div>
<div class="grid-col-6">
<div class="grid-row govuk-!-padding-top-4">
<div class="grid-row">
<div class="grid-col-6">
{{ big_number(
email_notifications|format_billions,

16
app/templates/views/pricing/billing-details.html
View File

@@ -19,7 +19,7 @@
<a class="usa-link" href="{{ url_for('main.support') }}">Contact us</a> if you need any other details.
</p>
<h2 class="heading-medium govuk-!-margin-top-7" id="supplier-details">
<h2 class="heading-medium" id="supplier-details">
Supplier details
</h2>
@@ -50,14 +50,14 @@
<abbr title="Value Added Tax">VAT</abbr> number
</h3>
<div class="govuk-!-margin-bottom-4">
<div>
{{ copy_to_clipboard(
'GB 88 88 010 80',
thing='<abbr title="Value Added Tax">VAT</abbr> number',
) }}
</div>
<h2 class="heading-medium govuk-!-margin-top-7" id="bank-details">
<h2 class="heading-medium" id="bank-details">
Bank details
</h2>
@@ -82,7 +82,7 @@
Account number
</h3>
<div class="govuk-!-margin-bottom-4">
<div>
{{ copy_to_clipboard(
billing_details['account_number'],
thing='account number',
@@ -93,7 +93,7 @@
Sort code
</h3>
<div class="govuk-!-margin-bottom-4">
<div>
{{ copy_to_clipboard(
billing_details['sort_code'],
thing='sort code',
@@ -104,7 +104,7 @@
<h3 class="font-body-lg" id="iban">
<abbr title="International Bank Account Number">IBAN</abbr>
</h3>
<div class="govuk-!-margin-bottom-4">
<div>
{{ copy_to_clipboard(
billing_details['IBAN'],
thing='IBAN',
@@ -115,14 +115,14 @@
Swift code
</h3>
<div class="govuk-!-margin-bottom-4">
<div>
{{ copy_to_clipboard(
billing_details['swift'],
thing='Swift code',
) }}
</div>
<h2 class="heading-medium govuk-!-margin-top-7" id="invoice-address">
<h2 class="heading-medium" id="invoice-address">
Invoice address
</h2>

4
app/templates/views/register-from-invite.html
View File

@@ -25,17 +25,15 @@ Create an account
<label for="username" aria-hidden="true">Email</label>
<input type="email" name="username" id="username" value="{{ invited_user.email_address }}" disabled="disabled" tabindex="-1" aria-hidden="true" autocomplete="username" />
</div>
{{ form.name(param_extensions={"classes": "govuk-!-width-three-quarters"}) }}
{{ form.name(param_extensions={}) }}
{% if invited_user.auth_type == 'sms_auth' %}
<div class="extra-tracking">
{{ form.mobile_number(param_extensions={
"classes": "govuk-!-width-three-quarters",
"hint": {"text": "We’ll send you a security code by text message"}
}) }}
</div>
{% endif %}
{{ form.password(param_extensions={
"classes": "govuk-!-width-three-quarters",
"hint": {"text": "At least 8 characters"},
"autocomplete": "new-password"
}) }}

4
app/templates/views/register-from-org-invite.html
View File

@@ -13,15 +13,13 @@ Create an account
<h1 class="font-body-2xl margin-bottom-3">Create an account</h1>
<p>Your account will be created with this email: {{invited_org_user.email_address}}</p>
{% call form_wrapper() %}
{{ form.name(param_extensions={"classes": "govuk-!-width-three-quarters"}) }}
{{ form.name(param_extensions={}) }}
<div class="extra-tracking">
{{ form.mobile_number(param_extensions={
"classes": "govuk-!-width-three-quarters",
"hint": {"text": "We’ll send you a security code by text message"}
}) }}
</div>
{{ form.password(param_extensions={
"classes": "govuk-!-width-three-quarters",
"hint": {"text": "At least 8 characters"},
"autocomplete": "new-password"
}) }}

6
app/templates/views/register.html
View File

@@ -12,11 +12,10 @@ Create an account
<div class="grid-col-8">
<h1 class="font-body-2xl margin-bottom-3">Create an account</h1>
{% 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
<div class="extra-tracking">
{{ form.mobile_number(param_extensions={
"hint": {"text": "We’ll send you a security code by text message"},
"classes": "govuk-!-width-three-quarters"
}) }}
</div>
{{ 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 %}

4
app/templates/views/send-test.html
View File

@@ -30,10 +30,10 @@
{% if skip_link or link_to_upload %}
<div class="grid-col-12">
{% if link_to_upload %}
<a class="usa-link govuk-!-margin-right-3" href="{{ url_for('.send_messages', service_id=current_service.id, template_id=template.id) }}">Upload a list of {{ 999|recipient_count_label(template.template_type) }}</a>
<a class="usa-link" href="{{ url_for('.send_messages', service_id=current_service.id, template_id=template.id) }}">Upload a list of {{ 999|recipient_count_label(template.template_type) }}</a>
{% endif %}
{% if skip_link %}
<a href="{{ skip_link[1] }}" class="usa-link govuk-!-margin-right-3">{{ skip_link[0] }}</a>
<a href="{{ skip_link[1] }}" class="usa-link">{{ skip_link[0] }}</a>
{% endif %}
</div>
{% endif %}

2
app/templates/views/service-settings/branding/email-branding-something-else.html
View File

@@ -21,7 +21,7 @@
{% block maincolumn_content %}
{% call form_wrapper(class="govuk-!-margin-top-3") %}
{% call form_wrapper() %}
{{ form.something_else }}
<p class="form-group">We’ll email you when your branding is ready, or if we need any more information.</p>
{{ page_footer('Request new branding') }}

2
app/templates/views/service-settings/estimate-usage.html
View File

@@ -28,11 +28,9 @@
{% call form_wrapper() %}
<div class="form-group">
{{ 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"},
}) }}
</div>

2
app/templates/views/service-settings/set-inbound-number.html
View File

@@ -23,7 +23,7 @@
{% elif no_available_numbers %}
<p> No available inbound numbers </p>
{% else %}
{% call form_wrapper(class="govuk-!-margin-top-3") %}
{% call form_wrapper() %}
{{ form.inbound_number(param_extensions={
'fieldset': {
'legend': {

1
app/templates/views/service-settings/set-service-setting.html
View File

@@ -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"

1
app/templates/views/service-settings/sms-sender/add.html
View File

@@ -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 %}

1
app/templates/views/service-settings/sms-sender/edit.html
View File

@@ -26,7 +26,6 @@
</p>
{% else %}
{{ form.sms_sender(param_extensions={
"classes": "govuk-!-width-one-quarter",
"hint": {"text": "Up to 11 characters, letters, numbers and spaces only"}
}) }}
{% endif %}

2
app/templates/views/signedout.html
View File

@@ -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 <a class="usa-link" href="{{ url_for('.sign_in' )}}">sign in</a> if you’ve used

6
app/templates/views/support/public.html
View File

@@ -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>

5
app/templates/views/templates/_template_list.html
View File

@@ -21,8 +21,7 @@
{% endif %}
</p>
{% else %}
<nav id="template-list"
class="{{ 'govuk-!-margin-top-1' if (not show_template_nav and not show_search_box) else 'govuk-!-margin-top-6' }}">
<nav id="template-list">
{% set checkboxes_data = [] %}
{% if not current_user.has_permissions('manage_templates') %}
@@ -95,7 +94,7 @@
<li
class="template-list-item {%- if item.ancestors %} template-list-item-hidden-by-default {%- else %} template-list-item-without-ancestors{%- endif %}">
{{ item_link_content }}
<p class="template-list-item-hint govuk-!-margin-bottom-4">
<p class="template-list-item-hint">
{{ item.hint }}
</p>
</li>

2
app/templates/views/templates/set-sender.html
View File

@@ -13,7 +13,7 @@
{% block maincolumn_content %}
<div class="grid-row govuk-!-margin-top-3">
<div class="grid-row">
{% call form_wrapper() %}
{{ form.sender(param_extensions={
'fieldset': {

2
app/templates/views/templates/set-template-sender.html
View File

@@ -15,7 +15,7 @@
{% block maincolumn_content %}
<div class="grid-row govuk-!-margin-top-3">
<div class="grid-row">
{% call form_wrapper() %}
{{ form.sender(param_extensions={
'fieldset': {

2
app/templates/views/user-profile/disable-platform-admin-view.html
View File

@@ -18,7 +18,7 @@
<div class="grid-row">
<div class="grid-col-10">
{% call form_wrapper(class="govuk-!-margin-top-3") %}
{% call form_wrapper() %}
{{ form.enabled(param_extensions={
'fieldset': {
'legend': {

4
paas-failwhale/index.html
View File

@@ -80,10 +80,10 @@
</header>
<div class="govuk-width-container">
<main class="govuk-main-wrapper govuk-!-padding-top-0" id="main-content" role="main">
<main class="govuk-main-wrapper" id="main-content" role="main">
<div class="grid-row">
<div class="grid-col-12">
<h1 class="govuk-heading-l govuk-!-padding-top-7">
<h1 class="govuk-heading-l">
Sorry, the service is unavailable
</h1>
<p class="govuk-body">