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

Removing or changing more govuk styles

Browse Source
This commit is contained in:
Jonathan Bobel
2023-08-25 10:40:56 -04:00
parent 769f1e9355
commit a388178e2a
43 changed files with 198 additions and 211 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -66,7 +66,7 @@
</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">
@@ -85,25 +85,25 @@
</main>
</div>
<footer class="govuk-footer " role="contentinfo">
<footer class="usa-footer " role="contentinfo">
<div class="govuk-width-container ">
<div class="govuk-footer__meta">
<div class="govuk-footer__meta-item govuk-footer__meta-item--grow">
<div class="usa-footer__meta">
<div class="usa-footer__meta-item usa-footer__meta-item--grow">
<h2 class="usa-sr-only">Support links</h2>
<div class="govuk-footer__meta-custom">
<div class="usa-footer__meta-custom">
Built by the <a href="https://www.gsa.gov/about-us/organization/federal-acquisition-service/technology-transformation-services/tts-solutions"
class="govuk-footer__link">Technology Transformation Services</a>
class="usa-footer__link">Technology Transformation Services</a>
</div>
<svg role="presentation" focusable="false" class="govuk-footer__licence-logo"
<svg role="presentation" focusable="false" class="usa-footer__licence-logo"
xmlns="http://www.w3.org/2000/svg" viewbox="0 0 483.2 195.7" height="17" width="41">
<path fill="currentColor"
d="M421.5 142.8V.1l-50.7 32.3v161.1h112.4v-50.7zm-122.3-9.6A47.12 47.12 0 0 1 221 97.8c0-26 21.1-47.1 47.1-47.1 16.7 0 31.4 8.7 39.7 21.8l42.7-27.2A97.63 97.63 0 0 0 268.1 0c-36.5 0-68.3 20.1-85.1 49.7A98 98 0 0 0 97.8 0C43.9 0 0 43.9 0 97.8s43.9 97.8 97.8 97.8c36.5 0 68.3-20.1 85.1-49.7a97.76 97.76 0 0 0 149.6 25.4l19.4 22.2h3v-87.8h-80l24.3 27.5zM97.8 145c-26 0-47.1-21.1-47.1-47.1s21.1-47.1 47.1-47.1 47.2 21 47.2 47S123.8 145 97.8 145" />
</svg>
<span class="govuk-footer__licence-description">
<span class="usa-footer__licence-description">
All content is available under the
<a class="govuk-footer__link"
<a class="usa-footer__link"
href="https://www.nationalarchives.gov.uk/doc/open-government-licence/version/3/" rel="license">Open
Government Licence v3.0</a>, except where otherwise stated
</span>

2
app/assets/javascripts/collapsibleCheckboxes.js
View File

@@ -20,7 +20,7 @@
}[field] || `No ${field}s`)
};
Summary.prototype.addContent = function() {
const $hint = this.module.$formGroup.find('.govuk-hint');
const $hint = this.module.$formGroup.find('.usa-hint');
this.$text = $(`<p class="selection-summary__text" />`);
if (this.fieldLabel === 'folder') { this.$text.addClass('selection-summary__text--folders'); }

4
app/assets/javascripts/errorBanner.js
View File

@@ -9,9 +9,9 @@
This may behave in unexpected ways if you have more than one element with the `banner-dangerous` class on your page.
*/
window.GOVUK.ErrorBanner = {
hideBanner: () => $('.banner-dangerous').addClass('govuk-!-display-none'),
hideBanner: () => $('.banner-dangerous').addClass('display-none'),
showBanner: () => $('.banner-dangerous')
.removeClass('govuk-!-display-none')
.removeClass('display-none')
.trigger('focus'),
};
})(window);

4
app/assets/sass/uswds/_uswds-theme-custom-styles.scss
View File

@@ -143,7 +143,7 @@ td.table-empty-message {
}
.usa-checkbox .usa-checkbox__label {
+ a.template-list-folder, + a.usa-template-list-template {
+ a.template-list-folder {
margin-left: units(4);
}
}
@@ -165,7 +165,7 @@ td.table-empty-message {
margin: 0 units(0.5);
}
.usa-template-list-template, .template-list-template {
.template-list-template {
background: url(../img/material-icons/description.svg) no-repeat;
padding-left: units(4);
display: inline-flex;

82
app/templates/components/components/footer/_footer.scss
View File

@@ -6,41 +6,41 @@
@include govuk-exports("govuk/component/footer") {
$govuk-footer-background: $govuk-canvas-background-colour;
$govuk-footer-border-top: #a1acb2;
$govuk-footer-border: govuk-colour("grey-2");
$govuk-footer-text: #454a4c;
$govuk-footer-link: $govuk-footer-text;
$govuk-footer-link-hover: #171819;
$usa-footer-background: $govuk-canvas-background-colour;
$usa-footer-border-top: #a1acb2;
$usa-footer-border: govuk-colour("grey-2");
$usa-footer-text: #454a4c;
$usa-footer-link: $usa-footer-text;
$usa-footer-link-hover: #171819;
// Based on the govuk-crest-2x.png image dimensions.
$govuk-footer-crest-image-width-2x: 250px;
$govuk-footer-crest-image-height-2x: 204px;
$usa-footer-crest-image-width-2x: 250px;
$usa-footer-crest-image-height-2x: 204px;
// Half the 2x image so that it fits the regular 1x size.
$govuk-footer-crest-image-width: ($govuk-footer-crest-image-width-2x / 2);
$govuk-footer-crest-image-height: ($govuk-footer-crest-image-height-2x / 2);
$usa-footer-crest-image-width: ($usa-footer-crest-image-width-2x / 2);
$usa-footer-crest-image-height: ($usa-footer-crest-image-height-2x / 2);
.govuk-footer {
.usa-footer {
@include govuk-font($size: 16);
@include govuk-responsive-padding(7, "top");
@include govuk-responsive-padding(5, "bottom");
border-top: 1px solid $govuk-footer-border-top;
color: $govuk-footer-text;
background: $govuk-footer-background;
border-top: 1px solid $usa-footer-border-top;
color: $usa-footer-text;
background: $usa-footer-background;
}
.govuk-footer__link {
.usa-footer__link {
@include govuk-focusable-fill;
&:link,
&:visited {
color: $govuk-footer-link;
color: $usa-footer-link;
}
&:hover,
&:active {
color: $govuk-footer-link-hover;
color: $usa-footer-link-hover;
}
// When focussed, the text colour needs to be darker to ensure that colour
@@ -59,14 +59,14 @@
}
}
.govuk-footer__section-break {
.usa-footer__section-break {
margin: 0; // Reset `<hr>` default margins
@include govuk-responsive-margin(8, "bottom");
border: 0; // Reset `<hr>` default borders
border-bottom: 1px solid $govuk-footer-border;
border-bottom: 1px solid $usa-footer-border;
}
.govuk-footer__meta {
.usa-footer__meta {
display: -webkit-box;
display: -webkit-flex;
display: -ms-flexbox;
@@ -86,13 +86,13 @@
justify-content: center; // Support: Flexbox
}
.govuk-footer__meta-item {
.usa-footer__meta-item {
margin-right: $govuk-gutter-half;
margin-bottom: govuk-spacing(5);
margin-left: $govuk-gutter-half;
}
.govuk-footer__meta-item--grow {
.usa-footer__meta-item--grow {
-webkit-box-flex: 1;
-webkit-flex: 1;
-ms-flex: 1;
@@ -104,7 +104,7 @@
}
}
.govuk-footer__licence-logo {
.usa-footer__licence-logo {
display: inline-block;
margin-right: govuk-spacing(2);
@include mq ($until: desktop) {
@@ -113,52 +113,52 @@
vertical-align: top;
}
.govuk-footer__licence-description {
.usa-footer__licence-description {
display: inline-block;
}
.govuk-footer__copyright-logo {
.usa-footer__copyright-logo {
display: inline-block;
min-width: $govuk-footer-crest-image-width;
padding-top: ($govuk-footer-crest-image-height + govuk-spacing(2));
min-width: $usa-footer-crest-image-width;
padding-top: ($usa-footer-crest-image-height + govuk-spacing(2));
background-image: govuk-image-url("govuk-crest.png");
@include govuk-device-pixel-ratio {
background-image: govuk-image-url("govuk-crest-2x.png");
}
background-repeat: no-repeat;
background-position: 50% 0%;
background-size: $govuk-footer-crest-image-width $govuk-footer-crest-image-height;
background-size: $usa-footer-crest-image-width $usa-footer-crest-image-height;
text-align: center;
text-decoration: none;
white-space: nowrap;
}
.govuk-footer__inline-list {
.usa-footer__inline-list {
margin-top: 0;
margin-bottom: govuk-spacing(3);
padding: 0;
}
.govuk-footer__meta-custom {
.usa-footer__meta-custom {
margin-bottom: govuk-spacing(4);
}
.govuk-footer__inline-list-item {
.usa-footer__inline-list-item {
display: inline-block;
margin-right: govuk-spacing(3);
margin-bottom: govuk-spacing(1);
}
.govuk-footer__heading {
.usa-footer__heading {
@include govuk-responsive-margin(7, "bottom");
padding-bottom: govuk-spacing(4);
@include mq ($until: tablet) {
padding-bottom: govuk-spacing(2);
}
border-bottom: 1px solid $govuk-footer-border;
border-bottom: 1px solid $usa-footer-border;
}
.govuk-footer__navigation {
.usa-footer__navigation {
display: -webkit-box;
display: -webkit-flex;
display: -ms-flexbox;
@@ -170,7 +170,7 @@
flex-wrap: wrap; // Support: Flexbox
}
.govuk-footer__section {
.usa-footer__section {
display: inline-block;
margin-right: $govuk-gutter-half;
margin-bottom: $govuk-gutter;
@@ -195,7 +195,7 @@
// Sections two-third:one-third on desktop
@include mq ($from: desktop) {
.govuk-footer__section:first-child {
.usa-footer__section:first-child {
-webkit-box-flex: 2;
-webkit-flex-grow: 2;
-ms-flex-positive: 2;
@@ -203,7 +203,7 @@
}
}
.govuk-footer__list {
.usa-footer__list {
margin: 0;
padding: 0;
list-style: none;
@@ -213,24 +213,24 @@
}
@include mq ($from: desktop) {
.govuk-footer__list--columns-2 {
.usa-footer__list--columns-2 {
-webkit-column-count: 2;
-moz-column-count: 2;
column-count: 2; // Support: Columns
}
.govuk-footer__list--columns-3 {
.usa-footer__list--columns-3 {
-webkit-column-count: 3;
-moz-column-count: 3;
column-count: 3; // Support: Columns
}
}
.govuk-footer__list-item {
.usa-footer__list-item {
@include govuk-responsive-margin(4, "bottom");
}
.govuk-footer__list-item:last-child {
.usa-footer__list-item:last-child {
margin-bottom: 0;
}
}

2
app/templates/components/components/footer/template.njk
View File

@@ -41,7 +41,7 @@
<h2 class="usa-sr-only">{{ params.meta.visuallyHiddenTitle | default("Support links") }}</h2>
{% if params.meta.items %}
{% for item in params.meta.items %}
<a class="govuk-footer__link" href="{{ item.href }}" {% for attribute, value in item.attributes %}
<a class="usa-footer__link" href="{{ item.href }}" {% for attribute, value in item.attributes %}
{{attribute}}="{{value}}" {% endfor %}>
{{ item.text }}
</a>

10
app/templates/components/components/hint/_hint.scss
View File

@@ -3,7 +3,7 @@
@import "../../helpers/all";
@include govuk-exports("govuk/component/hint") {
.govuk-hint {
.usa-hint {
@include govuk-font($size: 19);
display: block;
@@ -23,7 +23,7 @@
// This adjustment will not work in browsers that do not support :not().
// Users with these browsers will see the default size margin (5px larger).
.govuk-label:not(.govuk-label--m):not(.govuk-label--l):not(.govuk-label--xl) + .govuk-hint {
.govuk-label:not(.govuk-label--m):not(.govuk-label--l):not(.govuk-label--xl) + .usa-hint {
margin-bottom: govuk-spacing(2);
}
@@ -37,14 +37,14 @@
// This adjustment will not work in browsers that do not support :not().
// Users with these browsers will see the default size margin (5px larger).
.govuk-fieldset__legend:not(.govuk-fieldset__legend--m):not(.govuk-fieldset__legend--l):not(.govuk-fieldset__legend--xl) + .govuk-hint {
.govuk-fieldset__legend:not(.govuk-fieldset__legend--m):not(.govuk-fieldset__legend--l):not(.govuk-fieldset__legend--xl) + .usa-hint {
margin-bottom: govuk-spacing(2);
}
// Reduces visual spacing of legend when there is a hint
.govuk-fieldset__legend + .govuk-hint,
.govuk-fieldset__legend + .govuk-hint {
.govuk-fieldset__legend + .usa-hint,
.govuk-fieldset__legend + .usa-hint {
margin-top: -(govuk-spacing(1));
}
}

2
app/templates/components/radios.html
View File

@@ -29,7 +29,7 @@
) %}
<div class="{{ wrapping_class }} {% if field.errors %} form-group-error{% endif %}">
<fieldset>
<legend class="form-label {% if bold_legend %}govuk-!-font-weight-bold{% endif %}">
<legend class="form-label {% if bold_legend %}bold{% endif %}">
{{ field.label.text }}
{% if field.errors %}
<span class="error-message" data-module="track-error" data-error-type="{{ field.errors[0] }}" data-error-label="{{ field.name }}">

2
app/templates/components/service-link.html
View File

@@ -2,6 +2,6 @@
{% if service %}
<a class="usa-link" href="{{ url_for(endpoint, service_id=service.id) }}">{{ link_text }}</a>
{% else %}
<b class="govuk-!-font-weight-bold">{{ link_text|capitalize }}</b>
<b>{{ link_text|capitalize }}</b>
{% endif %}
{% endmacro %}

2
app/templates/forms/fields/checkboxes/template.njk
View File

@@ -8,7 +8,7 @@
Changes:
- `formGroup` option to control whether or not the checkboxes are wrapped with a `usa-form-group` class
- `classes` option added to `item` allow custom classes on the `.govuk-checkboxes__item` element
- `classes` option added to `item.hint` allow custom classes on the `.govuk-hint` element (added to GOVUK Frontend in v3.5.0 - remove when we update)
- `classes` option added to `item.hint` allow custom classes on the `.usa-hint` element (added to GOVUK Frontend in v3.5.0 - remove when we update)
- `asList` option added the root `params` object to allow setting of the `.govuk-checkboxes` and `.govuk-checkboxes__item` element types
- `children` option added to `item` allowing the sending in of prerendered child checkboxes (allowing the creation of tree structures through recursion) -#}
{#- If an id 'prefix' is not passed, fall back to using the name attribute

5
app/templates/main_template.html
View File

@@ -9,7 +9,8 @@
<meta charset="utf-8" />
<title>{% block pageTitle %}Notify.gov{% endblock %}</title>
<meta name="viewport" content="width=device-width, initial-scale=1, viewport-fit=cover">
<meta name="theme-color" content="{{ themeColor | default('#0b0c0c') }}" /> {# Hardcoded value of $govuk-black #}
<meta name="theme-color" media="(prefers-color-scheme: light)" content="f0f0f0" />
<meta name="theme-color" media="(prefers-color-scheme: dark)" content="1b1b1b" />
{% if config['NR_MONITOR_ON'] %}
{% include "partials/newrelic.html" -%}
{% endif %}
@@ -31,7 +32,7 @@
{# image url needs to be absolute e.g. http://wwww.domain.com/.../govuk-opengraph-image.png #}
<!-- <meta property="og:image" content="{{ assetUrl | default('/assets') }}/images/govuk-opengraph-image.png"> -->
</head>
<body class="govuk-template__body {{ bodyClasses }}">
<body class="usa-template__body {{ bodyClasses }}">
<script nonce="{{ csp_nonce() }}">document.body.className = ((document.body.className) ? document.body.className + ' js-enabled' : 'js-enabled');</script>
{% block bodyStart %}{% endblock %}

4
app/templates/org_template.html
View File

@@ -10,7 +10,7 @@
{% if current_user.platform_admin %}
<a href="{{ url_for('.organizations') }}" class="usa-link navigation-organization-link">Organizations</a>
{% endif %}
<div class="navigation-service govuk-!-font-weight-bold">
<div class="navigation-service">
{{ current_org.name }}
</div>
<a href="{{ url_for('main.choose_account') }}" class="usa-link navigation-service">Switch service</a>
@@ -23,7 +23,7 @@
{% block beforeContent %}
{% block backLink %}{% endblock %}
{% endblock %}
<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 content %}
{% include 'flash_messages.html' %}
{% block maincolumn_content %}{% endblock %}

2
app/templates/partials/jobs/status.html
View File

@@ -14,7 +14,7 @@
<p class="usa-error-message">
Notify cannot send these messages because you have reached a limit. You can only send {{ current_service.message_limit|format_thousands }} messages per day and {{ 250000|format_thousands }} messages in total.
</p>
<p class="usa-error-message govuk-!-margin-bottom-6">
<p class="usa-error-message">
Upload this spreadsheet again tomorrow or <a class="usa-link" href="https://www.notifications.service.gov.uk/support">contact the Notify.gov team</a> to raise the limit.
</p>
{% endif %}

6
app/templates/partials/templates/guidance-formatting-letters.html
View File

@@ -6,7 +6,7 @@
</p>
{{ govukInsetText({
"text": "# This is a heading",
"classes": "govuk-!-margin-top-0 govuk-!-margin-bottom-3"})
"classes": ""})
}}
<p class="govuk-body">
To make bullet points, use asterisks:
@@ -15,7 +15,7 @@
"html": "* point 1<br/>
* point 2<br/>
* point 3<br/>",
"classes": "govuk-!-margin-top-0 govuk-!-margin-bottom-3"})
"classes": ""})
}}
<p class="govuk-body">
To insert a page break, use three asterisks:
@@ -26,5 +26,5 @@
***<br/>
<br/>
Content on page 2<br/>",
"classes": "govuk-!-margin-top-0 govuk-!-margin-bottom-3"})
"classes": ""})
}}

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

@@ -4,24 +4,24 @@
<p class="bottom-gutter-1-3">
To put a title in your template, use a hash:
</p>
<div class="govuk-!-margin-bottom-6">
{{ govukInsetText({"text": "# This is a title", "classes": "govuk-!-margin-top-0"})}}
<div>
{{ govukInsetText({"text": "# This is a title", "classes": ""})}}
</div>
<p class="bottom-gutter-1-3">
To make bullet points, use asterisks:
</p>
<div class="govuk-!-margin-bottom-6">
<div>
{{ govukInsetText({
"html": "* point 1<br/>
* point 2<br/>
* point 3<br/>",
"classes": "govuk-!-margin-top-0"})
"classes": ""})
}}
</div>
<p class="bottom-gutter-1-3">
To add inset text, use a caret:
</p>
<div class="govuk-!-margin-bottom-6">
<div>
{{ govukInsetText({"text": "^ You must tell us if your circumstances change", "classes": "govuk-!-margin-top-0"})}}
</div>
<p class="bottom-gutter-1-3">
@@ -31,5 +31,5 @@
"html": '<p class="govuk-body">First paragraph</p>
<p class="govuk-body" style="letter-spacing: 1px;">---</p>
<p class="govuk-body">Second paragraph</p>',
"classes": "govuk-!-margin-top-0"})
"classes": ""})
}}

2
app/templates/views/dashboard/_inbox_messages.html
View File

@@ -4,7 +4,7 @@
<div class="ajax-block-container">
{% if messages %}
<p class="bottom-gutter-2-3 top-gutter-1-2">
<a href="{{ url_for('.inbox_download', service_id=current_service.id) }}" download class="usa-link govuk-!-font-weight-bold">Download these messages</a>
<a href="{{ url_for('.inbox_download', service_id=current_service.id) }}" download class="usa-link bold">Download these messages</a>
</p>
{% endif %}
{% call(item, row_number) list_table(

2
app/templates/views/email-not-received.html
View File

@@ -25,7 +25,7 @@
<ul class="govuk-list govuk-list--bullet">
<li>find a member of your team who has permission to manage settings, team and usage</li>
<li>ask them to change the email address for your account</li>
<li>select <span class="govuk-body govuk-!-font-weight-bold">Resend email link</span></li>
<li>select <span class="govuk-body bold">Resend email link</span></li>
</ul>
</div>

6
app/templates/views/features/text-messages.html
View File

@@ -33,9 +33,9 @@
<p>To change the text message sender from the default of ‘Notify.gov’:</p>
<ol class="list list-number">
<li>Go to the <b class="govuk-!-font-weight-bold">Text message settings</b> section of the {{ service_link(current_service, 'main.service_settings', 'settings') }} page.</li>
<li>Select <b class="govuk-!-font-weight-bold">Manage</b> on the <b class="govuk-!-font-weight-bold">Text message senders</b> row.</li>
<li>Select <b class="govuk-!-font-weight-bold">Change</b> or <b class="govuk-!-font-weight-bold">Add text message sender</b>.</li>
<li>Go to the <b class="bold">Text message settings</b> section of the {{ service_link(current_service, 'main.service_settings', 'settings') }} page.</li>
<li>Select <b class="bold">Manage</b> on the <b class="bold">Text message senders</b> row.</li>
<li>Select <b class="bold">Change</b> or <b class="bold">Add text message sender</b>.</li>
</ol>
<h2 class="heading heading-medium">Pricing<h2>

2
app/templates/views/get-started.html
View File

@@ -51,7 +51,7 @@
<li class="usa-process-list__item padding-bottom-4">
<h2 class="usa-process-list__heading line-height-sans-3">Start sending messages</h2>
{% if not current_user.is_authenticated or not current_service %}
<p>When you’re ready to send messages to people outside your team, go to the <b class="govuk-!-font-weight-bold">Settings</b> page and select <b class="govuk-!-font-weight-bold">Request to go live</b>. We’ll approve your request within one working day.</p>
<p>When you’re ready to send messages to people outside your team, go to the <b class="bold">Settings</b> page and select <b class="bold">Request to go live</b>. We’ll approve your request within one working day.</p>
{% else %}
<p>You should <a class="usa-link" href="{{ url_for('.request_to_go_live', service_id=current_service.id) }}">request to go live</a> when you’re ready to send messages to people outside your team. We’ll approve your request within one working day.</p>
{% endif %}

16
app/templates/views/guidance/branding-and-customisation.html
View File

@@ -24,8 +24,8 @@
<p>To change your email branding:</p>
<ol class="list list-number">
<li>Go to the <b class="govuk-!-font-weight-bold">Email settings</b> section of the {{ service_link(current_service, 'main.service_settings', 'settings') }} page.</li>
<li>Select <b class="govuk-!-font-weight-bold">Change</b> on the <b class="govuk-!-font-weight-bold">Email branding</b> row.</li>
<li>Go to the <b class="bold">Email settings</b> section of the {{ service_link(current_service, 'main.service_settings', 'settings') }} page.</li>
<li>Select <b class="bold">Change</b> on the <b class="bold">Email branding</b> row.</li>
</ol>
<h2 class="font-body-lg" id="reply-to-address">Add a reply-to email address</h2>
@@ -35,9 +35,9 @@
<p>To add a reply-to email address:</p>
<ol class="list list-number">
<li>Go to the <b class="govuk-!-font-weight-bold">Email settings</b> section of the {{ service_link(current_service, 'main.service_settings', 'settings') }} page.</li>
<li>Select <b class="govuk-!-font-weight-bold">Manage</b> on the <b class="govuk-!-font-weight-bold">Reply-to email addresses</b> row.</li>
<li>Select <b class="govuk-!-font-weight-bold">Add reply-to address</b>.</li>
<li>Go to the <b class="bold">Email settings</b> section of the {{ service_link(current_service, 'main.service_settings', 'settings') }} page.</li>
<li>Select <b class="bold">Manage</b> on the <b class="bold">Reply-to email addresses</b> row.</li>
<li>Select <b class="bold">Add reply-to address</b>.</li>
</ol> -->
<h2 class="font-body-lg" id="text-message-sender">Change the text message sender</h2>
@@ -47,9 +47,9 @@
<p>To change the text message sender from the default of ‘Notify.gov’:</p>
<ol class="list list-number">
<li>Go to the <b class="govuk-!-font-weight-bold">Text message settings</b> section of the {{ service_link(current_service, 'main.service_settings', 'settings') }} page.</li>
<li>Select <b class="govuk-!-font-weight-bold">Manage</b> on the <b class="govuk-!-font-weight-bold">Text message senders</b> row.</li>
<li>Select <b class="govuk-!-font-weight-bold">Change</b> or <b class="govuk-!-font-weight-bold">Add text message sender</b>.</li>
<li>Go to the <b class="bold">Text message settings</b> section of the {{ service_link(current_service, 'main.service_settings', 'settings') }} page.</li>
<li>Select <b class="bold">Manage</b> on the <b class="bold">Text message senders</b> row.</li>
<li>Select <b class="bold">Change</b> or <b class="bold">Add text message sender</b>.</li>
</ol>
{% endblock %}

4
app/templates/views/guidance/create-and-send-messages.html
View File

@@ -16,7 +16,7 @@
<p>To send a batch of messages at once:</p>
<ol class="list list-number">
<li>Go to the {{ service_link(current_service, 'main.choose_template', 'templates') }} page and choose an existing template.</li>
<li>Select <b class="govuk-!-font-weight-bold">Send</b>.</li>
<li>If you’re sending emails, select <b class="govuk-!-font-weight-bold">Upload a list of email addresses</b>. If you’re sending text messages, select <b class="govuk-!-font-weight-bold">Upload a list of phone numbers</b>.</li>
<li>Select <b class="bold">Send</b>.</li>
<li>If you’re sending emails, select <b class="bold">Upload a list of email addresses</b>. If you’re sending text messages, select <b class="bold">Upload a list of phone numbers</b>.</li>
{% endblock %}

10
app/templates/views/guidance/edit-and-format-messages.html
View File

@@ -23,7 +23,7 @@
<ol class="list list-number">
<li>Go to the {{ service_link(current_service, 'main.choose_template', 'templates') }} page.</li>
<li>Add a new template or choose an existing template and select <b class="govuk-!-font-weight-bold">Edit</b>.</li>
<li>Add a new template or choose an existing template and select <b class="bold">Edit</b>.</li>
</ol>
<!-- <p class="govuk-body">Email templates can include:</p>
@@ -60,9 +60,9 @@
<ol class="list list-number">
<li>Go to the {{ service_link(current_service, 'main.choose_template', 'templates') }} page.</li>
<li>Add a new template or choose an existing template and select <b class="govuk-!-font-weight-bold">Edit</b>.</li>
<li>Add a new template or choose an existing template and select <b class="bold">Edit</b>.</li>
<li>Add a placeholder using double brackets. For example: Hello ((first&nbsp;name)), your reference is ((ref&nbsp;number)).</li>
<li>Select <b class="govuk-!-font-weight-bold">Save</b>.</li>
<li>Select <b class="bold">Save</b>.</li>
</ol>
<p class="govuk-body">When you send a message you can either:</p>
@@ -80,9 +80,9 @@
<ol class="list list-number">
<li>Go to the {{ service_link(current_service, 'main.choose_template', 'templates') }} page.</li>
<li>Add a new template or choose an existing template and select <b class="govuk-!-font-weight-bold">Edit</b>.</li>
<li>Add a new template or choose an existing template and select <b class="bold">Edit</b>.</li>
<li>Use double brackets and ?? to define optional content. For example, if you only want to show something to people who are under 18: ((under18??Please get your application signed by a parent or guardian.))</li>
<li>Select <b class="govuk-!-font-weight-bold">Save</b>.</li>
<li>Select <b class="bold">Save</b>.</li>
</ol>
<p class="govuk-body">For each person you send this message to, specify ‘yes’ or ‘no’ to show or hide this content. You can either:</p>

16
app/templates/views/guidance/index.html
View File

@@ -37,7 +37,7 @@
<ol class="list list-number">
<li>Go to the {{ service_link(current_service, 'main.choose_template', 'templates') }} page.</li>
<li>Add a new template or choose an existing template and select <b class="govuk-!-font-weight-bold">Edit</b>.</li>
<li>Add a new template or choose an existing template and select <b class="bold">Edit</b>.</li>
</ol>
<h3 class="font-body-lg" id="links">Add links</h3>
@@ -68,10 +68,10 @@
<ol class="list list-number">
<li>Go to the {{ service_link(current_service, 'main.choose_template', 'templates') }} page.</li>
<li>Add a new template or choose an existing template and select <b class="govuk-!-font-weight-bold">Edit</b>.</li>
<li>Add a new template or choose an existing template and select <b class="bold">Edit</b>.</li>
<li>Add a placeholder using double brackets. For example: Hello ((first&nbsp;name)), your reference is
((ref&nbsp;number)).</li>
<li>Select <b class="govuk-!-font-weight-bold">Save</b>.</li>
<li>Select <b class="bold">Save</b>.</li>
</ol>
<p>When you send a message you can either:</p>
@@ -89,10 +89,10 @@
<ol class="list list-number">
<li>Go to the {{ service_link(current_service, 'main.choose_template', 'templates') }} page.</li>
<li>Add a new template or choose an existing template and select <b class="govuk-!-font-weight-bold">Edit</b>.</li>
<li>Add a new template or choose an existing template and select <b class="bold">Edit</b>.</li>
<li>Use double brackets and ?? to define optional content. For example, if you only want to show something to people
who are under 18: ((under18??Please get your application signed by a parent or guardian.))</li>
<li>Select <b class="govuk-!-font-weight-bold">Save</b>.</li>
<li>Select <b class="bold">Save</b>.</li>
</ol>
<p>For each person you send this message to, specify ‘yes’ or ‘no’ to show or hide this content. You
@@ -114,11 +114,11 @@
<p>To change the text message sender from the default of ‘Notify.gov’:</p>
<ol class="list list-number">
<li>Go to the <b class="govuk-!-font-weight-bold">Text message settings</b> section of the {{
<li>Go to the <b class="bold">Text message settings</b> section of the {{
service_link(current_service, 'main.service_settings', 'settings') }} page.</li>
<li>Select <b class="govuk-!-font-weight-bold">Manage</b> on the <b class="govuk-!-font-weight-bold">Text message
<li>Select <b class="bold">Manage</b> on the <b class="bold">Text message
senders</b> row.</li>
<li>Select <b class="govuk-!-font-weight-bold">Change</b> or <b class="govuk-!-font-weight-bold">Add text message
<li>Select <b class="bold">Change</b> or <b class="bold">Add text message
sender</b>.</li>
</ol>

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 govuk-!-font-weight-bold">{{ value.service.name }}</a>
<a href="{{ url_for('main.service_dashboard', service_id=value.service.id) }}" class="usa-link govuk-!-font-size-24 bold">{{ value.service.name }}</a>
</td>
</tr>
{% endfor %}

16
app/templates/views/organizations/organization/index.html
View File

@@ -41,7 +41,7 @@
</div>
{% if search_form %}
<div class="govuk-!-margin-bottom-5">
<div>
{{ live_search(
target_selector='.organization-service',
show=True,
@@ -54,8 +54,8 @@
<h2 class="heading-small {% if search_form %}visually-hidden{% endif %}">By service</h2>
{% for service in services %}
<div class="keyline-block govuk-!-margin-top-2 organization-service">
<h3 class="govuk-!-font-weight-bold govuk-!-font-size-24 govuk-!-margin-bottom-3 govuk-!-margin-top-1 live-search-relevant">
<div class="keyline-block organization-service">
<h3 class="live-search-relevant">
<a href="{{ url_for('main.usage', service_id=service.service_id) }}" class="usa-link browse-list-link">{{ service.service_name }}</a>
</h3>
<div class="grid-row">
@@ -85,16 +85,16 @@
</div>
</div>
{% endfor %}
<div class="keyline-block govuk-!-margin-top-2"></div>
<div class="keyline-block"></div>
{% if not services %}
<p class="govuk-body govuk-hint">
<p class="govuk-body usa-hint">
{{ current_org.name }} has no live services on Notify.gov
</p>
<div class="keyline-block govuk-!-margin-top-2"></div>
<div class="keyline-block"></div>
{% else %}
<div class="js-stick-at-bottom-when-scrolling">
<p class="govuk-!-margin-bottom-1">
<a href="{{ download_link }}" download="download" class="usa-link govuk-!-font-weight-bold">Download this report (<abbr title="Comma separated values">CSV</abbr>)</a>
<p>
<a href="{{ download_link }}" download="download" class="usa-link">Download this report (<abbr title="Comma separated values">CSV</abbr>)</a>
</p>
</div>
{% endif %}

2
app/templates/views/platform-admin/services.html
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 %}

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

@@ -52,10 +52,10 @@
</a>
{% else %}
<a href="{{ url_for('.view_template', service_id=current_service.id, template_id=item.id) }}"
class="usa-link usa-template-list-template">
class="usa-link template-list-template">
<span class="live-search-relevant">
{%- if current_service.api_keys -%}
<span class="govuk-!-display-none">{{ item.id }} </span>
<span class="display-none">{{ item.id }} </span>
{%- endif -%}
{{- format_item_name(item.name) -}}
</span>

2
app/templates/views/templates/choose-reply.html
View File

@@ -51,7 +51,7 @@
<span class="live-search-relevant">{{ item.name }}</span>
</a>
{% else %}
<a class="usa-link usa-template-list-template" href="{{ url_for('.conversation_reply_with_template', service_id=current_service.id, template_id=item.id, notification_id=notification_id) }}">
<a class="usa-link template-list-template" href="{{ url_for('.conversation_reply_with_template', service_id=current_service.id, template_id=item.id, notification_id=notification_id) }}">
<span class="live-search-relevant">{{ item.name }}</span>
</a>
{% endif %}

4
app/templates/views/trial-mode.html
View File

@@ -24,8 +24,8 @@
</p>
<ol class="list list-number">
<li><a class="usa-link" href="{{ url_for('.sign_in') }}">Sign in to Notify</a>.</li>
<li>Go to the <b class="govuk-!-font-weight-bold">Settings</b> page.</li>
<li>Select <b class="govuk-!-font-weight-bold">Request to go live</b>.</li>
<li>Go to the <b class="bold">Settings</b> page.</li>
<li>Select <b class="bold">Request to go live</b>.</li>
</ol>
{% endif %}
<p>

2
app/templates/views/two-factor-webauthn.html
View File

@@ -22,7 +22,7 @@
{% block maincolumn_content %}
{{ govukErrorMessage({
"classes": "banner-dangerous govuk-!-display-none",
"classes": "banner-dangerous display-none",
"html": (
'There’s a problem with your security key' +
'<p>Check you have the right key and try again. ' +

2
app/templates/views/user-profile/security-keys.html
View File

@@ -48,7 +48,7 @@
<div class="grid-row">
{{ govukErrorMessage({
"classes": "banner-dangerous govuk-!-display-none",
"classes": "banner-dangerous display-none",
"html": (
'There’s a problem with your security key' +
'<p>Check you have the right key and try again. ' +

2
app/templates/views/verification-not-received.html
View File

@@ -25,7 +25,7 @@
<ul class="govuk-list govuk-list--bullet">
<li>find a member of your team who has permission to manage settings, team and usage</li>
<li>ask them to change the mobile number for your account</li>
<li>select <span class="govuk-body govuk-!-font-weight-bold">Resend security code</span></li>
<li>select <span class="govuk-body bold">Resend security code</span></li>
</ul>
</div>
</div>