From 348e29fb4028fab4cc40cd9bcf110bf8e015d7f8 Mon Sep 17 00:00:00 2001 From: Jonathan Bobel Date: Tue, 8 Aug 2023 16:19:17 -0400 Subject: [PATCH] - 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 --- app/assets/error_pages/5xx.html | 2 +- .../uswds/_uswds-theme-custom-styles.scss | 34 +- app/assets/stylesheets/_grids.scss | 115 ----- app/assets/stylesheets/_url-helpers.scss | 12 - app/assets/stylesheets/app.scss | 255 ---------- .../stylesheets/components/area-list.scss | 189 -------- app/assets/stylesheets/components/banner.scss | 217 --------- .../stylesheets/components/big-number.scss | 195 -------- .../stylesheets/components/browse-list.scss | 28 -- .../stylesheets/components/checkboxes.scss | 120 ----- .../components/conditional-radios.scss | 27 -- .../components/content-metadata.scss | 43 -- .../components/copy-to-clipboard.scss | 33 -- .../stylesheets/components/email-message.scss | 75 --- .../stylesheets/components/file-upload.scss | 46 -- .../components/fullscreen-table.scss | 155 ------ .../stylesheets/components/list-entry.scss | 39 -- .../stylesheets/components/live-search.scss | 20 - .../components/loading-indicator.scss | 16 - .../stylesheets/components/message.scss | 314 ------------ .../stylesheets/components/navigation.scss | 247 ---------- .../stylesheets/components/page-footer.scss | 67 --- app/assets/stylesheets/components/pill.scss | 151 ------ .../stylesheets/components/placeholder.scss | 59 --- .../stylesheets/components/preview-pane.scss | 18 - app/assets/stylesheets/components/radios.scss | 169 ------- .../stylesheets/components/research-mode.scss | 8 - .../stylesheets/components/show-more.scss | 40 -- .../stylesheets/components/site-footer.scss | 29 -- .../stylesheets/components/sms-message.scss | 85 ---- .../stick-at-top-when-scrolling.scss | 153 ------ app/assets/stylesheets/components/table.scss | 452 ------------------ .../stylesheets/components/task-list.scss | 62 --- .../stylesheets/components/textbox.scss | 81 ---- .../stylesheets/components/tick-cross.scss | 46 -- .../components/vendor/breadcrumbs.scss | 106 ---- .../vendor/previous-next-navigation.scss | 111 ----- .../components/vendor/responsive-embed.scss | 60 --- app/assets/stylesheets/globals.scss | 68 --- .../stylesheets/govuk-frontend/_all.scss | 52 -- .../govuk-frontend/extensions.scss | 96 ---- .../govuk-frontend/focus/components.scss | 193 -------- .../govuk-frontend/focus/core.scss | 14 - .../govuk-frontend/focus/extensions.scss | 14 - .../govuk-frontend/focus/helpers.scss | 31 -- .../govuk-frontend/focus/settings.scss | 11 - .../stylesheets/govuk-frontend/overrides.scss | 185 ------- app/assets/stylesheets/local/_typography.scss | 68 --- app/assets/stylesheets/main.scss | 86 ---- app/assets/stylesheets/print.scss | 85 ---- app/assets/stylesheets/views/api.scss | 72 --- app/assets/stylesheets/views/cookies.scss | 9 - app/assets/stylesheets/views/dashboard.scss | 198 -------- app/assets/stylesheets/views/get_started.scss | 32 -- app/assets/stylesheets/views/history.scss | 32 -- .../stylesheets/views/notification.scss | 19 - .../stylesheets/views/product-page.scss | 144 ------ app/assets/stylesheets/views/send.scss | 14 - app/assets/stylesheets/views/template.scss | 37 -- app/assets/stylesheets/views/users.scss | 90 ---- app/assets/stylesheets/views/webauthn.scss | 40 -- app/main/forms.py | 6 +- app/main/validators.py | 2 +- app/main/views/api_keys.py | 2 +- app/main/views/invites.py | 4 +- app/main/views/sign_in.py | 2 +- app/templates/admin_template.html | 6 +- app/templates/components/banner.html | 2 +- app/templates/components/big-number.html | 4 +- app/templates/components/file-upload.html | 4 +- app/templates/components/folder-path.html | 8 +- app/templates/components/list-entry.html | 4 +- app/templates/components/page-footer.html | 4 +- .../components/previous-next-navigation.html | 4 +- app/templates/components/service-link.html | 2 +- app/templates/components/status-box.html | 2 +- app/templates/components/sub-navigation.html | 2 +- app/templates/components/task-list.html | 2 +- app/templates/components/textbox.html | 2 +- .../uk_components/skip-link/template.njk | 3 - .../back-link/README.md | 0 .../back-link/_back-link.scss | 0 .../back-link/macro-options.json | 0 .../back-link/macro.njk | 0 .../back-link/template.njk | 0 .../button/README.md | 0 .../button/_button.scss | 0 .../button/macro-options.json | 0 .../button/macro.njk | 0 .../button/template.njk | 0 .../checkboxes/README.md | 0 .../checkboxes/_checkboxes.scss | 0 .../checkboxes/macro-options.json | 0 .../checkboxes/macro.njk | 0 .../checkboxes/template.njk | 0 .../details/README.md | 0 .../details/_details.scss | 0 .../details/macro-options.json | 0 .../details/macro.njk | 0 .../details/template.njk | 0 .../error-message/README.md | 0 .../error-message/_error-message.scss | 0 .../error-message/macro-options.json | 0 .../error-message/macro.njk | 0 .../error-message/template.njk | 0 .../fieldset/README.md | 0 .../fieldset/_fieldset.scss | 0 .../fieldset/macro-options.json | 0 .../fieldset/macro.njk | 0 .../fieldset/template.njk | 0 .../footer/README.md | 0 .../footer/_footer.scss | 0 .../footer/macro-options.json | 0 .../footer/macro.njk | 0 .../footer/template.njk | 71 +-- .../header/README.md | 0 .../header/_header.scss | 0 .../header/macro-options.json | 0 .../header/macro.njk | 0 .../header/template.njk | 0 .../hint/README.md | 0 .../hint/_hint.scss | 0 .../hint/macro-options.json | 0 .../hint/macro.njk | 0 .../hint/template.njk | 0 .../input/README.md | 0 .../input/_input.scss | 0 .../input/macro-options.json | 0 .../input/macro.njk | 0 .../input/template.njk | 0 .../inset-text/README.md | 0 .../inset-text/_inset-text.scss | 0 .../inset-text/macro-options.json | 0 .../inset-text/macro.njk | 0 .../inset-text/template.njk | 0 .../label/README.md | 0 .../label/_label.scss | 0 .../label/macro-options.json | 0 .../label/macro.njk | 0 .../label/template.njk | 0 .../radios/README.md | 0 .../radios/_radios.scss | 0 .../radios/macro-options.json | 0 .../radios/macro.njk | 0 .../radios/template.njk | 0 .../skip-link/README.md | 0 .../skip-link/_skip-link.scss | 0 .../skip-link/macro-options.json | 0 .../skip-link/macro.njk | 0 .../us_components/skip-link/template.njk | 7 + .../textarea/README.md | 0 .../textarea/_textarea.scss | 0 .../textarea/macro-options.json | 0 .../textarea/macro.njk | 0 .../textarea/template.njk | 0 app/templates/content_template.html | 2 +- app/templates/error/401.html | 2 +- app/templates/error/404.html | 2 +- app/templates/error/410.html | 2 +- app/templates/error/500.html | 4 +- .../forms/fields/checkboxes/template.njk | 8 +- app/templates/main_nav.html | 6 +- app/templates/main_template.html | 6 +- app/templates/org_nav.html | 10 +- app/templates/org_template.html | 8 +- .../check/not-allowed-to-send-to.html | 2 +- .../partials/check/too-many-messages.html | 2 +- .../partials/jobs/notifications.html | 6 +- app/templates/partials/jobs/status.html | 2 +- .../partials/notifications/status.html | 2 +- .../guidance-formatting-letters.html | 2 +- .../templates/guidance-formatting.html | 2 +- .../partials/templates/guidance-links.html | 2 +- .../templates/guidance-optional-content.html | 2 +- .../templates/guidance-personalisation.html | 2 +- .../templates/guidance-send-a-document.html | 4 +- app/templates/partials/tour.html | 2 +- app/templates/service_navigation.html | 6 +- .../views/accessibility_statement.html | 34 +- .../views/activity/notifications.html | 2 +- app/templates/views/api/callbacks.html | 2 +- .../callbacks/delivery-status-callback.html | 4 +- .../received-text-messages-callback.html | 4 +- app/templates/views/api/guest-list.html | 8 +- app/templates/views/api/index.html | 10 +- app/templates/views/api/keys.html | 6 +- app/templates/views/api/keys/create.html | 2 +- app/templates/views/check/column-errors.html | 4 +- app/templates/views/check/ok.html | 8 +- app/templates/views/check/row-errors.html | 4 +- app/templates/views/choose-account.html | 2 +- .../views/conversations/conversation.html | 4 +- app/templates/views/dashboard/_inbox.html | 2 +- .../views/dashboard/_inbox_messages.html | 4 +- app/templates/views/dashboard/_jobs.html | 2 +- app/templates/views/dashboard/_totals.html | 2 +- app/templates/views/dashboard/_upcoming.html | 2 +- .../dashboard/all-template-statistics.html | 2 +- app/templates/views/dashboard/inbox.html | 2 +- .../views/dashboard/template-statistics.html | 2 +- app/templates/views/documentation.html | 4 +- app/templates/views/edit-email-template.html | 2 +- app/templates/views/edit-sms-template.html | 2 +- .../views/edit-user-permissions.html | 6 +- .../views/email-branding/manage-branding.html | 2 +- .../views/email-branding/select-branding.html | 4 +- app/templates/views/email-link-invalid.html | 2 +- app/templates/views/email-not-received.html | 2 +- app/templates/views/features.html | 20 +- app/templates/views/features/emails.html | 12 +- .../views/features/text-messages.html | 8 +- .../find-services/find-services-by-name.html | 2 +- app/templates/views/find-users/auth_type.html | 2 +- .../views/find-users/find-users-by-email.html | 4 +- .../views/find-users/user-information.html | 8 +- app/templates/views/get-started.html | 22 +- .../guidance/branding-and-customisation.html | 8 +- .../guidance/create-and-send-messages.html | 2 +- .../guidance/edit-and-format-messages.html | 8 +- app/templates/views/guidance/index.html | 14 +- .../views/guidance/send-files-by-email.html | 2 +- app/templates/views/inbound-sms-admin.html | 2 +- app/templates/views/integration-testing.html | 2 +- app/templates/views/invite-user.html | 2 +- app/templates/views/jobs/job.html | 2 +- app/templates/views/jobs/jobs.html | 2 +- app/templates/views/manage-users.html | 6 +- .../manage-users/confirm-edit-user-email.html | 2 +- .../confirm-edit-user-mobile-number.html | 2 +- .../views/manage-users/edit-user-email.html | 2 +- .../views/manage-users/edit-user-mobile.html | 2 +- app/templates/views/message-status.html | 8 +- app/templates/views/notifications.html | 2 +- app/templates/views/notifications/check.html | 4 +- .../views/notifications/notification.html | 8 +- .../organizations/add-gp-organization.html | 2 +- .../add-nhs-local-organization.html | 2 +- .../views/organizations/add-organization.html | 6 +- app/templates/views/organizations/index.html | 4 +- .../organizations/organization/index.html | 4 +- .../organization/settings/edit-domains.html | 2 +- .../settings/edit-go-live-notes.html | 2 +- .../organization/settings/edit-name.html | 2 +- .../edit-organization-billing-details.html | 2 +- .../settings/edit-organization-notes.html | 2 +- .../organization/settings/edit-type.html | 2 +- .../settings/preview-email-branding.html | 2 +- .../settings/set-email-branding.html | 2 +- .../organization/trial-mode-services.html | 2 +- .../organization/users/index.html | 6 +- .../organization/users/invite-org-user.html | 2 +- .../views/platform-admin/_base_template.html | 8 +- .../platform-admin/get-billing-report.html | 2 +- .../platform-admin/get-users-report.html | 2 +- app/templates/views/platform-admin/index.html | 4 +- .../views/platform-admin/reports.html | 14 +- .../views/platform-admin/services.html | 6 +- .../views/platform-admin/splash-page.html | 2 +- .../pricing/billing-details-signed-out.html | 2 +- .../views/pricing/billing-details.html | 2 +- app/templates/views/pricing/how-to-pay.html | 6 +- app/templates/views/pricing/index.html | 2 +- app/templates/views/privacy.html | 4 +- app/templates/views/providers/provider.html | 2 +- app/templates/views/providers/providers.html | 2 +- app/templates/views/roadmap.html | 2 +- app/templates/views/security.html | 12 +- app/templates/views/send-test.html | 6 +- app/templates/views/send.html | 2 +- app/templates/views/service-settings.html | 14 +- .../branding/email-branding-govuk-org.html | 4 +- .../branding/email-branding-govuk.html | 4 +- .../branding/email-branding-nhs.html | 2 +- .../branding/email-branding-options.html | 2 +- .../branding/email-branding-organization.html | 2 +- .../email-branding-something-else.html | 4 +- .../views/service-settings/confirm.html | 2 +- .../service-settings/data-retention.html | 2 +- .../service-settings/data-retention/add.html | 2 +- .../service-settings/data-retention/edit.html | 2 +- .../edit-service-billing-details.html | 2 +- .../service-settings/edit-service-notes.html | 2 +- .../email-reply-to/_verify-updates.html | 4 +- .../service-settings/email-reply-to/add.html | 2 +- .../service-settings/email-reply-to/edit.html | 2 +- .../email-reply-to/verify.html | 2 +- .../service-settings/email_reply_to.html | 6 +- .../service-settings/estimate-usage.html | 2 +- .../link-service-to-organization.html | 2 +- .../views/service-settings/name-local.html | 2 +- .../views/service-settings/name.html | 2 +- .../preview-email-branding.html | 2 +- .../service-settings/request-to-go-live.html | 4 +- .../service-settings/send-files-by-email.html | 4 +- .../service-already-live.html | 2 +- .../views/service-settings/set-auth-type.html | 6 +- .../service-settings/set-email-branding.html | 2 +- .../views/service-settings/set-email.html | 2 +- .../set-free-sms-allowance.html | 2 +- .../service-settings/set-inbound-number.html | 2 +- .../service-settings/set-inbound-sms.html | 8 +- .../set-international-sms.html | 4 +- .../service-settings/set-message-limit.html | 2 +- .../service-settings/set-rate-limit.html | 2 +- .../service-settings/set-service-setting.html | 2 +- .../views/service-settings/set-sms.html | 4 +- .../views/service-settings/sms-prefix.html | 2 +- .../service-settings/sms-sender/add.html | 2 +- .../service-settings/sms-sender/edit.html | 2 +- .../views/service-settings/sms-senders.html | 4 +- app/templates/views/signedout.html | 12 +- app/templates/views/signin.html | 2 +- app/templates/views/support/bat-phone.html | 6 +- app/templates/views/support/form.html | 4 +- app/templates/views/support/index.html | 2 +- app/templates/views/support/public.html | 8 +- app/templates/views/support/thanks.html | 2 +- app/templates/views/support/triage.html | 2 +- .../views/templates/action_blocked.html | 4 +- .../views/templates/breaking-change.html | 2 +- .../views/templates/choose-reply.html | 8 +- .../views/templates/choose_history.html | 2 +- app/templates/views/templates/copy.html | 10 +- app/templates/views/templates/set-sender.html | 2 +- .../views/templates/set-template-sender.html | 4 +- app/templates/views/templates/start-tour.html | 2 +- app/templates/views/templates/template.html | 2 +- app/templates/views/terms-of-use.html | 6 +- app/templates/views/trial-mode.html | 4 +- app/templates/views/two-factor-webauthn.html | 8 +- app/templates/views/user-already-invited.html | 2 +- .../views/user-already-team-member.html | 2 +- .../views/user-profile/authenticate.html | 2 +- .../views/user-profile/change-password.html | 2 +- app/templates/views/user-profile/change.html | 2 +- app/templates/views/user-profile/confirm.html | 2 +- .../disable-platform-admin-view.html | 2 +- .../user-profile/manage-security-key.html | 2 +- .../views/user-profile/security-keys.html | 8 +- app/templates/views/using-notify.html | 8 +- .../views/verification-not-received.html | 2 +- app/templates/withnav_template.html | 2 +- app/templates/withoutnav_template.html | 6 +- gulpfile.js | 24 - paas-failwhale/index.html | 6 +- .../views/accounts/test_choose_accounts.py | 6 +- .../test_service_setting_permissions.py | 2 +- tests/app/main/views/test_activity.py | 2 +- tests/app/main/views/test_api_integration.py | 2 +- tests/app/main/views/test_index.py | 2 - tests/javascripts/liveSearch.test.js | 2 +- .../stick-to-window-when-scrolling.test.js | 2 +- tests/javascripts/support/helpers/html.js | 2 +- tests/javascripts/updateContent.test.js | 2 +- 354 files changed, 449 insertions(+), 5979 deletions(-) delete mode 100644 app/assets/stylesheets/_grids.scss delete mode 100644 app/assets/stylesheets/_url-helpers.scss delete mode 100644 app/assets/stylesheets/app.scss delete mode 100644 app/assets/stylesheets/components/area-list.scss delete mode 100644 app/assets/stylesheets/components/banner.scss delete mode 100644 app/assets/stylesheets/components/big-number.scss delete mode 100644 app/assets/stylesheets/components/browse-list.scss delete mode 100644 app/assets/stylesheets/components/checkboxes.scss delete mode 100644 app/assets/stylesheets/components/conditional-radios.scss delete mode 100644 app/assets/stylesheets/components/content-metadata.scss delete mode 100644 app/assets/stylesheets/components/copy-to-clipboard.scss delete mode 100644 app/assets/stylesheets/components/email-message.scss delete mode 100644 app/assets/stylesheets/components/file-upload.scss delete mode 100644 app/assets/stylesheets/components/fullscreen-table.scss delete mode 100644 app/assets/stylesheets/components/list-entry.scss delete mode 100644 app/assets/stylesheets/components/live-search.scss delete mode 100644 app/assets/stylesheets/components/loading-indicator.scss delete mode 100644 app/assets/stylesheets/components/message.scss delete mode 100644 app/assets/stylesheets/components/navigation.scss delete mode 100644 app/assets/stylesheets/components/page-footer.scss delete mode 100644 app/assets/stylesheets/components/pill.scss delete mode 100644 app/assets/stylesheets/components/placeholder.scss delete mode 100644 app/assets/stylesheets/components/preview-pane.scss delete mode 100644 app/assets/stylesheets/components/radios.scss delete mode 100644 app/assets/stylesheets/components/research-mode.scss delete mode 100644 app/assets/stylesheets/components/show-more.scss delete mode 100644 app/assets/stylesheets/components/site-footer.scss delete mode 100644 app/assets/stylesheets/components/sms-message.scss delete mode 100644 app/assets/stylesheets/components/stick-at-top-when-scrolling.scss delete mode 100644 app/assets/stylesheets/components/table.scss delete mode 100644 app/assets/stylesheets/components/task-list.scss delete mode 100644 app/assets/stylesheets/components/textbox.scss delete mode 100644 app/assets/stylesheets/components/tick-cross.scss delete mode 100644 app/assets/stylesheets/components/vendor/breadcrumbs.scss delete mode 100644 app/assets/stylesheets/components/vendor/previous-next-navigation.scss delete mode 100644 app/assets/stylesheets/components/vendor/responsive-embed.scss delete mode 100644 app/assets/stylesheets/globals.scss delete mode 100644 app/assets/stylesheets/govuk-frontend/_all.scss delete mode 100644 app/assets/stylesheets/govuk-frontend/extensions.scss delete mode 100644 app/assets/stylesheets/govuk-frontend/focus/components.scss delete mode 100644 app/assets/stylesheets/govuk-frontend/focus/core.scss delete mode 100644 app/assets/stylesheets/govuk-frontend/focus/extensions.scss delete mode 100644 app/assets/stylesheets/govuk-frontend/focus/helpers.scss delete mode 100644 app/assets/stylesheets/govuk-frontend/focus/settings.scss delete mode 100644 app/assets/stylesheets/govuk-frontend/overrides.scss delete mode 100644 app/assets/stylesheets/local/_typography.scss delete mode 100644 app/assets/stylesheets/main.scss delete mode 100644 app/assets/stylesheets/print.scss delete mode 100644 app/assets/stylesheets/views/api.scss delete mode 100644 app/assets/stylesheets/views/cookies.scss delete mode 100644 app/assets/stylesheets/views/dashboard.scss delete mode 100644 app/assets/stylesheets/views/get_started.scss delete mode 100644 app/assets/stylesheets/views/history.scss delete mode 100644 app/assets/stylesheets/views/notification.scss delete mode 100644 app/assets/stylesheets/views/product-page.scss delete mode 100644 app/assets/stylesheets/views/send.scss delete mode 100644 app/assets/stylesheets/views/template.scss delete mode 100644 app/assets/stylesheets/views/users.scss delete mode 100644 app/assets/stylesheets/views/webauthn.scss delete mode 100644 app/templates/components/uk_components/skip-link/template.njk rename app/templates/components/{uk_components => us_components}/back-link/README.md (100%) rename app/templates/components/{uk_components => us_components}/back-link/_back-link.scss (100%) rename app/templates/components/{uk_components => us_components}/back-link/macro-options.json (100%) rename app/templates/components/{uk_components => us_components}/back-link/macro.njk (100%) rename app/templates/components/{uk_components => us_components}/back-link/template.njk (100%) rename app/templates/components/{uk_components => us_components}/button/README.md (100%) rename app/templates/components/{uk_components => us_components}/button/_button.scss (100%) rename app/templates/components/{uk_components => us_components}/button/macro-options.json (100%) rename app/templates/components/{uk_components => us_components}/button/macro.njk (100%) rename app/templates/components/{uk_components => us_components}/button/template.njk (100%) rename app/templates/components/{uk_components => us_components}/checkboxes/README.md (100%) rename app/templates/components/{uk_components => us_components}/checkboxes/_checkboxes.scss (100%) rename app/templates/components/{uk_components => us_components}/checkboxes/macro-options.json (100%) rename app/templates/components/{uk_components => us_components}/checkboxes/macro.njk (100%) rename app/templates/components/{uk_components => us_components}/checkboxes/template.njk (100%) rename app/templates/components/{uk_components => us_components}/details/README.md (100%) rename app/templates/components/{uk_components => us_components}/details/_details.scss (100%) rename app/templates/components/{uk_components => us_components}/details/macro-options.json (100%) rename app/templates/components/{uk_components => us_components}/details/macro.njk (100%) rename app/templates/components/{uk_components => us_components}/details/template.njk (100%) rename app/templates/components/{uk_components => us_components}/error-message/README.md (100%) rename app/templates/components/{uk_components => us_components}/error-message/_error-message.scss (100%) rename app/templates/components/{uk_components => us_components}/error-message/macro-options.json (100%) rename app/templates/components/{uk_components => us_components}/error-message/macro.njk (100%) rename app/templates/components/{uk_components => us_components}/error-message/template.njk (100%) rename app/templates/components/{uk_components => us_components}/fieldset/README.md (100%) rename app/templates/components/{uk_components => us_components}/fieldset/_fieldset.scss (100%) rename app/templates/components/{uk_components => us_components}/fieldset/macro-options.json (100%) rename app/templates/components/{uk_components => us_components}/fieldset/macro.njk (100%) rename app/templates/components/{uk_components => us_components}/fieldset/template.njk (100%) rename app/templates/components/{uk_components => us_components}/footer/README.md (100%) rename app/templates/components/{uk_components => us_components}/footer/_footer.scss (100%) rename app/templates/components/{uk_components => us_components}/footer/macro-options.json (100%) rename app/templates/components/{uk_components => us_components}/footer/macro.njk (100%) rename app/templates/components/{uk_components => us_components}/footer/template.njk (64%) rename app/templates/components/{uk_components => us_components}/header/README.md (100%) rename app/templates/components/{uk_components => us_components}/header/_header.scss (100%) rename app/templates/components/{uk_components => us_components}/header/macro-options.json (100%) rename app/templates/components/{uk_components => us_components}/header/macro.njk (100%) rename app/templates/components/{uk_components => us_components}/header/template.njk (100%) rename app/templates/components/{uk_components => us_components}/hint/README.md (100%) rename app/templates/components/{uk_components => us_components}/hint/_hint.scss (100%) rename app/templates/components/{uk_components => us_components}/hint/macro-options.json (100%) rename app/templates/components/{uk_components => us_components}/hint/macro.njk (100%) rename app/templates/components/{uk_components => us_components}/hint/template.njk (100%) rename app/templates/components/{uk_components => us_components}/input/README.md (100%) rename app/templates/components/{uk_components => us_components}/input/_input.scss (100%) rename app/templates/components/{uk_components => us_components}/input/macro-options.json (100%) rename app/templates/components/{uk_components => us_components}/input/macro.njk (100%) rename app/templates/components/{uk_components => us_components}/input/template.njk (100%) rename app/templates/components/{uk_components => us_components}/inset-text/README.md (100%) rename app/templates/components/{uk_components => us_components}/inset-text/_inset-text.scss (100%) rename app/templates/components/{uk_components => us_components}/inset-text/macro-options.json (100%) rename app/templates/components/{uk_components => us_components}/inset-text/macro.njk (100%) rename app/templates/components/{uk_components => us_components}/inset-text/template.njk (100%) rename app/templates/components/{uk_components => us_components}/label/README.md (100%) rename app/templates/components/{uk_components => us_components}/label/_label.scss (100%) rename app/templates/components/{uk_components => us_components}/label/macro-options.json (100%) rename app/templates/components/{uk_components => us_components}/label/macro.njk (100%) rename app/templates/components/{uk_components => us_components}/label/template.njk (100%) rename app/templates/components/{uk_components => us_components}/radios/README.md (100%) rename app/templates/components/{uk_components => us_components}/radios/_radios.scss (100%) rename app/templates/components/{uk_components => us_components}/radios/macro-options.json (100%) rename app/templates/components/{uk_components => us_components}/radios/macro.njk (100%) rename app/templates/components/{uk_components => us_components}/radios/template.njk (100%) rename app/templates/components/{uk_components => us_components}/skip-link/README.md (100%) rename app/templates/components/{uk_components => us_components}/skip-link/_skip-link.scss (100%) rename app/templates/components/{uk_components => us_components}/skip-link/macro-options.json (100%) rename app/templates/components/{uk_components => us_components}/skip-link/macro.njk (100%) create mode 100644 app/templates/components/us_components/skip-link/template.njk rename app/templates/components/{uk_components => us_components}/textarea/README.md (100%) rename app/templates/components/{uk_components => us_components}/textarea/_textarea.scss (100%) rename app/templates/components/{uk_components => us_components}/textarea/macro-options.json (100%) rename app/templates/components/{uk_components => us_components}/textarea/macro.njk (100%) rename app/templates/components/{uk_components => us_components}/textarea/template.njk (100%) diff --git a/app/assets/error_pages/5xx.html b/app/assets/error_pages/5xx.html index fcf9db915..84498d041 100644 --- a/app/assets/error_pages/5xx.html +++ b/app/assets/error_pages/5xx.html @@ -76,7 +76,7 @@ Try again later.

- You can check our system status page to see if there are any known issues.
To report a problem, email gov-uk-notify-support@digital.cabinet-office.gov.uk diff --git a/app/assets/sass/uswds/_uswds-theme-custom-styles.scss b/app/assets/sass/uswds/_uswds-theme-custom-styles.scss index 6d53a4d04..d53ebe6e2 100644 --- a/app/assets/sass/uswds/_uswds-theme-custom-styles.scss +++ b/app/assets/sass/uswds/_uswds-theme-custom-styles.scss @@ -41,20 +41,6 @@ h1 { font-weight: bold !important; } -.sub-content { - h1, - h2:not(.get-started-list__heading, .usa-process-list__heading) { - margin-top: units(4); - font-weight: bold; - } - - h2:not(.get-started-list__heading, .usa-process-list__heading), - h3 { - margin-top: units(5); - margin-bottom: units(2); - } -} - p, .list li { font-family: family("sans"); @@ -134,11 +120,6 @@ td.table-empty-message { text-decoration: none !important; } -.sub-content .banner-dangerous h1, -.sub-content h2.user-list-item-heading { - margin-top: 0; -} - .user-list-edit-link:active:before, .user-list-edit-link:focus:before { box-shadow: none; @@ -229,3 +210,18 @@ td.table-empty-message { font-size: units(3); background-color: transparent; } + +.usa-hero { + background-image: none; +} + +.usa-prose { + h1, h2, h3, h4, h5 { + font-family: family("sans"); + } +} + +.navigation-service.usa-breadcrumb { + padding-bottom: 0; +} + diff --git a/app/assets/stylesheets/_grids.scss b/app/assets/stylesheets/_grids.scss deleted file mode 100644 index bf89c79e9..000000000 --- a/app/assets/stylesheets/_grids.scss +++ /dev/null @@ -1,115 +0,0 @@ - -.govuk-grid-column-one-sixth { - @include govuk-grid-column(one-sixth, $class: false); -} - -.govuk-grid-column-five-sixths { - @include govuk-grid-column(five-sixths, $class: false); -} - -.govuk-grid-column-one-eighth { - @include govuk-grid-column(one-eighth, $class: false); -} - -.govuk-grid-column-five-eighths { - @include govuk-grid-column(five-eighths, $class: false); -} - -.govuk-grid-column-seven-eighths { - @include govuk-grid-column(seven-eighths, $class: false); -} - -%top-gutter, -.top-gutter { - @extend %contain-floats; - display: block; - margin-top: govuk-spacing(6); - clear: both; -} - -.top-gutter-4-3 { - @extend %top-gutter; - margin-top: govuk-spacing(7); -} - -.top-gutter-1-2 { - @extend %top-gutter; - margin-top: govuk-spacing(3); -} - -.top-gutter-1-3 { - @extend %top-gutter; - margin-top: govuk-spacing(2); -} - -.top-gutter-2-3 { - @extend %top-gutter; - margin-top: govuk-spacing(4); -} - -.top-gutter-0 { - margin-top: 0; -} - -%bottom-gutter, -.bottom-gutter { - @extend %contain-floats; - margin-bottom: govuk-spacing(6); - clear: both; -} - -.bottom-gutter-2-3 { - @extend %bottom-gutter; - margin-bottom: govuk-spacing(4); -} - -.bottom-gutter-1-2 { - @extend %bottom-gutter; - margin-bottom: govuk-spacing(3); -} - -.bottom-gutter-1-3 { - @extend %bottom-gutter; - margin-bottom: govuk-spacing(2); -} - -.bottom-gutter-3-2 { - @extend %bottom-gutter; - margin-bottom: govuk-spacing(6) * 3/2; -} - -.bottom-gutter-2 { - @extend %bottom-gutter; - margin-bottom: govuk-spacing(9); -} - -.left-gutter { - padding-left: govuk-spacing(6); -} - -.left-gutter-4-3 { - padding-left: govuk-spacing(7); -} - -.align-with-heading { - display: block; - text-align: center; - margin-top: 13px; - padding-left: 2px; - padding-right: 2px; -} - -.align-with-heading-copy { - display: block; - margin-top: 25px; -} - -.align-with-heading-copy-right { - display: block; - margin: 21px 0 19px 0; - text-align: right; -} - -.align-with-big-number-hint { - margin-top: govuk-spacing(8); -} diff --git a/app/assets/stylesheets/_url-helpers.scss b/app/assets/stylesheets/_url-helpers.scss deleted file mode 100644 index fa5ad7af2..000000000 --- a/app/assets/stylesheets/_url-helpers.scss +++ /dev/null @@ -1,12 +0,0 @@ -// Copy of _url-helpers.scss in govuk_frontend_toolkit -// to prepend the path to where we store images - -@function file-url($file) { - $url: ''; - @if $path { - $url: url($path + $file); - } @else { - $url: url($file); - } - @return $url; -} diff --git a/app/assets/stylesheets/app.scss b/app/assets/stylesheets/app.scss deleted file mode 100644 index d571f63d9..000000000 --- a/app/assets/stylesheets/app.scss +++ /dev/null @@ -1,255 +0,0 @@ -// Extra CSS overlaying elements -.form-control-1-1 { - width: 100%; -} - -.form-control-5em { - - width: 100%; - - @include media(tablet) { - width: 5em; - } - -} - -.column-main { - - .heading-large, - > .heading-medium { - margin: govuk-spacing(3) 0 govuk-spacing(4) 0; - word-wrap: break-word; - - &.top-gutter-0 { - margin-top: 0; - } - } - -} - -.highlight { - font-family: monospace; - overflow-x: scroll; - padding: 10px 0 10px 10px; -} - -.inline { - - .block-label { - - @include media(tablet) { - float: none; - display: inline-block; - } - - } - -} - -td { - vertical-align: top; -} - -.heading-xlarge { - margin-bottom: 20px; -} - -.heading-medium { - margin-top: govuk-spacing(6); -} - -.form-label { - margin-bottom: 5px; - - &.heading-small { - @include bold-19(); - } -} - -.hint { - color: $secondary-text-colour; - - .form-label + & { - display: block; - margin-top: -5px; - margin-bottom: 5px; - } -} - -.list-bullet { - - .list-bullet { - list-style: circle; - } - -} - -details summary { - text-decoration: underline; - margin-bottom: govuk-spacing(3); -} - -.spreadsheet { - - margin-bottom: -1 * govuk-spacing(6); - - .table { - margin-bottom: 0; - } - - th, - .table-field-index { - background: $grey-4; - font-weight: bold; - text-align: center; - } - - th, td { - padding-left: 10px; - padding-right: 10px; - border: 1px solid $border-colour; - } - - td { - - border-top: 0; - // 194 is the width of the table * 1/3.5, so the overflow cuts off - // at 3.5 columns wide. - // 11 accounts for the padding of the table cell - min-width: 194px - 11px; - - &:first-child { - min-width: auto; - } - - } - - .fullscreen-fixed-table { - - z-index: 1000; - - .table-field-heading-first { - background: $grey-4; - } - - } - -} - -.body-copy-table { - - table { - - th, - td { - @include core-19; - word-wrap: break-word; - } - - thead { - th { - @include bold-19; - } - } - - } - -} - -.tabular-numbers { - @include core-19($tabular-numbers: true); -} - -summary::-moz-details-marker { - display: none; -} -summary::-ms-details-marker { - display: none; -} -summary::-o-details-marker { - display: none; -} - -summary::details-marker { - display: none; -} - -summary::-webkit-details-marker { - display: none; -} - -details .arrow { - font-size: 16px; -} - -.block-label-hint { - @include core-16; - margin-top: 5px; -} - -.multiple-choice input:disabled+label { - opacity: 1; - color: $secondary-text-colour; - cursor: default; -} - -.heading-inline { - display: inline-block; -} - -.bordered-text-box { - padding: 5px; - outline: 2px solid $black; - max-width: 100%; -} - -.nowrap { - white-space: nowrap; -} - -.heading-upcoming-jobs { - margin-top: govuk-spacing(3); -} - -@keyframes live-pulse { - 0% { - background: $red; - box-shadow: inset 0 0 0 2px $red, inset 0 0 0 4px $white; - } - 40% { - background: $red; - box-shadow: inset 0 0 0 2px $red, inset 0 0 0 4px $white; - } - 50% { - background: $white; - box-shadow: inset 0 0 0 2px $red, inset 0 0 0 2px $white; - } - 100% { - background: $white; - box-shadow: inset 0 0 0 2px $red, inset 0 0 0 4px $white; - } -} - -input:-webkit-autofill::first-line { - @include core-19; -} - -.pilot-disabled { - a { - background-color: gray; - border-color: gray; - - span { - color: lightgray; - } - } - .big-number-status { - background-color: gray; - border-color: gray; - color: lightgray; - } - - & > * { - color: gray; - } -} diff --git a/app/assets/stylesheets/components/area-list.scss b/app/assets/stylesheets/components/area-list.scss deleted file mode 100644 index 86b7c068b..000000000 --- a/app/assets/stylesheets/components/area-list.scss +++ /dev/null @@ -1,189 +0,0 @@ -.area-list { - - display: inline; - - &-item { - - display: inline-block; - border: 2px solid $black; - // Create space for the remove link on the right of the list item (including borders) - padding: (govuk-spacing(1) + 1px) (govuk-spacing(2) + 37px) govuk-spacing(1) govuk-spacing(2); - margin: 0 govuk-spacing(1) govuk-spacing(2) 0; - position: relative; - - &-remove { - - display: block; // fallback for browsers that don't support flexbox - display: flex; - // center SVG vertically and horizontally - align-items: center; - justify-content: center; - position: absolute; - top: -2px; // cover list-item border-top - right: -2px; // cover list-item border-right - bottom: -2px; // cover list-item border-bottom - width: 37px; - padding: 0; - border: 2px solid $govuk-blue; - border-left: none; - text-align: center; - font-size: inherit; // counter govuk-button styles - line-height: 36px; // match area-list-item for browsers that don't support flexbox - - // set styles so they don't get overriden by govuk-button styles - &, - &:hover { - background: $govuk-blue; - } - - &:hover { - color: $light-blue-25; - } - - // set styles so they don't get overriden by govuk-button styles - &:active { - top: -2px; - } - - // The box-shadow that separates the remove link from the list item is hidden in - // high contrast mode. Remake using a border instead - // Also sets text colour to match govuk-button - @media (-ms-high-contrast: active), (forced-colors: active) { - - &:link, - &:active, - &:hover, - &:focus:not(:active):not(:hover) { - border-left: 2px solid $govuk-blue; - color: LinkText; - } - - } - - // set styles so they don't get overriden by govuk-button styles - &, - &:focus, - &:focus:not(:active):not(:hover) { - box-shadow: -2px 0 0 0 $black, inset 1px 0 0 0 rgba($white, 0.1); - } - - // set styles so they don't get overriden by govuk-button styles - &:focus, - &:focus:not(:active):not(:hover) { - border-color: $black; - } - - &:focus:hover { - background-color: $govuk-focus-colour; - color: $black; - } - - // show outline to make focus visible when background colours are overridden - @media (-ms-high-contrast: active), (forced-colors: active) { - - // set styles so they don't get overriden by govuk-button styles - &:focus:not(:active):not(:hover) { - outline: 3px solid transparent; - } - - // override hover styles when focused, to preserve dimensions and outline - &:focus:hover { - top: -2px; - right: -2px; - bottom: -2px; - width: 37px; - } - - } - } - - &:last-child { - margin-right: govuk-spacing(1) * 1.5; - } - - &--unremoveable { - padding-right: govuk-spacing(2); - background: $light-blue-25; - color: mix($black, $govuk-blue, 66%); - border-color: $light-blue-25; - margin: 0 govuk-spacing(1) govuk-spacing(2) 0; - font-weight: bold; - } - - &--smaller { - @include bold-16; - } - - } - - .govuk-button--secondary { - margin-left: 3px; - } - -} - -#area-list-map { - z-index: 50; - margin-bottom: govuk-spacing(4); -} - -.area-list-key { - - display: inline-block; - position: relative; - margin-right: govuk-spacing(3); - margin-bottom: govuk-spacing(4); - height: govuk-spacing(7); - padding-left: govuk-spacing(8); - line-height: govuk-spacing(7); - - &__icon { - position: absolute; - left: -5px; - top: -7px; - } - - &--certain { - &:before { - border: 2px solid $black; - background: $light-blue-50; - } - } - - &--likely { - &:before { - padding: 1px; - border: 2px dashed $govuk-blue; - border-image: file-url('dashed-border-govuk-blue.svg') 4 round; - background: $light-blue-25; - } - } - - &--phone-estimate { - padding-left: govuk-spacing(1); - margin-right: 0; - float: right; - &:before { - display: none; - } - } - -} - -.area-list-map-details { - - .govuk-details__summary { - display: block; - padding-top: govuk-spacing(1); - padding-bottom: govuk-spacing(1); - margin-top: 1px; - } - - .govuk-details__text { - padding: 0; - border: none; - border-bottom: 1px solid $border-colour; - margin-top: -1px; - } - -} diff --git a/app/assets/stylesheets/components/banner.scss b/app/assets/stylesheets/components/banner.scss deleted file mode 100644 index dc6da888a..000000000 --- a/app/assets/stylesheets/components/banner.scss +++ /dev/null @@ -1,217 +0,0 @@ -%banner, -.banner, -.banner-default { - - @include bold-19; - color: $button-colour; - display: block; - padding: govuk-spacing(3); - margin: govuk-spacing(3) 0 govuk-spacing(6) 0; - text-align: left; - position: relative; - clear: both; - border: 5px solid $button-colour; - - &-title { - @include bold-24; - } - - p { - margin: 10px 0 5px 0; - } - - .list-bullet { - @include copy-19; - } - - .page-footer { - margin-bottom: govuk-spacing(1); - } - -} - -%banner-with-tick, -.banner-with-tick { - padding: govuk-spacing(3) (govuk-spacing(6) + govuk-spacing(3)); - background-image: file-url('tick.png'); - background-size: 19px; - background-repeat: no-repeat; - background-position: govuk-spacing(3) govuk-spacing(3); - -} - -.banner-default-with-tick { - @extend %banner; - @extend %banner-with-tick; -} - -.banner-dangerous { - - @extend %banner; - @include bold-19; - background: $white; - color: $text-colour; - border: 5px solid $error-colour; - margin: 15px 0; - text-align: left; - - &:focus { - outline: 3px solid $govuk-focus-colour; - } - - .list { - margin-bottom: 0; - } - -} - -.banner-tour { - - @extend %banner; - background: $govuk-blue; - color: $white; - margin-top: 10px; - margin-bottom: 0; - padding: govuk-spacing(6); - height: 425px; - overflow: hidden; - box-shadow: inset 0 -1em 1.6em 0 rgba(0, 0, 0, 0.05); - border: 0; - - &-no-fixed-height { - height: auto; - padding-top: govuk-spacing(8); - min-height: 425px; - } - - &-with-service-name { - margin-top: -10px; - padding-top: 0; - box-shadow: 0 -1px 0 0 darken($govuk-blue, 10%); - } - - .heading-medium { - @include core-24; - } - - p { - - margin-top: 0; - margin-bottom: govuk-spacing(6); - color: $white; - - &:last-child { - margin-bottom: 0; - } - - & + p { - margin-top: -1 * govuk-spacing(3); - } - - } - - ul { - @include core-24; - color: $white; - margin-bottom: govuk-spacing(5); - } - - li { - margin-bottom: govuk-spacing(3); - list-style-type: disc; - margin-left: govuk-spacing(6); - } - - a { - - font-weight: bold; - display: block; - padding: 0 ; - margin: 0 0 govuk-spacing(6) 0; - - &:link, - &:visited { - color: $white; - } - - &:hover { - color: $white; - background-color: $link-hover-colour; - box-shadow: 0 0 0 10px $link-hover-colour; - } - - &:focus, - &:active { - color: $govuk-focus-text-colour; - background-color: $govuk-focus-colour; - box-shadow: 0 0 0 10px $govuk-focus-colour, 0 4px 0 10px $govuk-focus-text-colour; - } - - } - img { - width: 100%; - height: auto; - position: relative; - top: -1 * govuk-spacing(2); - } - - .greyed-out-step { - opacity: 0.6; - } - -} - -.banner-dashboard { - - $baseline-shift: 5px; - - display: block; // for browsers that don't support flexbox - display: flex; - align-items: baseline; - flex-wrap: wrap; - padding: (govuk-spacing(3) - 1px) 0 (govuk-spacing(3) + 1px) 0; - border-top: 1px solid $border-colour; - border-bottom: 1px solid $border-colour; - margin-bottom: govuk-spacing(6); - text-decoration: none; - - &:focus { - border-top: 1px solid transparent; - border-bottom: 1px solid transparent; - } - - &-count, - &-meta { - float: left; // for browsers that don't support flexbox - } - - &-count { - @include govuk-font(36, $weight: bold, $tabular: true); - padding-right: 8px; - position: relative; - // remove the top of the extra line-height this introduces - top: $baseline-shift; - margin-top: -$baseline-shift; - flex: 0 1 0.85ch; - } - - &-count-label { - @include govuk-font(24, $weight: bold); - text-decoration: underline; - padding-right: govuk-spacing(6); - margin: 10px 0px 5px; // 10px includes 5px extra to counter the -5px margin-top on the count item - flex: 2 1 auto; - } - - &-meta { - @include govuk-font(19); - float: right; - text-align: right; - flex: initial; - } - - & + .banner-dashboard { - margin-top: -1 * govuk-spacing(6); - border-top: none; - } -} diff --git a/app/assets/stylesheets/components/big-number.scss b/app/assets/stylesheets/components/big-number.scss deleted file mode 100644 index aeb78df42..000000000 --- a/app/assets/stylesheets/components/big-number.scss +++ /dev/null @@ -1,195 +0,0 @@ -%big-number, -.big-number { - - display: block; - - &-number, - &-label { - display: block; - } - - &-number { - @include bold-48($tabular-numbers: true); - } - - &-label { - @include core-19; - padding-bottom: 10px; - } - -} - -.pill .big-number-number { - - // reduce padding until screen is bigger than 420px / zoomed below 300% - padding-left: govuk-spacing(1); - - @include govuk-media-query($from: 420px) { - padding-left: govuk-spacing(2); - } - -} - -.big-number-dark { - @extend %big-number; - padding: govuk-spacing(3); - position: relative; - background: $black; - color: $white; - - .big-number-number { - @include bold-36($tabular-numbers: true); - } -} - -.big-number-smaller { - - @extend %big-number; - - .big-number-number { - @include bold-36($tabular-numbers: true); - } - -} - -.big-number-smallest { - - @extend %big-number; - - .big-number-number { - @include bold-24($tabular-numbers: true); - } - -} - -.big-number-with-status { - - @extend %big-number; - position: relative; - margin-bottom: govuk-spacing(4); - - .big-number, - .big-number-smaller { - padding: govuk-spacing(3); - position: relative; - background: $black; - color: $white; - } - - .big-number-label { - - padding-bottom: 0; - - &:link, - &:visited { - color: $link-colour; - } - - } - - .big-number-link { - - text-decoration: none; - background: $link-colour; - color: $white; - display: block; - border: 2px solid $link-colour; - margin-bottom: 5px; - - &:hover { - - color: $light-blue-25; - - .big-number, - .big-number-number, - .big-number-smaller, - .big-number-label { - color: $light-blue-25; - } - - } - - &:active, - &:focus { - background: $govuk-focus-colour; - border: none; - padding: 2px; /* replace the spacing the border gave */ - /* override the default focus style to inset the underline */ - box-shadow: inset 0 -4px $govuk-focus-text-colour; - - .big-number-number, - .big-number-smaller, - .big-number-label { - color: $govuk-focus-text-colour; - text-decoration: none; - } - } - - .big-number, - .big-number-smaller { - background: transparent; - } - - .big-number-label { - text-decoration: underline; - } - - } - - %big-number-status, - .big-number-status { - - @include core-19; - display: block; - background: $green; - color: $white; - padding: 15px; - - a { - - &:link, - &:visited, - &:active, - &:hover { - color: $white; - text-decoration: underline; - } - - &:active, - &:focus { - color: $black; - } - - } - - } - - .big-number-status-failing { - @extend %big-number-status; - background: $error-colour; - } - -} - -.big-number-meta-wrapper { - - position: relative; - margin: govuk-spacing(3) 0 govuk-spacing(6) 0; - background: $govuk-blue; - - .big-number-meta { - - padding: govuk-spacing(2) govuk-spacing(3); - color: $white; - pointer-events: none; - - @include media(desktop) { - position: absolute; - bottom: 7px; - right: 5px; - text-align: right; - } - - } - -} diff --git a/app/assets/stylesheets/components/browse-list.scss b/app/assets/stylesheets/components/browse-list.scss deleted file mode 100644 index 9b1647110..000000000 --- a/app/assets/stylesheets/components/browse-list.scss +++ /dev/null @@ -1,28 +0,0 @@ -.browse-list { - margin-bottom: govuk-spacing(3); - - .browse-sub-list { - margin-top: govuk-spacing(3); - margin-left: govuk-spacing(6); - @include media('desktop') { - margin-left: govuk-spacing(9); - } - } - - &-item, - &-sub-item { - @include bold-24; - list-style: none; - margin-bottom: govuk-spacing(3); - } - - &-link { - @include govuk-font(24, $weight: bold); - } - - &-hint { - @include core-19; - margin: 5px 0 10px 0; - color: $secondary-text-colour; - } -} diff --git a/app/assets/stylesheets/components/checkboxes.scss b/app/assets/stylesheets/components/checkboxes.scss deleted file mode 100644 index 094c37d7a..000000000 --- a/app/assets/stylesheets/components/checkboxes.scss +++ /dev/null @@ -1,120 +0,0 @@ -// Taken from https://github.com/alphagov/govuk-frontend/blob/v2.13.0/src/components/checkboxes/_checkboxes.scss -$govuk-touch-target-size: 44px; -$govuk-checkboxes-size: 40px; - -.selection-summary { - - .selection-summary__text { - @include core-19($tabular-numbers: true); - padding: 5px 0 0 0; - margin-bottom: govuk-spacing(3); - - &:focus { - outline: none; - } - } - - .selection-summary__text--folders { - padding: 10px 15px 5px 51px; - background-image: file-url('folder-black.svg'); - background-repeat: no-repeat; - background-size: 39px auto; - background-position: 0px 4px; - } - -} - -.checkboxes-nested { - - margin-bottom: 10px; - - .multiple-choice { - - $circle-diameter: 39px; - $border-thickness: 4px; - $border-indent: ($circle-diameter / 2) - ($border-thickness / 2); - $border-colour: $border-colour; - - float: none; - position: relative; - - &:before { - content: ""; - position: absolute; - bottom: 0; - left: $border-indent; - width: $border-thickness; - height: 100%; - background: $border-colour; - } - - label { - float: none; - } - - [type=checkbox]+label::before { - // To overlap the grey inset line - background: $white; - } - - ul { - // To equalise the spacing between the line and the top/bottom of - // the radio - margin-top: 5px; - margin-bottom: -5px; - padding-left: 12px; - } - - } - -} - -.govuk-form-group--nested { - - $border-thickness: $govuk-touch-target-size - $govuk-checkboxes-size; - $border-indent: $govuk-touch-target-size / 2; - - position: relative; - - // To equalise the spacing between the line and the top/bottom of - // the radio - margin-top: govuk-spacing(1) + ($border-thickness / 2); - margin-bottom: govuk-spacing(1) * -1; - padding-left: govuk-spacing(2) + 2; - - &:before { - content: ""; - position: absolute; - bottom: 0; - left: $border-indent * -1; - width: $border-thickness; - height: 100%; - background: $govuk-border-colour; - } -} - -.selection-content { - margin-bottom: govuk-spacing(4); - - .checkboxes-nested { - margin-bottom: 0; - } -} - -.selection-footer { - clear: both; -} - -.selection-footer__button { - // revert full-width button for smaller screens - display: inline-block; - width: auto; -} - -// styles specific to the collapsible checkboxes module -.selection-wrapper { - fieldset:focus { - outline: none; - } - -} diff --git a/app/assets/stylesheets/components/conditional-radios.scss b/app/assets/stylesheets/components/conditional-radios.scss deleted file mode 100644 index 204841740..000000000 --- a/app/assets/stylesheets/components/conditional-radios.scss +++ /dev/null @@ -1,27 +0,0 @@ -$border-thickness: 4px; -$top-spacing: govuk-spacing(5); - -.multiple-choice { - - z-index: 10; - - .block-label { - &:before { - box-shadow: 0 5px 0 0 $white; - } - } - -} - -.conditional-radios { - - &-panel { - border-left: $border-thickness solid $border-colour; - margin: 0 0 (-1 * govuk-spacing(3)) (govuk-spacing(3) + ($border-thickness / 2)); - padding: govuk-spacing(3) 0 0 (govuk-spacing(6) - ($border-thickness / 2)); - position: relative; - top: -$top-spacing; - z-index: 1; - } - -} diff --git a/app/assets/stylesheets/components/content-metadata.scss b/app/assets/stylesheets/components/content-metadata.scss deleted file mode 100644 index 034bb2534..000000000 --- a/app/assets/stylesheets/components/content-metadata.scss +++ /dev/null @@ -1,43 +0,0 @@ -.content-metadata { - @include govuk-font(16); - @include govuk-clearfix; - @include govuk-responsive-margin(5, "bottom"); - color: $govuk-text-colour; - margin-top: 15px; - - .content-metadata__term, - .content-metadata__definition { - line-height: 1.4; - } - - .content-metadata__term { - margin-top: .5em; - - @include govuk-media-query($from: tablet) { - box-sizing: border-box; - float: left; - clear: left; - padding-right: govuk-spacing(1); - margin-top: 0; - } - } - - .content-metadata__definition { - margin: 0; - - @include govuk-media-query($from: tablet) { - &:not(:last-of-type) { - margin-bottom: govuk-spacing(1); - } - } - } - - .content-metadata__suffix { - margin-top: 0.628em; - margin-bottom: 0; - - @include govuk-media-query($from: tablet) { - margin-top: 6px; - } - } -} diff --git a/app/assets/stylesheets/components/copy-to-clipboard.scss b/app/assets/stylesheets/components/copy-to-clipboard.scss deleted file mode 100644 index bcc5e53ce..000000000 --- a/app/assets/stylesheets/components/copy-to-clipboard.scss +++ /dev/null @@ -1,33 +0,0 @@ -.copy-to-clipboard { - - position: relative; - padding-bottom: 38px; // height of button - display: flex; - - &__name { - @include bold-19; - margin-bottom: 5px; - } - - &__notice, - &__value { - font-family: monospace; - display: block; - padding: 0 0 10px 0; - margin: auto 0; - } - - &__button--show, - &__button--copy { - - position: absolute; - bottom: 2px; - left: 0px; - - &:active { - top: auto; - } - - } - -} diff --git a/app/assets/stylesheets/components/email-message.scss b/app/assets/stylesheets/components/email-message.scss deleted file mode 100644 index 8147ed3db..000000000 --- a/app/assets/stylesheets/components/email-message.scss +++ /dev/null @@ -1,75 +0,0 @@ -$white-50-opaque: rgba($white, 0.5); -$button-bottom-border-colour: rgba(0, 0, 0, 0.17); -$email-message-gutter: govuk-spacing(9); - -// sass-lint:disable no-important - -.email-message { - - margin-bottom: govuk-spacing(6); - border: 1px solid $border-colour; - - &-meta { - - @include core-19; - margin: 0; - - td, - th { - @include core-19; - border-top: 0; - border-bottom: 1px solid $border-colour; - vertical-align: top; - } - - th { - color: $secondary-text-colour; - padding-left: $email-message-gutter; - } - - td { - - width: 99%; - padding-right: $email-message-gutter; - word-break: break-word; - - &:last-child { - padding-right: $email-message-gutter; - } - - } - - } - - &-from { - padding-top: 15px; - } - - &-body { - - width: 100%; - box-sizing: border-box; - padding: govuk-spacing(3) $email-message-gutter 0 $email-message-gutter; - margin: 0 0 0 0; - clear: both; - position: relative; - word-wrap: break-word; - - table { - margin: 0 0 20px 0; - - td { - border: 0; - padding: 0; - font-family: inherit !important; - } - - li:first-child { - margin-top: 0 !important; - } - - } - - } - -} diff --git a/app/assets/stylesheets/components/file-upload.scss b/app/assets/stylesheets/components/file-upload.scss deleted file mode 100644 index fd3a580ea..000000000 --- a/app/assets/stylesheets/components/file-upload.scss +++ /dev/null @@ -1,46 +0,0 @@ -.js-enabled { - .file-upload { - &-label { - @include bold-19; - display: block; - margin: 0 0 10px 0; - - .error-message { - padding: 0; - } - } - - &-field { - width: 0.1px; - height: 0.1px; - opacity: 0; - overflow: hidden; - position: absolute; - z-index: -1; - - // &:focus + .file-upload-button { - // background: $govuk-focus-colour; - // color: $govuk-focus-text-colour; - // } - } - - &-filename { - @include bold-19; - display: inline-block; - padding-left: govuk-spacing(3); - } - - &-submit { - display: none; - } - - &-alternate-link { - display: inline-block; - line-height: 35px; - - a { - font-weight: bold; - } - } - } -} diff --git a/app/assets/stylesheets/components/fullscreen-table.scss b/app/assets/stylesheets/components/fullscreen-table.scss deleted file mode 100644 index baffb30f2..000000000 --- a/app/assets/stylesheets/components/fullscreen-table.scss +++ /dev/null @@ -1,155 +0,0 @@ -.fullscreen { - - &-content { - - background: $white; - z-index: 10; - overflow-y: hidden; - box-sizing: border-box; - margin: 0 0 govuk-spacing(6) 0; - padding: 0 0 0 0; - overflow: hidden; - border-bottom: 1px solid $border-colour; - - .table { - - margin-bottom: 0; - - tr:last-child { - td { - border-bottom: 1px solid $white; - } - } - - } - - th, - .table-field-error-label, - .table-field-left-aligned { - white-space: nowrap; - } - - } - - &-right-shadow { - - position: absolute; - top: 0; - right: 0; - width: 4px; - height: 100%; - z-index: 200; - - &.visible { - - &.with-transition { - transition: box-shadow 0.6s ease-out; - } - - box-shadow: inset -1px 0 0 0 $border-colour, inset -3px 0 0 0 rgba($border-colour, 0.2); - - } - - } - - &-scrollable-table { - - overflow-x: auto; - overflow-y: hidden; - - .table-field-heading-first, - .table-field-index { - display: none; - } - - .table-field-left-aligned { - position: relative; - z-index: 150; - background: $white; - } - - &::-webkit-scrollbar { - -webkit-appearance: none; - } - - &::-webkit-scrollbar:horizontal { - height: 11px; - background-color: $white; - } - - &::-webkit-scrollbar-thumb { - border-radius: 8px; - border: 2px solid $white; - background-color: rgba(0, 0, 0, .5); - } - - &::-webkit-scrollbar-track { - background-color: $white; - border-radius: 8px; - } - - } - - &-fixed-table { - - position: absolute; - top: 0; - overflow: hidden; - - .table-field-heading { - visibility: hidden; - } - - .table-field-left-aligned { - width: 0; - position: relative; - z-index: 100; - visibility: hidden; - } - - .table-field-heading-first, - .table-field-index { - transition: none; - position: relative; - z-index: 200; - background: $white; - } - - } - - &-scrolled-table { - - padding-bottom: 20px; - - .table-field-heading-first, - .table-field-index { - transition: box-shadow 0.3s ease-in-out; - box-shadow: 1px 0 0 0 $border-colour, 3px 0 0 0 rgba($border-colour, 0.2); - } - - } - - &-shim { - - width: 100%; - position: relative; - z-index: 9; - margin-bottom: 30px; - pointer-events: none; - - & + .table-show-more-link { - margin-top: -28px; - } - - } - -} - -.js-focus-style { - outline: 3px solid $govuk-focus-text-colour; - box-shadow: 0 0 0 7px $govuk-focus-colour; - - *:focus { - outline: none; - } -} diff --git a/app/assets/stylesheets/components/list-entry.scss b/app/assets/stylesheets/components/list-entry.scss deleted file mode 100644 index c37729f1e..000000000 --- a/app/assets/stylesheets/components/list-entry.scss +++ /dev/null @@ -1,39 +0,0 @@ -.input-list { - - .list-entry { - vertical-align: middle; - margin-bottom: 15px; - position: relative; - - // move the left border, signifying the error, out of the main column - .govuk-form-group--error { - margin-left: ($govuk-border-width + $govuk-gutter-half) * -1; - } - } - - &__button--remove, - &__button--add { - width: auto; - } - - &__button--remove { - display: block; - margin-bottom: 15px; - margin-top: 5px; - position: static; - overflow: hidden; - - @include media(tablet) { - @include inline-block; - margin: 0 0 0 10px; - position: absolute; - top: 0; - left: 100%; - } - } - - &__button--add { - margin: 0 0 20px 0; - } - -} diff --git a/app/assets/stylesheets/components/live-search.scss b/app/assets/stylesheets/components/live-search.scss deleted file mode 100644 index d1fd91b60..000000000 --- a/app/assets/stylesheets/components/live-search.scss +++ /dev/null @@ -1,20 +0,0 @@ -input[type=search] { - // overrides this nasty global from GOV.UK template - -moz-box-sizing: border-box; - -webkit-box-sizing: border-box; - box-sizing: border-box; -} - -.live-search { - - display: none; - - .js-enabled & { - display: block; - } - - .form-group { - margin-bottom: govuk-spacing(4); - } - -} diff --git a/app/assets/stylesheets/components/loading-indicator.scss b/app/assets/stylesheets/components/loading-indicator.scss deleted file mode 100644 index 7a80ef6a2..000000000 --- a/app/assets/stylesheets/components/loading-indicator.scss +++ /dev/null @@ -1,16 +0,0 @@ -@keyframes ellipsis { - to { - width: 1.25em; - } -} - -.loading-indicator { - &:after { - overflow: hidden; - display: inline-block; - vertical-align: bottom; - animation: ellipsis steps(4,end) 1.5s infinite; - content: "\2026"; // ellipsis - width: 0; - } -} diff --git a/app/assets/stylesheets/components/message.scss b/app/assets/stylesheets/components/message.scss deleted file mode 100644 index 11b309e4a..000000000 --- a/app/assets/stylesheets/components/message.scss +++ /dev/null @@ -1,314 +0,0 @@ -$app-body-text-line-height-default: get-govuk-typography-style($size: 19, $breakpoint: null, $property: "line-height"); -$app-body-text-line-height-tablet: get-govuk-typography-style($size: 19, $breakpoint: tablet, $property: "line-height"); - -@mixin separator { - display: inline-block; - vertical-align: top; - width: 20px; - height: govuk-spacing(6); - position: relative; - - &:before { - content: ""; - display: block; - position: absolute; - top: -5px; - bottom: 1px; - right: 7px; - width: 9px; - height: 9px; - margin: auto 0; - -webkit-transform: rotate(45deg); - -ms-transform: rotate(45deg); - transform: rotate(45deg); - border: solid; - border-width: 2px 2px 0 0; - border-color: $secondary-text-colour; - } -} - -$govuk-checkboxes-size: 40px; -$govuk-checkboxes-label-padding-left-right: govuk-spacing(3); -$message-type-bottom-spacing: govuk-spacing(4); - -a { - - &:hover .message-name-separator:before { - border-color: $link-hover-colour; - } - - .message-name-separator { - - margin-right: -2px; - margin-left: -2px; - - &:before { - border-color: $link-colour; - } - } - -} - -.message-name-separator { - @include separator; -} - -.template-list { - - &-item { - - &-with-checkbox { - padding-left: $govuk-checkboxes-size + $govuk-checkboxes-label-padding-left-right; - } - - &-hidden-by-default { - display: none; - } - - &-without-ancestors { - - a { - - display: block; - - &:first-child { - display: block; - } - - &.template-list-folder:first-of-type { - background-position: 0 2px; - padding-left: 0; - text-indent: 35px; - - @include govuk-media-query($from: tablet) { - text-indent: 40px; - } - - } - - } - - .template-list-template, - .template-list-folder { - - position: relative; /* contain absolutely positioned ::before pseudo element*/ - display: block; /* fill horizontal space to allow hint/meta below to float */ - - &::before { - content: ''; - position: absolute; - left: 0px; - bottom: -1 * $app-body-text-line-height-default; /* extend link by line height of hint/meta so it covers it */ - width: 100%; - height: $app-body-text-line-height-default; - - @include govuk-media-query($from: tablet) { - bottom: -1 * $app-body-text-line-height-tablet; - height: $app-body-text-line-height-tablet; - } - } - - &:focus, - &:active { - - &, - &::before { - background-color: $govuk-focus-colour; - } - - &, - & + .template-list-item-hint, - .message-type { - color: $govuk-focus-text-colour; - } - - &::before { - box-shadow: 0px -2px $govuk-focus-colour, 0px 4px $govuk-focus-text-colour; - } - - } - - & + .template-list-item-hint, - & + .message-type { - position: relative; /* needs to be non-static to have a z-index above the link :before element */ - } - - } - - } - - &-label { - position: absolute; - left: 0; - width: $govuk-checkboxes-size + $govuk-checkboxes-label-padding-left-right; - height: 100%; - padding: 0; - } - - // Fix for GOVUK Frontend selector with high precendence - // https://github.com/alphagov/govuk-frontend/blob/v2.13.0/src/components/hint/_hint.scss - &-label:not(.govuk-label--m):not(.govuk-label--l):not(.govuk-label--xl)+.template-list-item-hint { - margin-bottom: $message-type-bottom-spacing; - } - - &-hint { - padding-left: 0; - } - - } - - &-folder, - &-template { - @include govuk-font($size: 24, $weight: bold, $line-height: 1.5); - @include govuk-media-query($from: tablet) { - line-height: 1.25; - } - } - - &-folder { - - display: inline; - padding-left: 35px; - background-image: file-url('folder-blue-bold.svg'); - background-repeat: no-repeat; - background-size: auto 20px; - background-position: 0px 4px; - - @include govuk-media-query($from: tablet) { - padding-left: 40px; - } - - &:hover { - background-image: file-url('folder-blue-bold-hover.svg'); - } - - &:focus, - &:active { - background-image: file-url('folder-black-bold.svg'); - } - - } - - &-template { - a { - display: inline; - } - } - - &-empty { - color: $secondary-text-colour; - padding: govuk-spacing(3) 0 govuk-spacing(2) 0; - } - - &-selected-counter { - color: $secondary-text-colour; - margin: govuk-spacing(3) 0; - - @include media(tablet) { - position: absolute; - right: 0; - top: govuk-spacing(6) - 1px; - margin: 0; - } - - .content-fixed__bottom & { - right: govuk-spacing(3); - } - - } - -} - -.sticky-template-form { - - padding: govuk-spacing(3); - margin: govuk-spacing(3) * -1; - - &:focus { - outline: none; - } - -} - -.folder-heading { - - .govuk-grid-row & { - margin: govuk-spacing(3) 0 20px 0; - word-wrap: break-word; - } - - a, - &-folder, - &-subfolder { - - display: inline; - vertical-align: top; - background-repeat: no-repeat; - background-size: auto 20px; - background-position: 0px 4px; - min-height: 30px; - - } - - &-folder { - padding: 0 0 0 40px; - background-image: file-url('folder-black-bold.svg'); - } - - &-folder-truncated { - width: 0; - padding: 0 0 0 30px; - white-space: nowrap; - overflow: hidden; - } - - &-folder-root-truncated { - max-width: 1.4em; - white-space: nowrap; - overflow: hidden; - text-overflow: ellipsis; - } - - a { - - display: inline-block; - vertical-align: top; - - &.folder-heading-folder { - - display: inline; - background-image: file-url('folder-blue-bold.svg'); - background-position: 0px 4px; - overflow: hidden; - text-overflow: ellipsis; - - &:hover { - background-image: file-url('folder-blue-bold-hover.svg'); - } - - } - - &.folder-heading-folder-truncated { - display: inline-block; - background-position: 0px 2px; - } - - &:hover { - color: $link-hover-colour; - } - - } - - &-separator { - @include separator; - } - - &-manage-link { - display: block; - text-align: right; - padding: govuk-spacing(4) 0 0 0; - position: relative; - top: -6px; - } - -} diff --git a/app/assets/stylesheets/components/navigation.scss b/app/assets/stylesheets/components/navigation.scss deleted file mode 100644 index 8db69d98f..000000000 --- a/app/assets/stylesheets/components/navigation.scss +++ /dev/null @@ -1,247 +0,0 @@ -.navigation { - - @include govuk-font($size: 19); - padding: 0 govuk-spacing(6) 0 0; - - $padding-top: 14px; - $padding-bottom: 11px; - - &-service-name, - &-organization-link { - display: inline-block; - overflow: hidden; - // aligning to the baseline with overflow: hidden adds to the parent's height - // aligning to the top doesn't - // see: https://stackoverflow.com/questions/23529369/why-does-x-overflowhidden-cause-extra-space-below#answer-51088033 - vertical-align: top; - white-space: nowrap; - text-overflow: ellipsis; - } - - &-service-type { - - @include bold-16; - position: relative; - display: inline-block; - margin-left: govuk-spacing(2); - padding: 0 govuk-spacing(1); - text-transform: uppercase; - letter-spacing: 0.05em; - - &--training { - background: $grey-3; - color: mix($grey-1, $text-colour); - box-shadow: 0 -3px 0 0 $grey-3; - } - - &--suspended { - background: $grey-3; - color: mix($grey-1, $text-colour); - box-shadow: 0 -3px 0 0 $grey-3; - } - - &--live, - &--test, - &--operator { - // This uses new Design System colours to match .govuk-tag--red - background: #F6D7D2; - color: #942514; - box-shadow: 0 -3px 0 0 #F6D7D2; - } - - &--government { - background: #942514; - color: #F6D7D2; - box-shadow: 0 -3px 0 0 #942514; - } - - } - - &-service-switch, - &-service-back-to, - &-organization-link { - - &:link, - &:visited { - text-decoration: none; - } - - &:hover { - text-decoration: underline; - } - - &:focus { - text-decoration: none; // override the :hover style (the focus style has its own underline) - } - - } - - &-service { - - @include govuk-font($size: 19); - border-bottom: 1px solid $border-colour; - margin: 0 0 10px; - position: relative; - - &-name { - - padding: $padding-top 0 $padding-bottom 0; - max-width: 50%; - - } - - &-switch { - - text-align: right; - position: absolute; - top: 0; - right: 0; - padding: $padding-top 0 $padding-bottom govuk-spacing(3); - - &:focus { - padding: $padding-top 0px $padding-bottom + 1px govuk-spacing(3) + 10; - /* override default focus style to inset bottom underline */ - box-shadow: inset 0 -4px $govuk-focus-text-colour; - } - - } - - &-back-to { - - padding: $padding-top govuk-spacing(3) $padding-bottom 0; - display: inline-block; - - } - - } - - &-organization-link { - - max-width: 25%; - padding: $padding-top 20px $padding-bottom 0; - margin-right: 5px; - box-sizing: border-box; - position: relative; - - &:before { - content: ""; - display: block; - position: absolute; - top: -1px; - bottom: 1px; - right: 2px; - width: 7px; - height: 7px; - margin: auto 0; - -webkit-transform: rotate(45deg); - -ms-transform: rotate(45deg); - transform: rotate(45deg); - border: solid; - border-width: 1px 1px 0 0; - border-color: $secondary-text-colour; - } - - &:focus:before { - border-color: $govuk-focus-text-colour; - } - - // hack to make the focus style fit in the navigation bar - &:focus { - box-shadow: inset 0 -3px $govuk-focus-text-colour, 0 1px $govuk-focus-text-colour; - } - - } - - li { - margin: 0; - list-style-type: none; - } - - a { - - display: block; - padding: 5px 0; - position: relative; - top: 5px; - - &:link, - &:visited { - text-decoration: none; - } - - &:hover { - text-decoration: underline; - } - - &:focus { - // override the :hover style (the focus style has its own underline) - text-decoration: none; - } - - &.selected { - @include bold-19; - position: relative; - // These two lines stop the width of the item jumping so much - // between selected and unselected states - left: -0.5px; - letter-spacing: -0.01em; - } - - } - -} - -// https://github.com/alphagov/product-page-example/blob/master/source/stylesheets/modules/_sub-navigation.scss -.sub-navigation { - @include media(tablet) { - margin-top: govuk-spacing(6) * 1.5; - } - - ol, - ul { - list-style: none; - padding: 0; - margin: 0; - - ol, - ul { - margin-top: govuk-spacing(2); - border-top: 1px $grey-3 solid; - } - } - - &__item { - @include core-16; - - border-bottom: 1px $grey-3 solid; - display: block; - padding: govuk-spacing(2) 0; - - a:link { - text-decoration: none; - } - - a:hover, - a:active { - text-decoration: underline; - } - - ol ol & { - padding-left: govuk-spacing(6); - - &:last-of-type { - border-bottom: none; - padding-bottom: 0; - } - } - } - - &__item--active { - @include bold-16; - - a:link, - a:visited { - color: $text-colour; - } - } -} \ No newline at end of file diff --git a/app/assets/stylesheets/components/page-footer.scss b/app/assets/stylesheets/components/page-footer.scss deleted file mode 100644 index 7d0552d14..000000000 --- a/app/assets/stylesheets/components/page-footer.scss +++ /dev/null @@ -1,67 +0,0 @@ -.page-footer { - - position: relative; - margin-bottom: 30px; - - &-link { - - line-height: 40px; - padding: 1px 0 0 15px; - font-weight: normal; - - } - - &-delete-link-without-button { - padding: 0; - display: inline-block; - } - - &-secondary-link { - display: block; - margin-top: govuk-spacing(6); - } - - &-right-aligned-link { - - position: absolute; - right: 0; - top: 9px; // align baseline with buttons - - &-without-button { - position: absolute; - right: 0; - top: 0; - } - - } - - &__button { - margin-right: 10px; - } - - .js-cancel { - margin: 0; - } - - &__button--centred { - display: block; - margin: 0 auto; - } - -} - -.search-form__button { - @include media(desktop) { - position: relative; - top: 30px; - left: -30px; - width: 100%; - margin-right: -30px; - padding-top: 9px; - box-sizing: content-box; - - &:active { - top: 32px; - } - } -} diff --git a/app/assets/stylesheets/components/pill.scss b/app/assets/stylesheets/components/pill.scss deleted file mode 100644 index 8ef516b31..000000000 --- a/app/assets/stylesheets/components/pill.scss +++ /dev/null @@ -1,151 +0,0 @@ -.pill { - - display: flex; - - &-item__container { - width: 25%; - flex-grow: 1; - text-align: left; - - /* - For browsers that don’t support flexbox, use float instead. - Float does not create floating of flex item, and do not take it - out-of-flow. So this is ignored by browsers that support flexbox. - See: https://www.w3.org/TR/css-flexbox-1/#flex-containers - */ - float: left; - /* - Setting this as a flex container means the contents (1 item) - will fill the vertical space due to `align-items` defaulting - to `stretch`. - See: https://css-tricks.com/snippets/css/a-guide-to-flexbox/#prop-align-items - */ - display: flex; - } - - &-item, - &-item--selected { - display: flex; // float causes display: block in browsers without flexbox - flex-direction: column; - justify-content: center; - float: left; - box-sizing: border-box; - width: 100%; - padding: 10px 0; - } - - &-item { - $background: $link-colour; - background: $background; - color: $white; - border: 2px solid $background; - position: relative; - text-decoration: none; - cursor: pointer; - - &:link, - &:visited { - color: $white; - } - - &:hover { - color: $light-blue-25; - } - - &:active, - &:focus { - z-index: 10; - color: $govuk-focus-text-colour; - /* override default focus styles to inset bottom underline */ - box-shadow: inset 0 -4px $govuk-focus-text-colour; - border: none; - padding: 12px 2px; /* compensate for lack of border with padding */ - } - } - - &-item--selected { - background: inherit; - border: 2px solid $black; - outline: 1px solid rgba($white, 0.1); - position: relative; - z-index: 10; - - &:link, - &:visited { - color: $govuk-text-colour; - } - - &:hover { - color: govuk-tint($govuk-text-colour, 25%); - } - - &:active, - &:focus { - z-index: 1000; - color: $govuk-focus-text-colour; - border: solid 2px $black; - padding: 10px 0px; /* reset padding to default */ - box-shadow: inset 0 -2px $govuk-focus-text-colour; /* remove bottom border from underline */ - } - - } - - &-item__label { - - text-decoration: underline; - // reduce padding until screen is above 420px / zoomed below 300% - padding-left: govuk-spacing(1); - - @include govuk-media-query($from: 420px) { - padding-left: govuk-spacing(2); - } - - } - - &-item, - &-item--selected { - &:focus .pill-item__label { - text-decoration: none; - } - } - - &-item--centered { - text-align: center; - padding-left: 0; - } - -} - -.pill-separate { - - &-item { - - display: block; - text-align: left; - padding: 9px (govuk-spacing(3) - 1); - border: 1px solid transparent; - text-align: center; - - &:link, - &:visited { - background: $link-colour; - color: $white; - text-decoration: underline; - } - - &:hover { - color: $light-blue-25; - } - - &:focus, - &:link:focus { - color: $govuk-focus-text-colour; - text-decoration: none; - background: $govuk-focus-colour; - /* override default focus style to inset bottom underline */ - box-shadow: inset 0 -4px $govuk-focus-text-colour; - } - - } - -} diff --git a/app/assets/stylesheets/components/placeholder.scss b/app/assets/stylesheets/components/placeholder.scss deleted file mode 100644 index 00724e557..000000000 --- a/app/assets/stylesheets/components/placeholder.scss +++ /dev/null @@ -1,59 +0,0 @@ -%placeholder, -.placeholder { - - display: inline; - background: $govuk-focus-colour; - color: $text-colour; - overflow-wrap: break-word; - word-wrap: break-word; - border-radius: 20px; - box-shadow: inset 0.47em 0 0 0 $white, inset -0.47em 0 0 0 $white, inset 0 -0.15em 0 0 $white, inset 0 0.15em 0 0 $white; - - .sms-message-wrapper & { - box-shadow: inset 0.47em 0 0 0 $panel-colour, inset -0.47em 0 0 0 $panel-colour, inset 0 -0.18em 0 0 $panel-colour, inset 0 0.18em 0 0 $panel-colour; - } - -} - -.placeholder-no-brackets { - @extend %placeholder; - padding-left: 3px; - padding-right: 3px; - border-radius: 1px; - box-shadow: inset 0 -0.1em 0 0 $white, inset 0 0.1em 0 0 $white; -} - -.placeholder-conditional { - - @extend %placeholder; - border-radius: 0; - border-top-left-radius: 20px; - border-bottom-left-radius: 20px; - border-top-right-radius: 8px; - border-bottom-right-radius: 8px; - box-shadow: inset 0.47em 0 0 0 $white, inset -0.89em 0 0 0 $white, inset 0 -0.16em 0 0 $white, inset 0 0.16em 0 0 $white; - - .sms-message-wrapper & { - box-shadow: inset 0.47em 0 0 0 $panel-colour, inset -0.89em 0 0 0 $panel-colour, inset 0 -0.18em 0 0 $panel-colour, inset 0 0.18em 0 0 $panel-colour; - } - -} - -.placeholder-redacted { - - background: currentColor; - padding: 0 0.5em; - opacity: 0.8; - box-shadow: inset 0 -0.35em 0 0 $white; - position: relative; - top: 0.1em; - - .sms-message-wrapper & { - box-shadow: inset 0 -0.35em 0 0 $panel-colour; - } - - *:focus + p & { - box-shadow: inset 0 -0.35em 0 0 $govuk-focus-colour; - } - -} diff --git a/app/assets/stylesheets/components/preview-pane.scss b/app/assets/stylesheets/components/preview-pane.scss deleted file mode 100644 index 9b2c8618f..000000000 --- a/app/assets/stylesheets/components/preview-pane.scss +++ /dev/null @@ -1,18 +0,0 @@ -.branding-preview { - width: 100%; - box-sizing: border-box; - border: solid 1px $border-colour; - min-height: 200px; - margin-bottom: govuk-spacing(6) -} - -#logo-img { - background-color: $grey-4; - background-image: linear-gradient(45deg, $grey-3 25%, transparent 25%), linear-gradient(-45deg, $grey-3 25%, transparent 25%), linear-gradient(45deg, transparent 75%, $grey-3 75%), linear-gradient(-45deg, transparent 75%, $grey-3 75%); - background-size: 20px 20px; - background-position: 0 0, 0 10px, 10px -10px, -10px 0px; - - img { - display: block; - } -} diff --git a/app/assets/stylesheets/components/radios.scss b/app/assets/stylesheets/components/radios.scss deleted file mode 100644 index 9afa37b97..000000000 --- a/app/assets/stylesheets/components/radios.scss +++ /dev/null @@ -1,169 +0,0 @@ -.radio-select { - - min-height: 39px; - - &__column { - - display: inline-block; - vertical-align: top; - - .multiple-choice { - padding-right: 10px; - padding-left: 54px - 10px; - } - - } - - &__button--category { - - margin-right: govuk-spacing(3); - width: auto; - - } - - &__button--done { - - display: block; - clear: both; - margin: 0 0 govuk-spacing(6) 0; - position: relative; - top: govuk-spacing(3); - - &:active { - top: govuk-spacing(3) + 2px; - } - - } - - .js-enabled & { - - overflow: visible; - - .multiple-choice { - display: none; - } - - .js-multiple-choice { - display: block; - } - - } - -} - -.radios-nested { - - margin-bottom: 10px; - - .multiple-choice { - - $circle-diameter: 39px; - $border-thickness: 4px; - $border-indent: ($circle-diameter / 2) - ($border-thickness / 2); - $border-colour: $border-colour; - - float: none; - position: relative; - - &:before { - content: ""; - position: absolute; - bottom: 0; - left: $border-indent; - width: $border-thickness; - height: 100%; - background: $border-colour; - } - - label { - float: none; - } - - [type=radio]+label::before { - // To overlap the grey inset line - background: $white; - } - - ul { - // To equalise the spacing between the line and the top/bottom of - // the radio - margin-top: 5px; - margin-bottom: -5px; - padding-left: 12px; - } - - .block-label-hint { - &:after { - // Adds an little extra segment of line alongside the ‘current folder’ - // hint so that it extends all the way down to the next radio - content: ""; - position: absolute; - top: $circle-diameter + 5px; - left: $border-indent; - width: $border-thickness; - height: 25px; - background: $border-colour; - } - } - - } - -} - -.inline { - .multiple-choice { - margin-right: 15px; - } -} - -.radio-slider { - - border-bottom: 2px solid $black; - height: 18px; - margin-bottom: 18px + 30px; - margin-right: -18px; - margin-left: -18px; - white-space: nowrap; - - legend { - display: none; - } - - .govuk-radios__item { - - margin-right: 0; - padding: 0; - width: 38px; - margin-right: calc((100% - (38px * 11)) / 10); - - &:last-child { - margin-right: 0; - } - - label { - - font-size: 0; - padding: 0; - - &:before { - background: $white; - } - - } - - } - - &-left-value { - position: absolute; - bottom: 30px; - left: 0; - } - - &-right-value { - position: absolute; - bottom: 30px; - right: 0; - text-align: right; - } - -} diff --git a/app/assets/stylesheets/components/research-mode.scss b/app/assets/stylesheets/components/research-mode.scss deleted file mode 100644 index 050a03f03..000000000 --- a/app/assets/stylesheets/components/research-mode.scss +++ /dev/null @@ -1,8 +0,0 @@ -.research-mode { - font-weight: bold; - display: inline-block; - padding: 5px 10px; - background: $govuk-blue; - color: $white; - border-radius: 2px; -} diff --git a/app/assets/stylesheets/components/show-more.scss b/app/assets/stylesheets/components/show-more.scss deleted file mode 100644 index c5d083fcb..000000000 --- a/app/assets/stylesheets/components/show-more.scss +++ /dev/null @@ -1,40 +0,0 @@ -%show-more, -.show-more { - - @include core-16; - display: block; - padding: 0 0; - margin: govuk-spacing(3) 0 govuk-spacing(3) 0; - text-align: center; - border-top: 1px solid $border-colour; - - &:focus { - - border-color: transparent; - /* override default focus style to increase top yellow box-shadow */ - box-shadow: 0 -15px $govuk-focus-colour, 0 4px $govuk-focus-text-colour; - - span { - outline: none; - border-color: transparent; - background-color: transparent; - } - - } - - span { - position: relative; - top: -11px; - outline: 10px solid white; - background: $white; - display: inline-block; - border-bottom: 1px solid $light-blue; - } - -} - -.show-more-no-border { - @extend %show-more; - border-top: 1px solid transparent; - margin-top: -5px; -} diff --git a/app/assets/stylesheets/components/site-footer.scss b/app/assets/stylesheets/components/site-footer.scss deleted file mode 100644 index ad0c1ace8..000000000 --- a/app/assets/stylesheets/components/site-footer.scss +++ /dev/null @@ -1,29 +0,0 @@ -#footer { - .footer-categories { - margin: 0 auto; - - &-wrapper { - margin-bottom: govuk-spacing(6); - padding-bottom: govuk-spacing(9); - border-bottom: 1px solid $grey-2; - } - - h2 { - margin: 20px 0; - - @include media(tablet) { - margin-top: 0; - } - } - - ul { - margin: 0; - padding: 0; - } - - li { - margin-bottom: 5px; - font-size: 16px; - } - } -} diff --git a/app/assets/stylesheets/components/sms-message.scss b/app/assets/stylesheets/components/sms-message.scss deleted file mode 100644 index f524532b3..000000000 --- a/app/assets/stylesheets/components/sms-message.scss +++ /dev/null @@ -1,85 +0,0 @@ -$tail-angle: 20deg; - -.sms-message-wrapper { - - position: relative; - width: 100%; - max-width: 464px; - box-sizing: border-box; - padding: govuk-spacing(3); - background: $panel-colour; - border: 1px solid $panel-colour; - border-radius: 5px; - white-space: normal; - margin: 0 0 govuk-spacing(6) 0; - clear: both; - word-wrap: break-word; - - &:after { - content: ""; - display: block; - position: absolute; - bottom: -5px; - right: -20px; - border: 10px solid transparent; - border-left-width: 13px; - border-right-width: 13px; - border-bottom-color: $panel-colour; - border-left-color: $panel-colour; - transform: rotate($tail-angle); - } - -} - -.sms-message-inbound { - - .sms-message-wrapper { - - &:after { - border-left-color: transparent; - border-bottom-color: $panel-colour; - border-right-color: $panel-colour; - right: auto; - left: -20px; - transform: rotate(-$tail-angle); - } - - } - -} - -.sms-message-sender { - @include copy-19; - color: $secondary-text-colour; - margin: 0 0 -10px 0; -} - -.sms-message-recipient { - @include copy-19; - color: $secondary-text-colour; - margin: 10px 0 0 0; -} - -.sms-message-status { - @include core-16; - color: $secondary-text-colour; - margin: -20px govuk-spacing(3) 20px govuk-spacing(3); -} - -.sms-message-status-outbound { - text-align: right; -} - -.sms-message-row { - - &:focus { - outline: none; - padding-top: 120px; - margin-top: -120px; - } - -} - -.sms-message-reply-link { - text-align: right; -} diff --git a/app/assets/stylesheets/components/stick-at-top-when-scrolling.scss b/app/assets/stylesheets/components/stick-at-top-when-scrolling.scss deleted file mode 100644 index acadbbe16..000000000 --- a/app/assets/stylesheets/components/stick-at-top-when-scrolling.scss +++ /dev/null @@ -1,153 +0,0 @@ -// CSS adapted from -// https://github.com/alphagov/govuk_frontend_toolkit/blob/d9489a987086471fe30b4b925a81c12cd198c91d/docs/javascript.md#stick-at-top-when-scrolling - -$sticky-padding: govuk-spacing(4); - -.js-stick-at-top-when-scrolling, -.js-stick-at-bottom-when-scrolling { - - overflow: hidden; - margin-left: -1 * govuk-spacing(3); - padding: 10px 0 0 govuk-spacing(3); - position: relative; - - .form-group { - margin-bottom: 20px; - - legend { - outline: none; - } - } - - .back-to-top-link { - position: absolute; - top: govuk-spacing(6); - right: govuk-spacing(3); - opacity: 0; - transition: opacity 0.1s ease-in-out; - } - -} - -.js-stick-at-top-when-scrolling { - - margin-top: -10px; - margin-bottom: 5px; - top: 5px; - transition: top 0.1s ease-out, box-shadow 1s ease-in-out; - -} - -.js-stick-at-bottom-when-scrolling { - - transition: bottom 0.1s ease-out, box-shadow 1s ease-in-out; - padding: $sticky-padding 0 $sticky-padding govuk-spacing(3); - margin-top: -$sticky-padding; - - & + .js-stick-at-bottom-when-scrolling { - margin-top: ($sticky-padding * 2) * -1; - } - - fieldset:focus { - outline: none; - } - - .page-footer { - margin-bottom: 1px; - } - - .notification-status { - margin: 0; - } - -} - -.content-fixed, -.content-fixed-onload { - - position: fixed; - background: $white; - z-index: 100; - padding-right: govuk-spacing(3); - margin-top: 0; - - .back-to-top-link { - opacity: 1; - transition: opacity 0.6s ease-in-out; - } - -} - -.js-stick-at-top-when-scrolling.content-fixed, -.js-stick-at-top-when-scrolling.content-fixed-onload { - - top: 0; - margin-top: 0; - -} - -.js-stick-at-top-when-scrolling.content-fixed__top { - - border-bottom: 1px solid $border-colour; - box-shadow: 0 2px 0 0 rgba($border-colour, 0.2); - -} - -.js-stick-at-top-when-scrolling.content-fixed { - - transition: background 0.6s ease-in-out, margin-top 0.4s ease-out; - -} - -.js-stick-at-bottom-when-scrolling.content-fixed, -.js-stick-at-bottom-when-scrolling.content-fixed-onload { - - top: auto; // cancel `top: 0;` inherited from govuk-template - bottom: 0; - -} - -.js-stick-at-bottom-when-scrolling.content-fixed__bottom { - - border-top: 1px solid $border-colour; - box-shadow: 0 -2px 0 0 rgba($border-colour, 0.2); - -} - -.js-stick-at-bottom-when-scrolling.content-fixed { - - transition: background 0.6s ease-in-out; - -} - -.js-stick-at-bottom-when-scrolling-loaded.content-fixed-onload { - - transition: none; - -} - -.shim { - display: block; - margin-bottom: 5px; -} - -.js-cancel { - - display: inline-block; - padding: 10px 10px 5px 10px; - margin-top: -10px; - margin-right: -10px; - text-decoration: underline; - color: $govuk-blue; - cursor: pointer; - - &:hover { - color: $link-hover-colour; - } - - &:focus { - /* override default box shadow to stop it looking so large vertically */ - box-shadow: inset 0 -4px $govuk-focus-text-colour; - } - -} diff --git a/app/assets/stylesheets/components/table.scss b/app/assets/stylesheets/components/table.scss deleted file mode 100644 index f06cd9ce5..000000000 --- a/app/assets/stylesheets/components/table.scss +++ /dev/null @@ -1,452 +0,0 @@ -.table { - margin-bottom: govuk-spacing(6); - width: 100%; -} - -.table-heading { - text-align: left; - margin: govuk-spacing(3) 0 govuk-spacing(3) 0; -} - -.dashboard-table { - - .heading-medium { - margin-bottom: 5px; - } - - .table { - table-layout: fixed; - } - - .table-field-headings { - th { - font-size: 1px; - } - } - - .table-field-headings-visible { - th { - padding-bottom: 5px; - } - } - - .table-field-heading-first { - width: 52.5%; - } - - .table-row { - th { - display: table-cell; - width: 52.5%; - font-weight: normal; - - .hint, - p { - white-space: nowrap; - overflow: hidden; - text-overflow: ellipsis; - } - } - } - - .big-number-label { - padding-bottom: 0; - } - -} - -.template-statistics-table { - - .table { - table-layout: fixed; - } - - .table-heading { - @include core-19; - margin: 0 0 10px 0; - } - - .table-field-heading-first { - width: 52.5%; - } - - .table-row { - th { - display: table-cell; - width: 52.5%; - font-weight: normal; - - .hint, - p { - white-space: nowrap; - overflow: hidden; - text-overflow: ellipsis; - } - } - } - - &-template-name { - - @include bold-24; - display: block; - white-space: nowrap; - overflow: hidden; - text-overflow: ellipsis; - padding: 10px 0 32px 0; - margin: -10px 0 -32px 0; - - &:focus { - - color: $text-colour; - - & + .template-statistics-table-hint { - color: $text-colour; - } - - } - - } - - &-hint { - @include core-19; - color: $secondary-text-colour; - pointer-events: none; - } - -} - -.settings-table { - - table { - table-layout: fixed; - margin-bottom: govuk-spacing(1); - } - - th { - - &:first-child { - width: 35%; // 33.33% + fudge - } - - &:last-child { - width: 17.5% // 16.67% + fudge - } - - } - - td.table-field-left-aligned { - - &:first-child { - - div { - white-space: normal; - } - - } - - div { - white-space: nowrap; - overflow: hidden; - text-overflow: ellipsis; - } - - ul li { - margin-bottom: 5px; - } - - } - - td.table-field-wrap-text { - - div { - white-space: normal; - } - - ul li { - margin-bottom: 5px; - } - - } - - .table-heading { - margin-bottom: 20px; - } - -} - -.usage-table { - - .table-field-heading-first { - width: 35%; // 33.33% + fudge - } - - .table-row { - th { - width: 17.5% // 16.67% + fudge - } - } - -} - -%table-field, -.table-field { - - vertical-align: top; - - &:last-child { - padding-right: 0; - } - - &-error { - - border-left: 5px solid $error-colour; - padding-left: 7px; - display: block; - - &-label { - display: block; - color: $error-colour; - font-weight: bold; - } - - } - - &-invisible-error { - border-left: 5px solid transparent; - padding-left: 7px; - display: block; - } - - &-status { - - &-default { - color: $secondary-text-colour; - } - - &-error { - - color: $error-colour; - font-weight: bold; - - .status-hint { - display: block; - font-weight: normal; - color: $red; - margin-top: 5px; - } - - } - - &-sent-international { - - .status-hint { - display: block; - font-weight: normal; - margin-top: 5px; - } - - } - - &-yes, - &-no { - display: block; - text-indent: -999em; - background-size: 19px 19px; - background-repeat: no-repeat; - background-position: 50% 50%; - } - - &-yes { - background-image: file-url('tick.png'); - } - - } - - &-noborder { - border: 0px; - } - - &-index { - - @include bold-16; - width: 15px; - - a { - - &:before { - content: ''; - position: absolute; - top: 0; - left: 0; - right: 0; - bottom: 0; - } - - &:focus { - - box-shadow: none; - - &:before { - background: $govuk-focus-colour; - box-shadow: inset 0 -4px 0 0 $govuk-focus-text-colour; - z-index: -1; - } - - } - - } - } - - p { - margin: 0 0 5px 0; - } - -} - -.table-font-xsmall td.table-field-index { // overrides GOV.UK Elements - @include bold-16; -} - - -.table-field-headings { - - th { - padding: 1px; /* needs some height for the grey border to show */ - } - -} - -.table-field-headings-visible { - - height: auto; - - th { - padding: .75em 1.25em .5625em 0; - } - -} - -.table-field-headings, -.table-field-headings-visible { - - th { - @include bold-19; - } - - .dashboard-table &-first { - width: 52.5%; - } - -} - -.table-field-heading { - - &:last-child { - padding-right: 0; - } - - &-right-aligned { - display: block; - text-align: right; - } - -} - -.table-field-right-aligned { - - @extend %table-field; - text-align: right; - - a { - - display: block; - position: relative; - - /* remove default focus styles in favour of those for :before pseudo class */ - &:focus { - box-shadow: none; - } - - &:before { - content: ""; - display: block; - - position: absolute; - - top: -1 * govuk-spacing(3); - right: 0; - bottom: -1 * govuk-spacing(3) + 4px; - left: -1 * govuk-spacing(3); - - background: transparent; - } - - &:active:before, - &:focus:before { - box-shadow: inset 0px -4px $govuk-focus-text-colour, inset 0px 15px $govuk-focus-colour, inset 15px 0px $govuk-focus-colour, inset 0px -11px $govuk-focus-colour; - } - - } - -} - - -.table-row-group { - border-top: 1px solid $border-colour; - border-bottom: 1px solid $border-colour; -} - -.table-empty-message, -td.table-empty-message { - @include core-19; - color: $secondary-text-colour; - border-bottom: 1px solid $border-colour; - padding: 20px 0 20px 0; -} - -.table-show-more-link { - - @include core-16; - color: $secondary-text-colour; - margin-bottom: govuk-spacing(7); - border-bottom: 1px solid $border-colour; - padding: 35px 0 10px 0; - text-align: center; - - .table + & { - margin-top: -1 * govuk-spacing(6); - } - -} - -a.table-show-more-link { - color: $link-colour; -} - -.table-no-data { - @include core-16; - color: $secondary-text-colour; - margin-top: 10px; - margin-bottom: govuk-spacing(7); - border-top: 1px solid $border-colour; - border-bottom: 1px solid $border-colour; - padding: 0.75em 0 0.5625em 0; -} - -.wide-left-hand-column { - display: block; - max-width: 560px; - white-space: nowrap; - overflow: hidden; - text-overflow: ellipsis; -} - -.truncate-text { - white-space: nowrap; - overflow: hidden; - text-overflow: ellipsis; -} - -.spark-bar-bar { - width: 100%; -} diff --git a/app/assets/stylesheets/components/task-list.scss b/app/assets/stylesheets/components/task-list.scss deleted file mode 100644 index c5222d084..000000000 --- a/app/assets/stylesheets/components/task-list.scss +++ /dev/null @@ -1,62 +0,0 @@ -$indicator-colour: $black; - -%task-list-indicator { - @include bold-16; - display: inline-block; - padding: 3px 8px 1px 8px; - position: absolute; - right: 0; - top: govuk-spacing(6) - 2px; - margin-top: -15px; - border: 2px solid $indicator-colour; - pointer-events: none; - z-index: 2; - min-width: 20%; - text-align: center; -} - -.task-list { - - border-top: 1px solid $border-colour; - margin: govuk-spacing(6) 0; - - &-item { - - position: relative; - - a { - border-bottom: 1px solid $border-colour; - display: block; - padding: govuk-spacing(3) 0; - padding-right: 20%; - position: relative; - - &:focus { - box-shadow: inset 0 -4px $govuk-focus-text-colour; - border-color: transparent; - top: -1px; - margin-bottom: -2px; - padding-top: govuk-spacing(3) + 1px; - padding-bottom: govuk-spacing(3) + 1px; - } - - } - - } - - &-indicator-completed { - @extend %task-list-indicator; - background-color: $indicator-colour; - color: $grey-4; - // Just a pinch of letter spacing to make reversed-out text a bit - // easier to read - letter-spacing: 0.02em; - } - - &-indicator-not-completed { - @extend %task-list-indicator; - background-color: $white; - color: $indicator-colour; - } - -} diff --git a/app/assets/stylesheets/components/textbox.scss b/app/assets/stylesheets/components/textbox.scss deleted file mode 100644 index f9687a7ea..000000000 --- a/app/assets/stylesheets/components/textbox.scss +++ /dev/null @@ -1,81 +0,0 @@ -.textbox-highlight { - - $tag-background: rgba($light-blue, 0.6); - - &-wrapper { - position: relative; - } - - &-textbox { - resize: none; - z-index: 20; - background: none; - } - - &-textbox, - &-background, - &-foreground, - &-mask { - font-size: 19px; - display: block; - box-sizing: border-box; - position: relative; - margin: 0; - padding: 4px; - overflow: hidden; - line-height: 1.6; - } - - &-background { - position: absolute; - top: 0; - left: 0; - pointer-events: none; - color: transparent; - white-space: pre-wrap; - overflow-wrap: break-word; - word-wrap: break-word; - border: 2px solid transparent; - padding-bottom: govuk-spacing(3); - z-index: 10; - - // transparent borders become visible in high contrast modes so set to match background - @media (-ms-high-contrast: active), (forced-colors: active) { - border-color: Canvas; - } - - .placeholder, - .placeholder-conditional { - color: transparent; - } - - } - -} - -.textbox-help-link { - margin: 10px 0 0 0; -} - -.textbox-right-aligned { - text-align: right; -} - -.extra-tracking .govuk-input { - @include core-19($tabular-numbers: true); - padding-left: 5px; - letter-spacing: 0.04em; -} - -.textbox-colour-preview { - @include media(desktop) { - width: 38px; - height: 38px; - margin-left: 5px; - border-radius: 50%; - box-shadow: inset 0 0 0 1px rgba($black, 0.2); - display: inline-block; - vertical-align: top; - transition: background 0.3s ease-out; - } -} diff --git a/app/assets/stylesheets/components/tick-cross.scss b/app/assets/stylesheets/components/tick-cross.scss deleted file mode 100644 index 701036806..000000000 --- a/app/assets/stylesheets/components/tick-cross.scss +++ /dev/null @@ -1,46 +0,0 @@ -%tick-cross { - @include core-19; - display: inline-block; - background-size: 19px 19px; - background-repeat: no-repeat; - background-position: 0 6px; - padding: 6px 0 5px 25px; -} - -.tick-cross { - - &-tick { - @extend %tick-cross; - background-image: file-url('tick.png'); - } - - &-cross { - @extend %tick-cross; - color: $secondary-text-colour; - background-image: file-url('cross-grey.svg'); - } - - &-list { - - position: relative; - - &-permissions { - - margin-top: 5px; - - li { - display: block; - margin-right: 0.5em; - } - - } - - &-hint { - color: #6F777B; - padding-top: 5px; - margin: 0; - } - - } - -} diff --git a/app/assets/stylesheets/components/vendor/breadcrumbs.scss b/app/assets/stylesheets/components/vendor/breadcrumbs.scss deleted file mode 100644 index 53a233b8a..000000000 --- a/app/assets/stylesheets/components/vendor/breadcrumbs.scss +++ /dev/null @@ -1,106 +0,0 @@ -/** - * Breadcrumbs Component - * - * Based on the existing breadcrumbs from GOV.UK Elements, re-implemented - * using BEM, allowing for an `inverse` modifier (e.g. against a masthead), with - * structured data markup, and allowing for the 'current page' to be included - * as the last element in the breadcrumb. - * - * Notes: - * - * - Link the current page to the same place as your skip link (e.g. #main) – - * this means that it is included by screen readers but is referred to as a - * 'same page' link, and clicking it does not reload the page. - * - You can test the structured data using Google's structured data testing - * tool: https://search.google.com/structured-data/testing-tool - * - * Example Usage: - * - *

- */ - -.breadcrumbs { - @include govuk-width-container; - @include core-16($line-height: (25 / 16), $line-height-640: 1.75); - - padding: govuk-spacing(2) 0; - list-style: none; - - @include media(tablet) { - margin-bottom: govuk-spacing(6); - } - - ol { - margin: 0; - padding: 0; - list-style: none; - } - - &__item { - display: inline-block; - - margin: 0; - padding: 0 (govuk-spacing(6) / 4) 0 (11px + govuk-spacing(6) / 4); - - background-image: file-url('separator.png'); - background-repeat: no-repeat; - background-size: 6px 11px; - background-position: left center; - - white-space: nowrap; - - @include device-pixel-ratio(2) { - background-image: file-url('separator-2x.png'); - } - - &, - a:link, - a:hover, - a:active, - a:visited { - color: $black; - } - - &--active { - @include bold-16; - - a:link, - a:visited { - text-decoration: none; - } - } - - &:first-child { - padding-left: 0; - background-image: none; - } - } - - &--inverse { - border-bottom: 1px $white solid; - border-bottom-color: rgba($white, 0.25); - - .breadcrumbs__item { - &--active, - a:link, - a:hover, - a:active, - a:visited { - color: $white; - } - - a:focus { - color: $black; - } - } - } -} diff --git a/app/assets/stylesheets/components/vendor/previous-next-navigation.scss b/app/assets/stylesheets/components/vendor/previous-next-navigation.scss deleted file mode 100644 index 502439270..000000000 --- a/app/assets/stylesheets/components/vendor/previous-next-navigation.scss +++ /dev/null @@ -1,111 +0,0 @@ -/* -Taken from the GOV.UK component at -https://github.com/alphagov/static/blob/3d93a762b9d7af54615c77ae3e479131c03b8175/app/assets/stylesheets/govuk-component/_previous-and-next-navigation.scss -and -https://github.com/alphagov/static/blob/da8aeeaa749093eab30286d7fc9f965533b66f47/app/assets/stylesheets/styleguide/_conditionals2.scss -*/ - -// Media query helpers. These make producing IE layouts -// super easy. - -// These are desktop and down media queries - -// There is also a local version of this in Smartanswers. - -$is-ie: false !default; - -@mixin media-down($size: false, $max-width: false, $min-width: false) { - @if $is-ie == false { - @if $size == mobile { - @media (max-width: 640px){ - @content; - } - } @else if $size == tablet { - @media (max-width: 800px){ - @content; - } - } - } -} - -.govuk-previous-and-next-navigation { - display: block; - margin-top: govuk-spacing(6); - margin-bottom: govuk-spacing(6); - margin-left: -1 * govuk-spacing(3); - margin-right: -1 * govuk-spacing(3); - @include govuk-clearfix; - - ul { - margin: 0; - padding: 0; - } - - li { - @include core-16($line-height: (20 / 16)); - float: left; - list-style: none; - text-align: right; - margin: 0; - padding: 0; - width: 50%; - - a { - display: block; - padding: govuk-spacing(3); - text-decoration: none; - - &:hover { - background-color: $canvas-colour; - } - - &:focus { - background-color: $govuk-focus-colour; - } - - .pagination-part-title { - @include core-27($line-height: (33.75 / 27)); - display: block; - } - } - } - - .previous-page { - float: left; - text-align: left; - } - - .next-page { - float: right; - text-align: right; - } - - @include media-down(mobile) { - .previous-page, - .next-page { - float: none; - width: 100%; - } - - .next-page a { - text-align: right; - } - } - - .pagination-icon { - display: inline-block; - margin-bottom: 1px; - height: .482em; - width: .63em; - } - - .pagination-label { - display: inline-block; - margin-top: 0.1em; - text-decoration: underline; - - &:empty { - display: none; - } - } -} diff --git a/app/assets/stylesheets/components/vendor/responsive-embed.scss b/app/assets/stylesheets/components/vendor/responsive-embed.scss deleted file mode 100644 index aa3cfaab4..000000000 --- a/app/assets/stylesheets/components/vendor/responsive-embed.scss +++ /dev/null @@ -1,60 +0,0 @@ -/** - * Responsive Embed Component - * - * Notes: - * - * - Ensure you use either responsive-embed--16by9 or responsive-embed--4by3 - * depending on the aspect ratio of your embed. - * - Credit: Nicolas Gallagher and SUIT CSS. - * - * Example Usage: - * - *
- *
- * - *
- *
- */ - -.responsive-embed { - .responsive-embed__wrapper { - position: relative; - display: block; - height: 0; - padding: 0; - overflow: hidden; - } - - .responsive-embed__item, - iframe, - embed, - object, - video { - position: absolute; - top: 0; - left: 0; - bottom: 0; - height: 100%; - width: 100%; - border: 0; - } -} - -.responsive-embed--bordered { - padding: 5px; - outline: 1px solid $border-colour; -} - -// Modifier class for 16:9 aspect ratio -.responsive-embed--16by9 { - .responsive-embed__wrapper { - padding-bottom: 56.25%; - } -} - -// Modifier class for 4:3 aspect ratio -.responsive-embed--4by3 { - .responsive-embed__wrapper { - padding-bottom: 75%; - } -} \ No newline at end of file diff --git a/app/assets/stylesheets/globals.scss b/app/assets/stylesheets/globals.scss deleted file mode 100644 index 66fb162d0..000000000 --- a/app/assets/stylesheets/globals.scss +++ /dev/null @@ -1,68 +0,0 @@ -@import "settings/typography-font-families"; - -// needed for IE10 desktop snap mode: http://menacingcloud.com/?c=cssViewportOrMetaTag -@-ms-viewport { - width: device-width; -} - -// To be removed when all text uses the GOV.UK Frontend New Transport font styles. -// At present, some text gets these styles due to being in a GOV.UK Frontend component -// or a link. -// This ensures all text will have these styles applied, until it can be moved to use -// the GOV.UK Frontend font styles. -body { - -webkit-font-smoothing: antialiased; - -moz-osx-font-smoothing: grayscale; -} - -b, -strong { - font-weight: 600; -} - -abbr[title] { - cursor: help; -} - -.js-enabled .js-hidden { - display: none; -} - -// To be removed when all search inputs use the GOV.UK Frontend text input component: -// https://design-system.service.gov.uk/components/text-input/ -/* - * 1. Addresses `appearance` set to `searchfield` in Safari 5 and Chrome. - * 2. Addresses `box-sizing` set to `border-box` in Safari 5 and Chrome - * (include `-moz` to future-proof). - */ - -input[type="search"] { - -webkit-appearance: textfield; /* 1 */ - -moz-box-sizing: content-box; - -webkit-box-sizing: content-box; /* 2 */ - box-sizing: content-box; -} -input[type="search"]::-webkit-search-cancel-button { - -webkit-appearance: searchfield-cancel-button; - margin-right: 2px; -} - -input[type="search"]::-webkit-search-decoration { - -webkit-appearance: none; -} - -// Each selector, and then the whole block when only one remains, to be removed when the -// element comes from the corresponding GOV.UK Frontend component: -// - https://design-system.service.gov.uk/components/text-input/ -// - https://design-system.service.gov.uk/components/textarea/ -// - https://design-system.service.gov.uk/components/select/ -// - https://design-system.service.gov.uk/components/button/ - -// Global styles for form controls - -input:focus, -textarea:focus, -select:focus { - outline: 3px solid $focus-colour; - outline-offset: 0; -} diff --git a/app/assets/stylesheets/govuk-frontend/_all.scss b/app/assets/stylesheets/govuk-frontend/_all.scss deleted file mode 100644 index b048562cb..000000000 --- a/app/assets/stylesheets/govuk-frontend/_all.scss +++ /dev/null @@ -1,52 +0,0 @@ -// Version of node_modules/govuk-frontend/components/all.scss specific to Notify -// Included to allow us to only include the components we need -// All imports come from node_modules/govuk-frontend - -// turn on compatibility mode for all legacy frameworks -// https://github.com/alphagov/govuk-frontend/blob/master/docs/installation/compatibility.md#turn-on-compatibility-mode -// to be removed when these frameworks are removed. -$govuk-compatibility-govukfrontendtoolkit: true; -$govuk-compatibility-govukelements: true; - -// set asset URL root to match that of application -$govuk-assets-path: "/static/"; - -@import "settings/all"; -// update to focus styles, remove when upgrading to GOVUK Frontend 3.x.x -@import "./focus/settings"; -@import "tools/all"; -@import "helpers/all"; -// update to focus styles, remove when upgrading to GOVUK Frontend 3.x.x -@import "./focus/helpers"; - -@import "core/all"; -// update to focus styles, remove when upgrading to GOVUK Frontend 3.x.x -@import "./focus/core"; -@import "objects/all"; - -// section replacing @import "components/all", specifying which components to include -@import "components/skip-link/_skip-link"; -@import "components/header/_header"; -@import "components/footer/_footer"; -@import "components/back-link/_back-link"; -@import "components/button/_button"; -@import "components/details/_details"; -@import "components/radios/_radios"; -@import "components/checkboxes/_checkboxes"; -@import "components/input/_input"; -@import "components/inset-text/_inset-text"; -@import "components/textarea/_textarea"; - -// update to focus styles, remove when upgrading to GOVUK Frontend 3.x.x -@import "./focus/components"; - -@import "utilities/all"; -@import "overrides/all"; - -// Styles extending those from GOV.UK Frontend -@import "./extensions"; -// update to focus styles, remove when upgrading to GOVUK Frontend 3.x.x -@import "./focus/extensions"; - -// Styles for GOV.UK Frontend components specific to this application -@import "./overrides"; diff --git a/app/assets/stylesheets/govuk-frontend/extensions.scss b/app/assets/stylesheets/govuk-frontend/extensions.scss deleted file mode 100644 index 02a4717f0..000000000 --- a/app/assets/stylesheets/govuk-frontend/extensions.scss +++ /dev/null @@ -1,96 +0,0 @@ -// Gives access to the Sass variables used in the GOVUK Frontend typographic styles -// See: https://frontend.design-system.service.gov.uk/sass-api-reference/#govuk-typography-scale -@function get-govuk-typography-style($size, $breakpoint, $property) { - $size-map: map-get($govuk-typography-scale, $size); - $breakpoint-map: map-get($size-map, $breakpoint); - - @if not map-has-key($breakpoint-map, $property) { - @error "Unknown property #{$property} - expected a property from the typography scale for #{$size}."; - } - - @return map-get($breakpoint-map, $property); -} - -// Extends footer column styles to allow 4 columns -@include mq ($from: desktop) { - .govuk-footer__list--columns-4 { - // TODO: Move support for legacy properties to something like Post-CSS's auto-prefixer - -webkit-column-count: 4; - -moz-column-count: 4; - column-count: 4; - } -} - -// Extends govuk-link to create a class of link that causes a destructive action -// Based on styles of link in: -// https://github.com/alphagov/govuk-frontend/blob/v2.13.0/src/helpers/_links.scss -// -// Note: all destructive actions must have a confirmation step these links navigate to -@mixin govuk-link-style-destructive-no-visited-state { - &:link, - &:visited { - color: $govuk-error-colour; - } - - &:hover { - color: govuk-tint($govuk-error-colour, 25%); - } - - // When focussed, the text colour needs to be darker to ensure that colour - // contrast is still acceptable against the focus colour - // Activated links are usually focused so this applies to them as well - &:active, - &:focus { - color: $govuk-focus-text-colour; - } -} - -.govuk-link--destructive { - @include govuk-link-style-destructive-no-visited-state; -} -$govuk-grid-widths: ( - one-eighth: 12.5%, - one-sixth: 16.6666%, - one-quarter: 25%, - one-third: 33.3333%, - one-half: 50%, - five-eighths: 62.5%, - two-thirds: 66.6666%, - three-quarters: 75%, - five-sixths: 83.3333%, - seven-eighths: 87.5%, - full: 100% -); - -.govuk-input--width-6 { - max-width: 14ex; -} - -// extensions to govuk-input to allow numbering by label -.govuk-input--numbered { - padding-left: 1.84em; - - @include media(desktop) { - @include inline-block; - } -} - -.govuk-input--numbered__label { - float: left; - width: 1.6em; - margin: 8px -1.6em 0 0; - position: relative; - left: 10px; - color: $govuk-secondary-text-colour; - font-weight: bold; - pointer-events: none; -} - -.govuk-input--numbered__label--error { - position: absolute; - bottom: 10px; - - @include govuk-media-query(desktop) { - bottom: 7px; - } -} diff --git a/app/assets/stylesheets/govuk-frontend/focus/components.scss b/app/assets/stylesheets/govuk-frontend/focus/components.scss deleted file mode 100644 index 0efce203d..000000000 --- a/app/assets/stylesheets/govuk-frontend/focus/components.scss +++ /dev/null @@ -1,193 +0,0 @@ -// Sass bringing in the new focus style from GOVUK Frontend 3.x.x -// TO DO: Delete this file when we upgrade to GOVUK Frontend 3.x.x -// -// See the following for details of the update: -// - https://designnotes.blog.gov.uk/2019/07/29/weve-made-the-gov-uk-design-system-more-accessible/ -// - https://design-system.service.gov.uk/get-started/focus-states/ -// - https://github.com/alphagov/govuk-frontend/releases/tag/v3.0.0 -// -// These styles were added in https://github.com/alphagov/govuk-frontend/pull/1309 - -// Updates to skip-link component -.govuk-skip-link { - @include govuk-typography-common; - @include govuk-focusable-fill; -} - -// Updates to header component -.govuk-header__link { - @include govuk-focusable-text-link; -} - -.govuk-header__link--homepage { - // Remove any borders that show when focused and hovered. - &:focus { - border-bottom: 0; - } -} - -// Updates to footer component -.govuk-footer__link { - @include govuk-focusable-text-link; -} - -// Updates to back-link component -.govuk-back-link { - @include govuk-focusable-text-link; - - // When the back link is focused, hide the bottom link border as the - // focus styles has a bottom border. - &:focus { - border-bottom-color: transparent; - } -} - -// Updates to details component -.govuk-details__summary { - &:hover { - color: $govuk-link-hover-colour; - } - - @include govuk-focusable-text-link; -} - -// Remove the underline when focussed to avoid duplicate borders -.govuk-details__summary:focus .govuk-details__summary-text { - text-decoration: none; -} - -.govuk-details__summary:before { - top: 0; -} - -// Updates to buttons -.govuk-button { - &:focus { - border-color: $govuk-focus-colour; - // When colours are overridden, for example when users have a dark mode, - // backgrounds and box-shadows disappear, so we need to ensure there's a - // transparent outline which will be set to a visible colour. - // Since Internet Explorer 8 does not support box-shadow, we want to force the user-agent outlines - @include govuk-not-ie8 { - outline: $govuk-focus-width solid transparent; - outline-offset: 0; - } - // Since Internet Explorer does not support `:not()` we set a clearer focus style to match user-agent outlines. - @include govuk-if-ie8 { - color: $govuk-text-colour; - background-color: $govuk-focus-colour; - } - box-shadow: inset 0 0 0 1px $govuk-focus-colour; - } - - &:focus:not(:active):not(:hover) { - border-color: $govuk-focus-colour; - color: $govuk-text-colour; - background-color: $govuk-focus-colour; - box-shadow: 0 2px 0 $govuk-focus-text-colour; - } -} - -// Updates to form inputs -.govuk-input { - &:focus { - // Double the border by adding its width again. Use `box-shadow` for this // instead of changing `border-width` - this is for consistency with - // components such as textarea where we avoid changing `border-width` as - // it will change the element size. Also, `outline` cannot be utilised - // here as it is already used for the yellow focus state. - box-shadow: inset 0 0 0 $govuk-border-width-form-element; - } -} -.govuk-input--error { - &:focus { - border-color: $govuk-input-border-colour; - // Remove `box-shadow` inherited from `:focus` as `input--error` - // already has the thicker border. - box-shadow: none; - } -} - -// Updates to form textareas (hacked to work with GOVUK Elements version) -.form-control { - @include govuk-focusable; - - &:focus { - // Double the border by adding its width again. Use `box-shadow` to do - // this instead of changing `border-width` (which changes element size) and - // since `outline` is already used for the yellow focus state. - box-shadow: inset 0 0 0 $govuk-border-width-form-element; - } -} -.form-control-error { - &:focus { - border-color: $govuk-input-border-colour; - // Remove `box-shadow` inherited from `:focus` as `input--error` - // already has the thicker border. - box-shadow: none; - } -} - -// Updates to form radios (hacked to work with GOVUK Elements version) - -$govuk-radios-size: 40px; -// When the default focus width is used on a curved edge it looks visually smaller. -// So for the circular radios we bump the default to make it look visually consistent. -$govuk-radios-focus-width: $govuk-focus-width + 1px; - -// ( ) Radio ring -.multiple-choice [type=radio] + label::before { - content: ""; - box-sizing: border-box; - position: absolute; - top: 0; - left: 0; - - width: $govuk-radios-size; - height: $govuk-radios-size; - - border: $govuk-border-width-form-element solid currentColor; - border-radius: 50%; - background: transparent; -} - -// • Radio button -// -// We create the 'button' entirely out of 'border' so that they remain -// 'filled' even when colours are overridden in the browser. -.multiple-choice [type=radio] + label::after { - content: ""; - - position: absolute; - top: govuk-spacing(2); - left: govuk-spacing(2); - - width: 0; - height: 0; - - border: govuk-spacing(2) solid currentColor; - border-radius: 50%; - opacity: 0; - background: currentColor; -} - -// Focused state (includes targeting for GOVUK radios, to apply version 3.x.x styles) -.multiple-choice [type=radio]:focus + label::before, -.govuk-radios__input:focus + .govuk-radios__label::before { - border-width: 4px; - // Since box-shadows are removed when users customise their colours we set a - // transparent outline that is shown instead. - // https://accessibility.blog.gov.uk/2017/03/27/how-users-change-colours-on-websites/ - outline: $govuk-focus-width solid transparent; - outline-offset: $govuk-focus-width; - box-shadow: 0 0 0 $govuk-radios-focus-width $govuk-focus-colour; -} - -// Selected state -.multiple-choice [type=radio]:checked + label::after { - opacity: 1; -} - -// Updates to form checkboxes -.govuk-checkboxes__input:focus + .govuk-checkboxes__label::before { - border-width: 4px; -} diff --git a/app/assets/stylesheets/govuk-frontend/focus/core.scss b/app/assets/stylesheets/govuk-frontend/focus/core.scss deleted file mode 100644 index 7e7290bea..000000000 --- a/app/assets/stylesheets/govuk-frontend/focus/core.scss +++ /dev/null @@ -1,14 +0,0 @@ -// Sass bringing in the new focus style from GOVUK Frontend 3.x.x -// TO DO: Delete this file when we upgrade to GOVUK Frontend 3.x.x -// -// See the following for details of the update: -// - https://designnotes.blog.gov.uk/2019/07/29/weve-made-the-gov-uk-design-system-more-accessible/ -// - https://design-system.service.gov.uk/get-started/focus-states/ -// - https://github.com/alphagov/govuk-frontend/releases/tag/v3.0.0 -// -// These styles were added in https://github.com/alphagov/govuk-frontend/pull/1309 - -// Hack to fix not being able to override the govuk-link-common mixin -.govuk-link { - @include govuk-focusable-text-link; -} diff --git a/app/assets/stylesheets/govuk-frontend/focus/extensions.scss b/app/assets/stylesheets/govuk-frontend/focus/extensions.scss deleted file mode 100644 index dc0ef347c..000000000 --- a/app/assets/stylesheets/govuk-frontend/focus/extensions.scss +++ /dev/null @@ -1,14 +0,0 @@ -// Sass bringing in the new focus style from GOVUK Frontend 3.x.x -// TO DO: Delete this file when we upgrade to GOVUK Frontend 3.x.x -// -// See the following for details of the update: -// - https://designnotes.blog.gov.uk/2019/07/29/weve-made-the-gov-uk-design-system-more-accessible/ -// - https://design-system.service.gov.uk/get-started/focus-states/ -// - https://github.com/alphagov/govuk-frontend/releases/tag/v3.0.0 -// -// These styles were added in https://github.com/alphagov/govuk-frontend/pull/1309 -// (for the error summary component, which we don't use yet) - -.govuk-link--destructive:focus { - @include govuk-focusable-text-link; -} diff --git a/app/assets/stylesheets/govuk-frontend/focus/helpers.scss b/app/assets/stylesheets/govuk-frontend/focus/helpers.scss deleted file mode 100644 index d3b9e61ff..000000000 --- a/app/assets/stylesheets/govuk-frontend/focus/helpers.scss +++ /dev/null @@ -1,31 +0,0 @@ -// Sass bringing in the new focus style from GOVUK Frontend 3.x.x -// TO DO: Delete this file when we upgrade to GOVUK Frontend 3.x.x -// -// See the following for details of the update: -// - https://designnotes.blog.gov.uk/2019/07/29/weve-made-the-gov-uk-design-system-more-accessible/ -// - https://design-system.service.gov.uk/get-started/focus-states/ -// - https://github.com/alphagov/govuk-frontend/releases/tag/v3.0.0 -// -// These styles were added in https://github.com/alphagov/govuk-frontend/pull/1309 -// and edited in https://github.com/alphagov/govuk-frontend/pull/1455 -// -/// Focusable with box-shadow -/// -/// Removes the visible outline and replace with box-shadow and background colour. -/// Used for interactive text-based elements. - -@mixin govuk-focusable-text-link { - &:focus { - // When colours are overridden, for example when users have a dark mode, - // backgrounds and box-shadows disappear, so we need to ensure there's a - // transparent outline which will be set to a visible colour. - - outline: $govuk-focus-width solid transparent; - color: $govuk-focus-text-colour; - background-color: $govuk-focus-colour; - box-shadow: 0 -2px $govuk-focus-colour, 0 4px $govuk-focus-text-colour; - // When link is focussed, hide the default underline since the - // box shadow adds the "underline" - text-decoration: none; - } -} diff --git a/app/assets/stylesheets/govuk-frontend/focus/settings.scss b/app/assets/stylesheets/govuk-frontend/focus/settings.scss deleted file mode 100644 index 4bc131707..000000000 --- a/app/assets/stylesheets/govuk-frontend/focus/settings.scss +++ /dev/null @@ -1,11 +0,0 @@ -// Sass bringing in the new focus style from GOVUK Frontend 3.x.x -// TO DO: Delete this file when we upgrade to GOVUK Frontend 3.x.x -// -// See the following for details of the update: -// - https://designnotes.blog.gov.uk/2019/07/29/weve-made-the-gov-uk-design-system-more-accessible/ -// - https://design-system.service.gov.uk/get-started/focus-states/ -// - https://github.com/alphagov/govuk-frontend/releases/tag/v3.0.0 -// -// The new 'yellow' colour was added in https://github.com/alphagov/govuk-frontend/pull/1288 - -$govuk-focus-colour: #ffdd00; // assign new 'yellow' colour directly to limit impact of change diff --git a/app/assets/stylesheets/govuk-frontend/overrides.scss b/app/assets/stylesheets/govuk-frontend/overrides.scss deleted file mode 100644 index 93dc62098..000000000 --- a/app/assets/stylesheets/govuk-frontend/overrides.scss +++ /dev/null @@ -1,185 +0,0 @@ -// Overrides for certain GOV.UK Frontend styles to make its components match this application's design - -// Additional padding-bottom override, following the GOV.UK Frontend spacing scale: -// https://design-system.service.gov.uk/styles/spacing/#the-responsive-spacing-scale -.govuk-\!-padding-bottom-12 { - padding-bottom: 70px; - - @include govuk-media-query($from: tablet) { - padding-bottom: 90px; - } -} - -.govuk-footer__navigation { - -webkit-flex-wrap: wrap; - -ms-flex-wrap: wrap; - flex-wrap: wrap -} - -.govuk-footer__section { - -webkit-flex-basis: 200px; - -ms-flex-preferred-size: 200px; - flex-basis: 100%; -} - -@include govuk-media-query($from: tablet) { - - .govuk-footer__navigation { - -webkit-flex-wrap: nowrap; - -ms-flex-wrap: nowrap; - flex-wrap: nowrap - } - - .govuk-footer__section { - -webkit-flex-basis: 200px; - -ms-flex-preferred-size: 200px; - flex-basis: 200px; - } - -} - -// Make column headings smaller to prevent wrapping -.govuk-footer__heading { - @include govuk-font($size: 19, $weight: bold); -} - -.govuk-button { - margin-bottom: 0px; -} - -// Allow legends that contain the h1 to go full width -.govuk-fieldset__legend.govuk-grid-column-full { - // $class parameter is deprecated but needed for v2 of GOVUK Frontend. Remove for v3 & above - @include govuk-grid-column(full, $class: false); -} - -// Add override from future version of GOV.UK Frontend -// Todo: remove this once we’ve upgraded past v3.11.0 -.govuk-\!-display-none { - display: none !important; -} - -.govuk-header__logotype { - margin-right: 0px !important; -} - -.govuk-header__logotype-text { - margin-left: 5px !important; -} - -// TODO: probably move these to a separate file - -.demo-tooltip { - position: relative; - color: #FFF; -} - -.demo-tooltip a { - pointer-events: none; -} - -.demo-tooltip:before, -.demo-tooltip:after { - position: absolute; - content: ''; - opacity: 0; - transition: all 0.4s ease; - pointer-events: none; - color: white; -} - -.demo-tooltip:hover:before, -.demo-tooltip:hover:after { - opacity: 1; - transform: translateY(-2px); -} - -.demo-tooltip:before { - border-width: 10px 8px 0 8px; - border-style: solid; - border-color: red transparent transparent transparent; - top: -15px; - transform: translateY(20px); -} - -.demo-tooltip:after { - content: attr(data-demo-tooltip); - background: red; - width: 160px; - height: 40px; - font-size: 13px; - font-weight: 300; - top: -75px; - left: -10px; - padding: 10px; - border-radius: 5px; - letter-spacing: 1px; - transform: translateY(20px); -} - - - -// alt tooltip -// .tooltip-demo { -// position: relative; -// } - -// .tooltip-demo:before, -// .tooltip-demo:after { -// display: block; -// opacity: 0; -// pointer-events: none; -// position: absolute; -// transform: translate3d(0, -10px, 0); -// transition: all .15s ease-in-out; -// } - -// .tooltip-demo:hover:before, -// .tooltip-demo:hover:after { -// opacity: 1; -// transform: translate3d(0, 0, 0); -// } - -// .tooltip-demo:after { -// border-right: 6px solid transparent; -// border-bottom: 6px solid rgba(0, 0, 0, .75); -// border-left: 6px solid transparent; -// content: ''; -// height: 0; -// top: 20px; -// left: 20px; -// width: 0; -// } - -// .tooltip-demo:before { -// background: rgba(0, 0, 0, .75); -// border-radius: 2px; -// color: #fff; -// content: attr(data-demo-tooltip); -// font-size: 14px; -// padding: 6px 10px; -// top: 26px; -// white-space: nowrap; -// } - -@keyframes shake { - 0% { - transform: rotate(2deg); - } - - 50% { - transform: rotate(-3deg); - } - - 70% { - transform: rotate(3deg); - } - - 100% { - transform: rotate(0deg); - } -} - -.demo-tooltip:hover { - animation: shake 500ms ease-in-out forwards; -} \ No newline at end of file diff --git a/app/assets/stylesheets/local/_typography.scss b/app/assets/stylesheets/local/_typography.scss deleted file mode 100644 index 2e85bf969..000000000 --- a/app/assets/stylesheets/local/_typography.scss +++ /dev/null @@ -1,68 +0,0 @@ -@import 'settings/all'; -@import 'helpers/all'; - -@mixin destructive-link-style-default { - &:link { - color: $govuk-error-colour; - } - - &:visited { - color: $govuk-link-visited-colour; - } - - &:hover { - color: govuk-tint( $govuk-error-colour, 25% ); - } - - &:active { - color: $govuk-link-active-colour; - } - - // When focussed, the text colour needs to be darker to ensure that colour - // contrast is still acceptable - &:focus { - color: $govuk-focus-text-colour; - } -} - -@mixin destructive-link-style-no-visited-state { - &:link { - color: $govuk-error-colour; - } - - &:visited { - color: $govuk-error-colour; - } - - &:hover { - color: govuk-tint( $govuk-error-colour, 25% ); - } - - &:active { - color: $govuk-link-active-colour; - } - - // When focussed, the text colour needs to be darker to ensure that colour - // contrast is still acceptable - &:focus { - color: $govuk-focus-text-colour; - } -} - -// mimics styles for govuk-link: -// https://github.com/alphagov/govuk-frontend/blob/063cd8e2470b62b824c6e50ca66342ac7a95d2d8/package/core/_links.scss#L7 -.destructive-link { - @include govuk-link-common; - @include destructive-link-style-default; - @include govuk-link-print-friendly; -} - -.destructive-link--no-visited-state { - @include destructive-link-style-no-visited-state; -} - -// Font override classes -.extended-gsm-characters { - font-family: $govuk-font-family-tabular; - letter-spacing: 0.5em; -} diff --git a/app/assets/stylesheets/main.scss b/app/assets/stylesheets/main.scss deleted file mode 100644 index 1d7c104db..000000000 --- a/app/assets/stylesheets/main.scss +++ /dev/null @@ -1,86 +0,0 @@ -// Path to assets for use with file-url() -$path: '/static/images/'; - -// Dependencies from GOV.UK Frontend Toolkit -// https://github.com/alphagov/govuk_frontend_toolkit/ -@import 'conditionals'; -@import 'shims'; -@import 'measurements'; -@import 'css3'; -@import 'colours'; -@import 'typography'; -@import 'grid_layout'; -@import 'helpers'; - -// Dependencies from GOVU.UK Frontend Toolkit, rewritten for this application -@import 'url-helpers'; - -// Specific to this application, needs to go at the top of the cascade -@import 'globals'; - -// Dependencies from GOV.UK Elements -// https://github.com/alphagov/govuk_elements -@import 'elements/helpers'; -@import 'elements/reset'; -@import 'elements/details'; -@import 'elements/elements-typography'; -@import 'elements/forms'; -@import 'elements/forms/form-multiple-choice'; -@import 'elements/forms/form-validation'; -@import 'elements/lists'; -@import 'elements/panels'; -@import 'elements/tables'; - -// Dependencies from GOV.UK Frontend, packaged to be specific to this application -@import './govuk-frontend/all'; - -// Specific to this application -@import 'local/typography'; -@import 'grids'; -@import 'components/site-footer'; -@import 'components/placeholder'; -@import 'components/sms-message'; -@import 'components/page-footer'; -@import 'components/table'; -@import 'components/navigation'; -@import 'components/big-number'; -@import 'components/banner'; -@import 'components/textbox'; -@import 'components/file-upload'; -@import 'components/browse-list'; -@import 'components/email-message'; -@import 'components/copy-to-clipboard'; -@import 'components/vendor/previous-next-navigation'; -@import 'components/radios'; -@import 'components/checkboxes'; -@import 'components/pill'; -@import 'components/show-more'; -@import 'components/message'; -@import 'components/research-mode'; -@import 'components/tick-cross'; -@import 'components/list-entry'; -@import 'components/live-search'; -@import 'components/stick-at-top-when-scrolling'; -@import 'components/fullscreen-table'; -@import 'components/conditional-radios'; -@import 'components/vendor/breadcrumbs'; -@import 'components/vendor/responsive-embed'; -@import 'components/preview-pane'; -@import 'components/task-list'; -@import 'components/loading-indicator'; -@import 'components/area-list'; -@import 'components/content-metadata'; - -@import 'views/dashboard'; -@import 'views/users'; -@import 'views/api'; -@import 'views/product-page'; -@import 'views/template'; -@import 'views/notification'; -@import 'views/send'; -@import 'views/get_started'; -@import 'views/history'; -@import 'views/webauthn'; - -// TODO: break this up -@import 'app'; diff --git a/app/assets/stylesheets/print.scss b/app/assets/stylesheets/print.scss deleted file mode 100644 index 88a014faf..000000000 --- a/app/assets/stylesheets/print.scss +++ /dev/null @@ -1,85 +0,0 @@ -// sass-lint:disable no-important -// set asset URL root to match that of application -$govuk-assets-path: "/static/"; - -@import "settings/all"; -@import "tools/all"; -@import "helpers/all"; - -@import "core/all"; -@import "objects/all"; - -* { - background: transparent; - color: black; - text-shadow: none; - filter: none; - -ms-filter: none; -} - -body { - @include govuk-font($size: 14); - margin: 0; - padding: 0; - width: 100%; -} - -a, -a:visited { - word-wrap: break-word; -} - -a[href^="/"]:after, -a[href^="http://"]:after, -a[href^="https://"]:after { - content: " (" attr(href) ")"; - font-size: 90%; -} - -a[href^="javascript:"]:after, -a[href^="#"]:after { - content: ""; -} - -img { - max-width: 100% !important; -} - -select { - background: white; -} - -.govuk-header { - - .govuk-header__logo { - @include govuk-font($size: 19); - text-rendering: optimizeLegibility; - - a { - &, - &:visited { - text-decoration: none; - } - - &:after { - content: ""; - } - } - - svg { - width: 45px; - height: 40px; - position: relative; - top: -3px; - vertical-align: bottom; - } - } -} - -.govuk-visually-hidden, -.govuk-visually-hidden-focusable, -.notify-cookie-message, -.govuk-skip-link, -.govuk-footer { - display: none !important; -} diff --git a/app/assets/stylesheets/views/api.scss b/app/assets/stylesheets/views/api.scss deleted file mode 100644 index f2f1b717b..000000000 --- a/app/assets/stylesheets/views/api.scss +++ /dev/null @@ -1,72 +0,0 @@ -.api-notifications { - - font-family: monospace; - -webkit-font-smoothing: antialiased; - -moz-osx-font-smoothing: grayscale; - border-bottom: 1px solid $border-colour; - - &-item { - - border-top: 1px solid $border-colour; - padding: 10px 0 0 0; - - &__heading, - &__data, - &__view { - font-family: monospace; - } - - &__heading { - display: block; - margin-bottom: govuk-spacing(3); - - &::before { - top: -1.3em; - } - } - - &__meta { - - display: block; - color: $secondary-text-colour; - text-decoration: none; - - &-key, - &-time { - color: $secondary-text-colour; - display: inline-block; - width: auto; - } - - @include govuk-media-query($from: tablet) { - &-key, - &-time { - width: 50%; - } - - &-time { - text-align: right; - } - } - - } - - &__data { - - border-left: none; - padding-left: 25px; - - &-name { - color: $secondary-text-colour; - } - - &-value { - color: $text-colour; - padding-bottom: 15px; - } - - } - - } - -} diff --git a/app/assets/stylesheets/views/cookies.scss b/app/assets/stylesheets/views/cookies.scss deleted file mode 100644 index 930540966..000000000 --- a/app/assets/stylesheets/views/cookies.scss +++ /dev/null @@ -1,9 +0,0 @@ -.cookie-settings__no-js { - .js-enabled & { - display: none; - } -} - -.cookie-settings__confirmation { - display: none; -} diff --git a/app/assets/stylesheets/views/dashboard.scss b/app/assets/stylesheets/views/dashboard.scss deleted file mode 100644 index 1615628f9..000000000 --- a/app/assets/stylesheets/views/dashboard.scss +++ /dev/null @@ -1,198 +0,0 @@ -.dashboard { - - th { - font-weight: normal; - } - - > .heading-medium:first-of-type { - margin-top: govuk-spacing(3); - } - -} - -.keyline-block { - border-top: 1px solid $border-colour; - padding-top: govuk-spacing(3); -} - -.spark-bar { - - @include core-16; - box-sizing: border-box; - display: block; - width: 100%; - margin-bottom: govuk-spacing(3); - height: govuk-spacing(3); - color: $text-colour; - text-align: left; - - &-bar { - @include bold-27($tabular-numbers: true); - box-sizing: border-box; - display: inline-block; - overflow: visible; - background: $panel-colour; - color: $black; - padding: 10px 6px 8px 0; - text-indent: 12px; - text-align: right; - margin: 2px 0 1px 0; - transition: width 0.6s ease-in-out; - } - -} - -.file-list { - - // for file-lists with section-like content and a single item - &--sectioned { - display: flex; - flex-wrap: wrap; - text-align: justify; // fallback for browsers that don't support flexbox - justify-content: space-between; - - // note: first-child of a section should be a heading - & > :first-child, - & > .area-list { - width: 100%; - text-align: left; - } - - & > .file-list-hint-large, - & > .file-list-status { - // fallback for browsers that don't support flexbox - let `text-align: justify` on parent - // and making children inline mimic `justify-content: space-between` - display: inline-block; - - // This simulates a 50% column in a govuk grid on smaller screens - // govuk grid columns go to 100% width on smaller screens - width: 100%; - - // This simulates a 50% column in a govuk grid on larger screens - // as with govuk grid, this includes a gap between columns to ensure the contents - // are separated by a space - @include govuk-media-query($from: tablet) { - max-width: calc(50% - #{$govuk-gutter-half}); - } - } - - & > .file-list-status { - overflow: hidden; // old IE hack to make it vertically line up with the hint - margin-bottom: 0; // cancel margin-bottom from .govuk-hint class - } - - & > .file-list-hint-large { - text-align: left; // reset for text-align fallback on parent - } - } - - &-hint, - &-hint-large, - &-status { - pointer-events: none; // delegate clicks to the overlapping link - position: relative; // make non-static to sit above the overlapping focus style - } - - &-filename { - @include bold-19; - display: block; - white-space: nowrap; - overflow: hidden; - text-overflow: ellipsis; - padding-bottom: 30px; - padding-top: 10px; - margin-bottom: -30px; - margin-top: -10px; - } - - &-filename-large { - @include bold-24; - display: block; - white-space: nowrap; - overflow: hidden; - text-overflow: ellipsis; - padding-bottom: 30px; - padding-top: 10px; - margin-bottom: -30px; - margin-top: -10px; - } - - &-filename-large-no-hint { - padding-bottom: 0; - padding-top: 5px; - margin-bottom: 0; - margin-top: 5px; - overflow: visible; // don't cut off thicker underline - } - - &-filename-unlinked { - @include core-19; - } - - &-hint { - @include core-16; - display: block; - color: $secondary-text-colour; - overflow: hidden; - white-space: nowrap; - text-overflow: ellipsis; - max-width: 580px; - } - - &-hint-large { - @include core-19; - display: block; - color: $secondary-text-colour; - overflow: hidden; - white-space: nowrap; - text-overflow: ellipsis; - max-width: 580px; - } - - &-status { - text-align: right; - } - -} - -/* The focus state for sibling links overlaps the hint so the hint's text colour needs to adapt */ -.govuk-link:focus { - - &.file-list-filename, - &.file-list-filename-large { - /* override box-shadow to push underline down a bit */ - box-shadow: 0 -2px $govuk-focus-colour, 0 5px $govuk-focus-text-colour; - - // File-list items contained by keyline-blocks have more spacing at the top so adapt to cover it - .keyline-block > .file-list & { - box-shadow: 0 -5px $govuk-focus-colour, 0 5px $govuk-focus-text-colour; - } - } - - & + .file-list-hint, - & + .file-list-hint-large { - color: $govuk-focus-text-colour; - } - -} - -// Note: this selector should use the :has() pseudo-class in the future when it is supported -// which will remove the need for JS -.file-list .js-child-has-focus { - - & + .file-list-hint-large, - & ~ .file-list-status { - color: $govuk-focus-text-colour; - } - -} - -.failure-highlight { - @include bold-19; - color: $error-colour; -} - -.align-with-message-body { - display: block; - margin-top: govuk-spacing(5); -} diff --git a/app/assets/stylesheets/views/get_started.scss b/app/assets/stylesheets/views/get_started.scss deleted file mode 100644 index ed914894f..000000000 --- a/app/assets/stylesheets/views/get_started.scss +++ /dev/null @@ -1,32 +0,0 @@ -.get-started-list { - - counter-reset: get-started-counter; - - &__item { - - counter-increment: get-started-counter; - padding: 0 0 0 govuk-spacing(6) + 5px; - margin: govuk-spacing(8) 0 0 0; - position: relative; - - &:before { - @include bold-24; - content: counter(get-started-counter) "."; - position: absolute; - top: 5px; - left: 0; - } - - summary[aria-expanded=false] { - margin-bottom: 0; - } - - } - - &__heading { - @include bold-24; - display: inline-block; - margin: 5px 0 govuk-spacing(3) 0; - } - -} diff --git a/app/assets/stylesheets/views/history.scss b/app/assets/stylesheets/views/history.scss deleted file mode 100644 index 0a0ed11d1..000000000 --- a/app/assets/stylesheets/views/history.scss +++ /dev/null @@ -1,32 +0,0 @@ -$item-top-padding: govuk-spacing(3); - -.history-list { - - @include core-19; - margin-bottom: govuk-spacing(6); - - &-item { - - padding: $item-top-padding 0 govuk-spacing(3) 0; - border-top: 1px solid $border-colour; - position: relative; - - &:last-child { - border-bottom: 1px solid $border-colour; - } - - .page-footer { - margin-bottom: 5px; - } - - } - - &-user { - display: block; - } - - &-time { - display: block; - color: $secondary-text-colour; - } -} diff --git a/app/assets/stylesheets/views/notification.scss b/app/assets/stylesheets/views/notification.scss deleted file mode 100644 index e0586069a..000000000 --- a/app/assets/stylesheets/views/notification.scss +++ /dev/null @@ -1,19 +0,0 @@ -.notification-status { - - @include core-16; - color: $secondary-text-colour; - margin-top: -1 * govuk-spacing(3); - - &.error { - - color: $govuk-error-colour; - font-weight: bold; - - } - - &-cancelled { - @include bold-19; - color: $govuk-error-colour; - } - -} diff --git a/app/assets/stylesheets/views/product-page.scss b/app/assets/stylesheets/views/product-page.scss deleted file mode 100644 index 523285f76..000000000 --- a/app/assets/stylesheets/views/product-page.scss +++ /dev/null @@ -1,144 +0,0 @@ -$product-page-blue: #005EA5; -// See https://github.com/alphagov/govuk-frontend/blob/v2.13.0/src/components/button/_button.scss#L24 -$button-shadow-size: $govuk-border-width-form-element; - -.product-page { - - &-intro { - - // The GOV.UK Frontend header component wraps content that is `position: relative` - // This changes its z-index position, putting it above the `
` section in the stacking order - // We need the `
` section to be above it, like the default order, so when we apply the - // negative margin-top it overlaps the theme bar at the bottom of the header - position: relative; - margin: -10px 0 govuk-spacing(6) * 1.5 0; - background: $product-page-blue; - color: $white; - - &-wrapper { - - @include govuk-width-container; - user-select: none; - padding: 0 0 govuk-spacing(9) 0; - - .govuk-grid-column-one-third { - display: none; - img { - max-width: 100%; - } - } - - @include media(desktop) { - .govuk-grid-column-one-third { - display: block; - } - } - - &--alternative { - @include media(desktop) { - background-image: file-url('product/proposition-alternative.svg'); - background-size: 320px; - background-repeat: no-repeat; - background-position: right 10px bottom 0; - - .govuk-grid-column-one-third { - display: none; - } - } - } - - } - - h1 { - @include bold-48; - margin: 20px 0 govuk-spacing(6) 0; - } - - p { - @include core-24; - color: $white; - margin: govuk-spacing(3) 0 govuk-spacing(6); - } - - .govuk-link { - - &:link, - &:visited { - color: $white; - } - - &:hover { - color: $light-blue-25; - } - - &:active, - &:focus { - color: $govuk-focus-text-colour; - } - - } - - } - - &-section { - - @include govuk-width-container; - margin-bottom: govuk-spacing(3); - - h2 { - @include bold-27; - margin: 0 0 govuk-spacing(6); - } - - .with-keyline { - border-top: 1px solid $border-colour; - padding: govuk-spacing(6) * 1.5 0 0 0; - } - - img { - width: 100%; - margin: 0 0 govuk-spacing(6) * 1.5 0; - } - - } - - &-big-number { - @include bold-48($tabular-numbers: true); - margin: 0 0 0 0; - } - -} - -.button-container { - line-height: 2.36; -} - -.button-container__button { - vertical-align: baseline; -} - -.product-page-button { - - // based on the govuk-button styles: - // https://github.com/alphagov/govuk-frontend/blob/v2.13.0/src/components/button/_button.scss - @include govuk-font($size: 24, $weight: bold); - color: $product-page-blue; - box-shadow: 0 $button-shadow-size 0 govuk-shade($colour: $product-page-blue, $percentage: 15%); - background: $white; - - &:link, - &:visited, - &:hover { - color: $product-page-blue; - } - - &:focus { - background: $white; - } - - &:hover { - background: $light-blue-25; - outline: none; - } - -} diff --git a/app/assets/stylesheets/views/send.scss b/app/assets/stylesheets/views/send.scss deleted file mode 100644 index 417c2480c..000000000 --- a/app/assets/stylesheets/views/send.scss +++ /dev/null @@ -1,14 +0,0 @@ -.send-one-off-form { - - .form-group, - .govuk-form-group { - margin-bottom: 20px; - } - -} - -.send-recipient { - white-space: nowrap; - overflow: hidden; - text-overflow: ellipsis; -} diff --git a/app/assets/stylesheets/views/template.scss b/app/assets/stylesheets/views/template.scss deleted file mode 100644 index 90f574333..000000000 --- a/app/assets/stylesheets/views/template.scss +++ /dev/null @@ -1,37 +0,0 @@ -.template-container { - position: relative; -} - -%edit-template-link, -.edit-template-link { - - @include core-19; - position: absolute; - background: $link-colour; - color: $white; - padding: 10px govuk-spacing(3); - z-index: 10000; - - &:link, &:visited { - color: $white; - } - - &:hover { - color: $light-blue-25; - } - - &:focus { - color: $govuk-text-colour; - } - -} - -.template-content-count { - @include core-19($tabular-numbers: true); - color: $secondary-text-colour; - padding: 0 0 govuk-spacing(6) 0; - - & .govuk-error-message { - margin: 0; - } -} diff --git a/app/assets/stylesheets/views/users.scss b/app/assets/stylesheets/views/users.scss deleted file mode 100644 index 7dc8a6bf8..000000000 --- a/app/assets/stylesheets/views/users.scss +++ /dev/null @@ -1,90 +0,0 @@ -$item-top-padding: govuk-spacing(3); - -.user-list { - - @include core-19; - margin-bottom: govuk-spacing(6); - - &-item { - - padding: govuk-spacing(3) 0px; - border-top: 1px solid $border-colour; - - &-heading { - - padding-right: govuk-spacing(3); - overflow: hidden; - overflow-wrap: break-word; - - .heading-small { - color: $black; - } - - } - - &:last-child { - border-bottom: 1px solid $border-colour; - } - - & :last-child { - margin-bottom: 0; - } - - &-blank { - - margin-bottom: govuk-spacing(3); - - @include govuk-media-query($from: tablet) { - margin-bottom: 0; - } - - } - - } - - &-edit-link { - - position: relative; - display: block; - margin: govuk-spacing(3) 0 govuk-spacing(3); - - @include govuk-media-query($from: tablet) { - float: right; - margin: 0; - } - - &:focus { - /* cancel default focus styling in favour of that from :before pseudo class */ - box-shadow: none; - } - - &:before { - content: ""; - display: block; - - position: absolute; - - top: -1 * govuk-spacing(3) - 1; - right: 0; - bottom: -1 * govuk-spacing(3); - left: -1 * govuk-spacing(3); - - background: transparent; - } - - &:active:before, - &:focus:before { - box-shadow: inset 0px -4px $govuk-focus-text-colour, inset 0px 16px $govuk-focus-colour, inset 3px 0px $govuk-focus-colour, inset 0px -15px $govuk-focus-colour, inset -3px 0px $govuk-focus-colour; - right: -3px; - left: -3px; - - @include govuk-media-query($from: tablet) { - border-width: 15px 3px 15px 15px; - box-shadow: inset 0px -4px $govuk-focus-text-colour, inset 0px 16px $govuk-focus-colour, inset 15px 0px $govuk-focus-colour, inset 0px -15px $govuk-focus-colour, inset -3px 0px $govuk-focus-colour; - left: -15px; - } - } - - } - -} diff --git a/app/assets/stylesheets/views/webauthn.scss b/app/assets/stylesheets/views/webauthn.scss deleted file mode 100644 index 33d1ee24e..000000000 --- a/app/assets/stylesheets/views/webauthn.scss +++ /dev/null @@ -1,40 +0,0 @@ -.webauthn__no-js { - .js-enabled & { - display: none; - } -} - -.webauthn__api-missing { - display: none; - - .js-enabled & { - display: block; - } - - .js-enabled.webauthn-api-enabled & { - display: none; - } -} - -.webauthn__api-required { - display: none; - - .webauthn-api-enabled & { - display: block; - } -} - -.webauthn-illustration { - - box-sizing: border-box; - width: 100%; - height: 100%; - margin: govuk-spacing(6) auto 0 auto; - padding: 0 govuk-spacing(9) 0 govuk-spacing(9); - - @include govuk-media-query($from: tablet) { - margin: govuk-spacing(9) auto 0 auto; - padding: 0; - } - -} diff --git a/app/main/forms.py b/app/main/forms.py index f396e2b51..5192b22f5 100644 --- a/app/main/forms.py +++ b/app/main/forms.py @@ -256,7 +256,7 @@ def govuk_text_input_field_widget(self, field, type=None, param_extensions=None, merge_jsonlike(params, param_extensions) return Markup( - render_template('components/uk_components/input/template.njk', params=params)) + render_template('components/us_components/input/template.njk', params=params)) class GovukTextInputField(StringField): @@ -791,7 +791,7 @@ def govuk_radios_field_widget(self, field, param_extensions=None, **kwargs): merge_jsonlike(params, param_extensions) return Markup( - render_template('components/uk_components/radios/template.njk', params=params)) + render_template('components/us_components/radios/template.njk', params=params)) class GovukCheckboxField(BooleanField): @@ -848,7 +848,7 @@ class GovukTextareaField(TextAreaField): merge_jsonlike(params, param_extensions) return Markup( - render_template('components/uk_components/textarea/template.njk', params=params)) + render_template('components/us_components/textarea/template.njk', params=params)) # based on work done by @richardjpope: https://github.com/richardjpope/recourse/blob/master/recourse/forms.py#L6 diff --git a/app/main/validators.py b/app/main/validators.py index 894370187..dafffbdfd 100644 --- a/app/main/validators.py +++ b/app/main/validators.py @@ -46,7 +46,7 @@ class ValidGovEmail: from flask import url_for message = ''' Enter a public sector email address or - find out who can use Notify + find out who can use Notify '''.format(url_for('main.features')) if not is_gov_user(field.data.lower()): raise ValidationError(message) diff --git a/app/main/views/api_keys.py b/app/main/views/api_keys.py index f2a0cf390..7b88656d3 100644 --- a/app/main/views/api_keys.py +++ b/app/main/views/api_keys.py @@ -93,7 +93,7 @@ def create_api_key(service_id): 'hint': { 'html': Markup( 'Not available because your service is in ' - 'trial mode') + 'trial mode') } } if form.validate_on_submit(): diff --git a/app/main/views/invites.py b/app/main/views/invites.py index 72f6719fa..a0da1ad66 100644 --- a/app/main/views/invites.py +++ b/app/main/views/invites.py @@ -22,7 +22,7 @@ def accept_invite(token): message = Markup(""" You’re signed in as {}. This invite is for another email address. - Sign out + Sign out and click the link again to accept this invite. """.format( current_user.email_address, @@ -82,7 +82,7 @@ def accept_org_invite(token): message = Markup(""" You’re signed in as {}. This invite is for another email address. - Sign out + Sign out and click the link again to accept this invite. """.format( current_user.email_address, diff --git a/app/main/views/sign_in.py b/app/main/views/sign_in.py index edf3d4950..8d4d185ec 100644 --- a/app/main/views/sign_in.py +++ b/app/main/views/sign_in.py @@ -66,7 +66,7 @@ def sign_in(): flash(Markup( ( f"The email address or password you entered is incorrect." - f" Forgot your password?" + f" Forgot your password?" ) )) diff --git a/app/templates/admin_template.html b/app/templates/admin_template.html index c6436380e..1ef49ca34 100644 --- a/app/templates/admin_template.html +++ b/app/templates/admin_template.html @@ -14,8 +14,6 @@ {%- for font in font_paths %} {%- endfor %} - - {% block extra_stylesheets %} {% endblock %} @@ -148,9 +146,9 @@ {% if current_service and current_service.research_mode %} - {% set meta_suffix = 'Built by the Technology Transformation Servicesresearch mode' %} + {% set meta_suffix = 'Built by the Technology Transformation Servicesresearch mode' %} {% else %} - {% set meta_suffix = 'Built by the Technology Transformation Services' %} + {% set meta_suffix = 'Built by the Technology Transformation Services' %} {% endif %} {{ govukFooter({ diff --git a/app/templates/components/banner.html b/app/templates/components/banner.html index faf6cdb66..6a552be24 100644 --- a/app/templates/components/banner.html +++ b/app/templates/components/banner.html @@ -1,5 +1,5 @@ {% 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 %} {% macro banner(body, type=None, with_tick=False, delete_button=None, subhead=None, context=None, action=None, id=None, thing=None) %}
+ {% endif %} @@ -42,7 +42,7 @@ {% if failures %} {% if failure_link %} - + {{ "{:,}".format(failures) }} failed – {{ failure_percentage }}% diff --git a/app/templates/components/file-upload.html b/app/templates/components/file-upload.html index 3a146ff1a..d006fbd9e 100644 --- a/app/templates/components/file-upload.html +++ b/app/templates/components/file-upload.html @@ -1,4 +1,4 @@ -{% from "components/uk_components/button/macro.njk" import govukButton %} +{% from "components/us_components/button/macro.njk" import govukButton %} {% macro file_upload( field, @@ -34,7 +34,7 @@ {% if alternate_link and alternate_link_text %} - or {{ alternate_link_text }} + or {{ alternate_link_text }} {% endif %} diff --git a/app/templates/components/folder-path.html b/app/templates/components/folder-path.html index 44cf127f5..6ba0108aa 100644 --- a/app/templates/components/folder-path.html +++ b/app/templates/components/folder-path.html @@ -40,7 +40,7 @@ {% if folder_path %}

{% if folder_path|length == 1 %} - Services + Services {{ folder_path_separator() }} {% endif %} {% for folder in folder_path %} @@ -51,15 +51,15 @@ {% else %} {% if folder.id %} {% if current_user.has_template_folder_permission(folder) %} - {{ folder.name }} + {{ folder.name }} {% else %} {{ folder.name }} {% endif %} {% if not loop.last %}{{ folder_path_separator() }}{% endif %} {% elif folder.parent_id == None %} - {{ from_service.name }} {% if not loop.last %}{{ folder_path_separator() }}{% endif %} + {{ from_service.name }} {% if not loop.last %}{{ folder_path_separator() }}{% endif %} {% else %} - {{ from_service.name }} {% if not loop.last %}{{ folder_path_separator() }}{% endif %} + {{ from_service.name }} {% if not loop.last %}{{ folder_path_separator() }}{% endif %} {% endif %} {% endif %} {% endfor %} diff --git a/app/templates/components/list-entry.html b/app/templates/components/list-entry.html index 1c74279fb..7b41b40dd 100644 --- a/app/templates/components/list-entry.html +++ b/app/templates/components/list-entry.html @@ -1,5 +1,5 @@ -{% from "components/uk_components/fieldset/macro.njk" import govukFieldset %} -{% from "components/uk_components/error-message/macro.njk" import govukErrorMessage %} +{% from "components/us_components/fieldset/macro.njk" import govukFieldset %} +{% from "components/us_components/error-message/macro.njk" import govukErrorMessage %} {% macro list_entry( field, diff --git a/app/templates/components/page-footer.html b/app/templates/components/page-footer.html index 8ce6eea89..9e6fbaa5f 100644 --- a/app/templates/components/page-footer.html +++ b/app/templates/components/page-footer.html @@ -1,4 +1,4 @@ -{% from "components/uk_components/button/macro.njk" import govukButton %} +{% from "components/us_components/button/macro.njk" import govukButton %} {% macro page_footer( button_text=None, @@ -32,7 +32,7 @@ {% endif %} {% if delete_link %} - {{ delete_link_text }} + {{ delete_link_text }} {% endif %} {% if secondary_link and secondary_link_text %} diff --git a/app/templates/components/previous-next-navigation.html b/app/templates/components/previous-next-navigation.html index 483dc3f18..6b9c5c4ab 100644 --- a/app/templates/components/previous-next-navigation.html +++ b/app/templates/components/previous-next-navigation.html @@ -4,7 +4,7 @@
    {% if previous_page %}
  • - + @@ -17,7 +17,7 @@ {% endif %} {% if next_page %}
  • -
    {{ number }} {{ label }} + {{ number }} {{ label }} {% else %} {{ number }} {{ label }} {% endif %} diff --git a/app/templates/components/sub-navigation.html b/app/templates/components/sub-navigation.html index 74e498c18..54ea664b3 100644 --- a/app/templates/components/sub-navigation.html +++ b/app/templates/components/sub-navigation.html @@ -24,7 +24,7 @@ {% macro sub_navigation( item_set ) %} -
    diff --git a/app/templates/components/uk_components/skip-link/template.njk b/app/templates/components/uk_components/skip-link/template.njk deleted file mode 100644 index b78695eae..000000000 --- a/app/templates/components/uk_components/skip-link/template.njk +++ /dev/null @@ -1,3 +0,0 @@ - - {{- params.html | safe if params.html else params.text -}} - diff --git a/app/templates/components/uk_components/back-link/README.md b/app/templates/components/us_components/back-link/README.md similarity index 100% rename from app/templates/components/uk_components/back-link/README.md rename to app/templates/components/us_components/back-link/README.md diff --git a/app/templates/components/uk_components/back-link/_back-link.scss b/app/templates/components/us_components/back-link/_back-link.scss similarity index 100% rename from app/templates/components/uk_components/back-link/_back-link.scss rename to app/templates/components/us_components/back-link/_back-link.scss diff --git a/app/templates/components/uk_components/back-link/macro-options.json b/app/templates/components/us_components/back-link/macro-options.json similarity index 100% rename from app/templates/components/uk_components/back-link/macro-options.json rename to app/templates/components/us_components/back-link/macro-options.json diff --git a/app/templates/components/uk_components/back-link/macro.njk b/app/templates/components/us_components/back-link/macro.njk similarity index 100% rename from app/templates/components/uk_components/back-link/macro.njk rename to app/templates/components/us_components/back-link/macro.njk diff --git a/app/templates/components/uk_components/back-link/template.njk b/app/templates/components/us_components/back-link/template.njk similarity index 100% rename from app/templates/components/uk_components/back-link/template.njk rename to app/templates/components/us_components/back-link/template.njk diff --git a/app/templates/components/uk_components/button/README.md b/app/templates/components/us_components/button/README.md similarity index 100% rename from app/templates/components/uk_components/button/README.md rename to app/templates/components/us_components/button/README.md diff --git a/app/templates/components/uk_components/button/_button.scss b/app/templates/components/us_components/button/_button.scss similarity index 100% rename from app/templates/components/uk_components/button/_button.scss rename to app/templates/components/us_components/button/_button.scss diff --git a/app/templates/components/uk_components/button/macro-options.json b/app/templates/components/us_components/button/macro-options.json similarity index 100% rename from app/templates/components/uk_components/button/macro-options.json rename to app/templates/components/us_components/button/macro-options.json diff --git a/app/templates/components/uk_components/button/macro.njk b/app/templates/components/us_components/button/macro.njk similarity index 100% rename from app/templates/components/uk_components/button/macro.njk rename to app/templates/components/us_components/button/macro.njk diff --git a/app/templates/components/uk_components/button/template.njk b/app/templates/components/us_components/button/template.njk similarity index 100% rename from app/templates/components/uk_components/button/template.njk rename to app/templates/components/us_components/button/template.njk diff --git a/app/templates/components/uk_components/checkboxes/README.md b/app/templates/components/us_components/checkboxes/README.md similarity index 100% rename from app/templates/components/uk_components/checkboxes/README.md rename to app/templates/components/us_components/checkboxes/README.md diff --git a/app/templates/components/uk_components/checkboxes/_checkboxes.scss b/app/templates/components/us_components/checkboxes/_checkboxes.scss similarity index 100% rename from app/templates/components/uk_components/checkboxes/_checkboxes.scss rename to app/templates/components/us_components/checkboxes/_checkboxes.scss diff --git a/app/templates/components/uk_components/checkboxes/macro-options.json b/app/templates/components/us_components/checkboxes/macro-options.json similarity index 100% rename from app/templates/components/uk_components/checkboxes/macro-options.json rename to app/templates/components/us_components/checkboxes/macro-options.json diff --git a/app/templates/components/uk_components/checkboxes/macro.njk b/app/templates/components/us_components/checkboxes/macro.njk similarity index 100% rename from app/templates/components/uk_components/checkboxes/macro.njk rename to app/templates/components/us_components/checkboxes/macro.njk diff --git a/app/templates/components/uk_components/checkboxes/template.njk b/app/templates/components/us_components/checkboxes/template.njk similarity index 100% rename from app/templates/components/uk_components/checkboxes/template.njk rename to app/templates/components/us_components/checkboxes/template.njk diff --git a/app/templates/components/uk_components/details/README.md b/app/templates/components/us_components/details/README.md similarity index 100% rename from app/templates/components/uk_components/details/README.md rename to app/templates/components/us_components/details/README.md diff --git a/app/templates/components/uk_components/details/_details.scss b/app/templates/components/us_components/details/_details.scss similarity index 100% rename from app/templates/components/uk_components/details/_details.scss rename to app/templates/components/us_components/details/_details.scss diff --git a/app/templates/components/uk_components/details/macro-options.json b/app/templates/components/us_components/details/macro-options.json similarity index 100% rename from app/templates/components/uk_components/details/macro-options.json rename to app/templates/components/us_components/details/macro-options.json diff --git a/app/templates/components/uk_components/details/macro.njk b/app/templates/components/us_components/details/macro.njk similarity index 100% rename from app/templates/components/uk_components/details/macro.njk rename to app/templates/components/us_components/details/macro.njk diff --git a/app/templates/components/uk_components/details/template.njk b/app/templates/components/us_components/details/template.njk similarity index 100% rename from app/templates/components/uk_components/details/template.njk rename to app/templates/components/us_components/details/template.njk diff --git a/app/templates/components/uk_components/error-message/README.md b/app/templates/components/us_components/error-message/README.md similarity index 100% rename from app/templates/components/uk_components/error-message/README.md rename to app/templates/components/us_components/error-message/README.md diff --git a/app/templates/components/uk_components/error-message/_error-message.scss b/app/templates/components/us_components/error-message/_error-message.scss similarity index 100% rename from app/templates/components/uk_components/error-message/_error-message.scss rename to app/templates/components/us_components/error-message/_error-message.scss diff --git a/app/templates/components/uk_components/error-message/macro-options.json b/app/templates/components/us_components/error-message/macro-options.json similarity index 100% rename from app/templates/components/uk_components/error-message/macro-options.json rename to app/templates/components/us_components/error-message/macro-options.json diff --git a/app/templates/components/uk_components/error-message/macro.njk b/app/templates/components/us_components/error-message/macro.njk similarity index 100% rename from app/templates/components/uk_components/error-message/macro.njk rename to app/templates/components/us_components/error-message/macro.njk diff --git a/app/templates/components/uk_components/error-message/template.njk b/app/templates/components/us_components/error-message/template.njk similarity index 100% rename from app/templates/components/uk_components/error-message/template.njk rename to app/templates/components/us_components/error-message/template.njk diff --git a/app/templates/components/uk_components/fieldset/README.md b/app/templates/components/us_components/fieldset/README.md similarity index 100% rename from app/templates/components/uk_components/fieldset/README.md rename to app/templates/components/us_components/fieldset/README.md diff --git a/app/templates/components/uk_components/fieldset/_fieldset.scss b/app/templates/components/us_components/fieldset/_fieldset.scss similarity index 100% rename from app/templates/components/uk_components/fieldset/_fieldset.scss rename to app/templates/components/us_components/fieldset/_fieldset.scss diff --git a/app/templates/components/uk_components/fieldset/macro-options.json b/app/templates/components/us_components/fieldset/macro-options.json similarity index 100% rename from app/templates/components/uk_components/fieldset/macro-options.json rename to app/templates/components/us_components/fieldset/macro-options.json diff --git a/app/templates/components/uk_components/fieldset/macro.njk b/app/templates/components/us_components/fieldset/macro.njk similarity index 100% rename from app/templates/components/uk_components/fieldset/macro.njk rename to app/templates/components/us_components/fieldset/macro.njk diff --git a/app/templates/components/uk_components/fieldset/template.njk b/app/templates/components/us_components/fieldset/template.njk similarity index 100% rename from app/templates/components/uk_components/fieldset/template.njk rename to app/templates/components/us_components/fieldset/template.njk diff --git a/app/templates/components/uk_components/footer/README.md b/app/templates/components/us_components/footer/README.md similarity index 100% rename from app/templates/components/uk_components/footer/README.md rename to app/templates/components/us_components/footer/README.md diff --git a/app/templates/components/uk_components/footer/_footer.scss b/app/templates/components/us_components/footer/_footer.scss similarity index 100% rename from app/templates/components/uk_components/footer/_footer.scss rename to app/templates/components/us_components/footer/_footer.scss diff --git a/app/templates/components/uk_components/footer/macro-options.json b/app/templates/components/us_components/footer/macro-options.json similarity index 100% rename from app/templates/components/uk_components/footer/macro-options.json rename to app/templates/components/us_components/footer/macro-options.json diff --git a/app/templates/components/uk_components/footer/macro.njk b/app/templates/components/us_components/footer/macro.njk similarity index 100% rename from app/templates/components/uk_components/footer/macro.njk rename to app/templates/components/us_components/footer/macro.njk diff --git a/app/templates/components/uk_components/footer/template.njk b/app/templates/components/us_components/footer/template.njk similarity index 64% rename from app/templates/components/uk_components/footer/template.njk rename to app/templates/components/us_components/footer/template.njk index 94b37c216..af58c3b3c 100644 --- a/app/templates/components/uk_components/footer/template.njk +++ b/app/templates/components/us_components/footer/template.njk @@ -1,65 +1,3 @@ -{#
    -
    - Return to top -
    -
    - {% if params.navigation %} -
    - {% for nav in params.navigation %} -
    -

    {{ nav.title }}

    - {% if nav.items %} - {% set listClasses %} - {% if nav.columns %} - govuk-footer__list--columns-{{ nav.columns }} - {% endif %} - {% endset %} -
      - {% for item in nav.items %} - {% if item.href and item.text %} -
    • - - {{ item.text }} - -
      • - {% endif %} - {% endfor %} -
    - {% endif %} -
    - {% endfor %} -
    -
    - {% endif %} -
    -
    - {% if params.meta %} -

    {{ params.meta.visuallyHiddenTitle | default("Support links") }}

    - {% if params.meta.items %} - - {% endif %} - {% if params.meta.text or params.meta.html %} -
    - {{ params.meta.html | safe if params.meta.html else params.meta.text }} -
    - {% endif %} - {% endif %} - -
    -
    -
    -
    #} - -
    -
    -
    - +
    {% if params.meta %}

    {{ params.meta.visuallyHiddenTitle | default("Support links") }}

    {% if params.meta.items %} - {% endif %} {% if params.meta.text or params.meta.html %}
    @@ -123,7 +55,6 @@ {% endif %}
    -

diff --git a/app/templates/components/uk_components/header/README.md b/app/templates/components/us_components/header/README.md similarity index 100% rename from app/templates/components/uk_components/header/README.md rename to app/templates/components/us_components/header/README.md diff --git a/app/templates/components/uk_components/header/_header.scss b/app/templates/components/us_components/header/_header.scss similarity index 100% rename from app/templates/components/uk_components/header/_header.scss rename to app/templates/components/us_components/header/_header.scss diff --git a/app/templates/components/uk_components/header/macro-options.json b/app/templates/components/us_components/header/macro-options.json similarity index 100% rename from app/templates/components/uk_components/header/macro-options.json rename to app/templates/components/us_components/header/macro-options.json diff --git a/app/templates/components/uk_components/header/macro.njk b/app/templates/components/us_components/header/macro.njk similarity index 100% rename from app/templates/components/uk_components/header/macro.njk rename to app/templates/components/us_components/header/macro.njk diff --git a/app/templates/components/uk_components/header/template.njk b/app/templates/components/us_components/header/template.njk similarity index 100% rename from app/templates/components/uk_components/header/template.njk rename to app/templates/components/us_components/header/template.njk diff --git a/app/templates/components/uk_components/hint/README.md b/app/templates/components/us_components/hint/README.md similarity index 100% rename from app/templates/components/uk_components/hint/README.md rename to app/templates/components/us_components/hint/README.md diff --git a/app/templates/components/uk_components/hint/_hint.scss b/app/templates/components/us_components/hint/_hint.scss similarity index 100% rename from app/templates/components/uk_components/hint/_hint.scss rename to app/templates/components/us_components/hint/_hint.scss diff --git a/app/templates/components/uk_components/hint/macro-options.json b/app/templates/components/us_components/hint/macro-options.json similarity index 100% rename from app/templates/components/uk_components/hint/macro-options.json rename to app/templates/components/us_components/hint/macro-options.json diff --git a/app/templates/components/uk_components/hint/macro.njk b/app/templates/components/us_components/hint/macro.njk similarity index 100% rename from app/templates/components/uk_components/hint/macro.njk rename to app/templates/components/us_components/hint/macro.njk diff --git a/app/templates/components/uk_components/hint/template.njk b/app/templates/components/us_components/hint/template.njk similarity index 100% rename from app/templates/components/uk_components/hint/template.njk rename to app/templates/components/us_components/hint/template.njk diff --git a/app/templates/components/uk_components/input/README.md b/app/templates/components/us_components/input/README.md similarity index 100% rename from app/templates/components/uk_components/input/README.md rename to app/templates/components/us_components/input/README.md diff --git a/app/templates/components/uk_components/input/_input.scss b/app/templates/components/us_components/input/_input.scss similarity index 100% rename from app/templates/components/uk_components/input/_input.scss rename to app/templates/components/us_components/input/_input.scss diff --git a/app/templates/components/uk_components/input/macro-options.json b/app/templates/components/us_components/input/macro-options.json similarity index 100% rename from app/templates/components/uk_components/input/macro-options.json rename to app/templates/components/us_components/input/macro-options.json diff --git a/app/templates/components/uk_components/input/macro.njk b/app/templates/components/us_components/input/macro.njk similarity index 100% rename from app/templates/components/uk_components/input/macro.njk rename to app/templates/components/us_components/input/macro.njk diff --git a/app/templates/components/uk_components/input/template.njk b/app/templates/components/us_components/input/template.njk similarity index 100% rename from app/templates/components/uk_components/input/template.njk rename to app/templates/components/us_components/input/template.njk diff --git a/app/templates/components/uk_components/inset-text/README.md b/app/templates/components/us_components/inset-text/README.md similarity index 100% rename from app/templates/components/uk_components/inset-text/README.md rename to app/templates/components/us_components/inset-text/README.md diff --git a/app/templates/components/uk_components/inset-text/_inset-text.scss b/app/templates/components/us_components/inset-text/_inset-text.scss similarity index 100% rename from app/templates/components/uk_components/inset-text/_inset-text.scss rename to app/templates/components/us_components/inset-text/_inset-text.scss diff --git a/app/templates/components/uk_components/inset-text/macro-options.json b/app/templates/components/us_components/inset-text/macro-options.json similarity index 100% rename from app/templates/components/uk_components/inset-text/macro-options.json rename to app/templates/components/us_components/inset-text/macro-options.json diff --git a/app/templates/components/uk_components/inset-text/macro.njk b/app/templates/components/us_components/inset-text/macro.njk similarity index 100% rename from app/templates/components/uk_components/inset-text/macro.njk rename to app/templates/components/us_components/inset-text/macro.njk diff --git a/app/templates/components/uk_components/inset-text/template.njk b/app/templates/components/us_components/inset-text/template.njk similarity index 100% rename from app/templates/components/uk_components/inset-text/template.njk rename to app/templates/components/us_components/inset-text/template.njk diff --git a/app/templates/components/uk_components/label/README.md b/app/templates/components/us_components/label/README.md similarity index 100% rename from app/templates/components/uk_components/label/README.md rename to app/templates/components/us_components/label/README.md diff --git a/app/templates/components/uk_components/label/_label.scss b/app/templates/components/us_components/label/_label.scss similarity index 100% rename from app/templates/components/uk_components/label/_label.scss rename to app/templates/components/us_components/label/_label.scss diff --git a/app/templates/components/uk_components/label/macro-options.json b/app/templates/components/us_components/label/macro-options.json similarity index 100% rename from app/templates/components/uk_components/label/macro-options.json rename to app/templates/components/us_components/label/macro-options.json diff --git a/app/templates/components/uk_components/label/macro.njk b/app/templates/components/us_components/label/macro.njk similarity index 100% rename from app/templates/components/uk_components/label/macro.njk rename to app/templates/components/us_components/label/macro.njk diff --git a/app/templates/components/uk_components/label/template.njk b/app/templates/components/us_components/label/template.njk similarity index 100% rename from app/templates/components/uk_components/label/template.njk rename to app/templates/components/us_components/label/template.njk diff --git a/app/templates/components/uk_components/radios/README.md b/app/templates/components/us_components/radios/README.md similarity index 100% rename from app/templates/components/uk_components/radios/README.md rename to app/templates/components/us_components/radios/README.md diff --git a/app/templates/components/uk_components/radios/_radios.scss b/app/templates/components/us_components/radios/_radios.scss similarity index 100% rename from app/templates/components/uk_components/radios/_radios.scss rename to app/templates/components/us_components/radios/_radios.scss diff --git a/app/templates/components/uk_components/radios/macro-options.json b/app/templates/components/us_components/radios/macro-options.json similarity index 100% rename from app/templates/components/uk_components/radios/macro-options.json rename to app/templates/components/us_components/radios/macro-options.json diff --git a/app/templates/components/uk_components/radios/macro.njk b/app/templates/components/us_components/radios/macro.njk similarity index 100% rename from app/templates/components/uk_components/radios/macro.njk rename to app/templates/components/us_components/radios/macro.njk diff --git a/app/templates/components/uk_components/radios/template.njk b/app/templates/components/us_components/radios/template.njk similarity index 100% rename from app/templates/components/uk_components/radios/template.njk rename to app/templates/components/us_components/radios/template.njk diff --git a/app/templates/components/uk_components/skip-link/README.md b/app/templates/components/us_components/skip-link/README.md similarity index 100% rename from app/templates/components/uk_components/skip-link/README.md rename to app/templates/components/us_components/skip-link/README.md diff --git a/app/templates/components/uk_components/skip-link/_skip-link.scss b/app/templates/components/us_components/skip-link/_skip-link.scss similarity index 100% rename from app/templates/components/uk_components/skip-link/_skip-link.scss rename to app/templates/components/us_components/skip-link/_skip-link.scss diff --git a/app/templates/components/uk_components/skip-link/macro-options.json b/app/templates/components/us_components/skip-link/macro-options.json similarity index 100% rename from app/templates/components/uk_components/skip-link/macro-options.json rename to app/templates/components/us_components/skip-link/macro-options.json diff --git a/app/templates/components/uk_components/skip-link/macro.njk b/app/templates/components/us_components/skip-link/macro.njk similarity index 100% rename from app/templates/components/uk_components/skip-link/macro.njk rename to app/templates/components/us_components/skip-link/macro.njk diff --git a/app/templates/components/us_components/skip-link/template.njk b/app/templates/components/us_components/skip-link/template.njk new file mode 100644 index 000000000..f18f881e8 --- /dev/null +++ b/app/templates/components/us_components/skip-link/template.njk @@ -0,0 +1,7 @@ + + {{- params.html | safe if params.html else params.text -}} + + + + Skip to main content + \ No newline at end of file diff --git a/app/templates/components/uk_components/textarea/README.md b/app/templates/components/us_components/textarea/README.md similarity index 100% rename from app/templates/components/uk_components/textarea/README.md rename to app/templates/components/us_components/textarea/README.md diff --git a/app/templates/components/uk_components/textarea/_textarea.scss b/app/templates/components/us_components/textarea/_textarea.scss similarity index 100% rename from app/templates/components/uk_components/textarea/_textarea.scss rename to app/templates/components/us_components/textarea/_textarea.scss diff --git a/app/templates/components/uk_components/textarea/macro-options.json b/app/templates/components/us_components/textarea/macro-options.json similarity index 100% rename from app/templates/components/uk_components/textarea/macro-options.json rename to app/templates/components/us_components/textarea/macro-options.json diff --git a/app/templates/components/uk_components/textarea/macro.njk b/app/templates/components/us_components/textarea/macro.njk similarity index 100% rename from app/templates/components/uk_components/textarea/macro.njk rename to app/templates/components/us_components/textarea/macro.njk diff --git a/app/templates/components/uk_components/textarea/template.njk b/app/templates/components/us_components/textarea/template.njk similarity index 100% rename from app/templates/components/uk_components/textarea/template.njk rename to app/templates/components/us_components/textarea/template.njk diff --git a/app/templates/content_template.html b/app/templates/content_template.html index e217a5c1d..abca0be7e 100644 --- a/app/templates/content_template.html +++ b/app/templates/content_template.html @@ -14,7 +14,7 @@
{{ sub_navigation(navigation_links) }}
-
+
{% else %}
{% endif %} diff --git a/app/templates/error/401.html b/app/templates/error/401.html index b579650dc..d8d30b399 100644 --- a/app/templates/error/401.html +++ b/app/templates/error/401.html @@ -4,6 +4,6 @@

You’re not authorised to see this page

-

Sign in to Notify.gov and try again.

+

Sign in to Notify.gov and try again.

{% endblock %} diff --git a/app/templates/error/404.html b/app/templates/error/404.html index fdf574ca0..ba607bc02 100644 --- a/app/templates/error/404.html +++ b/app/templates/error/404.html @@ -13,7 +13,7 @@ If you pasted the web address, check you copied the entire address.

- If the web address is correct or you selected a link or button, contact us. + If the web address is correct or you selected a link or button, contact us.

diff --git a/app/templates/error/410.html b/app/templates/error/410.html index fdf574ca0..ba607bc02 100644 --- a/app/templates/error/410.html +++ b/app/templates/error/410.html @@ -13,7 +13,7 @@ If you pasted the web address, check you copied the entire address.

- If the web address is correct or you selected a link or button, contact us. + If the web address is correct or you selected a link or button, contact us.

diff --git a/app/templates/error/500.html b/app/templates/error/500.html index db505a014..b8e5f9144 100644 --- a/app/templates/error/500.html +++ b/app/templates/error/500.html @@ -10,10 +10,10 @@ Try again later.

- To report a problem, please email notify-support@gsa.gov. + To report a problem, please email notify-support@gsa.gov.

diff --git a/app/templates/forms/fields/checkboxes/template.njk b/app/templates/forms/fields/checkboxes/template.njk index 10d1a7df8..e081ccd4b 100644 --- a/app/templates/forms/fields/checkboxes/template.njk +++ b/app/templates/forms/fields/checkboxes/template.njk @@ -1,7 +1,7 @@ -{% from "components/uk_components/error-message/macro.njk" import govukErrorMessage -%} -{% from "components/uk_components/fieldset/macro.njk" import govukFieldset %} -{% from "components/uk_components/hint/macro.njk" import govukHint %} -{% from "components/uk_components/label/macro.njk" import govukLabel %} +{% from "components/us_components/error-message/macro.njk" import govukErrorMessage -%} +{% from "components/us_components/fieldset/macro.njk" import govukFieldset %} +{% from "components/us_components/hint/macro.njk" import govukHint %} +{% from "components/us_components/label/macro.njk" import govukLabel %} {#- Copied from https://github.com/alphagov/govuk-frontend/blob/v2.13.0/src/components/checkboxes/template.njk diff --git a/app/templates/main_nav.html b/app/templates/main_nav.html index a57d221db..c479f4945 100644 --- a/app/templates/main_nav.html +++ b/app/templates/main_nav.html @@ -19,11 +19,11 @@
  • Settings
    • {% endif %} {% if current_user.has_permissions('manage_api_keys') %} - + {% endif %} {% elif current_user.has_permissions(allow_org_user=True) %} -
  • Usage
    • -
  • Team members
    • +
  • Usage
    • +
  • Team members
    • {% endif %} diff --git a/app/templates/main_template.html b/app/templates/main_template.html index 51f0c2369..9944d8306 100644 --- a/app/templates/main_template.html +++ b/app/templates/main_template.html @@ -1,6 +1,6 @@ -{% from "./components/uk_components/skip-link/macro.njk" import govukSkipLink -%} -{% from "./components/uk_components/header/macro.njk" import govukHeader -%} -{% from "./components/uk_components/footer/macro.njk" import govukFooter -%} +{% from "./components/us_components/skip-link/macro.njk" import govukSkipLink -%} +{% from "./components/us_components/header/macro.njk" import govukHeader -%} +{% from "./components/us_components/footer/macro.njk" import govukFooter -%} {# specify absolute url for the static assets folder e.g. http://wwww.domain.com/assets #} {%- set assetUrl = assetUrl | default(assetPath) -%} diff --git a/app/templates/org_nav.html b/app/templates/org_nav.html index 4363f94cf..f7f7a5b93 100644 --- a/app/templates/org_nav.html +++ b/app/templates/org_nav.html @@ -1,11 +1,11 @@ diff --git a/app/templates/org_template.html b/app/templates/org_template.html index 82928fc34..cf195a2e9 100644 --- a/app/templates/org_template.html +++ b/app/templates/org_template.html @@ -6,14 +6,14 @@ {% block main %}
    -
    +
    {% if current_user.platform_admin %} - Organizations + Organizations {% endif %} -
    +
    {{ current_org.name }}
    - Switch service + Switch service
    diff --git a/app/templates/partials/check/not-allowed-to-send-to.html b/app/templates/partials/check/not-allowed-to-send-to.html index ad00b0cb1..87543ec77 100644 --- a/app/templates/partials/check/not-allowed-to-send-to.html +++ b/app/templates/partials/check/not-allowed-to-send-to.html @@ -7,6 +7,6 @@ {%- endif %}

    - In trial mode you can only + In trial mode you can only send to yourself and members of your team

    diff --git a/app/templates/partials/check/too-many-messages.html b/app/templates/partials/check/too-many-messages.html index e3b711556..855733baf 100644 --- a/app/templates/partials/check/too-many-messages.html +++ b/app/templates/partials/check/too-many-messages.html @@ -8,7 +8,7 @@

    You can only send {{ current_service.message_limit|format_thousands }} messages per day {%- if current_service.trial_mode %} - in trial mode + in trial mode {%- endif -%} .

    diff --git a/app/templates/partials/jobs/notifications.html b/app/templates/partials/jobs/notifications.html index 7e181f578..84f45a28e 100644 --- a/app/templates/partials/jobs/notifications.html +++ b/app/templates/partials/jobs/notifications.html @@ -7,7 +7,7 @@

    Sending - {{ job.template.name }} + {{ job.template.name }} {{ job.scheduled_for|format_datetime_relative }}

    @@ -30,7 +30,7 @@

    {% elif notifications %}

    - Download this report (CSV) + Download this report (CSV)   {{ time_left }}

    @@ -48,7 +48,7 @@ field_headings_visible=False ) %} {% call row_heading() %} - {{ item.to }} + {{ item.to }}

    {{ item.preview_of_content }}

    diff --git a/app/templates/partials/jobs/status.html b/app/templates/partials/jobs/status.html index e826fc0cf..17ee1beb2 100644 --- a/app/templates/partials/jobs/status.html +++ b/app/templates/partials/jobs/status.html @@ -15,7 +15,7 @@ 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.

    - Upload this spreadsheet again tomorrow or contact the Notify.gov team to raise the limit. + Upload this spreadsheet again tomorrow or contact the Notify.gov team to raise the limit.

    {% endif %}
    diff --git a/app/templates/partials/notifications/status.html b/app/templates/partials/notifications/status.html index aa4eb45e5..2796c69e3 100644 --- a/app/templates/partials/notifications/status.html +++ b/app/templates/partials/notifications/status.html @@ -4,7 +4,7 @@ {% set status_url = notification.status|format_notification_status_as_url(notification.notification_type) %}

    {% if status_url %} - + {% endif %} {% if notification.status != 'sending' %} diff --git a/app/templates/partials/templates/guidance-formatting-letters.html b/app/templates/partials/templates/guidance-formatting-letters.html index a1b80ed3a..05bafcef9 100644 --- a/app/templates/partials/templates/guidance-formatting-letters.html +++ b/app/templates/partials/templates/guidance-formatting-letters.html @@ -1,4 +1,4 @@ -{% from "components/uk_components/inset-text/macro.njk" import govukInsetText %} +{% from "components/us_components/inset-text/macro.njk" import govukInsetText %}

    Formatting

    diff --git a/app/templates/partials/templates/guidance-formatting.html b/app/templates/partials/templates/guidance-formatting.html index d23941113..ab13ae820 100644 --- a/app/templates/partials/templates/guidance-formatting.html +++ b/app/templates/partials/templates/guidance-formatting.html @@ -1,4 +1,4 @@ -{% from "components/uk_components/inset-text/macro.njk" import govukInsetText %} +{% from "components/us_components/inset-text/macro.njk" import govukInsetText %}

    Formatting

    diff --git a/app/templates/partials/templates/guidance-links.html b/app/templates/partials/templates/guidance-links.html index 58ff7b6bf..7eaab8869 100644 --- a/app/templates/partials/templates/guidance-links.html +++ b/app/templates/partials/templates/guidance-links.html @@ -1,4 +1,4 @@ -{% from "components/uk_components/inset-text/macro.njk" import govukInsetText %} +{% from "components/us_components/inset-text/macro.njk" import govukInsetText %}

    Links and URLs

    diff --git a/app/templates/partials/templates/guidance-optional-content.html b/app/templates/partials/templates/guidance-optional-content.html index b0713f115..38ab34767 100644 --- a/app/templates/partials/templates/guidance-optional-content.html +++ b/app/templates/partials/templates/guidance-optional-content.html @@ -1,4 +1,4 @@ -{% from "components/uk_components/inset-text/macro.njk" import govukInsetText %} +{% from "components/us_components/inset-text/macro.njk" import govukInsetText %}

    Optional content diff --git a/app/templates/partials/templates/guidance-personalisation.html b/app/templates/partials/templates/guidance-personalisation.html index c1f506f8b..f8ba56edc 100644 --- a/app/templates/partials/templates/guidance-personalisation.html +++ b/app/templates/partials/templates/guidance-personalisation.html @@ -1,4 +1,4 @@ -{% from "components/uk_components/inset-text/macro.njk" import govukInsetText %} +{% from "components/us_components/inset-text/macro.njk" import govukInsetText %}

    Personalization diff --git a/app/templates/partials/templates/guidance-send-a-document.html b/app/templates/partials/templates/guidance-send-a-document.html index 2e2530579..d3d78779b 100644 --- a/app/templates/partials/templates/guidance-send-a-document.html +++ b/app/templates/partials/templates/guidance-send-a-document.html @@ -1,4 +1,4 @@ -{% from "components/uk_components/inset-text/macro.njk" import govukInsetText %} +{% from "components/us_components/inset-text/macro.njk" import govukInsetText %}

    Send a document by email @@ -11,4 +11,4 @@ "classes": "govuk-!-margin-top-0 govuk-!-margin-bottom-3"}) }} -Next, use the API to upload your document. Follow the instructions to send a document by email in the API documentation. +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/partials/tour.html b/app/templates/partials/tour.html index 019e70cfd..9174559bc 100644 --- a/app/templates/partials/tour.html +++ b/app/templates/partials/tour.html @@ -31,7 +31,7 @@ Notify delivers the message

    {% if help == '3' %} - + Now go to your dashboard {% endif %} diff --git a/app/templates/service_navigation.html b/app/templates/service_navigation.html index f4d4324b3..06fac282d 100644 --- a/app/templates/service_navigation.html +++ b/app/templates/service_navigation.html @@ -1,8 +1,8 @@ {% macro navigation_service_name(service) %} -
    +
    {{ service.name }} {% if not service.active %} - Suspended + Suspended {% endif %}
    {% endmacro %} @@ -11,7 +11,7 @@ {% if current_service.organization_id %} {% if current_user.platform_admin or (current_user.belongs_to_organization(current_service.organization_id) and current_service.live) %} - {{ current_service.organization_name }} + {{ current_service.organization_name }} {% endif %} {% endif %} {{ navigation_service_name(current_service) }} diff --git a/app/templates/views/accessibility_statement.html b/app/templates/views/accessibility_statement.html index 6cd07dc22..9782a305b 100644 --- a/app/templates/views/accessibility_statement.html +++ b/app/templates/views/accessibility_statement.html @@ -19,7 +19,7 @@ ) }}

    - This accessibility statement applies to the Notify.gov domain. + This accessibility statement applies to the Notify.gov domain.

    @@ -38,7 +38,7 @@

    - AbilityNet has advice on making your device easier to use if you have a disability. + AbilityNet has advice on making your device easier to use if you have a disability.

    How accessible is this website?

    @@ -66,7 +66,7 @@

    Feedback and contact information

    - If you need any part of this service in a different format like large print, audio recording or braille, contact the Notify.gov team. + If you need any part of this service in a different format like large print, audio recording or braille, contact the Notify.gov team.

    @@ -76,13 +76,13 @@

    Reporting accessibility problems with this website

    - We’re always looking to improve the accessibility of this website. If you find any problems not listed on this page or think we’re not meeting accessibility requirements, contact the Notify.gov team. + We’re always looking to improve the accessibility of this website. If you find any problems not listed on this page or think we’re not meeting accessibility requirements, contact the Notify.gov team.

    Technical information about this website’s accessibility

    - We strive to make our website as accessible and usable as possible. We do this by following Section 508 and the Web Content Accessibility Guidelines (WCAG 2.0) produced by the World Wide Web Consortium (W3C, the web's governing body). + We strive to make our website as accessible and usable as possible. We do this by following Section 508 and the Web Content Accessibility Guidelines (WCAG 2.0) produced by the World Wide Web Consortium (W3C, the web's governing body). Section 508 is a legal requirement and WCAG is a set of checkpoints and guidelines that help ensure that websites are designed and written properly.

    @@ -105,13 +105,13 @@ @@ -167,19 +167,19 @@

    - The following content on the Notify status page is not compliant with the WCAG version 2.1 AA standard: + The following content on the Notify status page is not compliant with the WCAG version 2.1 AA standard:

    diff --git a/app/templates/views/activity/notifications.html b/app/templates/views/activity/notifications.html index 4920a151e..ef2d32b45 100644 --- a/app/templates/views/activity/notifications.html +++ b/app/templates/views/activity/notifications.html @@ -16,7 +16,7 @@ field_headings_visible=False ) %} {% call row_heading() %} - {{ item.to.splitlines()|join(', ') if item.to else '' }} + {{ item.to.splitlines()|join(', ') if item.to else '' }}

    {{ item.preview_of_content }}

    diff --git a/app/templates/views/api/callbacks.html b/app/templates/views/api/callbacks.html index 2b81e37aa..fcabbaa74 100644 --- a/app/templates/views/api/callbacks.html +++ b/app/templates/views/api/callbacks.html @@ -2,7 +2,7 @@ {% from "components/page-header.html" import page_header %} {% from "components/page-footer.html" import page_footer %} {% from "components/table.html" import mapping_table, row, text_field, edit_field, optional_text_field with context %} -{% from "components/uk_components/back-link/macro.njk" import govukBackLink %} +{% from "components/us_components/back-link/macro.njk" import govukBackLink %} {% block service_page_title %} Callbacks diff --git a/app/templates/views/api/callbacks/delivery-status-callback.html b/app/templates/views/api/callbacks/delivery-status-callback.html index 8c6695525..92cc14ab2 100644 --- a/app/templates/views/api/callbacks/delivery-status-callback.html +++ b/app/templates/views/api/callbacks/delivery-status-callback.html @@ -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 %} Callbacks for delivery receipts @@ -21,7 +21,7 @@

    When you send an email or text message, we can tell you if Notify was able to deliver it. - Read the Callbacks section of our API documentation for more information. + Read the Callbacks section of our API documentation for more information.

    {% call form_wrapper() %} diff --git a/app/templates/views/api/callbacks/received-text-messages-callback.html b/app/templates/views/api/callbacks/received-text-messages-callback.html index 1f9a13e8e..2bfc0d2dd 100644 --- a/app/templates/views/api/callbacks/received-text-messages-callback.html +++ b/app/templates/views/api/callbacks/received-text-messages-callback.html @@ -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 %} Callbacks for received text messages @@ -18,7 +18,7 @@

    When you receive a text message in Notify, we can forward it to your system. - Check the callback documentation for more information. + Check the callback documentation for more information.

    {% call form_wrapper() %} diff --git a/app/templates/views/api/guest-list.html b/app/templates/views/api/guest-list.html index 51ffcf43c..16385289d 100644 --- a/app/templates/views/api/guest-list.html +++ b/app/templates/views/api/guest-list.html @@ -5,7 +5,7 @@ {% from "components/page-footer.html" import page_footer %} {% from "components/list-entry.html" import list_entry %} {% 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 %} Guest list @@ -26,12 +26,12 @@ @@ -45,7 +45,7 @@

    - You do not need to add yourself or your team members to the guest list. + You do not need to add yourself or your team members to the guest list.

    {% call form_wrapper() %} diff --git a/app/templates/views/api/index.html b/app/templates/views/api/index.html index 1d01f5c4b..d05520086 100644 --- a/app/templates/views/api/index.html +++ b/app/templates/views/api/index.html @@ -14,13 +14,13 @@ @@ -31,7 +31,7 @@
    - Refresh + Refresh
    @@ -74,7 +74,7 @@
    {{ notification[key] }}
    {% endif %} {% endfor %} - View {{ 1|message_count_label(notification.template.template_type, suffix='') }} + View {{ 1|message_count_label(notification.template.template_type, suffix='') }}
    diff --git a/app/templates/views/api/keys.html b/app/templates/views/api/keys.html index 53ade9483..e08b78dbe 100644 --- a/app/templates/views/api/keys.html +++ b/app/templates/views/api/keys.html @@ -1,8 +1,8 @@ {% extends "withnav_template.html" %} {% from "components/table.html" import list_table, field, hidden_field_heading %} {% from "components/page-header.html" import page_header %} -{% 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 %} API keys @@ -48,7 +48,7 @@ {% endcall %} {% else %} {% call field(align='right', status='error') %} - + Revoke {{ item.name }} {% endcall %} diff --git a/app/templates/views/api/keys/create.html b/app/templates/views/api/keys/create.html index 13d0872b8..56bf74b28 100644 --- a/app/templates/views/api/keys/create.html +++ b/app/templates/views/api/keys/create.html @@ -3,7 +3,7 @@ {% from "components/page-footer.html" import page_footer %} {% from "components/banner.html" import banner_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 %} Create an API key diff --git a/app/templates/views/check/column-errors.html b/app/templates/views/check/column-errors.html index 41d569e90..6fe749a53 100644 --- a/app/templates/views/check/column-errors.html +++ b/app/templates/views/check/column-errors.html @@ -3,7 +3,7 @@ {% from "components/radios.html" import radio_select %} {% from "components/table.html" import list_table, field, text_field, index_field, hidden_field_heading %} {% from "components/file-upload.html" import file_upload %} -{% from "components/uk_components/back-link/macro.njk" import govukBackLink %} +{% from "components/us_components/back-link/macro.njk" import govukBackLink %} {% block service_page_title %} Error @@ -127,7 +127,7 @@ ) }} {% endif %}
    - Back to top + Back to top
    {% if not request.args.from_test %} diff --git a/app/templates/views/check/ok.html b/app/templates/views/check/ok.html index e62e9298e..6b69e65d9 100644 --- a/app/templates/views/check/ok.html +++ b/app/templates/views/check/ok.html @@ -2,9 +2,9 @@ {% from "components/banner.html" import banner_wrapper %} {% from "components/table.html" import list_table, field, text_field, index_field, hidden_field_heading %} {% from "components/page-header.html" import page_header %} -{% from "components/uk_components/button/macro.njk" import govukButton %} -{% from "components/uk_components/skip-link/macro.njk" import govukSkipLink %} -{% from "components/uk_components/back-link/macro.njk" import govukBackLink %} +{% from "components/us_components/button/macro.njk" import govukButton %} +{% from "components/us_components/skip-link/macro.njk" import govukSkipLink %} +{% from "components/us_components/back-link/macro.njk" import govukBackLink %} {% set file_contents_header_id = 'file-preview' %} @@ -67,7 +67,7 @@ {% if (item.index + 2) == preview_row %} {{ item.index + 2 }} {% else %} - {{ item.index + 2 }} + {{ item.index + 2 }} {% endif %} {% endcall %} diff --git a/app/templates/views/check/row-errors.html b/app/templates/views/check/row-errors.html index 2f3a34d6a..e7154e2b6 100644 --- a/app/templates/views/check/row-errors.html +++ b/app/templates/views/check/row-errors.html @@ -3,7 +3,7 @@ {% from "components/radios.html" import radio_select %} {% from "components/table.html" import mapping_table, row, field, text_field, index_field, hidden_field_heading %} {% from "components/file-upload.html" import file_upload %} -{% from "components/uk_components/back-link/macro.njk" import govukBackLink %} +{% from "components/us_components/back-link/macro.njk" import govukBackLink %} {% block service_page_title %} Error @@ -49,7 +49,7 @@ button_text='Upload your file again' ) }}
    - Back to top + Back to top
    diff --git a/app/templates/views/choose-account.html b/app/templates/views/choose-account.html index 31bb281bc..dce5ded21 100644 --- a/app/templates/views/choose-account.html +++ b/app/templates/views/choose-account.html @@ -1,5 +1,5 @@ {% extends "withoutnav_template.html" %} -{% from "components/uk_components/button/macro.njk" import govukButton %} +{% from "components/us_components/button/macro.njk" import govukButton %} {% macro service_list( heading, diff --git a/app/templates/views/conversations/conversation.html b/app/templates/views/conversations/conversation.html index c1d64c683..ba8827a20 100644 --- a/app/templates/views/conversations/conversation.html +++ b/app/templates/views/conversations/conversation.html @@ -1,5 +1,5 @@ {% 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 %} {% extends "withnav_template.html" %} @@ -29,7 +29,7 @@ {% if current_user.has_permissions('send_messages') %}

    - Send a text message to this phone number + Send a text message to this phone number

    {% endif %} diff --git a/app/templates/views/dashboard/_inbox.html b/app/templates/views/dashboard/_inbox.html index 90f9fb6b6..7d28c2e54 100644 --- a/app/templates/views/dashboard/_inbox.html +++ b/app/templates/views/dashboard/_inbox.html @@ -1,6 +1,6 @@
    {% if current_service.inbound_sms_summary != None %} -

    Download these messages + Download these messages

    {% endif %} {% call(item, row_number) list_table( @@ -20,7 +20,7 @@ ) %} {% call field() %} {{ item.user_number | format_phone_number_human_readable }} diff --git a/app/templates/views/dashboard/_jobs.html b/app/templates/views/dashboard/_jobs.html index 0b1ecad2f..e732fe6c0 100644 --- a/app/templates/views/dashboard/_jobs.html +++ b/app/templates/views/dashboard/_jobs.html @@ -17,7 +17,7 @@ ) %} {% call row_heading() %}
    - {{ item.original_file_name }} + {{ item.original_file_name }} {% if item.scheduled %} Sending {{ diff --git a/app/templates/views/dashboard/_totals.html b/app/templates/views/dashboard/_totals.html index 62d4af437..ea8fd03cf 100644 --- a/app/templates/views/dashboard/_totals.html +++ b/app/templates/views/dashboard/_totals.html @@ -16,7 +16,7 @@

    You do not need any technical knowledge to use Notify.

    {% if not current_user.is_authenticated %} -

    Create an account for free and try it yourself.

    +

    Create an account for free and try it yourself.

    {% endif %}

    Reusable message templates

    @@ -27,18 +27,18 @@

    Personalized content

    Notify makes it easy to send personalized messages from a single template.

    -

    See how to personalize your content.

    +

    See how to personalize your content.

    Bulk sending

    To send a batch of messages at once, upload a list of contact details to Notify. You can also schedule the date and time you want them to be sent.

    +

    Read our API documentation for more information.

    -->

    Reporting

    Notify’s real-time dashboard lets you see the number of messages sent. You can also check the current status of any message to see when it was delivered.

    -

    Read more about the delivery status of your messages.

    +

    Read more about the delivery status of your messages.

    Permissions

    Control which members of your team can see, create, edit, and send messages.

    @@ -57,7 +57,7 @@ - +

    Security

    Notify protects and manages data to meet the needs of government services.

    @@ -67,10 +67,10 @@

    Two-factor authentication

    Notify uses two-factor authentication (2FA) to keep your account secure. When you sign in, we’ll send a unique one-time code to your phone and ask you to enter it before we let you use your account.

    -

    Read more about security. +

    Read more about security. +

    Find out more about support.

    --> {% endblock %} diff --git a/app/templates/views/features/emails.html b/app/templates/views/features/emails.html index d07db6e1f..88731639f 100644 --- a/app/templates/views/features/emails.html +++ b/app/templates/views/features/emails.html @@ -10,7 +10,7 @@

    Emails

    Send an unlimited number of emails for free with Notify.gov.

    {% if not current_user.is_authenticated %} -

    Create an account and try Notify for yourself.

    +

    Create an account and try Notify for yourself.

    {% endif %}

    Features

    @@ -20,11 +20,11 @@
  • personalize the content of your emails
  • send and schedule bulk messages
    • -

    You can also integrate with our API to send emails automatically.

    +

    You can also integrate with our API to send emails automatically.

    Email branding

    Add your organization’s logo and brand color to email templates.

    -

    See how to change your email branding.

    +

    See how to change your email branding.

    Send files by email

    Notify offers a safe and reliable way to send files by email.

    @@ -35,15 +35,15 @@
  • email attachments are often marked as spam
    • -

    Read our API documentation for more information.

    +

    Read our API documentation for more information.

    Add a reply-to address

    Notify lets you choose the email address that users reply to.

    Emails with a reply-to address seem more trustworthy and are less likely to be labelled as spam.

    -

    See how to add a reply-to address.

    +

    See how to add a reply-to address.

    Pricing

    It’s free to send emails through Notify.

    -

    See pricing for more details.

    +

    See pricing for more details.

    {% endblock %} diff --git a/app/templates/views/features/text-messages.html b/app/templates/views/features/text-messages.html index ccacee0f8..28989d1c0 100644 --- a/app/templates/views/features/text-messages.html +++ b/app/templates/views/features/text-messages.html @@ -11,7 +11,7 @@

    Text messages

    Send thousands of free text messages to US phone numbers with Notify.

    {% if not current_user.is_authenticated %} -

    Create an account and try Notify for yourself.

    +

    Create an account and try Notify for yourself.

    {% endif %}

    Features

    @@ -20,12 +20,12 @@
  • create reusable text message templates
  • personalize the content of your texts
  • send and schedule bulk messages
    • - +

    Contact us to request a unique number for text message replies.

    -->

    Show people who your texts are from

    When you send a text message with Notify, the sender name tells people who it’s from.

    @@ -40,6 +40,6 @@

    Pricing

    Each service you add has an annual allowance of free text messages.

    -

    See pricing for more details.

    +

    See pricing for more details.

    {% endblock %} diff --git a/app/templates/views/find-services/find-services-by-name.html b/app/templates/views/find-services/find-services-by-name.html index 264b009b0..0be551043 100644 --- a/app/templates/views/find-services/find-services-by-name.html +++ b/app/templates/views/find-services/find-services-by-name.html @@ -1,7 +1,7 @@ {% extends "views/platform-admin/_base_template.html" %} {% 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 %} {% block per_page_title %} Find services by name diff --git a/app/templates/views/find-users/auth_type.html b/app/templates/views/find-users/auth_type.html index 178adf5fe..d6c6e325d 100644 --- a/app/templates/views/find-users/auth_type.html +++ b/app/templates/views/find-users/auth_type.html @@ -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 per_page_title %} Set auth type for {{ user.name }} diff --git a/app/templates/views/find-users/find-users-by-email.html b/app/templates/views/find-users/find-users-by-email.html index 7aa2ff12d..7d7c644c3 100644 --- a/app/templates/views/find-users/find-users-by-email.html +++ b/app/templates/views/find-users/find-users-by-email.html @@ -1,7 +1,7 @@ {% extends "views/platform-admin/_base_template.html" %} {% 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 %} {% block per_page_title %} Find users by email @@ -41,7 +41,7 @@
      {% for user in users_found %}
    • - {{ user.email_address }} + {{ user.email_address }}

      {{ user.name }}

      • diff --git a/app/templates/views/find-users/user-information.html b/app/templates/views/find-users/user-information.html index d4ba0bf15..03bfa9645 100644 --- a/app/templates/views/find-users/user-information.html +++ b/app/templates/views/find-users/user-information.html @@ -20,7 +20,7 @@ @@ -36,7 +36,7 @@ @@ -50,7 +50,7 @@

      Authentication

      {{ user.auth_type | format_auth_type }}

      {% if user.auth_type != 'webauthn_auth' %} - + Change authentication for this user {% endif %} @@ -72,7 +72,7 @@ {% endif %} {% if user.state == 'active' %} - + Archive user diff --git a/app/templates/views/get-started.html b/app/templates/views/get-started.html index 9aacf3ac4..130a3158e 100644 --- a/app/templates/views/get-started.html +++ b/app/templates/views/get-started.html @@ -1,7 +1,7 @@ {% extends "content_template.html" %} {% from "components/table.html" import mapping_table, row, text_field, edit_field, field with context %} {% from "components/sub-navigation.html" import sub_navigation %} -{% from "components/uk_components/details/macro.njk" import govukDetails %} +{% from "components/us_components/details/macro.njk" import govukDetails %} {% block per_page_title %} Get started @@ -12,23 +12,23 @@

      Get started

        -
      1. +

      2. Check if Notify.gov is right for you

        -

        Read about our features, pricing and roadmap.

        +

        Read about our features, pricing and roadmap.

      3. Create an account

        {% if not current_user.is_authenticated %} -

        Create an account for free and add your first Notify service. When you add a new service it will start in trial mode.

        +

        Create an account for free and add your first Notify service. When you add a new service it will start in trial mode.

        {% else %} -

        Create an account for free and add your first Notify service. When you add a new service, it will start in trial mode.

        +

        Create an account for free and add your first Notify service. When you add a new service, it will start in trial mode.

        {% endif %}

      4. Write some messages

        -

        Add message templates with examples of the content you plan to send. You can use our guidance to help you.

        +

        Add message templates with examples of the content you plan to send. You can use our guidance to help you.

      5. @@ -37,15 +37,15 @@

        Review your settings to add message branding and sender information.

        Add team members and check their permissions.

        {% else %} -

        Review your settings to add message branding and sender information.

        -

        Add team members and check their permissions.

        +

        Review your settings to add message branding and sender information.

        +

        Add team members and check their permissions.

        {% endif %}
      6. @@ -53,9 +53,9 @@ {% if not current_user.is_authenticated or not current_service %}

        When you’re ready to send messages to people outside your team, go to the Settings page and select Request to go live. We’ll approve your request within one working day.

        {% else %} -

        You should request to go live when you’re ready to send messages to people outside your team. We’ll approve your request within one working day.

        +

        You should request to go live when you’re ready to send messages to people outside your team. We’ll approve your request within one working day.

        {% endif %} - +
      diff --git a/app/templates/views/guidance/branding-and-customisation.html b/app/templates/views/guidance/branding-and-customisation.html index 7b7cb0421..2010ed1ae 100644 --- a/app/templates/views/guidance/branding-and-customisation.html +++ b/app/templates/views/guidance/branding-and-customisation.html @@ -12,9 +12,9 @@ +
    • edit and format messages
      • +
    • add branding and customization
      • +

    Edit and format messages

    This section explains how to:

    Format your content

    diff --git a/app/templates/views/guidance/send-files-by-email.html b/app/templates/views/guidance/send-files-by-email.html index 982d290d2..432ef74bf 100644 --- a/app/templates/views/guidance/send-files-by-email.html +++ b/app/templates/views/guidance/send-files-by-email.html @@ -8,7 +8,7 @@

    Send files by email

    -

    To send a file by email, follow the instructions in our API documentation.

    +

    To send a file by email, follow the instructions in our API documentation.

    This is an API-only feature.

    diff --git a/app/templates/views/inbound-sms-admin.html b/app/templates/views/inbound-sms-admin.html index 5206867f0..c5d9da9fb 100644 --- a/app/templates/views/inbound-sms-admin.html +++ b/app/templates/views/inbound-sms-admin.html @@ -52,7 +52,7 @@ Inbound SMS {% endif %} - {{ value.service.name }} + {{ value.service.name }} {% endfor %} diff --git a/app/templates/views/integration-testing.html b/app/templates/views/integration-testing.html index 670243735..f36cfa7a4 100644 --- a/app/templates/views/integration-testing.html +++ b/app/templates/views/integration-testing.html @@ -14,7 +14,7 @@

    This information has moved.

    - Refer to the documentation + Refer to the documentation for the client library you are using.

    diff --git a/app/templates/views/invite-user.html b/app/templates/views/invite-user.html index efeb87b0d..e665581d4 100644 --- a/app/templates/views/invite-user.html +++ b/app/templates/views/invite-user.html @@ -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 %} Invite a team member diff --git a/app/templates/views/jobs/job.html b/app/templates/views/jobs/job.html index 89ba335b9..6b18a96ad 100644 --- a/app/templates/views/jobs/job.html +++ b/app/templates/views/jobs/job.html @@ -3,7 +3,7 @@ {% from "components/ajax-block.html" import ajax_block %} {% from "components/page-footer.html" import page_footer %} {% from "components/page-header.html" import page_header %} -{% from "components/uk_components/back-link/macro.njk" import govukBackLink %} +{% from "components/us_components/back-link/macro.njk" import govukBackLink %} {% block service_page_title %} {{ job.original_file_name }} diff --git a/app/templates/views/jobs/jobs.html b/app/templates/views/jobs/jobs.html index c0e8065c8..36c430321 100644 --- a/app/templates/views/jobs/jobs.html +++ b/app/templates/views/jobs/jobs.html @@ -1,6 +1,6 @@ {% from "components/previous-next-navigation.html" import previous_next_navigation %} {% extends "withnav_template.html" %} -{% from "components/uk_components/button/macro.njk" import govukButton %} +{% from "components/us_components/button/macro.njk" import govukButton %} {% block service_page_title %} Uploads diff --git a/app/templates/views/manage-users.html b/app/templates/views/manage-users.html index d7906559c..cb5cbe245 100644 --- a/app/templates/views/manage-users.html +++ b/app/templates/views/manage-users.html @@ -1,7 +1,7 @@ {% extends "withnav_template.html" %} {% from "components/tick-cross.html" import tick_cross %} {% from "components/live-search.html" import live_search %} -{% from "components/uk_components/button/macro.njk" import govukButton %} +{% from "components/us_components/button/macro.njk" import govukButton %} {% block service_page_title %} Team members @@ -72,9 +72,9 @@
    {% if current_user.has_permissions('manage_service') %} {% if user.status == 'pending' %} - Cancel invitation for {{ user.email_address }} + Cancel invitation for {{ user.email_address }} {% elif user.is_editable_by(current_user) %} - Change details for {{ user.name }} {{ user.email_address }} + Change details for {{ user.name }} {{ user.email_address }} {% endif %} {% endif %}
    diff --git a/app/templates/views/manage-users/confirm-edit-user-email.html b/app/templates/views/manage-users/confirm-edit-user-email.html index 77975d326..84f1fd60c 100644 --- a/app/templates/views/manage-users/confirm-edit-user-email.html +++ b/app/templates/views/manage-users/confirm-edit-user-email.html @@ -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 per_page_title %} Confirm change of email address diff --git a/app/templates/views/manage-users/confirm-edit-user-mobile-number.html b/app/templates/views/manage-users/confirm-edit-user-mobile-number.html index 631c5ac2c..b6a74c0fd 100644 --- a/app/templates/views/manage-users/confirm-edit-user-mobile-number.html +++ b/app/templates/views/manage-users/confirm-edit-user-mobile-number.html @@ -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 per_page_title %} Confirm change of mobile number diff --git a/app/templates/views/manage-users/edit-user-email.html b/app/templates/views/manage-users/edit-user-email.html index 8ea541aa2..86dd24868 100644 --- a/app/templates/views/manage-users/edit-user-email.html +++ b/app/templates/views/manage-users/edit-user-email.html @@ -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 per_page_title %} Change team member’s email address diff --git a/app/templates/views/manage-users/edit-user-mobile.html b/app/templates/views/manage-users/edit-user-mobile.html index 271b30d72..20510c30d 100644 --- a/app/templates/views/manage-users/edit-user-mobile.html +++ b/app/templates/views/manage-users/edit-user-mobile.html @@ -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 per_page_title %} Change team member’s mobile number diff --git a/app/templates/views/message-status.html b/app/templates/views/message-status.html index 43f815d38..9e6ca1a19 100644 --- a/app/templates/views/message-status.html +++ b/app/templates/views/message-status.html @@ -10,7 +10,7 @@

    Delivery status

    Notify’s real-time dashboard lets you check the status of any message.

    -

    For security, this information is only available for seven days after a message has been sent. You can download a report, including a list of sent messages, for your own records.

    +

    For security, this information is only available for seven days after a message has been sent. You can download a report, including a list of sent messages, for your own records.

    This page describes the statuses you’ll see when you’re signed in to Notify.

    A note about timezones

    @@ -18,7 +18,7 @@

    Notify currently uses UTC (Coordinated Universal Time) for managing and displaying all dates and times in the system. This means that when you're scheduling messages to send later, or are looking at the time a message was sent, it will be in the UTC timezone.

    You can refer to this chart for help with converting UTC times to your local timezone.

    - {% endblock %} diff --git a/app/templates/views/pricing/index.html b/app/templates/views/pricing/index.html index efbcc5e09..5f8eb5a01 100644 --- a/app/templates/views/pricing/index.html +++ b/app/templates/views/pricing/index.html @@ -1,7 +1,7 @@ {% from "components/content-metadata.html" import content_metadata %} {% from "components/table.html" import mapping_table, row, text_field, field, row_heading %} {% from "components/live-search.html" import live_search %} -{% from "components/uk_components/details/macro.njk" import govukDetails %} +{% from "components/us_components/details/macro.njk" import govukDetails %} {% extends "content_template.html" %} diff --git a/app/templates/views/privacy.html b/app/templates/views/privacy.html index 4b7d14dfe..07d03da74 100644 --- a/app/templates/views/privacy.html +++ b/app/templates/views/privacy.html @@ -60,7 +60,7 @@

    We design, build and run our systems to make sure that your data is as safe as possible at any stage, both while it’s processed and when it’s stored.

    - +

    How we protect your data and keep it secure

    @@ -195,7 +195,7 @@

    Questions and complaints

    -

    Contact the TTS Public Benefits Studio if you either:

    +

    Contact the TTS Public Benefits Studio if you either:

    • have questions about anything in this document
      • diff --git a/app/templates/views/providers/provider.html b/app/templates/views/providers/provider.html index db248e5cf..838c9961d 100644 --- a/app/templates/views/providers/provider.html +++ b/app/templates/views/providers/provider.html @@ -2,7 +2,7 @@ {% from "components/table.html" import list_table, field, text_field, link_field, right_aligned_field_heading, hidden_field_heading %} {% 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 per_page_title %} {{ provider_versions[0].display_name }} diff --git a/app/templates/views/providers/providers.html b/app/templates/views/providers/providers.html index de4b9f5ac..aa0f578df 100644 --- a/app/templates/views/providers/providers.html +++ b/app/templates/views/providers/providers.html @@ -12,7 +12,7 @@ Providers

      SMS

      - Change priority + Change priority {% call(item, row_number) list_table( domestic_sms_providers, diff --git a/app/templates/views/roadmap.html b/app/templates/views/roadmap.html index b3531512d..0784e693d 100644 --- a/app/templates/views/roadmap.html +++ b/app/templates/views/roadmap.html @@ -20,7 +20,7 @@

      The Notify roadmap shows what we’re working on and what we're planning to do next.

      This roadmap is only a guide. It does not cover everything we do, and some things may change.

      -

      You can contact us if you have any questions about the roadmap or suggestions for new features.

      +

      You can contact us if you have any questions about the roadmap or suggestions for new features.

      What we’re working on

      diff --git a/app/templates/views/security.html b/app/templates/views/security.html index 1065d8f62..f55ad3de5 100644 --- a/app/templates/views/security.html +++ b/app/templates/views/security.html @@ -22,7 +22,7 @@
    • when it’s stored on the service

    Any recipient data you upload is only held for seven days.

    - +

    Technical security

    +

    The Notify team has Security Check (SC) level clearance from United Kingdom Security Vetting (UKSV).

    --> {% endblock %} diff --git a/app/templates/views/send-test.html b/app/templates/views/send-test.html index 0b3d28b5a..7fd0a61e0 100644 --- a/app/templates/views/send-test.html +++ b/app/templates/views/send-test.html @@ -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 %} {{ page_title }} @@ -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/send.html b/app/templates/views/send.html index 1671c199c..8d8642e80 100644 --- a/app/templates/views/send.html +++ b/app/templates/views/send.html @@ -3,7 +3,7 @@ {% from "components/page-footer.html" import page_footer %} {% from "components/file-upload.html" import file_upload %} {% from "components/table.html" import list_table, text_field, index_field, index_field_heading %} -{% from "components/uk_components/back-link/macro.njk" import govukBackLink %} +{% from "components/us_components/back-link/macro.njk" import govukBackLink %} {% block service_page_title %} Upload a list of {{ 999|recipient_count_label(template.template_type) }} diff --git a/app/templates/views/service-settings.html b/app/templates/views/service-settings.html index ddce1b7d1..2195738ff 100644 --- a/app/templates/views/service-settings.html +++ b/app/templates/views/service-settings.html @@ -206,7 +206,7 @@

    {% if current_user.has_permissions('manage_service') %} To remove these restrictions, you can send us a - request to go live. + request to go live. {% else %} Your service manager can ask to have these restrictions removed. {% endif %} @@ -222,7 +222,7 @@

    Problems or comments? - Give feedback. + Give feedback.

    {% endif %} @@ -272,7 +272,7 @@ {{ text_field('Organization')}} {% call field() %} {% if current_service.organization_id %} - + {{ current_service.organization_name }} {% else %} @@ -358,13 +358,13 @@ {% if current_user.platform_admin %} - + Suspend service - + Service history @@ -378,13 +378,13 @@
    - + Resume service - + Service history diff --git a/app/templates/views/service-settings/branding/email-branding-govuk-org.html b/app/templates/views/service-settings/branding/email-branding-govuk-org.html index 643a27998..d8094a920 100644 --- a/app/templates/views/service-settings/branding/email-branding-govuk-org.html +++ b/app/templates/views/service-settings/branding/email-branding-govuk-org.html @@ -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 @@

    You cannot use Notify.gov branding if your organization is - independent from government.

    diff --git a/app/templates/views/service-settings/branding/email-branding-govuk.html b/app/templates/views/service-settings/branding/email-branding-govuk.html index 8828d3b40..53ea0d5ba 100644 --- a/app/templates/views/service-settings/branding/email-branding-govuk.html +++ b/app/templates/views/service-settings/branding/email-branding-govuk.html @@ -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 @@

    You cannot use Notify.gov branding if your organization is - independent from government.

    diff --git a/app/templates/views/service-settings/branding/email-branding-nhs.html b/app/templates/views/service-settings/branding/email-branding-nhs.html index dd01b6b20..a94211c8c 100644 --- a/app/templates/views/service-settings/branding/email-branding-nhs.html +++ b/app/templates/views/service-settings/branding/email-branding-nhs.html @@ -29,7 +29,7 @@

    Make sure you’re allowed to use NHS branding.

    - If you’re not sure, check the guidance on the NHS website. + If you’re not sure, check the guidance on the NHS website.

    {% call form_wrapper() %} diff --git a/app/templates/views/service-settings/branding/email-branding-options.html b/app/templates/views/service-settings/branding/email-branding-options.html index 834ebbfe3..40bc1ea50 100644 --- a/app/templates/views/service-settings/branding/email-branding-options.html +++ b/app/templates/views/service-settings/branding/email-branding-options.html @@ -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 %} diff --git a/app/templates/views/service-settings/branding/email-branding-organization.html b/app/templates/views/service-settings/branding/email-branding-organization.html index 9e40a42a8..d740fc67f 100644 --- a/app/templates/views/service-settings/branding/email-branding-organization.html +++ b/app/templates/views/service-settings/branding/email-branding-organization.html @@ -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 %} 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 81a5508a1..256f58037 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 @@ -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 diff --git a/app/templates/views/service-settings/confirm.html b/app/templates/views/service-settings/confirm.html index b7176da94..a2fe55709 100644 --- a/app/templates/views/service-settings/confirm.html +++ b/app/templates/views/service-settings/confirm.html @@ -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 }} diff --git a/app/templates/views/service-settings/data-retention.html b/app/templates/views/service-settings/data-retention.html index 05eb01e09..eed4d849f 100644 --- a/app/templates/views/service-settings/data-retention.html +++ b/app/templates/views/service-settings/data-retention.html @@ -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 diff --git a/app/templates/views/service-settings/data-retention/add.html b/app/templates/views/service-settings/data-retention/add.html index 8b88df17f..fdccd220b 100644 --- a/app/templates/views/service-settings/data-retention/add.html +++ b/app/templates/views/service-settings/data-retention/add.html @@ -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 diff --git a/app/templates/views/service-settings/data-retention/edit.html b/app/templates/views/service-settings/data-retention/edit.html index df6e9670d..dacaa0415 100644 --- a/app/templates/views/service-settings/data-retention/edit.html +++ b/app/templates/views/service-settings/data-retention/edit.html @@ -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 diff --git a/app/templates/views/service-settings/edit-service-billing-details.html b/app/templates/views/service-settings/edit-service-billing-details.html index e1647f761..63832b918 100644 --- a/app/templates/views/service-settings/edit-service-billing-details.html +++ b/app/templates/views/service-settings/edit-service-billing-details.html @@ -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 %} diff --git a/app/templates/views/service-settings/edit-service-notes.html b/app/templates/views/service-settings/edit-service-notes.html index 96c1e946c..2f7a231bc 100644 --- a/app/templates/views/service-settings/edit-service-notes.html +++ b/app/templates/views/service-settings/edit-service-notes.html @@ -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 diff --git a/app/templates/views/service-settings/email-reply-to/_verify-updates.html b/app/templates/views/service-settings/email-reply-to/_verify-updates.html index 98cf286aa..88b117b9c 100644 --- a/app/templates/views/service-settings/email-reply-to/_verify-updates.html +++ b/app/templates/views/service-settings/email-reply-to/_verify-updates.html @@ -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 %}
    {% if verification_status == "pending" %} @@ -13,7 +13,7 @@

    - Refresh + Refresh

    {% elif verification_status == "success" %} {{ banner("‘{}’ is ready to use".format(reply_to_email_address), type='default', with_tick=True) }} diff --git a/app/templates/views/service-settings/email-reply-to/add.html b/app/templates/views/service-settings/email-reply-to/add.html index 43c891b84..dd04278f4 100644 --- a/app/templates/views/service-settings/email-reply-to/add.html +++ b/app/templates/views/service-settings/email-reply-to/add.html @@ -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 diff --git a/app/templates/views/service-settings/email-reply-to/edit.html b/app/templates/views/service-settings/email-reply-to/edit.html index ae1ef2026..3037f9598 100644 --- a/app/templates/views/service-settings/email-reply-to/edit.html +++ b/app/templates/views/service-settings/email-reply-to/edit.html @@ -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 diff --git a/app/templates/views/service-settings/email-reply-to/verify.html b/app/templates/views/service-settings/email-reply-to/verify.html index d5cb011fb..3da2aff17 100644 --- a/app/templates/views/service-settings/email-reply-to/verify.html +++ b/app/templates/views/service-settings/email-reply-to/verify.html @@ -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 diff --git a/app/templates/views/service-settings/email_reply_to.html b/app/templates/views/service-settings/email_reply_to.html index 280c3e01d..9421de261 100644 --- a/app/templates/views/service-settings/email_reply_to.html +++ b/app/templates/views/service-settings/email_reply_to.html @@ -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 @@
    {% if current_user.has_permissions('manage_service') %} - + Change {{ item.email_address }} {% endif %} diff --git a/app/templates/views/service-settings/estimate-usage.html b/app/templates/views/service-settings/estimate-usage.html index 90d2c7bd3..4273b7f4b 100644 --- a/app/templates/views/service-settings/estimate-usage.html +++ b/app/templates/views/service-settings/estimate-usage.html @@ -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 diff --git a/app/templates/views/service-settings/link-service-to-organization.html b/app/templates/views/service-settings/link-service-to-organization.html index 4df5bb50c..d18850593 100644 --- a/app/templates/views/service-settings/link-service-to-organization.html +++ b/app/templates/views/service-settings/link-service-to-organization.html @@ -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" %} diff --git a/app/templates/views/service-settings/name-local.html b/app/templates/views/service-settings/name-local.html index bff5403de..fd12955ca 100644 --- a/app/templates/views/service-settings/name-local.html +++ b/app/templates/views/service-settings/name-local.html @@ -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 diff --git a/app/templates/views/service-settings/name.html b/app/templates/views/service-settings/name.html index 6c0dc364f..aace17194 100644 --- a/app/templates/views/service-settings/name.html +++ b/app/templates/views/service-settings/name.html @@ -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 diff --git a/app/templates/views/service-settings/preview-email-branding.html b/app/templates/views/service-settings/preview-email-branding.html index f764015aa..02d99d45f 100644 --- a/app/templates/views/service-settings/preview-email-branding.html +++ b/app/templates/views/service-settings/preview-email-branding.html @@ -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 %} diff --git a/app/templates/views/service-settings/request-to-go-live.html b/app/templates/views/service-settings/request-to-go-live.html index 5527d5c06..cf81b5c1d 100644 --- a/app/templates/views/service-settings/request-to-go-live.html +++ b/app/templates/views/service-settings/request-to-go-live.html @@ -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 we’ll get back to you within one working day.

    - By requesting to go live you’re agreeing to our terms of use. + By requesting to go live you’re agreeing to our terms of use.

    {% call form_wrapper() %} {{ page_footer('Request to go live') }} diff --git a/app/templates/views/service-settings/send-files-by-email.html b/app/templates/views/service-settings/send-files-by-email.html index e43ef5a38..c2f06ff13 100644 --- a/app/templates/views/service-settings/send-files-by-email.html +++ b/app/templates/views/service-settings/send-files-by-email.html @@ -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.

    - To send a file by email, follow the instructions in our API documentation. + To send a file by email, follow the instructions in our API documentation.

    {% if contact_details %}Change contact details for{% else %}Add contact details to{% endif %} the file download page

    diff --git a/app/templates/views/service-settings/service-already-live.html b/app/templates/views/service-settings/service-already-live.html index a2280efe5..3fdb63228 100644 --- a/app/templates/views/service-settings/service-already-live.html +++ b/app/templates/views/service-settings/service-already-live.html @@ -19,7 +19,7 @@

    - Switch service + Switch service if you want to make a different service live.

    diff --git a/app/templates/views/service-settings/set-auth-type.html b/app/templates/views/service-settings/set-auth-type.html index 8fd4a60ca..98de8181f 100644 --- a/app/templates/views/service-settings/set-auth-type.html +++ b/app/templates/views/service-settings/set-auth-type.html @@ -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.

    - You can set the sign-in method for individual team members. + You can set the sign-in method for individual team members.

    {% else %}

    @@ -35,7 +35,7 @@ Your team members sign in with a text message code.

    - Contact us if signing in with a text message is a problem for your team. + Contact us if signing in with a text message is a problem for your team.

    {% endif %}
    diff --git a/app/templates/views/service-settings/set-email-branding.html b/app/templates/views/service-settings/set-email-branding.html index 4b4971f06..54074214d 100644 --- a/app/templates/views/service-settings/set-email-branding.html +++ b/app/templates/views/service-settings/set-email-branding.html @@ -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" %} diff --git a/app/templates/views/service-settings/set-email.html b/app/templates/views/service-settings/set-email.html index 215c15121..cfe9d3442 100644 --- a/app/templates/views/service-settings/set-email.html +++ b/app/templates/views/service-settings/set-email.html @@ -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 diff --git a/app/templates/views/service-settings/set-free-sms-allowance.html b/app/templates/views/service-settings/set-free-sms-allowance.html index 6830784ad..dc2cc5808 100644 --- a/app/templates/views/service-settings/set-free-sms-allowance.html +++ b/app/templates/views/service-settings/set-free-sms-allowance.html @@ -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 diff --git a/app/templates/views/service-settings/set-inbound-number.html b/app/templates/views/service-settings/set-inbound-number.html index 218c402c6..a8c08efae 100644 --- a/app/templates/views/service-settings/set-inbound-number.html +++ b/app/templates/views/service-settings/set-inbound-number.html @@ -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' %} diff --git a/app/templates/views/service-settings/set-inbound-sms.html b/app/templates/views/service-settings/set-inbound-sms.html index 60b6e5542..14ed34dea 100644 --- a/app/templates/views/service-settings/set-inbound-sms.html +++ b/app/templates/views/service-settings/set-inbound-sms.html @@ -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.

    - Contact us if you want to switch this feature off. + Contact us if you want to switch this feature off.

    {% if current_user.has_permissions('manage_api_keys') %}

    You can set up callbacks for received text messages on the - API integration page. + API integration page.

    {% endif %} {% else %}

    - Contact us if you want to be able to receive text messages from your users. + Contact us if you want to be able to receive text messages from your users.

    We’ll create a unique phone number for your service that they can reply to. diff --git a/app/templates/views/service-settings/set-international-sms.html b/app/templates/views/service-settings/set-international-sms.html index c6518bb61..8c98e8ed2 100644 --- a/app/templates/views/service-settings/set-international-sms.html +++ b/app/templates/views/service-settings/set-international-sms.html @@ -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.

    - See pricing for the list + See pricing for the list of rates.

    {% call form_wrapper() %} diff --git a/app/templates/views/service-settings/set-message-limit.html b/app/templates/views/service-settings/set-message-limit.html index ecc669e54..5a74b1f0f 100644 --- a/app/templates/views/service-settings/set-message-limit.html +++ b/app/templates/views/service-settings/set-message-limit.html @@ -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 diff --git a/app/templates/views/service-settings/set-rate-limit.html b/app/templates/views/service-settings/set-rate-limit.html index 039be0e67..2c0613691 100644 --- a/app/templates/views/service-settings/set-rate-limit.html +++ b/app/templates/views/service-settings/set-rate-limit.html @@ -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 diff --git a/app/templates/views/service-settings/set-service-setting.html b/app/templates/views/service-settings/set-service-setting.html index 65f5b12ec..d28efb8ef 100644 --- a/app/templates/views/service-settings/set-service-setting.html +++ b/app/templates/views/service-settings/set-service-setting.html @@ -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 }} diff --git a/app/templates/views/service-settings/set-sms.html b/app/templates/views/service-settings/set-sms.html index 13dd1166a..427f5ba03 100644 --- a/app/templates/views/service-settings/set-sms.html +++ b/app/templates/views/service-settings/set-sms.html @@ -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.

    -->

    - See pricing for more details. + See pricing for more details.

    {% call form_wrapper() %} {{ form.enabled }} diff --git a/app/templates/views/service-settings/sms-prefix.html b/app/templates/views/service-settings/sms-prefix.html index 69c86f54c..6c0596431 100644 --- a/app/templates/views/service-settings/sms-prefix.html +++ b/app/templates/views/service-settings/sms-prefix.html @@ -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 diff --git a/app/templates/views/service-settings/sms-sender/add.html b/app/templates/views/service-settings/sms-sender/add.html index 65de131a2..0b0d71809 100644 --- a/app/templates/views/service-settings/sms-sender/add.html +++ b/app/templates/views/service-settings/sms-sender/add.html @@ -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 diff --git a/app/templates/views/service-settings/sms-sender/edit.html b/app/templates/views/service-settings/sms-sender/edit.html index 5ca4511b2..3d8a825ad 100644 --- a/app/templates/views/service-settings/sms-sender/edit.html +++ b/app/templates/views/service-settings/sms-sender/edit.html @@ -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 diff --git a/app/templates/views/service-settings/sms-senders.html b/app/templates/views/service-settings/sms-senders.html index 15895a772..5db71b584 100644 --- a/app/templates/views/service-settings/sms-senders.html +++ b/app/templates/views/service-settings/sms-senders.html @@ -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 diff --git a/app/templates/views/signedout.html b/app/templates/views/signedout.html index 2a924a566..f81bbf8e2 100644 --- a/app/templates/views/signedout.html +++ b/app/templates/views/signedout.html @@ -1,5 +1,5 @@ {% extends "fullwidth_template.html" %} -{% from "components/uk_components/button/macro.njk" import govukButton %} +{% from "components/us_components/button/macro.njk" import govukButton %} {% block meta %} +
    @@ -164,7 +164,7 @@ Notify.gov "classes": "product-page-button button-container__button govuk-!-margin-right-3", "href": url_for('main.register' ) }) }} - or sign in if you’ve used + or sign in if you’ve used it before
    @@ -257,7 +257,7 @@ Notify.gov

    See the - list of services and organizations. + list of services and organizations.

    @@ -280,7 +280,7 @@ Notify.gov

    There’s no monthly charge, no setup fee and no procurement process.

    -

    Find out more about pricing. +

    Find out more about pricing.

    @@ -296,7 +296,7 @@ Notify.gov Notify.gov is built and maintained by the Public Benefits Studio, within the General Services Administration's Technology Transformation Services.

    - Contact us if you have a question or want + Contact us if you have a question or want to give feedback.

    diff --git a/app/templates/views/signin.html b/app/templates/views/signin.html index ad20fb5cb..33bbcf29a 100644 --- a/app/templates/views/signin.html +++ b/app/templates/views/signin.html @@ -31,7 +31,7 @@ {% endif %} diff --git a/app/templates/views/support/bat-phone.html b/app/templates/views/support/bat-phone.html index b2a68bb9e..134313396 100644 --- a/app/templates/views/support/bat-phone.html +++ b/app/templates/views/support/bat-phone.html @@ -1,7 +1,7 @@ {% extends "withoutnav_template.html" %} {% from "components/page-footer.html" import page_footer %} {% from "components/page-header.html" import page_header %} -{% from "components/uk_components/back-link/macro.njk" import govukBackLink %} +{% from "components/us_components/back-link/macro.njk" import govukBackLink %} {% block per_page_title %} Out of hours emergencies @@ -18,7 +18,7 @@

    First, check the - system status page. + system status page. You do not need to contact us if the problem you’re having is listed on that page.

    @@ -36,7 +36,7 @@

    Any other problems

    - Fill in this form + Fill in this form and we’ll get back to you by the next working day.

    diff --git a/app/templates/views/support/form.html b/app/templates/views/support/form.html index 27e5cf0aa..cc047db0a 100644 --- a/app/templates/views/support/form.html +++ b/app/templates/views/support/form.html @@ -3,7 +3,7 @@ {% from "components/page-footer.html" import sticky_page_footer %} {% from "components/page-header.html" import page_header %} {% 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 per_page_title %} {{ page_title }} @@ -21,7 +21,7 @@ {% if show_status_page_banner %}

    - Check our system status + Check our system status page to see if there are any known issues with Notify.gov.

    diff --git a/app/templates/views/support/index.html b/app/templates/views/support/index.html index 2311a04c0..ed03a667a 100644 --- a/app/templates/views/support/index.html +++ b/app/templates/views/support/index.html @@ -10,7 +10,7 @@

    Contact us

    -

    We are available at notify-support@gsa.gov.

    +

    We are available at notify-support@gsa.gov.

    You can expect a response within one business day.

    diff --git a/app/templates/views/support/public.html b/app/templates/views/support/public.html index c07fa3165..ebd0492bd 100644 --- a/app/templates/views/support/public.html +++ b/app/templates/views/support/public.html @@ -1,7 +1,7 @@ {% extends "withoutnav_template.html" %} {% from "components/page-header.html" import page_header %} -{% from "components/uk_components/back-link/macro.njk" import govukBackLink %} +{% from "components/us_components/back-link/macro.njk" import govukBackLink %} {% block per_page_title %} The Notify.gov service is for people who work in the government @@ -27,19 +27,19 @@

    - Coronavirus (COVID-19) + Coronavirus (COVID-19)

    Find guidance and support.

    - Contact the government + Contact the government

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

    - Report internet scams and phishing + Report internet scams and phishing

    Advice on suspicious emails and text messages. diff --git a/app/templates/views/support/thanks.html b/app/templates/views/support/thanks.html index 1a23c5a61..b60e8cd24 100644 --- a/app/templates/views/support/thanks.html +++ b/app/templates/views/support/thanks.html @@ -1,7 +1,7 @@ {% extends "withoutnav_template.html" %} {% from "components/page-footer.html" import page_footer %} {% from "components/page-header.html" import page_header %} -{% from "components/uk_components/back-link/macro.njk" import govukBackLink %} +{% from "components/us_components/back-link/macro.njk" import govukBackLink %} {% block per_page_title %} Thanks for contacting us diff --git a/app/templates/views/support/triage.html b/app/templates/views/support/triage.html index a9c0b8a2e..8445415d2 100644 --- a/app/templates/views/support/triage.html +++ b/app/templates/views/support/triage.html @@ -2,7 +2,7 @@ {% from "components/page-footer.html" import page_footer %} {% from "components/page-header.html" import page_header %} {% 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 per_page_title %} {{ page_title }} diff --git a/app/templates/views/templates/action_blocked.html b/app/templates/views/templates/action_blocked.html index 81c617733..9585ac6f4 100644 --- a/app/templates/views/templates/action_blocked.html +++ b/app/templates/views/templates/action_blocked.html @@ -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 %} {{ notification_type.capitalize() }} are disabled @@ -21,7 +21,7 @@

    If you need to send {{ 999|message_count_label(notification_type, suffix='') }} - get in touch with the Notify.gov team. + get in touch with the Notify.gov team.

    diff --git a/app/templates/views/templates/breaking-change.html b/app/templates/views/templates/breaking-change.html index 705a66775..4b801e81d 100644 --- a/app/templates/views/templates/breaking-change.html +++ b/app/templates/views/templates/breaking-change.html @@ -4,7 +4,7 @@ {% from "components/page-footer.html" import page_footer %} {% from "components/list.html" import list_of_placeholders, list_of_code_snippets %} {% 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 %} Confirm changes diff --git a/app/templates/views/templates/choose-reply.html b/app/templates/views/templates/choose-reply.html index f958e6b7f..fd5524651 100644 --- a/app/templates/views/templates/choose-reply.html +++ b/app/templates/views/templates/choose-reply.html @@ -1,6 +1,6 @@ {% from "components/live-search.html" import live_search %} {% from "components/folder-path.html" import folder_path %} -{% from "components/uk_components/button/macro.njk" import govukButton %} +{% from "components/us_components/button/macro.njk" import govukButton %} {% extends "withnav_template.html" %} @@ -42,16 +42,16 @@ {% for item in templates_and_folders %}
  • {% for ancestor in item.ancestors %} - + {{ ancestor.name }} {% endfor %} {% if item.is_folder %} - + {{ item.name }} {% else %} - + {{ item.name }} {% endif %} diff --git a/app/templates/views/templates/choose_history.html b/app/templates/views/templates/choose_history.html index 7b87ff5fe..2c045f1c4 100644 --- a/app/templates/views/templates/choose_history.html +++ b/app/templates/views/templates/choose_history.html @@ -14,6 +14,6 @@ {% endfor %}

    - Back to current templates + Back to current templates

    {% endblock %} diff --git a/app/templates/views/templates/copy.html b/app/templates/views/templates/copy.html index ad68ab90c..757a804b5 100644 --- a/app/templates/views/templates/copy.html +++ b/app/templates/views/templates/copy.html @@ -31,23 +31,23 @@
  • {% for ancestor in item.ancestors %} {% if ancestor.is_service %} - + {% else %} - + {% endif %} {{ ancestor.name }} {% endfor %} {% if item.is_service %} - + {{ item.name }} {% elif item.is_folder %} - + {{ item.name }} {% else %} - + {{ item.name }} {% endif %} diff --git a/app/templates/views/templates/set-sender.html b/app/templates/views/templates/set-sender.html index 672bc62b0..82ed044be 100644 --- a/app/templates/views/templates/set-sender.html +++ b/app/templates/views/templates/set-sender.html @@ -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 %} {{ sender_context.title }} diff --git a/app/templates/views/templates/set-template-sender.html b/app/templates/views/templates/set-template-sender.html index dc0a5f0cd..2c97e160c 100644 --- a/app/templates/views/templates/set-template-sender.html +++ b/app/templates/views/templates/set-template-sender.html @@ -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 %} {% set page_title = 'Set letter contact block' %} @@ -29,7 +29,7 @@ }) }}
    {{ page_footer('Continue') }} - Add new sender + Add new sender
    {% endcall %} diff --git a/app/templates/views/templates/start-tour.html b/app/templates/views/templates/start-tour.html index 17ff55a12..bf0b92ff0 100644 --- a/app/templates/views/templates/start-tour.html +++ b/app/templates/views/templates/start-tour.html @@ -1,5 +1,5 @@ {% extends "withnav_template.html" %} -{% from "components/uk_components/button/macro.njk" import govukButton %} +{% from "components/us_components/button/macro.njk" import govukButton %} {% block service_page_title %} {{ template.name }} diff --git a/app/templates/views/templates/template.html b/app/templates/views/templates/template.html index d97dde886..7a7e3c83d 100644 --- a/app/templates/views/templates/template.html +++ b/app/templates/views/templates/template.html @@ -3,7 +3,7 @@ {% from "components/folder-path.html" import folder_path, page_title_folder_path %} {% from "components/page-footer.html" import page_footer %} {% from "components/copy-to-clipboard.html" import copy_to_clipboard %} -{% from "components/uk_components/button/macro.njk" import govukButton %} +{% from "components/us_components/button/macro.njk" import govukButton %} {% block service_page_title %} {{ page_title_folder_path(current_service.get_template_path(template._template)) }} diff --git a/app/templates/views/terms-of-use.html b/app/templates/views/terms-of-use.html index 5a061d0d1..1f0a54c52 100644 --- a/app/templates/views/terms-of-use.html +++ b/app/templates/views/terms-of-use.html @@ -29,14 +29,14 @@
    • send all the messages you pass to us, as long as they meet our guidelines
      • -
    • keep your data secure
      • +
    • keep your data secure
    • give you one month’s notice by email if we change our terms of use or delivery providers

    Leaving Notify

    -

    You can leave Notify at any time. Just contact us and we’ll close your account.

    +

    You can leave Notify at any time. Just contact us and we’ll close your account.

    When you leave Notify, all your data will be deleted.

    {% endblock %} diff --git a/app/templates/views/trial-mode.html b/app/templates/views/trial-mode.html index 8c0eb781b..6d7c5d912 100644 --- a/app/templates/views/trial-mode.html +++ b/app/templates/views/trial-mode.html @@ -17,13 +17,13 @@ {% if current_service and current_service.trial_mode %}

    - To remove these restrictions, you can request to go live.

    + To remove these restrictions, you can request to go live.

    {% else %}

    To remove these restrictions:

      -
    1. Sign in to Notify.
      2. +
    2. Sign in to Notify.
    3. Go to the Settings page.
    4. Select Request to go live.
    diff --git a/app/templates/views/two-factor-webauthn.html b/app/templates/views/two-factor-webauthn.html index 7b155f556..e0fcc3722 100644 --- a/app/templates/views/two-factor-webauthn.html +++ b/app/templates/views/two-factor-webauthn.html @@ -1,9 +1,9 @@ {% extends "withoutnav_template.html" %} {% from "components/page-header.html" import page_header %} -{% 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 %} {% from "components/webauthn-api-check.html" import webauthn_api_check %} -{% from "components/uk_components/error-message/macro.njk" import govukErrorMessage %} +{% from "components/us_components/error-message/macro.njk" import govukErrorMessage %} {% set page_title = 'Get your security key' %} @@ -27,7 +27,7 @@ 'There’s a problem with your security key' + '

    Check you have the right key and try again. ' + 'If this does not work, ' + - 'contact us." + + 'contact us." + '

    ' ), "attributes": { diff --git a/app/templates/views/user-already-invited.html b/app/templates/views/user-already-invited.html index a9c84c318..9b5a1046f 100644 --- a/app/templates/views/user-already-invited.html +++ b/app/templates/views/user-already-invited.html @@ -1,6 +1,6 @@ {% extends "withnav_template.html" %} {% from "components/page-header.html" import page_header %} -{% from "components/uk_components/back-link/macro.njk" import govukBackLink %} +{% from "components/us_components/back-link/macro.njk" import govukBackLink %} {% block service_page_title %} This person has already received an invite diff --git a/app/templates/views/user-already-team-member.html b/app/templates/views/user-already-team-member.html index 22d35f47f..e3f08aba2 100644 --- a/app/templates/views/user-already-team-member.html +++ b/app/templates/views/user-already-team-member.html @@ -1,6 +1,6 @@ {% extends "withnav_template.html" %} {% from "components/page-header.html" import page_header %} -{% from "components/uk_components/back-link/macro.njk" import govukBackLink %} +{% from "components/us_components/back-link/macro.njk" import govukBackLink %} {% block service_page_title %} This person is already a team member diff --git a/app/templates/views/user-profile/authenticate.html b/app/templates/views/user-profile/authenticate.html index 57f5f37cc..24942ba28 100644 --- a/app/templates/views/user-profile/authenticate.html +++ b/app/templates/views/user-profile/authenticate.html @@ -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 per_page_title %} Change your {{ thing }} diff --git a/app/templates/views/user-profile/change-password.html b/app/templates/views/user-profile/change-password.html index 080985cc5..596de379d 100644 --- a/app/templates/views/user-profile/change-password.html +++ b/app/templates/views/user-profile/change-password.html @@ -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 per_page_title %} Change your password diff --git a/app/templates/views/user-profile/change.html b/app/templates/views/user-profile/change.html index b21d3109a..235d0df45 100644 --- a/app/templates/views/user-profile/change.html +++ b/app/templates/views/user-profile/change.html @@ -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 per_page_title %} Change your {{ thing }} diff --git a/app/templates/views/user-profile/confirm.html b/app/templates/views/user-profile/confirm.html index 62e2f530f..d54f84de8 100644 --- a/app/templates/views/user-profile/confirm.html +++ b/app/templates/views/user-profile/confirm.html @@ -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 per_page_title %} Change your {{ thing }} diff --git a/app/templates/views/user-profile/disable-platform-admin-view.html b/app/templates/views/user-profile/disable-platform-admin-view.html index fd4c12f0b..d17567362 100644 --- a/app/templates/views/user-profile/disable-platform-admin-view.html +++ b/app/templates/views/user-profile/disable-platform-admin-view.html @@ -1,7 +1,7 @@ {% extends "withoutnav_template.html" %} {% from "components/form.html" import form_wrapper %} {% 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 %} {% set page_title = 'Use platform admin view' %} diff --git a/app/templates/views/user-profile/manage-security-key.html b/app/templates/views/user-profile/manage-security-key.html index 67f8d2506..cc2f8c008 100644 --- a/app/templates/views/user-profile/manage-security-key.html +++ b/app/templates/views/user-profile/manage-security-key.html @@ -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 %} {% set page_title = 'Manage ' + '‘' + security_key.name + '’' %} diff --git a/app/templates/views/user-profile/security-keys.html b/app/templates/views/user-profile/security-keys.html index 82603c69c..38f61180a 100644 --- a/app/templates/views/user-profile/security-keys.html +++ b/app/templates/views/user-profile/security-keys.html @@ -1,10 +1,10 @@ {% extends "withoutnav_template.html" %} {% from "components/page-header.html" import page_header %} -{% 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 %} {% from "components/table.html" import edit_field, mapping_table, row, field, row_heading %} {% from "components/webauthn-api-check.html" import webauthn_api_check %} -{% from "components/uk_components/error-message/macro.njk" import govukErrorMessage %} +{% from "components/us_components/error-message/macro.njk" import govukErrorMessage %} {% set page_title = 'Security keys' %} {% set credentials = current_user.webauthn_credentials %} @@ -53,7 +53,7 @@ 'There’s a problem with your security key' + '

    Check you have the right key and try again. ' + 'If this does not work, ' + - 'contact us." + + 'contact us." + '

    ' ), "attributes": { diff --git a/app/templates/views/using-notify.html b/app/templates/views/using-notify.html index 92c7223f4..3daa05583 100644 --- a/app/templates/views/using-notify.html +++ b/app/templates/views/using-notify.html @@ -19,10 +19,10 @@

    Find out more about:

    diff --git a/app/templates/views/verification-not-received.html b/app/templates/views/verification-not-received.html index 3ca3b258e..2c1e4efc2 100644 --- a/app/templates/views/verification-not-received.html +++ b/app/templates/views/verification-not-received.html @@ -1,5 +1,5 @@ {% extends "withoutnav_template.html" %} -{% from "components/uk_components/button/macro.njk" import govukButton %} +{% from "components/us_components/button/macro.njk" import govukButton %} {% block per_page_title %} Resend security code diff --git a/app/templates/withnav_template.html b/app/templates/withnav_template.html index e22be1617..e94de3666 100644 --- a/app/templates/withnav_template.html +++ b/app/templates/withnav_template.html @@ -18,7 +18,7 @@ {% if help %}
    {% else %} -
    +
    {% endif %} {% block beforeContent %} {% block backLink %}{% endblock %} diff --git a/app/templates/withoutnav_template.html b/app/templates/withoutnav_template.html index 95b9d5c15..7836106b0 100644 --- a/app/templates/withoutnav_template.html +++ b/app/templates/withoutnav_template.html @@ -1,11 +1,11 @@ {% extends "admin_template.html" %} -{% set mainClasses = "padding-bottom-5" %} +{% set mainClasses = "margin-top-5 padding-bottom-5" %} {% block beforeContent %} {% if current_service and current_service.active and current_user.is_authenticated and current_user.belongs_to_service(current_service.id) %} -
    - Back to {{ current_service.name }} +
    + Back to {{ current_service.name }}
    {% endif %} {% block backLink %}{% endblock %} diff --git a/gulpfile.js b/gulpfile.js index 4d9689be0..6fc319758 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -145,29 +145,6 @@ const javascripts = () => { }; -const sass = () => { - return src([ - paths.src + '/stylesheets/main*.scss', - paths.src + '/stylesheets/print.scss' - ]) - .pipe(plugins.prettyerror()) - .pipe(plugins.sass.sync({ - includePaths: [ - paths.npm + 'govuk-elements-sass/public/sass/', - paths.toolkit + 'stylesheets/', - paths.govuk_frontend, - paths.npm - ] - })) - .pipe(plugins.cssUrlAdjuster({ - replace: [staticPathMatcher, '/'] - })) - // cssUrlAdjuster outputs uncompressed CSS so we need to perform the compression here - .pipe(plugins.cleanCSS({ compatibility: '*' })) - .pipe(dest(paths.dist + 'stylesheets/')) -}; - - // Copy images const images = () => { @@ -243,7 +220,6 @@ const defaultTask = parallel( series( javascripts ), - sass, uswds.compile, uswds.copyAssets, copy.gtm diff --git a/paas-failwhale/index.html b/paas-failwhale/index.html index 81622eb8b..3208b043c 100644 --- a/paas-failwhale/index.html +++ b/paas-failwhale/index.html @@ -90,7 +90,7 @@ We’re performing some essential updates. Notify will be back shortly.

    - Please check the status page for updates.

    @@ -106,7 +106,7 @@

    Support links

    Built by the Technology Transformation Services + class="usa-link">Technology Transformation Services
    All content is available under the - Open Government Licence v3.0, except where otherwise stated diff --git a/tests/app/main/views/accounts/test_choose_accounts.py b/tests/app/main/views/accounts/test_choose_accounts.py index 21531c3b6..f0c177ca0 100644 --- a/tests/app/main/views/accounts/test_choose_accounts.py +++ b/tests/app/main/views/accounts/test_choose_accounts.py @@ -231,7 +231,7 @@ def test_choose_account_should_show_back_to_service_link( ): resp = client_request.get('main.choose_account') - service_navigation = resp.find('div', {'class': 'navigation-service'}) + service_navigation = resp.find('div', {'class': 'navigation-service usa-breadcrumb'}) back_to_service_link = service_navigation.a assert back_to_service_link['href'] == url_for('main.show_accounts_or_dashboard') @@ -248,7 +248,7 @@ def test_choose_account_should_not_show_back_to_service_link_if_no_service_in_se session['service_id'] = None page = client_request.get('main.choose_account') - assert len(page.select('.navigation-service a')) == 0 + assert len(page.select('.navigation-service usa-breadcrumb a')) == 0 def test_choose_account_should_not_show_back_to_service_link_if_not_signed_in( @@ -262,7 +262,7 @@ def test_choose_account_should_not_show_back_to_service_link_if_not_signed_in( page = client_request.get('main.sign_in') assert page.select_one('h1').text == 'Sign in' # We’re not signed in - assert page.select_one('.navigation-service a') is None + assert page.select_one('.navigation-service usa-breadcrumb a') is None @pytest.mark.parametrize('active', ( diff --git a/tests/app/main/views/service_settings/test_service_setting_permissions.py b/tests/app/main/views/service_settings/test_service_setting_permissions.py index b45a045cc..dd6780355 100644 --- a/tests/app/main/views/service_settings/test_service_setting_permissions.py +++ b/tests/app/main/views/service_settings/test_service_setting_permissions.py @@ -187,7 +187,7 @@ def test_service_settings_doesnt_show_option_if_parent_permission_disabled( def test_service_setting_toggles_dont_show(get_service_settings_page, service_one, service_fields, link_text): service_one.update(service_fields) page = get_service_settings_page() - toggles = page.find_all('a', {'class': 'govuk-link'}) + toggles = page.find_all('a', {'class': 'usa-link'}) assert not any(link for link in toggles if link_text in link.text) diff --git a/tests/app/main/views/test_activity.py b/tests/app/main/views/test_activity.py index cdf1a5939..94dac0593 100644 --- a/tests/app/main/views/test_activity.py +++ b/tests/app/main/views/test_activity.py @@ -130,7 +130,7 @@ def test_can_show_notifications( ) first_row = page.select_one('tbody tr') assert normalize_spaces( - first_row.select_one('a.file-list-filename.govuk-link').text + first_row.select_one('a.file-list-filename.usa-link').text ) == ( # Comes from # https://github.com/alphagov/notifications-admin/blob/8faffad508f9a087b0006989c197741c693cc2e2/tests/__init__.py#L436 diff --git a/tests/app/main/views/test_api_integration.py b/tests/app/main/views/test_api_integration.py index 5f63388d4..648bf0199 100644 --- a/tests/app/main/views/test_api_integration.py +++ b/tests/app/main/views/test_api_integration.py @@ -119,7 +119,7 @@ def test_should_show_api_keys_page( ): page = client_request.get('main.api_keys', service_id=SERVICE_ONE_ID) rows = [normalize_spaces(row.text) for row in page.select('main tr')] - revoke_link = page.select_one('main tr a.govuk-link.govuk-link--destructive') + revoke_link = page.select_one('main tr a.usa-link.usa-link--destructive') assert rows[0] == 'API keys Action' assert rows[1] == f"another key name Revoked {format_datetime_short(date.fromtimestamp(0).isoformat())}" diff --git a/tests/app/main/views/test_index.py b/tests/app/main/views/test_index.py index 771db8bc9..c0c2b737c 100644 --- a/tests/app/main/views/test_index.py +++ b/tests/app/main/views/test_index.py @@ -238,8 +238,6 @@ def test_css_is_served_from_correct_path(client_request): page.select('link[rel=stylesheet]') ): assert link['href'].startswith([ - 'https://static.example.com/stylesheets/main.css?', - 'https://static.example.com/stylesheets/print.css?', 'https://static.example.com/css/styles.css?', ][index]) diff --git a/tests/javascripts/liveSearch.test.js b/tests/javascripts/liveSearch.test.js index 27b5cd0d7..cf609a798 100644 --- a/tests/javascripts/liveSearch.test.js +++ b/tests/javascripts/liveSearch.test.js @@ -517,7 +517,7 @@ describe('Live search', () => {
  • - Cancel invitation + Cancel invitation
    • `); diff --git a/tests/javascripts/stick-to-window-when-scrolling.test.js b/tests/javascripts/stick-to-window-when-scrolling.test.js index cea0d530e..18e3973a1 100644 --- a/tests/javascripts/stick-to-window-when-scrolling.test.js +++ b/tests/javascripts/stick-to-window-when-scrolling.test.js @@ -752,7 +752,7 @@ describe("Stick to top/bottom of window when scrolling", () => {

    This is a paragraph with a horizontal line underneath.

    This is a paragraph with a horizontal line above.

    -

    This paragraph has a link in it: https://www.gov.uk.

    +

    This paragraph has a link in it: https://www.gov.uk.

    diff --git a/tests/javascripts/support/helpers/html.js b/tests/javascripts/support/helpers/html.js index 77e445410..b430e7191 100644 --- a/tests/javascripts/support/helpers/html.js +++ b/tests/javascripts/support/helpers/html.js @@ -48,7 +48,7 @@ function templatesAndFoldersCheckboxes (hierarchy) { - + ${node.label} ${node.meta} diff --git a/tests/javascripts/updateContent.test.js b/tests/javascripts/updateContent.test.js index b3249669b..011e12494 100644 --- a/tests/javascripts/updateContent.test.js +++ b/tests/javascripts/updateContent.test.js @@ -293,7 +293,7 @@ describe('Update content', () => {

    - ${content.title} + ${content.title}