diff --git a/app/assets/javascripts/collapsibleCheckboxes.js b/app/assets/javascripts/collapsibleCheckboxes.js
index f3c43abb7..b92c10b4d 100644
--- a/app/assets/javascripts/collapsibleCheckboxes.js
+++ b/app/assets/javascripts/collapsibleCheckboxes.js
@@ -65,7 +65,7 @@
return $(`
'
);
ListEntry.prototype.addButtonTemplate = Hogan.compile(
- ''
+ ''
);
ListEntry.prototype.getSharedAttributes = function () {
var $inputs = this.$wrapper.find('input'),
diff --git a/app/templates/components/page-footer.html b/app/templates/components/page-footer.html
index 9399f313e..9d5288970 100644
--- a/app/templates/components/page-footer.html
+++ b/app/templates/components/page-footer.html
@@ -17,7 +17,7 @@
{% set button_data = {"text": button_text} %}
- {% if destructive %}{% set _ = button_data.update({"classes": "govuk-button--warning page-footer__button"}) %}{% endif %}
+ {% if destructive %}{% set _ = button_data.update({"classes": "usa-button usa-button--secondary page-footer__button"}) %}{% endif %}
{% if centered_button %}{% set _ = button_data.update({"classes": "page-footer__button--centred"}) %}{% endif %}
{% if button_name %}{% set _ = button_data.update({"name": button_name}) %}{% endif %}
{% if button_value %}{% set _ = button_data.update({"value": button_value}) %}{% endif %}
diff --git a/app/templates/views/api/keys.html b/app/templates/views/api/keys.html
index d32baa3e0..a1b3bdca8 100644
--- a/app/templates/views/api/keys.html
+++ b/app/templates/views/api/keys.html
@@ -61,7 +61,7 @@
"element": "a",
"text": "Create an API key",
"href": url_for('.create_api_key', service_id=current_service.id),
- "classes": "govuk-button--secondary"
+ "classes": "usa-button"
}) }}
diff --git a/app/templates/views/organizations/index.html b/app/templates/views/organizations/index.html
index d837e4b24..9830b47f0 100644
--- a/app/templates/views/organizations/index.html
+++ b/app/templates/views/organizations/index.html
@@ -34,7 +34,7 @@
"element": "a",
"text": "New organization",
"href": url_for('main.add_organization'),
- "classes": "govuk-button--secondary"
+ "classes": "usa-button"
}) }}
diff --git a/app/templates/views/organizations/organization/users/index.html b/app/templates/views/organizations/organization/users/index.html
index 770189fb4..19b52b0db 100644
--- a/app/templates/views/organizations/organization/users/index.html
+++ b/app/templates/views/organizations/organization/users/index.html
@@ -68,7 +68,7 @@
"element": "a",
"text": "Invite team member",
"href": url_for('.invite_org_user', org_id=current_org.id),
- "classes": "govuk-button--secondary"
+ "classes": "usa-button"
}) }}
diff --git a/backstop_data/bitmaps_reference/backstop_test_API_Keys_0_document_0_desktop.png b/backstop_data/bitmaps_reference/backstop_test_API_Keys_0_document_0_desktop.png
index 66f7d6183..262db6187 100644
Binary files a/backstop_data/bitmaps_reference/backstop_test_API_Keys_0_document_0_desktop.png and b/backstop_data/bitmaps_reference/backstop_test_API_Keys_0_document_0_desktop.png differ
diff --git a/backstop_data/bitmaps_reference/backstop_test_About_0_document_0_desktop.png b/backstop_data/bitmaps_reference/backstop_test_About_0_document_0_desktop.png
index c288a10f0..e823605be 100644
Binary files a/backstop_data/bitmaps_reference/backstop_test_About_0_document_0_desktop.png and b/backstop_data/bitmaps_reference/backstop_test_About_0_document_0_desktop.png differ
diff --git a/backstop_data/bitmaps_reference/backstop_test_Add_Service_0_document_0_desktop.png b/backstop_data/bitmaps_reference/backstop_test_Add_Service_0_document_0_desktop.png
index 50db241e0..fbae45f61 100644
Binary files a/backstop_data/bitmaps_reference/backstop_test_Add_Service_0_document_0_desktop.png and b/backstop_data/bitmaps_reference/backstop_test_Add_Service_0_document_0_desktop.png differ
diff --git a/backstop_data/bitmaps_reference/backstop_test_Benchmark_Performance_0_document_0_desktop.png b/backstop_data/bitmaps_reference/backstop_test_Benchmark_Performance_0_document_0_desktop.png
index d9c97aa58..50849a518 100644
Binary files a/backstop_data/bitmaps_reference/backstop_test_Benchmark_Performance_0_document_0_desktop.png and b/backstop_data/bitmaps_reference/backstop_test_Benchmark_Performance_0_document_0_desktop.png differ
diff --git a/backstop_data/bitmaps_reference/backstop_test_Best_Practices_0_document_0_desktop.png b/backstop_data/bitmaps_reference/backstop_test_Best_Practices_0_document_0_desktop.png
index 8ac573b9b..f92b55f9b 100644
Binary files a/backstop_data/bitmaps_reference/backstop_test_Best_Practices_0_document_0_desktop.png and b/backstop_data/bitmaps_reference/backstop_test_Best_Practices_0_document_0_desktop.png differ
diff --git a/backstop_data/bitmaps_reference/backstop_test_Clear_Goals_0_document_0_desktop.png b/backstop_data/bitmaps_reference/backstop_test_Clear_Goals_0_document_0_desktop.png
index 234c770e1..918b7bd3c 100644
Binary files a/backstop_data/bitmaps_reference/backstop_test_Clear_Goals_0_document_0_desktop.png and b/backstop_data/bitmaps_reference/backstop_test_Clear_Goals_0_document_0_desktop.png differ
diff --git a/backstop_data/bitmaps_reference/backstop_test_Delivery_Status_0_document_0_desktop.png b/backstop_data/bitmaps_reference/backstop_test_Delivery_Status_0_document_0_desktop.png
index bbf2c3ded..c35b3a5c4 100644
Binary files a/backstop_data/bitmaps_reference/backstop_test_Delivery_Status_0_document_0_desktop.png and b/backstop_data/bitmaps_reference/backstop_test_Delivery_Status_0_document_0_desktop.png differ
diff --git a/backstop_data/bitmaps_reference/backstop_test_Establish_Trust_0_document_0_desktop.png b/backstop_data/bitmaps_reference/backstop_test_Establish_Trust_0_document_0_desktop.png
index 7089d33d4..e3c06c069 100644
Binary files a/backstop_data/bitmaps_reference/backstop_test_Establish_Trust_0_document_0_desktop.png and b/backstop_data/bitmaps_reference/backstop_test_Establish_Trust_0_document_0_desktop.png differ
diff --git a/backstop_data/bitmaps_reference/backstop_test_Get_Started_0_document_0_desktop.png b/backstop_data/bitmaps_reference/backstop_test_Get_Started_0_document_0_desktop.png
index 6e4d21576..81baddf4c 100644
Binary files a/backstop_data/bitmaps_reference/backstop_test_Get_Started_0_document_0_desktop.png and b/backstop_data/bitmaps_reference/backstop_test_Get_Started_0_document_0_desktop.png differ
diff --git a/backstop_data/bitmaps_reference/backstop_test_Get_Started_Page_-_Highlight_Trial_Mode_0_document_0_desktop.png b/backstop_data/bitmaps_reference/backstop_test_Get_Started_Page_-_Highlight_Trial_Mode_0_document_0_desktop.png
index 6e4d21576..81baddf4c 100644
Binary files a/backstop_data/bitmaps_reference/backstop_test_Get_Started_Page_-_Highlight_Trial_Mode_0_document_0_desktop.png and b/backstop_data/bitmaps_reference/backstop_test_Get_Started_Page_-_Highlight_Trial_Mode_0_document_0_desktop.png differ
diff --git a/backstop_data/bitmaps_reference/backstop_test_How_To_0_document_0_desktop.png b/backstop_data/bitmaps_reference/backstop_test_How_To_0_document_0_desktop.png
index 3d8227151..79a871a7f 100644
Binary files a/backstop_data/bitmaps_reference/backstop_test_How_To_0_document_0_desktop.png and b/backstop_data/bitmaps_reference/backstop_test_How_To_0_document_0_desktop.png differ
diff --git a/backstop_data/bitmaps_reference/backstop_test_Multiple_Languages_0_document_0_desktop.png b/backstop_data/bitmaps_reference/backstop_test_Multiple_Languages_0_document_0_desktop.png
index 466f373f8..17aca87ab 100644
Binary files a/backstop_data/bitmaps_reference/backstop_test_Multiple_Languages_0_document_0_desktop.png and b/backstop_data/bitmaps_reference/backstop_test_Multiple_Languages_0_document_0_desktop.png differ
diff --git a/backstop_data/bitmaps_reference/backstop_test_Notifygov_Service_Ending_0_document_0_desktop.png b/backstop_data/bitmaps_reference/backstop_test_Notifygov_Service_Ending_0_document_0_desktop.png
index 16f9aa06c..140f97eec 100644
Binary files a/backstop_data/bitmaps_reference/backstop_test_Notifygov_Service_Ending_0_document_0_desktop.png and b/backstop_data/bitmaps_reference/backstop_test_Notifygov_Service_Ending_0_document_0_desktop.png differ
diff --git a/backstop_data/bitmaps_reference/backstop_test_Notifygov_Sign_In_0_document_0_desktop.png b/backstop_data/bitmaps_reference/backstop_test_Notifygov_Sign_In_0_document_0_desktop.png
index 13b62ade6..4c92e5cc6 100644
Binary files a/backstop_data/bitmaps_reference/backstop_test_Notifygov_Sign_In_0_document_0_desktop.png and b/backstop_data/bitmaps_reference/backstop_test_Notifygov_Sign_In_0_document_0_desktop.png differ
diff --git a/backstop_data/bitmaps_reference/backstop_test_Pricing_0_document_0_desktop.png b/backstop_data/bitmaps_reference/backstop_test_Pricing_0_document_0_desktop.png
index 38114c214..e4f2de47e 100644
Binary files a/backstop_data/bitmaps_reference/backstop_test_Pricing_0_document_0_desktop.png and b/backstop_data/bitmaps_reference/backstop_test_Pricing_0_document_0_desktop.png differ
diff --git a/backstop_data/bitmaps_reference/backstop_test_Rules_And_Regulations_0_document_0_desktop.png b/backstop_data/bitmaps_reference/backstop_test_Rules_And_Regulations_0_document_0_desktop.png
index bd2096bc6..d2ecbcd94 100644
Binary files a/backstop_data/bitmaps_reference/backstop_test_Rules_And_Regulations_0_document_0_desktop.png and b/backstop_data/bitmaps_reference/backstop_test_Rules_And_Regulations_0_document_0_desktop.png differ
diff --git a/backstop_data/bitmaps_reference/backstop_test_SMS_Template_Preview_0_document_0_desktop.png b/backstop_data/bitmaps_reference/backstop_test_SMS_Template_Preview_0_document_0_desktop.png
index 21cfe44ce..f36e2d62c 100644
Binary files a/backstop_data/bitmaps_reference/backstop_test_SMS_Template_Preview_0_document_0_desktop.png and b/backstop_data/bitmaps_reference/backstop_test_SMS_Template_Preview_0_document_0_desktop.png differ
diff --git a/backstop_data/bitmaps_reference/backstop_test_Support_0_document_0_desktop.png b/backstop_data/bitmaps_reference/backstop_test_Support_0_document_0_desktop.png
index 9fe82e4c8..32c4649e2 100644
Binary files a/backstop_data/bitmaps_reference/backstop_test_Support_0_document_0_desktop.png and b/backstop_data/bitmaps_reference/backstop_test_Support_0_document_0_desktop.png differ
diff --git a/backstop_data/bitmaps_reference/backstop_test_Write_For_Action_0_document_0_desktop.png b/backstop_data/bitmaps_reference/backstop_test_Write_For_Action_0_document_0_desktop.png
index 5d5f865fa..763aa8192 100644
Binary files a/backstop_data/bitmaps_reference/backstop_test_Write_For_Action_0_document_0_desktop.png and b/backstop_data/bitmaps_reference/backstop_test_Write_For_Action_0_document_0_desktop.png differ
diff --git a/tests/app/main/views/organizations/test_organizations.py b/tests/app/main/views/organizations/test_organizations.py
index bb952d661..ceab59519 100644
--- a/tests/app/main/views/organizations/test_organizations.py
+++ b/tests/app/main/views/organizations/test_organizations.py
@@ -64,7 +64,7 @@ def test_organization_page_shows_all_organizations(
assert normalize_spaces(archived.parent.text) == "Test 2 - archived 2 live services"
assert (
- normalize_spaces(page.select_one("a.govuk-button--secondary").text)
+ normalize_spaces(page.select_one("a.usa-button").text)
== "New organization"
)
get_organizations.assert_called_once_with()
diff --git a/tests/javascripts/collapsibleCheckboxes.test.js b/tests/javascripts/collapsibleCheckboxes.test.js
index c75e25ff6..6358827cc 100644
--- a/tests/javascripts/collapsibleCheckboxes.test.js
+++ b/tests/javascripts/collapsibleCheckboxes.test.js
@@ -122,7 +122,7 @@ describe('Collapsible fieldset', () => {
test("has a button to expand the fieldset", () => {
- const button = formGroup.querySelector('.govuk-button');
+ const button = formGroup.querySelector('.usa-button');
expect(button).not.toBeNull();
expect(button.textContent.trim()).toEqual('Choose folders');
@@ -131,7 +131,7 @@ describe('Collapsible fieldset', () => {
test("has the correct aria attributes on the button", () => {
- expect(helpers.element(formGroup.querySelector('.govuk-button')).hasAttributesSetTo({
+ expect(helpers.element(formGroup.querySelector('.usa-button')).hasAttributesSetTo({
'aria-controls': fieldset.getAttribute('id'),
'aria-expanded': 'false'
})).toBe(true);
@@ -231,7 +231,7 @@ describe('Collapsible fieldset', () => {
// start module
window.GOVUK.modules.start();
- helpers.triggerEvent(formGroup.querySelector('.govuk-button'), 'click');
+ helpers.triggerEvent(formGroup.querySelector('.usa-button'), 'click');
});
@@ -249,13 +249,13 @@ describe('Collapsible fieldset', () => {
test("it uses ARIA to mark the checkboxes as expanded", () => {
- expect(formGroup.querySelector('.govuk-button').getAttribute('aria-expanded')).toEqual('true');
+ expect(formGroup.querySelector('.usa-button').getAttribute('aria-expanded')).toEqual('true');
});
test("it changes it's text to indicate it's new action", () => {
- expect(formGroup.querySelector('.govuk-button').textContent.trim()).toEqual("Done choosing folders");
+ expect(formGroup.querySelector('.usa-button').textContent.trim()).toEqual("Done choosing folders");
});
@@ -269,10 +269,10 @@ describe('Collapsible fieldset', () => {
window.GOVUK.modules.start();
// show the checkboxes
- helpers.triggerEvent(formGroup.querySelector('.govuk-button'), 'click');
+ helpers.triggerEvent(formGroup.querySelector('.usa-button'), 'click');
// click the button
- helpers.triggerEvent(formGroup.querySelector('.govuk-button'), 'click');
+ helpers.triggerEvent(formGroup.querySelector('.usa-button'), 'click');
});
@@ -290,13 +290,13 @@ describe('Collapsible fieldset', () => {
test("it uses ARIA to mark the checkboxes as collapsed", () => {
- expect(formGroup.querySelector('.govuk-button').getAttribute('aria-expanded')).toEqual('false');
+ expect(formGroup.querySelector('.usa-button').getAttribute('aria-expanded')).toEqual('false');
});
test("it changes it's text to indicate it's new action", () => {
- expect(formGroup.querySelector('.govuk-button').textContent.trim()).toEqual("Choose folders");
+ expect(formGroup.querySelector('.usa-button').textContent.trim()).toEqual("Choose folders");
});
});
@@ -311,7 +311,7 @@ describe('Collapsible fieldset', () => {
window.GOVUK.modules.start();
// show the checkboxes
- helpers.triggerEvent(formGroup.querySelector('.govuk-button'), 'click');
+ helpers.triggerEvent(formGroup.querySelector('.usa-button'), 'click');
expect(formGroup.querySelector('.selection-footer').previousElementSibling.nodeName).toBe('FIELDSET');
@@ -329,7 +329,7 @@ describe('Collapsible fieldset', () => {
window.GOVUK.modules.start();
// show the checkboxes
- helpers.triggerEvent(formGroup.querySelector('.govuk-button'), 'click');
+ helpers.triggerEvent(formGroup.querySelector('.usa-button'), 'click');
expect(formGroup.querySelector('.selection-footer').previousElementSibling.nodeName).toBe('FIELDSET');
@@ -348,7 +348,7 @@ describe('Collapsible fieldset', () => {
window.GOVUK.modules.start();
// show the checkboxes
- helpers.triggerEvent(formGroup.querySelector('.govuk-button'), 'click');
+ helpers.triggerEvent(formGroup.querySelector('.usa-button'), 'click');
});
@@ -361,7 +361,7 @@ describe('Collapsible fieldset', () => {
test("is removed when the fieldset is collapsed", () => {
// click the button to collapse the fieldset
- helpers.triggerEvent(formGroup.querySelector('.govuk-button'), 'click');
+ helpers.triggerEvent(formGroup.querySelector('.usa-button'), 'click');
expect(formGroup.querySelector('.selection-footer').classList.contains('js-stick-at-bottom-when-scrolling')).toBe(false);
@@ -376,7 +376,7 @@ describe('Collapsible fieldset', () => {
beforeEach(() => {
window.GOVUK.modules.start();
- helpers.triggerEvent(formGroup.querySelector('.govuk-button'), 'click');
+ helpers.triggerEvent(formGroup.querySelector('.usa-button'), 'click');
});
test("adds a 'Select all' button when checkboxes are shown", () => {
@@ -420,7 +420,7 @@ describe('Collapsible fieldset', () => {
test("button is hidden when fieldset is collapsed", () => {
const toggleButton = document.querySelector('.usa-button--small');
- const doneButton = formGroup.querySelector('.govuk-button');
+ const doneButton = formGroup.querySelector('.usa-button');
expect(toggleButton.parentElement.style.display).not.toEqual('none');
@@ -436,13 +436,13 @@ describe('Collapsible fieldset', () => {
test("shows toggle button again when fieldset is re-opened", () => {
window.GOVUK.modules.start();
- helpers.triggerEvent(formGroup.querySelector('.govuk-button'), 'click');
+ helpers.triggerEvent(formGroup.querySelector('.usa-button'), 'click');
const toggleButton = document.querySelector('.usa-button--small');
expect(toggleButton).not.toBeNull();
- helpers.triggerEvent(formGroup.querySelector('.govuk-button'), 'click');
+ helpers.triggerEvent(formGroup.querySelector('.usa-button'), 'click');
- helpers.triggerEvent(formGroup.querySelector('.govuk-button'), 'click');
+ helpers.triggerEvent(formGroup.querySelector('.usa-button'), 'click');
const toggleButtonAfter = document.querySelector('.usa-button--small');
expect(toggleButtonAfter).not.toBeNull();
@@ -454,7 +454,7 @@ describe('Collapsible fieldset', () => {
describe("when the selection changes", () => {
const showCheckboxes = () => {
- helpers.triggerEvent(formGroup.querySelector('.govuk-button'), 'click');
+ helpers.triggerEvent(formGroup.querySelector('.usa-button'), 'click');
};
const checkFirstCheckbox = () => {
diff --git a/tests/javascripts/fileUpload.test.js b/tests/javascripts/fileUpload.test.js
index 9e99bde63..a2184a68d 100644
--- a/tests/javascripts/fileUpload.test.js
+++ b/tests/javascripts/fileUpload.test.js
@@ -25,7 +25,7 @@ describe('File upload', () => {
Upload logo
-
+
`;
form = document.querySelector('form');
diff --git a/tests/javascripts/preventDuplicateFormSubmissions.test.js b/tests/javascripts/preventDuplicateFormSubmissions.test.js
index 09ec7e5d2..6a3d665bf 100644
--- a/tests/javascripts/preventDuplicateFormSubmissions.test.js
+++ b/tests/javascripts/preventDuplicateFormSubmissions.test.js
@@ -19,7 +19,7 @@ describe('Prevent duplicate form submissions', () => {
// set up DOM
document.body.innerHTML = `
`;
form = document.querySelector('form');
diff --git a/tests/javascripts/stick-to-window-when-scrolling.test.js b/tests/javascripts/stick-to-window-when-scrolling.test.js
index 18e3973a1..f75ee067f 100644
--- a/tests/javascripts/stick-to-window-when-scrolling.test.js
+++ b/tests/javascripts/stick-to-window-when-scrolling.test.js
@@ -91,7 +91,7 @@ describe("Stick to top/bottom of window when scrolling", () => {
@@ -756,7 +756,7 @@ describe("Stick to top/bottom of window when scrolling", () => {