- */
-
-.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/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/main/forms.py b/app/main/forms.py
index 94fd57433..aa46da166 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/components/input/template.njk', params=params))
class GovukTextInputField(StringField):
@@ -313,7 +313,7 @@ class GovukSearchField(SearchField):
# this bypasses that by making self.widget a method with the same interface as widget.__call__
def widget(self, field, param_extensions=None, **kwargs):
- params = {"classes": "govuk-!-width-full"} # email addresses don't need to be spellchecked
+ params = {"classes": ""} # email addresses don't need to be spellchecked
merge_jsonlike(params, param_extensions)
return govuk_text_input_field_widget(self, field, type="search", param_extensions=params, **kwargs)
@@ -511,7 +511,7 @@ class NestedFieldMixin:
}
},
"formGroup": {
- "classes": "govuk-form-group--nested"
+ "classes": "usa-form-group--nested"
},
"asList": True,
"items": []
@@ -720,7 +720,6 @@ def govuk_checkboxes_field_widget(self, field, wrap_in_collapsible=False, param_
"attributes": {"id": field.name},
"legend": {
"text": field.label.text,
- "classes": "govuk-fieldset__legend--s"
}
},
"asList": self.render_as_list,
@@ -791,7 +790,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/components/radios/template.njk', params=params))
class GovukCheckboxField(BooleanField):
@@ -848,7 +847,7 @@ class GovukTextareaField(TextAreaField):
merge_jsonlike(params, param_extensions)
return Markup(
- render_template('components/uk_components/textarea/template.njk', params=params))
+ render_template('components/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 05ce1fe6a..54db0a4a1 100644
--- a/app/main/views/sign_in.py
+++ b/app/main/views/sign_in.py
@@ -64,7 +64,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..e63e507b4 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/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/uk_components/back-link/README.md b/app/templates/components/components/back-link/README.md
similarity index 100%
rename from app/templates/components/uk_components/back-link/README.md
rename to app/templates/components/components/back-link/README.md
diff --git a/app/templates/components/uk_components/back-link/_back-link.scss b/app/templates/components/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/components/back-link/_back-link.scss
diff --git a/app/templates/components/uk_components/back-link/macro-options.json b/app/templates/components/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/components/back-link/macro-options.json
diff --git a/app/templates/components/uk_components/back-link/macro.njk b/app/templates/components/components/back-link/macro.njk
similarity index 100%
rename from app/templates/components/uk_components/back-link/macro.njk
rename to app/templates/components/components/back-link/macro.njk
diff --git a/app/templates/components/uk_components/back-link/template.njk b/app/templates/components/components/back-link/template.njk
similarity index 81%
rename from app/templates/components/uk_components/back-link/template.njk
rename to app/templates/components/components/back-link/template.njk
index 21f0078b4..25e611b06 100644
--- a/app/templates/components/uk_components/back-link/template.njk
+++ b/app/templates/components/components/back-link/template.njk
@@ -1,2 +1,2 @@
-{{ (params.html | safe if params.html else (params.text if params.text else 'Back')) }}
diff --git a/app/templates/components/uk_components/button/README.md b/app/templates/components/components/button/README.md
similarity index 100%
rename from app/templates/components/uk_components/button/README.md
rename to app/templates/components/components/button/README.md
diff --git a/app/templates/components/uk_components/button/_button.scss b/app/templates/components/components/button/_button.scss
similarity index 100%
rename from app/templates/components/uk_components/button/_button.scss
rename to app/templates/components/components/button/_button.scss
diff --git a/app/templates/components/uk_components/button/macro-options.json b/app/templates/components/components/button/macro-options.json
similarity index 100%
rename from app/templates/components/uk_components/button/macro-options.json
rename to app/templates/components/components/button/macro-options.json
diff --git a/app/templates/components/uk_components/button/macro.njk b/app/templates/components/components/button/macro.njk
similarity index 100%
rename from app/templates/components/uk_components/button/macro.njk
rename to app/templates/components/components/button/macro.njk
diff --git a/app/templates/components/uk_components/button/template.njk b/app/templates/components/components/button/template.njk
similarity index 100%
rename from app/templates/components/uk_components/button/template.njk
rename to app/templates/components/components/button/template.njk
diff --git a/app/templates/components/uk_components/checkboxes/README.md b/app/templates/components/components/checkboxes/README.md
similarity index 100%
rename from app/templates/components/uk_components/checkboxes/README.md
rename to app/templates/components/components/checkboxes/README.md
diff --git a/app/templates/components/uk_components/checkboxes/_checkboxes.scss b/app/templates/components/components/checkboxes/_checkboxes.scss
similarity index 100%
rename from app/templates/components/uk_components/checkboxes/_checkboxes.scss
rename to app/templates/components/components/checkboxes/_checkboxes.scss
diff --git a/app/templates/components/uk_components/checkboxes/macro-options.json b/app/templates/components/components/checkboxes/macro-options.json
similarity index 100%
rename from app/templates/components/uk_components/checkboxes/macro-options.json
rename to app/templates/components/components/checkboxes/macro-options.json
diff --git a/app/templates/components/uk_components/checkboxes/macro.njk b/app/templates/components/components/checkboxes/macro.njk
similarity index 100%
rename from app/templates/components/uk_components/checkboxes/macro.njk
rename to app/templates/components/components/checkboxes/macro.njk
diff --git a/app/templates/components/uk_components/checkboxes/template.njk b/app/templates/components/components/checkboxes/template.njk
similarity index 94%
rename from app/templates/components/uk_components/checkboxes/template.njk
rename to app/templates/components/components/checkboxes/template.njk
index 9a12be65c..2eeb21fe7 100644
--- a/app/templates/components/uk_components/checkboxes/template.njk
+++ b/app/templates/components/components/checkboxes/template.njk
@@ -49,7 +49,7 @@
visuallyHiddenText: params.errorMessage.visuallyHiddenText
}) | indent(2) | trim }}
{% endif %}
-
{% for item in params.items %}
@@ -93,7 +93,7 @@
{% endset -%}
-
+
{% if params.fieldset %}
{% call govukFieldset({
describedBy: describedBy,
diff --git a/app/templates/components/uk_components/details/README.md b/app/templates/components/components/details/README.md
similarity index 100%
rename from app/templates/components/uk_components/details/README.md
rename to app/templates/components/components/details/README.md
diff --git a/app/templates/components/uk_components/details/_details.scss b/app/templates/components/components/details/_details.scss
similarity index 100%
rename from app/templates/components/uk_components/details/_details.scss
rename to app/templates/components/components/details/_details.scss
diff --git a/app/templates/components/uk_components/details/macro-options.json b/app/templates/components/components/details/macro-options.json
similarity index 100%
rename from app/templates/components/uk_components/details/macro-options.json
rename to app/templates/components/components/details/macro-options.json
diff --git a/app/templates/components/uk_components/details/macro.njk b/app/templates/components/components/details/macro.njk
similarity index 100%
rename from app/templates/components/uk_components/details/macro.njk
rename to app/templates/components/components/details/macro.njk
diff --git a/app/templates/components/uk_components/details/template.njk b/app/templates/components/components/details/template.njk
similarity index 64%
rename from app/templates/components/uk_components/details/template.njk
rename to app/templates/components/components/details/template.njk
index 999a7ec0d..76b380594 100644
--- a/app/templates/components/uk_components/details/template.njk
+++ b/app/templates/components/components/details/template.njk
@@ -1,4 +1,4 @@
-
+
{{ params.summaryHtml | safe if params.summaryHtml else params.summaryText }}
diff --git a/app/templates/components/uk_components/error-message/README.md b/app/templates/components/components/error-message/README.md
similarity index 100%
rename from app/templates/components/uk_components/error-message/README.md
rename to app/templates/components/components/error-message/README.md
diff --git a/app/templates/components/uk_components/error-message/_error-message.scss b/app/templates/components/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/components/error-message/_error-message.scss
diff --git a/app/templates/components/uk_components/error-message/macro-options.json b/app/templates/components/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/components/error-message/macro-options.json
diff --git a/app/templates/components/uk_components/error-message/macro.njk b/app/templates/components/components/error-message/macro.njk
similarity index 100%
rename from app/templates/components/uk_components/error-message/macro.njk
rename to app/templates/components/components/error-message/macro.njk
diff --git a/app/templates/components/uk_components/error-message/template.njk b/app/templates/components/components/error-message/template.njk
similarity index 100%
rename from app/templates/components/uk_components/error-message/template.njk
rename to app/templates/components/components/error-message/template.njk
diff --git a/app/templates/components/uk_components/fieldset/README.md b/app/templates/components/components/fieldset/README.md
similarity index 100%
rename from app/templates/components/uk_components/fieldset/README.md
rename to app/templates/components/components/fieldset/README.md
diff --git a/app/templates/components/uk_components/fieldset/_fieldset.scss b/app/templates/components/components/fieldset/_fieldset.scss
similarity index 100%
rename from app/templates/components/uk_components/fieldset/_fieldset.scss
rename to app/templates/components/components/fieldset/_fieldset.scss
diff --git a/app/templates/components/uk_components/fieldset/macro-options.json b/app/templates/components/components/fieldset/macro-options.json
similarity index 100%
rename from app/templates/components/uk_components/fieldset/macro-options.json
rename to app/templates/components/components/fieldset/macro-options.json
diff --git a/app/templates/components/uk_components/fieldset/macro.njk b/app/templates/components/components/fieldset/macro.njk
similarity index 100%
rename from app/templates/components/uk_components/fieldset/macro.njk
rename to app/templates/components/components/fieldset/macro.njk
diff --git a/app/templates/components/uk_components/fieldset/template.njk b/app/templates/components/components/fieldset/template.njk
similarity index 76%
rename from app/templates/components/uk_components/fieldset/template.njk
rename to app/templates/components/components/fieldset/template.njk
index 5388e06a8..9ca89387b 100644
--- a/app/templates/components/uk_components/fieldset/template.njk
+++ b/app/templates/components/components/fieldset/template.njk
@@ -1,11 +1,11 @@
-
-
diff --git a/app/templates/components/uk_components/header/README.md b/app/templates/components/components/header/README.md
similarity index 100%
rename from app/templates/components/uk_components/header/README.md
rename to app/templates/components/components/header/README.md
diff --git a/app/templates/components/uk_components/header/_header.scss b/app/templates/components/components/header/_header.scss
similarity index 100%
rename from app/templates/components/uk_components/header/_header.scss
rename to app/templates/components/components/header/_header.scss
diff --git a/app/templates/components/uk_components/header/macro-options.json b/app/templates/components/components/header/macro-options.json
similarity index 100%
rename from app/templates/components/uk_components/header/macro-options.json
rename to app/templates/components/components/header/macro-options.json
diff --git a/app/templates/components/uk_components/header/macro.njk b/app/templates/components/components/header/macro.njk
similarity index 100%
rename from app/templates/components/uk_components/header/macro.njk
rename to app/templates/components/components/header/macro.njk
diff --git a/app/templates/components/uk_components/header/template.njk b/app/templates/components/components/header/template.njk
similarity index 100%
rename from app/templates/components/uk_components/header/template.njk
rename to app/templates/components/components/header/template.njk
diff --git a/app/templates/components/uk_components/hint/README.md b/app/templates/components/components/hint/README.md
similarity index 100%
rename from app/templates/components/uk_components/hint/README.md
rename to app/templates/components/components/hint/README.md
diff --git a/app/templates/components/uk_components/hint/_hint.scss b/app/templates/components/components/hint/_hint.scss
similarity index 100%
rename from app/templates/components/uk_components/hint/_hint.scss
rename to app/templates/components/components/hint/_hint.scss
diff --git a/app/templates/components/uk_components/hint/macro-options.json b/app/templates/components/components/hint/macro-options.json
similarity index 100%
rename from app/templates/components/uk_components/hint/macro-options.json
rename to app/templates/components/components/hint/macro-options.json
diff --git a/app/templates/components/uk_components/hint/macro.njk b/app/templates/components/components/hint/macro.njk
similarity index 100%
rename from app/templates/components/uk_components/hint/macro.njk
rename to app/templates/components/components/hint/macro.njk
diff --git a/app/templates/components/uk_components/hint/template.njk b/app/templates/components/components/hint/template.njk
similarity index 100%
rename from app/templates/components/uk_components/hint/template.njk
rename to app/templates/components/components/hint/template.njk
diff --git a/app/templates/components/uk_components/input/README.md b/app/templates/components/components/input/README.md
similarity index 100%
rename from app/templates/components/uk_components/input/README.md
rename to app/templates/components/components/input/README.md
diff --git a/app/templates/components/uk_components/input/_input.scss b/app/templates/components/components/input/_input.scss
similarity index 100%
rename from app/templates/components/uk_components/input/_input.scss
rename to app/templates/components/components/input/_input.scss
diff --git a/app/templates/components/uk_components/input/macro-options.json b/app/templates/components/components/input/macro-options.json
similarity index 100%
rename from app/templates/components/uk_components/input/macro-options.json
rename to app/templates/components/components/input/macro-options.json
diff --git a/app/templates/components/uk_components/input/macro.njk b/app/templates/components/components/input/macro.njk
similarity index 100%
rename from app/templates/components/uk_components/input/macro.njk
rename to app/templates/components/components/input/macro.njk
diff --git a/app/templates/components/uk_components/input/template.njk b/app/templates/components/components/input/template.njk
similarity index 100%
rename from app/templates/components/uk_components/input/template.njk
rename to app/templates/components/components/input/template.njk
diff --git a/app/templates/components/uk_components/inset-text/README.md b/app/templates/components/components/inset-text/README.md
similarity index 100%
rename from app/templates/components/uk_components/inset-text/README.md
rename to app/templates/components/components/inset-text/README.md
diff --git a/app/templates/components/uk_components/inset-text/_inset-text.scss b/app/templates/components/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/components/inset-text/_inset-text.scss
diff --git a/app/templates/components/uk_components/inset-text/macro-options.json b/app/templates/components/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/components/inset-text/macro-options.json
diff --git a/app/templates/components/uk_components/inset-text/macro.njk b/app/templates/components/components/inset-text/macro.njk
similarity index 100%
rename from app/templates/components/uk_components/inset-text/macro.njk
rename to app/templates/components/components/inset-text/macro.njk
diff --git a/app/templates/components/uk_components/inset-text/template.njk b/app/templates/components/components/inset-text/template.njk
similarity index 100%
rename from app/templates/components/uk_components/inset-text/template.njk
rename to app/templates/components/components/inset-text/template.njk
diff --git a/app/templates/components/uk_components/label/README.md b/app/templates/components/components/label/README.md
similarity index 100%
rename from app/templates/components/uk_components/label/README.md
rename to app/templates/components/components/label/README.md
diff --git a/app/templates/components/uk_components/label/_label.scss b/app/templates/components/components/label/_label.scss
similarity index 100%
rename from app/templates/components/uk_components/label/_label.scss
rename to app/templates/components/components/label/_label.scss
diff --git a/app/templates/components/uk_components/label/macro-options.json b/app/templates/components/components/label/macro-options.json
similarity index 100%
rename from app/templates/components/uk_components/label/macro-options.json
rename to app/templates/components/components/label/macro-options.json
diff --git a/app/templates/components/uk_components/label/macro.njk b/app/templates/components/components/label/macro.njk
similarity index 100%
rename from app/templates/components/uk_components/label/macro.njk
rename to app/templates/components/components/label/macro.njk
diff --git a/app/templates/components/uk_components/label/template.njk b/app/templates/components/components/label/template.njk
similarity index 100%
rename from app/templates/components/uk_components/label/template.njk
rename to app/templates/components/components/label/template.njk
diff --git a/app/templates/components/components/radio-label/README.md b/app/templates/components/components/radio-label/README.md
new file mode 100644
index 000000000..0fa9beef8
--- /dev/null
+++ b/app/templates/components/components/radio-label/README.md
@@ -0,0 +1,15 @@
+# Label
+
+## Installation
+
+See the [main README quick start guide](https://github.com/alphagov/govuk-frontend#quick-start) for how to install this component.
+
+## Guidance and Examples
+
+The radio label component is used in other input components, to see an example of it in use see the [text input component](https://design-system.service.gov.uk/components/text-input/).
+
+## Component options
+
+Use options to customize the appearance, content and behavior of a component when using a macro, for example, changing the text.
+
+See [options table](https://design-system.service.gov.uk/components/file-upload/#options-example-default--label) for details.
\ No newline at end of file
diff --git a/app/templates/components/components/radio-label/_label.scss b/app/templates/components/components/radio-label/_label.scss
new file mode 100644
index 000000000..bfe400e57
--- /dev/null
+++ b/app/templates/components/components/radio-label/_label.scss
@@ -0,0 +1,45 @@
+@import "../../settings/all";
+@import "../../tools/all";
+@import "../../helpers/all";
+
+@include govuk-exports("govuk/component/label") {
+ .govuk-label {
+ @include govuk-font($size: 19);
+ @include govuk-text-colour;
+
+ display: block;
+
+ margin-bottom: govuk-spacing(1);
+ }
+
+ // Modifiers that make labels look more like their equivalent headings
+
+ .govuk-label--xl {
+ @include govuk-font($size: 48, $weight: bold);
+ margin-bottom: govuk-spacing(3);
+ }
+
+ .govuk-label--l {
+ @include govuk-font($size: 36, $weight: bold);
+ margin-bottom: govuk-spacing(3);
+ }
+
+ .govuk-label--m {
+ @include govuk-font($size: 24, $weight: bold);
+ margin-bottom: govuk-spacing(2);
+ }
+
+ .govuk-label--s {
+ @include govuk-font($size: 19, $weight: bold);
+ }
+
+ // When the label is nested inside a heading, override the heading so that it
+ // does not have a margin. Effectively we want to be able to treat the heading
+ // as if it is not there.
+ //
+ // This breaks BEM conventions because it exists as a parent of the 'block',
+ // so we can't really consider an element.
+ .govuk-label-wrapper {
+ margin: 0;
+ }
+}
diff --git a/app/templates/components/components/radio-label/macro-options.json b/app/templates/components/components/radio-label/macro-options.json
new file mode 100644
index 000000000..2b40a9577
--- /dev/null
+++ b/app/templates/components/components/radio-label/macro-options.json
@@ -0,0 +1,38 @@
+[
+ {
+ "name": "text",
+ "type": "string",
+ "required": true,
+ "description": "If `html` is set, this is not required. Text to use within the label. If `html` is provided, the `text` argument will be ignored."
+ },
+ {
+ "name": "html",
+ "type": "string",
+ "required": true,
+ "description": "If `text` is set, this is not required. HTML to use within the label. If `html` is provided, the `text` argument will be ignored."
+ },
+ {
+ "name": "for",
+ "type": "string",
+ "required": true,
+ "description": "The value of the for attribute, the id of the input the label is associated with."
+ },
+ {
+ "name": "isPageHeading",
+ "type": "boolean",
+ "required": false,
+ "description": "Whether the label also acts as the heading for the page."
+ },
+ {
+ "name": "classes",
+ "type": "string",
+ "required": false,
+ "description": "Classes to add to the label tag."
+ },
+ {
+ "name": "attributes",
+ "type": "object",
+ "required": false,
+ "description": "HTML attributes (for example data attributes) to add to the label tag."
+ }
+]
\ No newline at end of file
diff --git a/app/templates/components/components/radio-label/macro.njk b/app/templates/components/components/radio-label/macro.njk
new file mode 100644
index 000000000..43d2cabf2
--- /dev/null
+++ b/app/templates/components/components/radio-label/macro.njk
@@ -0,0 +1,3 @@
+{% macro usaRadioLabel(params) %}
+ {%- include "./template.njk" -%}
+{% endmacro %}
diff --git a/app/templates/components/components/radio-label/template.njk b/app/templates/components/components/radio-label/template.njk
new file mode 100644
index 000000000..855b1d349
--- /dev/null
+++ b/app/templates/components/components/radio-label/template.njk
@@ -0,0 +1,15 @@
+{% if params.html or params.text %}
+{% set labelHtml %}
+
+{% endset %}
+
+{% if params.isPageHeading %}
+
{{ labelHtml | safe | indent(2) }}
+{% else %}
+{{ labelHtml | safe }}
+{% endif %}
+{% endif %}
diff --git a/app/templates/components/uk_components/radios/README.md b/app/templates/components/components/radios/README.md
similarity index 100%
rename from app/templates/components/uk_components/radios/README.md
rename to app/templates/components/components/radios/README.md
diff --git a/app/templates/components/uk_components/radios/_radios.scss b/app/templates/components/components/radios/_radios.scss
similarity index 100%
rename from app/templates/components/uk_components/radios/_radios.scss
rename to app/templates/components/components/radios/_radios.scss
diff --git a/app/templates/components/uk_components/radios/macro-options.json b/app/templates/components/components/radios/macro-options.json
similarity index 100%
rename from app/templates/components/uk_components/radios/macro-options.json
rename to app/templates/components/components/radios/macro-options.json
diff --git a/app/templates/components/uk_components/radios/macro.njk b/app/templates/components/components/radios/macro.njk
similarity index 100%
rename from app/templates/components/uk_components/radios/macro.njk
rename to app/templates/components/components/radios/macro.njk
diff --git a/app/templates/components/uk_components/radios/template.njk b/app/templates/components/components/radios/template.njk
similarity index 95%
rename from app/templates/components/uk_components/radios/template.njk
rename to app/templates/components/components/radios/template.njk
index 5ef8b832c..0ee1a77c2 100644
--- a/app/templates/components/uk_components/radios/template.njk
+++ b/app/templates/components/components/radios/template.njk
@@ -88,7 +88,7 @@
{% endset -%}
-
+
{% if params.fieldset %}
{% call govukFieldset({
describedBy: describedBy,
diff --git a/app/templates/components/uk_components/skip-link/README.md b/app/templates/components/components/skip-link/README.md
similarity index 100%
rename from app/templates/components/uk_components/skip-link/README.md
rename to app/templates/components/components/skip-link/README.md
diff --git a/app/templates/components/uk_components/skip-link/_skip-link.scss b/app/templates/components/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/components/skip-link/_skip-link.scss
diff --git a/app/templates/components/uk_components/skip-link/macro-options.json b/app/templates/components/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/components/skip-link/macro-options.json
diff --git a/app/templates/components/uk_components/skip-link/macro.njk b/app/templates/components/components/skip-link/macro.njk
similarity index 100%
rename from app/templates/components/uk_components/skip-link/macro.njk
rename to app/templates/components/components/skip-link/macro.njk
diff --git a/app/templates/components/components/skip-link/template.njk b/app/templates/components/components/skip-link/template.njk
new file mode 100644
index 000000000..f18f881e8
--- /dev/null
+++ b/app/templates/components/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/components/textarea/README.md
similarity index 100%
rename from app/templates/components/uk_components/textarea/README.md
rename to app/templates/components/components/textarea/README.md
diff --git a/app/templates/components/uk_components/textarea/_textarea.scss b/app/templates/components/components/textarea/_textarea.scss
similarity index 100%
rename from app/templates/components/uk_components/textarea/_textarea.scss
rename to app/templates/components/components/textarea/_textarea.scss
diff --git a/app/templates/components/uk_components/textarea/macro-options.json b/app/templates/components/components/textarea/macro-options.json
similarity index 100%
rename from app/templates/components/uk_components/textarea/macro-options.json
rename to app/templates/components/components/textarea/macro-options.json
diff --git a/app/templates/components/uk_components/textarea/macro.njk b/app/templates/components/components/textarea/macro.njk
similarity index 100%
rename from app/templates/components/uk_components/textarea/macro.njk
rename to app/templates/components/components/textarea/macro.njk
diff --git a/app/templates/components/uk_components/textarea/template.njk b/app/templates/components/components/textarea/template.njk
similarity index 91%
rename from app/templates/components/uk_components/textarea/template.njk
rename to app/templates/components/components/textarea/template.njk
index 56d9cc333..49c5642ba 100644
--- a/app/templates/components/uk_components/textarea/template.njk
+++ b/app/templates/components/components/textarea/template.njk
@@ -5,7 +5,7 @@
{#- a record of other elements that we need to associate with the input using
aria-describedby – for example hints or error messages -#}
{% set describedBy = params.describedBy if params.describedBy else "" %}
-