diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index bd49531..2ba1dd3 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -30,11 +30,13 @@ Currently we take [static precompiled exports of the GOV.UK Frontend files](http 2. Download and unzip the ZIP folder, copying the assets (including fonts and images) into the `inst/www/` folder -3. Apply any changes from `css_changes.md` manually, to preserve previous edits +3. Update the CSS file name in `attachDependency.R` script -4. Test all the code functions as expected using `devtools::check()` +4. Apply any changes from `css_changes.md` manually, to preserve previous edits -5. Manually test the examples using `shinyGovstyle::run_example()`, ensuring the styling is as expected +5. Test all the code functions as expected using `devtools::check()` + +6. Manually test the examples using `shinyGovstyle::run_example()`, ensuring the styling is as expected If unsure on the styling and expected appearance, use the [GOV.UK Design System site](https://design-system.service.gov.uk/) to explore the components in more detail and official guidance for their use. diff --git a/R/attachDependency.R b/R/attachDependency.R index d9b00ea..0d38513 100644 --- a/R/attachDependency.R +++ b/R/attachDependency.R @@ -14,7 +14,7 @@ attachDependency <- function(tag, widget = NULL) { dep <- htmltools::htmlDependency( name = "stylecss", version = version, src = c(href="shinyGovstyle/css"), - stylesheet = "govuk-frontend-norem.css" + stylesheet = "govuk-frontend-5.7.1.min.css" ) if (!is.null(widget)) { diff --git a/css_changes.md b/css_changes.md index 7be65c4..857cb8b 100644 --- a/css_changes.md +++ b/css_changes.md @@ -7,23 +7,11 @@ background: white; color: #0b0c0c; ``` -* error summary change -``` -.govuk-error-summary__list { - color: #d4351c; - font-weight: 700; - text-decoration: underline; - text-underline-offset: 0.1em -``` +* Move fonts css to the font css + +* Add `font-size: 16px;` to root at top of file underneath `--govuk-frontend-version: VERSION NUMBER;` -* add -``` -.govuk-link { - border:none -} -``` -* Move fonts css to the font css * Change url links * For accordion need to fix the css by: @@ -177,7 +165,7 @@ only screen and (min-resolution:2dppx) { * Updated govuk-link--no-visited-state to still have a clear focus highlight (copied from the govuk-link formatting) ``` -.govuk-link--no-visited-state:focus { +.govuk-link--no-visited-state:active, .govuk-link--no-visited-state:focus { outline: 3px solid transparent; background-color: #fd0; box-shadow: 0 -2px #fd0, 0 4px #0b0c0c; @@ -218,6 +206,8 @@ only screen and (min-resolution:2dppx) { * Container for the value_box ``` +/*Container for value box*/ + .value-box-container { font-family: GDS Transport, Arial, sans-serif; font-weight: 400; @@ -232,6 +222,8 @@ only screen and (min-resolution:2dppx) { * Larger screens styling for value_box ``` +/*Larger screen sizing for value box*/ + @media (min-width: 40.0625em) { .value-box-container { font-size: 1.2rem; @@ -242,6 +234,8 @@ only screen and (min-resolution:2dppx) { * Styling for the value in value_box ``` +/*Styling value for value box*/ + .value-box-value { font-size: 1.5rem; line-height: 1; @@ -253,6 +247,8 @@ only screen and (min-resolution:2dppx) { * Styling for the optional description in value_box ``` +/*Styling for optional description for value box*/ + .value-box-description { font-size: 1rem; line-height: 1; diff --git a/inst/www/css/govuk-frontend-norem.css b/inst/www/css/govuk-frontend-5.7.1.min.css similarity index 86% rename from inst/www/css/govuk-frontend-norem.css rename to inst/www/css/govuk-frontend-5.7.1.min.css index bdd8d34..66bf9e3 100644 --- a/inst/www/css/govuk-frontend-norem.css +++ b/inst/www/css/govuk-frontend-5.7.1.min.css @@ -1,8 +1,8 @@ @charset "UTF-8"; :root { - --govuk-frontend-version: "5.4.0"; - font-size: 16px; + --govuk-frontend-version: "5.7.1"; + font-size: 16px; --govuk-frontend-breakpoint-mobile: 20rem; --govuk-frontend-breakpoint-tablet: 40.0625rem; --govuk-frontend-breakpoint-desktop: 48.0625rem @@ -52,39 +52,28 @@ color: #003078 } -.govuk-link:active, -.govuk-link:focus { +.govuk-link:active, .govuk-link:focus { color: #0b0c0c } @media print { - - [href^="/"].govuk-link:after, - [href^="http://"].govuk-link:after, - [href^="https://"].govuk-link:after { - content: " (" attr(href) ")"; + [href^="/"].govuk-link:after, [href^="http://"].govuk-link:after, [href^="https://"].govuk-link:after { + content: " ("attr(href) ")"; font-size: 90%; word-wrap: break-word } } -.govuk-link--muted:link, -.govuk-link--muted:visited { +.govuk-link--muted:link, .govuk-link--muted:visited { color: #505a5f } -.govuk-link--muted:active, -.govuk-link--muted:focus, -.govuk-link--muted:hover, -.govuk-link--text-colour:link, -.govuk-link--text-colour:visited { +.govuk-link--muted:active, .govuk-link--muted:focus, .govuk-link--muted:hover, .govuk-link--text-colour:link, .govuk-link--text-colour:visited { color: #0b0c0c } @media print { - - .govuk-link--text-colour:link, - .govuk-link--text-colour:visited { + .govuk-link--text-colour:link, .govuk-link--text-colour:visited { color: #000 } } @@ -93,26 +82,21 @@ color: rgba(11, 12, 12, .99) } -.govuk-link--text-colour:active, -.govuk-link--text-colour:focus { +.govuk-link--text-colour:active, .govuk-link--text-colour:focus { color: #0b0c0c } @media print { - - .govuk-link--text-colour:active, - .govuk-link--text-colour:focus { + .govuk-link--text-colour:active, .govuk-link--text-colour:focus { color: #000 } } -.govuk-link--inverse:link, -.govuk-link--inverse:visited { +.govuk-link--inverse:link, .govuk-link--inverse:visited { color: #fff } -.govuk-link--inverse:active, -.govuk-link--inverse:hover { +.govuk-link--inverse:active, .govuk-link--inverse:hover { color: hsla(0, 0%, 100%, .99) } @@ -124,20 +108,10 @@ text-decoration: none } -.govuk-link--no-visited-state:link, -.govuk-link--no-visited-state:visited { +.govuk-link--no-visited-state:link, .govuk-link--no-visited-state:visited { color: #1d70b8 } -.govuk-link--no-visited-state:focus { - outline: 3px solid transparent; - background-color: #fd0; - box-shadow: 0 -2px #fd0, 0 4px #0b0c0c; - text-decoration: none; - -webkit-box-decoration-break: clone; - box-decoration-break: clone -} - .govuk-link--no-visited-state:hover { text-decoration-thickness: max(3px, .1875rem, .12em); -webkit-text-decoration-skip-ink: none; @@ -146,10 +120,13 @@ text-decoration-skip: none; color: #003078 } - -.govuk-link--no-visited-state:active, -.govuk-link--no-visited-state:focus { - color: #0b0c0c +.govuk-link--no-visited-state:active, .govuk-link--no-visited-state:focus { + outline: 3px solid transparent; + background-color: #fd0; + box-shadow: 0 -2px #fd0, 0 4px #0b0c0c; + text-decoration: none; + -webkit-box-decoration-break: clone; + box-decoration-break: clone } .govuk-link-image { @@ -222,15 +199,12 @@ list-style-type: decimal } -.govuk-list--bullet>li, -.govuk-list--number>li { +.govuk-list--bullet>li, .govuk-list--number>li { margin-bottom: 0 } @media (min-width:40.0625em) { - - .govuk-list--bullet>li, - .govuk-list--number>li { + .govuk-list--bullet>li, .govuk-list--number>li { margin-bottom: 5px } } @@ -506,8 +480,7 @@ } } -.govuk-body-l, -.govuk-body-lead { +.govuk-body-l, .govuk-body-lead { color: #0b0c0c; font-family: GDS Transport, arial, sans-serif; -webkit-font-smoothing: antialiased; @@ -520,42 +493,33 @@ } @media print { - - .govuk-body-l, - .govuk-body-lead { + .govuk-body-l, .govuk-body-lead { color: #000; font-family: sans-serif } } @media (min-width:40.0625em) { - - .govuk-body-l, - .govuk-body-lead { + .govuk-body-l, .govuk-body-lead { font-size: 1.5rem; line-height: 1.25 } } @media print { - - .govuk-body-l, - .govuk-body-lead { + .govuk-body-l, .govuk-body-lead { font-size: 18pt; line-height: 1.15 } } @media (min-width:40.0625em) { - - .govuk-body-l, - .govuk-body-lead { + .govuk-body-l, .govuk-body-lead { margin-bottom: 30px } } -.govuk-body, -.govuk-body-m { +.govuk-body, .govuk-body-m { color: #0b0c0c; font-family: GDS Transport, arial, sans-serif; -webkit-font-smoothing: antialiased; @@ -568,36 +532,28 @@ } @media print { - - .govuk-body, - .govuk-body-m { + .govuk-body, .govuk-body-m { color: #000; font-family: sans-serif } } @media (min-width:40.0625em) { - - .govuk-body, - .govuk-body-m { + .govuk-body, .govuk-body-m { font-size: 1.1875rem; line-height: 1.3157894737 } } @media print { - - .govuk-body, - .govuk-body-m { + .govuk-body, .govuk-body-m { font-size: 14pt; line-height: 1.15 } } @media (min-width:40.0625em) { - - .govuk-body, - .govuk-body-m { + .govuk-body, .govuk-body-m { margin-bottom: 20px } } @@ -680,57 +636,32 @@ } } -.govuk-body-l+.govuk-heading-l, -.govuk-body-lead+.govuk-heading-l { +.govuk-body-l+.govuk-heading-l, .govuk-body-lead+.govuk-heading-l { padding-top: 5px } @media (min-width:40.0625em) { - - .govuk-body-l+.govuk-heading-l, - .govuk-body-lead+.govuk-heading-l { + .govuk-body-l+.govuk-heading-l, .govuk-body-lead+.govuk-heading-l { padding-top: 10px } } -.govuk-body+.govuk-heading-l, -.govuk-body-m+.govuk-heading-l, -.govuk-body-s+.govuk-heading-l, -.govuk-list+.govuk-heading-l { +.govuk-body+.govuk-heading-l, .govuk-body-m+.govuk-heading-l, .govuk-body-s+.govuk-heading-l, .govuk-list+.govuk-heading-l { padding-top: 15px } @media (min-width:40.0625em) { - - .govuk-body+.govuk-heading-l, - .govuk-body-m+.govuk-heading-l, - .govuk-body-s+.govuk-heading-l, - .govuk-list+.govuk-heading-l { + .govuk-body+.govuk-heading-l, .govuk-body-m+.govuk-heading-l, .govuk-body-s+.govuk-heading-l, .govuk-list+.govuk-heading-l { padding-top: 20px } } -.govuk-body+.govuk-heading-m, -.govuk-body+.govuk-heading-s, -.govuk-body-m+.govuk-heading-m, -.govuk-body-m+.govuk-heading-s, -.govuk-body-s+.govuk-heading-m, -.govuk-body-s+.govuk-heading-s, -.govuk-list+.govuk-heading-m, -.govuk-list+.govuk-heading-s { +.govuk-body+.govuk-heading-m, .govuk-body+.govuk-heading-s, .govuk-body-m+.govuk-heading-m, .govuk-body-m+.govuk-heading-s, .govuk-body-s+.govuk-heading-m, .govuk-body-s+.govuk-heading-s, .govuk-list+.govuk-heading-m, .govuk-list+.govuk-heading-s { padding-top: 5px } @media (min-width:40.0625em) { - - .govuk-body+.govuk-heading-m, - .govuk-body+.govuk-heading-s, - .govuk-body-m+.govuk-heading-m, - .govuk-body-m+.govuk-heading-s, - .govuk-body-s+.govuk-heading-m, - .govuk-body-s+.govuk-heading-s, - .govuk-list+.govuk-heading-m, - .govuk-list+.govuk-heading-s { + .govuk-body+.govuk-heading-m, .govuk-body+.govuk-heading-s, .govuk-body-m+.govuk-heading-m, .govuk-body-m+.govuk-heading-s, .govuk-body-s+.govuk-heading-m, .govuk-body-s+.govuk-heading-s, .govuk-list+.govuk-heading-m, .govuk-list+.govuk-heading-s { padding-top: 10px } } @@ -839,8 +770,7 @@ align-items: baseline } - .govuk-button-group .govuk-button, - .govuk-button-group .govuk-link { + .govuk-button-group .govuk-button, .govuk-button-group .govuk-link { margin-right: 15px } @@ -1053,15 +983,12 @@ } } -.govuk-main-wrapper--auto-spacing:first-child, -.govuk-main-wrapper--l { +.govuk-main-wrapper--auto-spacing:first-child, .govuk-main-wrapper--l { padding-top: 30px } @media (min-width:40.0625em) { - - .govuk-main-wrapper--auto-spacing:first-child, - .govuk-main-wrapper--l { + .govuk-main-wrapper--auto-spacing:first-child, .govuk-main-wrapper--l { padding-top: 50px } } @@ -1362,11 +1289,6 @@ -webkit-appearance: none } -.js-enabled .govuk-accordion__section-toggle { - pointer-events: none; -} - - @media (min-width:40.0625em) { .js-enabled .govuk-accordion__section-button { padding-bottom: 10px @@ -1400,9 +1322,7 @@ outline: 0 } -.js-enabled .govuk-accordion__section-button:focus .govuk-accordion__section-heading-text-focus, -.js-enabled .govuk-accordion__section-button:focus .govuk-accordion__section-summary-focus, -.js-enabled .govuk-accordion__section-button:focus .govuk-accordion__section-toggle-focus { +.js-enabled .govuk-accordion__section-button:focus .govuk-accordion__section-heading-text-focus, .js-enabled .govuk-accordion__section-button:focus .govuk-accordion__section-summary-focus, .js-enabled .govuk-accordion__section-button:focus .govuk-accordion__section-toggle-focus { outline: 3px solid transparent; color: #0b0c0c; background-color: #fd0; @@ -1447,22 +1367,12 @@ } } -.js-enabled .govuk-accordion__section-heading-text, -.js-enabled .govuk-accordion__section-summary, -.js-enabled .govuk-accordion__section-toggle { +.js-enabled .govuk-accordion__section-heading-text, .js-enabled .govuk-accordion__section-summary, .js-enabled .govuk-accordion__section-toggle { display: block; margin-bottom: 13px } -.js-enabled .govuk-accordion__section-heading-text .govuk-accordion__section-heading-text-focus, -.js-enabled .govuk-accordion__section-heading-text .govuk-accordion__section-summary-focus, -.js-enabled .govuk-accordion__section-heading-text .govuk-accordion__section-toggle-focus, -.js-enabled .govuk-accordion__section-summary .govuk-accordion__section-heading-text-focus, -.js-enabled .govuk-accordion__section-summary .govuk-accordion__section-summary-focus, -.js-enabled .govuk-accordion__section-summary .govuk-accordion__section-toggle-focus, -.js-enabled .govuk-accordion__section-toggle .govuk-accordion__section-heading-text-focus, -.js-enabled .govuk-accordion__section-toggle .govuk-accordion__section-summary-focus, -.js-enabled .govuk-accordion__section-toggle .govuk-accordion__section-toggle-focus { +.js-enabled .govuk-accordion__section-heading-text .govuk-accordion__section-heading-text-focus, .js-enabled .govuk-accordion__section-heading-text .govuk-accordion__section-summary-focus, .js-enabled .govuk-accordion__section-heading-text .govuk-accordion__section-toggle-focus, .js-enabled .govuk-accordion__section-summary .govuk-accordion__section-heading-text-focus, .js-enabled .govuk-accordion__section-summary .govuk-accordion__section-summary-focus, .js-enabled .govuk-accordion__section-summary .govuk-accordion__section-toggle-focus, .js-enabled .govuk-accordion__section-toggle .govuk-accordion__section-heading-text-focus, .js-enabled .govuk-accordion__section-toggle .govuk-accordion__section-summary-focus, .js-enabled .govuk-accordion__section-toggle .govuk-accordion__section-toggle-focus { display: inline } @@ -1470,9 +1380,11 @@ font-size: 1rem; line-height: 1.25; font-weight: 400; - color: #1d70b8 + color: #1d70b8; + pointer-events: none; } + @media (min-width:40.0625em) { .js-enabled .govuk-accordion__section-toggle { font-size: 1.1875rem; @@ -1487,27 +1399,17 @@ } } -.js-enabled .govuk-accordion__section-toggle-text, -.js-enabled .govuk-accordion__show-all-text { +.js-enabled .govuk-accordion__section-toggle-text, .js-enabled .govuk-accordion__show-all-text { margin-left: 5px; vertical-align: middle } @media screen and (forced-colors:active) { - - .js-enabled .govuk-accordion__section-button:hover .govuk-accordion-nav__chevron, - .js-enabled .govuk-accordion__show-all:hover .govuk-accordion-nav__chevron { + .js-enabled .govuk-accordion__section-button:hover .govuk-accordion-nav__chevron, .js-enabled .govuk-accordion__show-all:hover .govuk-accordion-nav__chevron { background-color: transparent } - .js-enabled .govuk-accordion__section-button:focus .govuk-accordion-nav__chevron, - .js-enabled .govuk-accordion__section-button:focus .govuk-accordion__section-heading-text-focus, - .js-enabled .govuk-accordion__section-button:focus .govuk-accordion__section-summary-focus, - .js-enabled .govuk-accordion__section-button:focus .govuk-accordion__section-toggle-focus, - .js-enabled .govuk-accordion__show-all:focus .govuk-accordion-nav__chevron, - .js-enabled .govuk-accordion__show-all:focus .govuk-accordion__section-heading-text-focus, - .js-enabled .govuk-accordion__show-all:focus .govuk-accordion__section-summary-focus, - .js-enabled .govuk-accordion__show-all:focus .govuk-accordion__section-toggle-focus { + .js-enabled .govuk-accordion__section-button:focus .govuk-accordion-nav__chevron, .js-enabled .govuk-accordion__section-button:focus .govuk-accordion__section-heading-text-focus, .js-enabled .govuk-accordion__section-button:focus .govuk-accordion__section-summary-focus, .js-enabled .govuk-accordion__section-button:focus .govuk-accordion__section-toggle-focus, .js-enabled .govuk-accordion__show-all:focus .govuk-accordion-nav__chevron, .js-enabled .govuk-accordion__show-all:focus .govuk-accordion__section-heading-text-focus, .js-enabled .govuk-accordion__show-all:focus .govuk-accordion__section-summary-focus, .js-enabled .govuk-accordion__show-all:focus .govuk-accordion__section-toggle-focus { background: transparent; background-color: transparent } @@ -1524,6 +1426,8 @@ } } + + .govuk-back-link { font-size: .875rem; line-height: 1.1428571429; @@ -1537,7 +1441,10 @@ position: relative; margin-top: 15px; margin-bottom: 15px; - padding-left: .875em + padding-left: .875em; + border: none; + background: white; + color: #0b0c0c; } @media (min-width:40.0625em) { @@ -1573,15 +1480,12 @@ box-decoration-break: clone } -.govuk-back-link:link, -.govuk-back-link:visited { +.govuk-back-link:link, .govuk-back-link:visited { color: #0b0c0c } @media print { - - .govuk-back-link:link, - .govuk-back-link:visited { + .govuk-back-link:link, .govuk-back-link:visited { color: #000 } } @@ -1590,15 +1494,12 @@ color: rgba(11, 12, 12, .99) } -.govuk-back-link:active, -.govuk-back-link:focus { +.govuk-back-link:active, .govuk-back-link:focus { color: #0b0c0c } @media print { - - .govuk-back-link:active, - .govuk-back-link:focus { + .govuk-back-link:active, .govuk-back-link:focus { color: #000 } } @@ -1639,13 +1540,11 @@ left: 0 } -.govuk-back-link--inverse:link, -.govuk-back-link--inverse:visited { +.govuk-back-link--inverse:link, .govuk-back-link--inverse:visited { color: #fff } -.govuk-back-link--inverse:active, -.govuk-back-link--inverse:hover { +.govuk-back-link--inverse:active, .govuk-back-link--inverse:hover { color: hsla(0, 0%, 100%, .99) } @@ -1777,15 +1676,12 @@ box-decoration-break: clone } -.govuk-breadcrumbs__link:link, -.govuk-breadcrumbs__link:visited { +.govuk-breadcrumbs__link:link, .govuk-breadcrumbs__link:visited { color: #0b0c0c } @media print { - - .govuk-breadcrumbs__link:link, - .govuk-breadcrumbs__link:visited { + .govuk-breadcrumbs__link:link, .govuk-breadcrumbs__link:visited { color: #000 } } @@ -1794,15 +1690,12 @@ color: rgba(11, 12, 12, .99) } -.govuk-breadcrumbs__link:active, -.govuk-breadcrumbs__link:focus { +.govuk-breadcrumbs__link:active, .govuk-breadcrumbs__link:focus { color: #0b0c0c } @media print { - - .govuk-breadcrumbs__link:active, - .govuk-breadcrumbs__link:focus { + .govuk-breadcrumbs__link:active, .govuk-breadcrumbs__link:focus { color: #000 } } @@ -1812,8 +1705,7 @@ display: none } - .govuk-breadcrumbs--collapse-on-mobile .govuk-breadcrumbs__list-item:first-child, - .govuk-breadcrumbs--collapse-on-mobile .govuk-breadcrumbs__list-item:last-child { + .govuk-breadcrumbs--collapse-on-mobile .govuk-breadcrumbs__list-item:first-child, .govuk-breadcrumbs--collapse-on-mobile .govuk-breadcrumbs__list-item:last-child { display: inline-block } @@ -1827,14 +1719,11 @@ } } -.govuk-breadcrumbs--inverse, -.govuk-breadcrumbs--inverse .govuk-breadcrumbs__link:link, -.govuk-breadcrumbs--inverse .govuk-breadcrumbs__link:visited { +.govuk-breadcrumbs--inverse, .govuk-breadcrumbs--inverse .govuk-breadcrumbs__link:link, .govuk-breadcrumbs--inverse .govuk-breadcrumbs__link:visited { color: #fff } -.govuk-breadcrumbs--inverse .govuk-breadcrumbs__link:active, -.govuk-breadcrumbs--inverse .govuk-breadcrumbs__link:hover { +.govuk-breadcrumbs--inverse .govuk-breadcrumbs__link:active, .govuk-breadcrumbs--inverse .govuk-breadcrumbs__link:hover { color: hsla(0, 0%, 100%, .99) } @@ -1897,10 +1786,7 @@ } } -.govuk-button:active, -.govuk-button:hover, -.govuk-button:link, -.govuk-button:visited { +.govuk-button:active, .govuk-button:hover, .govuk-button:link, .govuk-button:visited { color: #fff; text-decoration: none } @@ -1965,11 +1851,7 @@ box-shadow: 0 2px 0 #929191 } -.govuk-button--secondary, -.govuk-button--secondary:active, -.govuk-button--secondary:hover, -.govuk-button--secondary:link, -.govuk-button--secondary:visited { +.govuk-button--secondary, .govuk-button--secondary:active, .govuk-button--secondary:hover, .govuk-button--secondary:link, .govuk-button--secondary:visited { color: #0b0c0c } @@ -1986,11 +1868,7 @@ box-shadow: 0 2px 0 #55150b } -.govuk-button--warning, -.govuk-button--warning:active, -.govuk-button--warning:hover, -.govuk-button--warning:link, -.govuk-button--warning:visited { +.govuk-button--warning, .govuk-button--warning:active, .govuk-button--warning:hover, .govuk-button--warning:link, .govuk-button--warning:visited { color: #fff } @@ -2007,11 +1885,7 @@ box-shadow: 0 2px 0 #144e81 } -.govuk-button--inverse, -.govuk-button--inverse:active, -.govuk-button--inverse:hover, -.govuk-button--inverse:link, -.govuk-button--inverse:visited { +.govuk-button--inverse, .govuk-button--inverse:active, .govuk-button--inverse:hover, .govuk-button--inverse:link, .govuk-button--inverse:visited { color: #1d70b8 } @@ -2125,8 +1999,7 @@ } } -.govuk-fieldset__legend:not(.govuk-fieldset__legend--m):not(.govuk-fieldset__legend--l):not(.govuk-fieldset__legend--xl)+.govuk-hint, -.govuk-label:not(.govuk-label--m):not(.govuk-label--l):not(.govuk-label--xl)+.govuk-hint { +.govuk-fieldset__legend:not(.govuk-fieldset__legend--m):not(.govuk-fieldset__legend--l):not(.govuk-fieldset__legend--xl)+.govuk-hint, .govuk-label:not(.govuk-label--m):not(.govuk-label--l):not(.govuk-label--xl)+.govuk-hint { margin-bottom: 10px } @@ -2167,9 +2040,7 @@ } } -.govuk-label--l, -.govuk-label--m, -.govuk-label--xl { +.govuk-label--l, .govuk-label--m, .govuk-label--xl { font-weight: 700; margin-bottom: 15px } @@ -2315,8 +2186,7 @@ } } -.govuk-character-count .govuk-form-group, -.govuk-character-count .govuk-textarea { +.govuk-character-count .govuk-form-group, .govuk-character-count .govuk-textarea { margin-bottom: 5px } @@ -2348,9 +2218,7 @@ } @supports not (caret-color:auto) { - - .govuk-fieldset, - x:-moz-any-link { + .govuk-fieldset, x:-moz-any-link { display: table-cell } } @@ -2392,9 +2260,7 @@ } } -.govuk-fieldset__legend--l, -.govuk-fieldset__legend--m, -.govuk-fieldset__legend--xl { +.govuk-fieldset__legend--l, .govuk-fieldset__legend--m, .govuk-fieldset__legend--xl { font-weight: 700; margin-bottom: 15px } @@ -2473,8 +2339,7 @@ margin-bottom: 10px } -.govuk-checkboxes__item:last-child, -.govuk-checkboxes__item:last-of-type { +.govuk-checkboxes__item:last-child, .govuk-checkboxes__item:last-of-type { margin-bottom: 0 } @@ -2504,8 +2369,7 @@ border: 2px solid } -.govuk-checkboxes__label:after, -.govuk-checkboxes__label:before { +.govuk-checkboxes__label:after, .govuk-checkboxes__label:before { content: ""; box-sizing: border-box; position: absolute; @@ -2543,8 +2407,7 @@ box-shadow: 0 0 0 3px #fd0 } -@media (-ms-high-contrast:active), -screen and (forced-colors:active) { +@media (-ms-high-contrast:active), screen and (forced-colors:active) { .govuk-checkboxes__input:focus+.govuk-checkboxes__label:before { outline-color: Highlight } @@ -2554,13 +2417,11 @@ screen and (forced-colors:active) { opacity: 1 } -.govuk-checkboxes__input:disabled, -.govuk-checkboxes__input:disabled+.govuk-checkboxes__label { +.govuk-checkboxes__input:disabled, .govuk-checkboxes__input:disabled+.govuk-checkboxes__label { cursor: not-allowed } -.govuk-checkboxes__input:disabled+.govuk-checkboxes__label, -.govuk-checkboxes__input:disabled~.govuk-hint { +.govuk-checkboxes__input:disabled+.govuk-checkboxes__label, .govuk-checkboxes__input:disabled~.govuk-hint { opacity: .5 } @@ -2600,8 +2461,8 @@ screen and (forced-colors:active) { .govuk-checkboxes__conditional { margin-bottom: 15px; - margin-left: 18px; - padding-left: 33px; + margin-left: 20px; + padding-left: 35px; border-left: 4px solid #b1b4b6 } @@ -2615,8 +2476,7 @@ screen and (forced-colors:active) { display: none } -.govuk-checkboxes--small .govuk-checkboxes__item, -.govuk-checkboxes__conditional>:last-child { +.govuk-checkboxes--small .govuk-checkboxes__item, .govuk-checkboxes__conditional>:last-child { margin-bottom: 0 } @@ -2652,6 +2512,11 @@ screen and (forced-colors:active) { padding-left: 20px } +.govuk-checkboxes--small .govuk-checkboxes__divider { + width: 24px; + margin-bottom: 5px +} + .govuk-checkboxes--small .govuk-checkboxes__item:hover .govuk-checkboxes__input:not(:disabled)+.govuk-checkboxes__label:before { outline: 3px dashed transparent; outline-offset: 1px; @@ -2662,15 +2527,13 @@ screen and (forced-colors:active) { box-shadow: 0 0 0 3px #fd0, 0 0 0 10px #b1b4b6 } -@media (-ms-high-contrast:active), -screen and (forced-colors:active) { +@media (-ms-high-contrast:active), screen and (forced-colors:active) { .govuk-checkboxes--small .govuk-checkboxes__item:hover .govuk-checkboxes__input:focus+.govuk-checkboxes__label:before { outline-color: Highlight } } -@media (hover:none), -(pointer:coarse) { +@media (hover:none), (pointer:coarse) { .govuk-checkboxes--small .govuk-checkboxes__item:hover .govuk-checkboxes__input:not(:disabled)+.govuk-checkboxes__label:before { box-shadow: none } @@ -2753,8 +2616,7 @@ screen and (forced-colors:active) { cursor: not-allowed } -.govuk-input::-webkit-inner-spin-button, -.govuk-input::-webkit-outer-spin-button { +.govuk-input::-webkit-inner-spin-button, .govuk-input::-webkit-outer-spin-button { margin: 0; -webkit-appearance: none } @@ -2826,8 +2688,7 @@ screen and (forced-colors:active) { } } -.govuk-input__prefix, -.govuk-input__suffix { +.govuk-input__prefix, .govuk-input__suffix { font-family: GDS Transport, arial, sans-serif; -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; @@ -2850,35 +2711,27 @@ screen and (forced-colors:active) { } @media print { - - .govuk-input__prefix, - .govuk-input__suffix { + .govuk-input__prefix, .govuk-input__suffix { font-family: sans-serif } } @media (min-width:40.0625em) { - - .govuk-input__prefix, - .govuk-input__suffix { + .govuk-input__prefix, .govuk-input__suffix { font-size: 1.1875rem; line-height: 1.3157894737 } } @media print { - - .govuk-input__prefix, - .govuk-input__suffix { + .govuk-input__prefix, .govuk-input__suffix { font-size: 14pt; line-height: 1.15 } } @media (max-width:19.99em) { - - .govuk-input__prefix, - .govuk-input__suffix { + .govuk-input__prefix, .govuk-input__suffix { display: block; height: 100%; white-space: normal @@ -2971,7 +2824,10 @@ screen and (forced-colors:active) { } .govuk-details__summary { - display: inline-block; + display: block +} + +.govuk-details[open] .govuk-details__summary { margin-bottom: 5px } @@ -2979,8 +2835,7 @@ screen and (forced-colors:active) { margin-top: 0 } -.govuk-details__summary-text>:last-child, -.govuk-details__summary-text>:only-child { +.govuk-details__summary-text>:last-child, .govuk-details__summary-text>:only-child { margin-bottom: 0 } @@ -3024,6 +2879,8 @@ screen and (forced-colors:active) { @supports not (-ms-ime-align:auto) { .govuk-details__summary { position: relative; + width: -webkit-fit-content; + width: fit-content; padding-left: 25px; color: #1d70b8; cursor: pointer @@ -3187,8 +3044,11 @@ screen and (forced-colors:active) { } } -.govuk-error-summary__list, -.govuk-error-summary__list li:last-child { +.govuk-error-summary__body>:last-child { + margin-bottom: 5px +} + +.govuk-error-summary__list, .govuk-error-summary__list li:last-child { margin-bottom: 0 } @@ -3225,8 +3085,7 @@ screen and (forced-colors:active) { box-decoration-break: clone } -.govuk-error-summary__list a:link, -.govuk-error-summary__list a:visited { +.govuk-error-summary__list a:link, .govuk-error-summary__list a:visited { color: #d4351c } @@ -3384,7 +3243,7 @@ screen and (forced-colors:active) { padding-bottom: 15px; border-top: 1px solid #b1b4b6; color: #0b0c0c; - background: #f3f2f1; + background: #f3f2f1 } @media print { @@ -3447,15 +3306,12 @@ screen and (forced-colors:active) { box-decoration-break: clone } -.govuk-footer__link:link, -.govuk-footer__link:visited { +.govuk-footer__link:link, .govuk-footer__link:visited { color: #0b0c0c } @media print { - - .govuk-footer__link:link, - .govuk-footer__link:visited { + .govuk-footer__link:link, .govuk-footer__link:visited { color: #000 } } @@ -3464,15 +3320,12 @@ screen and (forced-colors:active) { color: rgba(11, 12, 12, .99) } -.govuk-footer__link:active, -.govuk-footer__link:focus { +.govuk-footer__link:active, .govuk-footer__link:focus { color: #0b0c0c } @media print { - - .govuk-footer__link:active, - .govuk-footer__link:focus { + .govuk-footer__link:active, .govuk-footer__link:focus { color: #000 } } @@ -3528,14 +3381,15 @@ screen and (forced-colors:active) { } .govuk-footer__licence-description { - display: inline-block + display: inline-block; + text-wrap: balance } .govuk-footer__copyright-logo { display: inline-block; min-width: 125px; padding-top: 112px; - background-image: url(../images/govuk-crest.png); + background-image: url(../images/govuk-crest.svg); background-repeat: no-repeat; background-position: 50% 0; background-size: 125px 102px; @@ -3681,6 +3535,14 @@ only screen and (min-resolution:2dppx) { clear: both } +.govuk-header--full-width-border { + border-bottom-color: #1d70b8 +} + +.govuk-header--full-width-border .govuk-header__container { + border-bottom-color: transparent +} + .govuk-header__logotype { display: inline-block; position: relative; @@ -3746,13 +3608,11 @@ only screen and (min-resolution:2dppx) { text-decoration: none } -.govuk-header__link:link, -.govuk-header__link:visited { +.govuk-header__link:link, .govuk-header__link:visited { color: #fff } -.govuk-header__link:active, -.govuk-header__link:hover { +.govuk-header__link:active, .govuk-header__link:hover { color: hsla(0, 0%, 100%, .99) } @@ -3788,13 +3648,11 @@ only screen and (min-resolution:2dppx) { } } -.govuk-header__link--homepage:link, -.govuk-header__link--homepage:visited { +.govuk-header__link--homepage:link, .govuk-header__link--homepage:visited { text-decoration: none } -.govuk-header__link--homepage:active, -.govuk-header__link--homepage:hover { +.govuk-header__link--homepage:active, .govuk-header__link--homepage:hover { margin-bottom: -3px; border-bottom: 3px solid } @@ -3826,8 +3684,7 @@ only screen and (min-resolution:2dppx) { } } -.govuk-header__content, -.govuk-header__logo { +.govuk-header__content, .govuk-header__logo { box-sizing: border-box } @@ -3950,8 +3807,7 @@ only screen and (min-resolution:2dppx) { display: block } -.govuk-frontend-supported .govuk-header__menu-button[hidden], -.govuk-header__menu-button[hidden] { +.govuk-frontend-supported .govuk-header__menu-button[hidden], .govuk-header__menu-button[hidden] { display: none } @@ -4014,9 +3870,7 @@ only screen and (min-resolution:2dppx) { } } -.govuk-header__navigation-item--active a:hover, -.govuk-header__navigation-item--active a:link, -.govuk-header__navigation-item--active a:visited { +.govuk-header__navigation-item--active a:hover, .govuk-header__navigation-item--active a:link, .govuk-header__navigation-item--active a:visited { color: #1d8feb } @@ -4042,8 +3896,7 @@ only screen and (min-resolution:2dppx) { background: transparent } - .govuk-header__link:link, - .govuk-header__link:visited { + .govuk-header__link:link, .govuk-header__link:visited { color: #0b0c0c } @@ -4099,8 +3952,7 @@ only screen and (min-resolution:2dppx) { margin-top: 0 } -.govuk-inset-text>:last-child, -.govuk-inset-text>:only-child { +.govuk-inset-text>:last-child, .govuk-inset-text>:only-child { margin-bottom: 0 } @@ -4261,8 +4113,7 @@ only screen and (min-resolution:2dppx) { box-decoration-break: clone } -.govuk-notification-banner__link:link, -.govuk-notification-banner__link:visited { +.govuk-notification-banner__link:link, .govuk-notification-banner__link:visited { color: #1d70b8 } @@ -4270,8 +4121,7 @@ only screen and (min-resolution:2dppx) { color: #003078 } -.govuk-notification-banner__link:active, -.govuk-notification-banner__link:focus { +.govuk-notification-banner__link:active, .govuk-notification-banner__link:focus { color: #0b0c0c } @@ -4280,8 +4130,7 @@ only screen and (min-resolution:2dppx) { background-color: #00703c } -.govuk-notification-banner--success .govuk-notification-banner__link:link, -.govuk-notification-banner--success .govuk-notification-banner__link:visited { +.govuk-notification-banner--success .govuk-notification-banner__link:link, .govuk-notification-banner--success .govuk-notification-banner__link:visited { color: #00703c } @@ -4319,9 +4168,7 @@ only screen and (min-resolution:2dppx) { list-style: none } -.govuk-pagination__item, -.govuk-pagination__next, -.govuk-pagination__prev { +.govuk-pagination__item, .govuk-pagination__next, .govuk-pagination__prev { font-family: GDS Transport, arial, sans-serif; -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; @@ -4337,37 +4184,26 @@ only screen and (min-resolution:2dppx) { } @media print { - - .govuk-pagination__item, - .govuk-pagination__next, - .govuk-pagination__prev { + .govuk-pagination__item, .govuk-pagination__next, .govuk-pagination__prev { font-family: sans-serif } } @media (min-width:40.0625em) { - - .govuk-pagination__item, - .govuk-pagination__next, - .govuk-pagination__prev { + .govuk-pagination__item, .govuk-pagination__next, .govuk-pagination__prev { font-size: 1.1875rem; line-height: 1.3157894737 } } @media print { - - .govuk-pagination__item, - .govuk-pagination__next, - .govuk-pagination__prev { + .govuk-pagination__item, .govuk-pagination__next, .govuk-pagination__prev { font-size: 14pt; line-height: 1.15 } } -.govuk-pagination__item:hover, -.govuk-pagination__next:hover, -.govuk-pagination__prev:hover { +.govuk-pagination__item:hover, .govuk-pagination__next:hover, .govuk-pagination__prev:hover { background-color: #f3f2f1 } @@ -4382,13 +4218,11 @@ only screen and (min-resolution:2dppx) { } } -.govuk-pagination__next, -.govuk-pagination__prev { +.govuk-pagination__next, .govuk-pagination__prev { font-weight: 700 } -.govuk-pagination__next .govuk-pagination__link, -.govuk-pagination__prev .govuk-pagination__link { +.govuk-pagination__next .govuk-pagination__link, .govuk-pagination__prev .govuk-pagination__link { display: flex; align-items: center } @@ -4401,10 +4235,7 @@ only screen and (min-resolution:2dppx) { padding-right: 0 } -.govuk-pagination__item--current, -.govuk-pagination__item--ellipses, -.govuk-pagination__item:first-child, -.govuk-pagination__item:last-child { +.govuk-pagination__item--current, .govuk-pagination__item--ellipses, .govuk-pagination__item:first-child, .govuk-pagination__item:last-child { display: block } @@ -4418,13 +4249,11 @@ only screen and (min-resolution:2dppx) { background-color: #1d70b8 } -.govuk-pagination__item--current .govuk-pagination__link:link, -.govuk-pagination__item--current .govuk-pagination__link:visited { +.govuk-pagination__item--current .govuk-pagination__link:link, .govuk-pagination__item--current .govuk-pagination__link:visited { color: #fff } -.govuk-pagination__item--current .govuk-pagination__link:active, -.govuk-pagination__item--current .govuk-pagination__link:hover { +.govuk-pagination__item--current .govuk-pagination__link:active, .govuk-pagination__item--current .govuk-pagination__link:hover { color: hsla(0, 0%, 100%, .99) } @@ -4457,17 +4286,13 @@ only screen and (min-resolution:2dppx) { } } -.govuk-pagination__link:active .govuk-pagination__link-title--decorated, -.govuk-pagination__link:hover .govuk-pagination__link-title--decorated { +.govuk-pagination__link:active .govuk-pagination__link-title--decorated, .govuk-pagination__link:hover .govuk-pagination__link-title--decorated { text-decoration: underline; text-decoration-thickness: max(1px, .0625rem); text-underline-offset: .1578em } -.govuk-pagination__link:active .govuk-pagination__link-label, -.govuk-pagination__link:active .govuk-pagination__link-title--decorated, -.govuk-pagination__link:hover .govuk-pagination__link-label, -.govuk-pagination__link:hover .govuk-pagination__link-title--decorated { +.govuk-pagination__link:active .govuk-pagination__link-label, .govuk-pagination__link:active .govuk-pagination__link-title--decorated, .govuk-pagination__link:hover .govuk-pagination__link-label, .govuk-pagination__link:hover .govuk-pagination__link-title--decorated { text-decoration-thickness: max(3px, .1875rem, .12em); -webkit-text-decoration-skip-ink: none; text-decoration-skip-ink: none; @@ -4479,8 +4304,7 @@ only screen and (min-resolution:2dppx) { color: #0b0c0c } -.govuk-pagination__link:focus .govuk-pagination__link-label, -.govuk-pagination__link:focus .govuk-pagination__link-title--decorated { +.govuk-pagination__link:focus .govuk-pagination__link-label, .govuk-pagination__link:focus .govuk-pagination__link-title--decorated { text-decoration: none } @@ -4489,8 +4313,7 @@ only screen and (min-resolution:2dppx) { text-decoration: underline; text-decoration-thickness: max(1px, .0625rem); text-underline-offset: .1578em; - display: inline-block; - padding-left: 30px + display: inline-block } .govuk-pagination__icon { @@ -4513,59 +4336,41 @@ only screen and (min-resolution:2dppx) { display: block } -.govuk-pagination--block .govuk-pagination__item { - padding: 15px; +.govuk-pagination--block .govuk-pagination__next, .govuk-pagination--block .govuk-pagination__prev { + padding-left: 0; float: none } -.govuk-pagination--block .govuk-pagination__next, -.govuk-pagination--block .govuk-pagination__prev { - padding-left: 0; - float: none +.govuk-pagination--block .govuk-pagination__next .govuk-pagination__link, .govuk-pagination--block .govuk-pagination__prev .govuk-pagination__link { + display: inline-block } .govuk-pagination--block .govuk-pagination__next { padding-right: 15px } -.govuk-pagination--block .govuk-pagination__next .govuk-pagination__icon { - margin-left: 0 -} - .govuk-pagination--block .govuk-pagination__prev+.govuk-pagination__next { border-top: 1px solid #b1b4b6 } -.govuk-pagination--block .govuk-pagination__link, -.govuk-pagination--block .govuk-pagination__link-title { - display: inline -} - .govuk-pagination--block .govuk-pagination__link-title:after { content: ""; display: block } .govuk-pagination--block .govuk-pagination__link { + padding-left: 30px; text-align: left } -.govuk-pagination--block .govuk-pagination__link:focus .govuk-pagination__link-label { - outline: 3px solid transparent; - color: #0b0c0c; - background-color: #fd0; - box-shadow: 0 -2px #fd0, 0 4px #0b0c0c; - text-decoration: none; - -webkit-box-decoration-break: clone; - box-decoration-break: clone -} - .govuk-pagination--block .govuk-pagination__link:not(:focus) { text-decoration: none } .govuk-pagination--block .govuk-pagination__icon { - margin-right: 10px + margin-top: .326em; + margin-left: -30px; + float: left } .govuk-panel { @@ -4832,12 +4637,6 @@ only screen and (min-resolution:2dppx) { } } -@media screen and (forced-colors:active) { - .govuk-phase-banner__content__tag { - font-weight: 700 - } -} - .govuk-phase-banner__text { display: table-cell; vertical-align: middle @@ -4850,8 +4649,7 @@ only screen and (min-resolution:2dppx) { margin-bottom: 10px } -.govuk-radios__item:last-child, -.govuk-radios__item:last-of-type { +.govuk-radios__item:last-child, .govuk-radios__item:last-of-type { margin-bottom: 0 } @@ -4919,8 +4717,7 @@ only screen and (min-resolution:2dppx) { box-shadow: 0 0 0 4px #fd0 } -@media (-ms-high-contrast:active), -screen and (forced-colors:active) { +@media (-ms-high-contrast:active), screen and (forced-colors:active) { .govuk-radios__input:focus+.govuk-radios__label:before { outline-color: Highlight } @@ -4930,13 +4727,11 @@ screen and (forced-colors:active) { opacity: 1 } -.govuk-radios__input:disabled, -.govuk-radios__input:disabled+.govuk-radios__label { +.govuk-radios__input:disabled, .govuk-radios__input:disabled+.govuk-radios__label { cursor: not-allowed } -.govuk-radios__input:disabled+.govuk-radios__label, -.govuk-radios__input:disabled~.govuk-hint { +.govuk-radios__input:disabled+.govuk-radios__label, .govuk-radios__input:disabled~.govuk-hint { opacity: .5 } @@ -4988,8 +4783,8 @@ screen and (forced-colors:active) { .govuk-radios__conditional { margin-bottom: 15px; - margin-left: 18px; - padding-left: 33px; + margin-left: 20px; + padding-left: 35px; border-left: 4px solid #b1b4b6 } @@ -5003,8 +4798,7 @@ screen and (forced-colors:active) { display: none } -.govuk-radios--small .govuk-radios__item, -.govuk-radios__conditional>:last-child { +.govuk-radios--small .govuk-radios__item, .govuk-radios__conditional>:last-child { margin-bottom: 0 } @@ -5053,15 +4847,13 @@ screen and (forced-colors:active) { box-shadow: 0 0 0 4px 0 0 0 10px #fd0 #b1b4b6 } -@media (-ms-high-contrast:active), -screen and (forced-colors:active) { +@media (-ms-high-contrast:active), screen and (forced-colors:active) { .govuk-radios--small .govuk-radios__item:hover .govuk-radios__input:focus+.govuk-radios__label:before { outline-color: Highlight } } -@media (hover:none), -(pointer:coarse) { +@media (hover:none), (pointer:coarse) { .govuk-radios--small .govuk-radios__item:hover .govuk-radios__input:not(:disabled)+.govuk-radios__label:before { box-shadow: none } @@ -5120,9 +4912,7 @@ screen and (forced-colors:active) { cursor: not-allowed } -.govuk-select option:active, -.govuk-select option:checked, -.govuk-select:focus::-ms-value { +.govuk-select option:active, .govuk-select option:checked, .govuk-select:focus::-ms-value { color: #fff; background-color: #1d70b8 } @@ -5135,19 +4925,301 @@ screen and (forced-colors:active) { border-color: #0b0c0c } +.govuk-service-navigation { + border-bottom: 1px solid #b1b4b6; + background-color: #f3f2f1 +} + +.govuk-service-navigation__container { + display: flex; + flex-direction: column; + align-items: start +} + +@media (min-width:40.0625em) { + .govuk-service-navigation__container { + flex-direction: row; + flex-wrap: wrap + } +} + +.govuk-service-navigation__item, .govuk-service-navigation__service-name { + position: relative; + margin: 10px 0; + border: 0 solid #1a65a6 +} + +@media (min-width:40.0625em) { + .govuk-service-navigation__item, .govuk-service-navigation__service-name { + margin-top: 0; + margin-bottom: 0; + padding: 20px 0 + } + + .govuk-service-navigation__item:not(:last-child), .govuk-service-navigation__service-name:not(:last-child) { + margin-right: 20px + } +} + +@media (min-width:40.0625em) and (min-width:40.0625em) { + .govuk-service-navigation__item:not(:last-child), .govuk-service-navigation__service-name:not(:last-child) { + margin-right: 30px + } +} + +@media (max-width:40.0525em) { + .govuk-service-navigation__item--active { + margin-left: -15px; + padding-left: 10px; + border-left-width: 5px + } +} + +@media (min-width:40.0625em) { + .govuk-service-navigation__item--active { + padding-bottom: 15px; + border-bottom-width: 5px + } +} + +.govuk-service-navigation__link { + font-family: GDS Transport, arial, sans-serif; + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; + text-decoration: underline; + text-decoration-thickness: max(1px, .0625rem); + text-underline-offset: .1578em +} + +@media print { + .govuk-service-navigation__link { + font-family: sans-serif + } +} + +.govuk-service-navigation__link:hover { + text-decoration-thickness: max(3px, .1875rem, .12em); + -webkit-text-decoration-skip-ink: none; + text-decoration-skip-ink: none; + -webkit-text-decoration-skip: none; + text-decoration-skip: none +} + +.govuk-service-navigation__link:focus { + outline: 3px solid transparent; + background-color: #fd0; + box-shadow: 0 -2px #fd0, 0 4px #0b0c0c; + text-decoration: none; + -webkit-box-decoration-break: clone; + box-decoration-break: clone +} + +.govuk-service-navigation__link:not(:hover):not(:active) { + text-decoration: none +} + +.govuk-service-navigation__link:link, .govuk-service-navigation__link:visited { + color: #1d70b8 +} + +.govuk-service-navigation__link:hover { + color: #003078 +} + +.govuk-service-navigation__link:active, .govuk-service-navigation__link:focus { + color: #0b0c0c +} + +.govuk-service-navigation__link:not(:hover):not(:focus) { + color: #1a65a6 +} + +.govuk-service-navigation__service-name { + font-family: GDS Transport, arial, sans-serif; + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; + font-weight: 700; + font-size: 1rem; + line-height: 1.25 +} + +@media print { + .govuk-service-navigation__service-name { + font-family: sans-serif + } +} + +@media (min-width:40.0625em) { + .govuk-service-navigation__service-name { + font-size: 1.1875rem; + line-height: 1.3157894737 + } +} + +@media print { + .govuk-service-navigation__service-name { + font-size: 14pt; + line-height: 1.15 + } +} + +.govuk-service-navigation__service-name .govuk-service-navigation__link:link, .govuk-service-navigation__service-name .govuk-service-navigation__link:visited { + color: #0b0c0c +} + +@media print { + .govuk-service-navigation__service-name .govuk-service-navigation__link:link, .govuk-service-navigation__service-name .govuk-service-navigation__link:visited { + color: #000 + } +} + +.govuk-service-navigation__service-name .govuk-service-navigation__link:hover { + color: rgba(11, 12, 12, .99) +} + +.govuk-service-navigation__service-name .govuk-service-navigation__link:active, .govuk-service-navigation__service-name .govuk-service-navigation__link:focus { + color: #0b0c0c +} + +@media print { + .govuk-service-navigation__service-name .govuk-service-navigation__link:active, .govuk-service-navigation__service-name .govuk-service-navigation__link:focus { + color: #000 + } +} + +.govuk-service-navigation__toggle { + font-family: GDS Transport, arial, sans-serif; + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; + font-weight: 700; + font-size: 1rem; + line-height: 1.25; + display: inline-flex; + margin: 10px 0; + padding: 0; + border: 0; + color: #1a65a6; + background: none; + word-break: break-all; + cursor: pointer; + align-items: center +} + +@media print { + .govuk-service-navigation__toggle { + font-family: sans-serif + } +} + +@media (min-width:40.0625em) { + .govuk-service-navigation__toggle { + font-size: 1.1875rem; + line-height: 1.3157894737 + } +} + +@media print { + .govuk-service-navigation__toggle { + font-size: 14pt; + line-height: 1.15 + } +} + +.govuk-service-navigation__toggle:focus { + outline: 3px solid transparent; + color: #0b0c0c; + background-color: #fd0; + box-shadow: 0 -2px #fd0, 0 4px #0b0c0c; + text-decoration: none; + -webkit-box-decoration-break: clone; + box-decoration-break: clone +} + +.govuk-service-navigation__toggle:after { + display: inline-block; + width: 0; + height: 0; + -webkit-clip-path: polygon(0 0, 50% 100%, 100% 0); + clip-path: polygon(0 0, 50% 100%, 100% 0); + border-color: transparent; + border-style: solid; + border-width: 8.66px 5px 0; + border-top-color: inherit; + content: ""; + margin-left: 5px +} + +.govuk-service-navigation__toggle[aria-expanded=true]:after { + display: inline-block; + width: 0; + height: 0; + -webkit-clip-path: polygon(50% 0, 0 100%, 100% 100%); + clip-path: polygon(50% 0, 0 100%, 100% 100%); + border-color: transparent; + border-style: solid; + border-width: 0 5px 8.66px; + border-bottom-color: inherit +} + +.govuk-service-navigation__toggle[hidden] { + display: none +} + +.govuk-service-navigation__service-name+.govuk-service-navigation__wrapper .govuk-service-navigation__toggle { + margin-top: 0 +} + +.govuk-service-navigation__list { + font-family: GDS Transport, arial, sans-serif; + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; + font-weight: 400; + font-size: 1rem; + line-height: 1.25; + margin: 0 0 15px; + padding: 0; + list-style: none +} + +@media print { + .govuk-service-navigation__list { + font-family: sans-serif + } +} + +@media (min-width:40.0625em) { + .govuk-service-navigation__list { + font-size: 1.1875rem; + line-height: 1.3157894737 + } +} + +@media print { + .govuk-service-navigation__list { + font-size: 14pt; + line-height: 1.15 + } +} + +@media (min-width:40.0625em) { + .govuk-service-navigation__list { + display: flex; + flex-wrap: wrap; + margin-bottom: 0 + } +} + +@media (min-width:40.0625em) and (-ms-high-contrast:none), screen and (min-width:40.0625em) and (-ms-high-contrast:active) { + .govuk-service-navigation__list { + display: block + } +} + +.govuk-service-navigation__active-fallback { + font-weight: inherit +} + .govuk-skip-link { - position: absolute !important; - width: 1px !important; - height: 1px !important; - margin: 0 !important; - overflow: hidden !important; - clip: rect(0 0 0 0) !important; - -webkit-clip-path: inset(50%) !important; - clip-path: inset(50%) !important; - white-space: nowrap !important; - -webkit-user-select: none; - -ms-user-select: none; - user-select: none; font-family: GDS Transport, arial, sans-serif; -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; @@ -5160,20 +5232,21 @@ screen and (forced-colors:active) { padding: 10px 15px } -.govuk-skip-link:active, -.govuk-skip-link:focus { - position: static !important; - width: auto !important; - height: auto !important; - margin: inherit !important; - overflow: visible !important; - clip: auto !important; - -webkit-clip-path: none !important; - clip-path: none !important; - white-space: inherit !important; - -webkit-user-select: text; - -ms-user-select: text; - user-select: text +.govuk-skip-link:not(:active):not(:focus) { + position: absolute !important; + width: 1px !important; + height: 1px !important; + margin: 0 !important; + padding: 0 !important; + overflow: hidden !important; + clip: rect(0 0 0 0) !important; + -webkit-clip-path: inset(50%) !important; + clip-path: inset(50%) !important; + border: 0 !important; + white-space: nowrap !important; + -webkit-user-select: none; + -ms-user-select: none; + user-select: none } @media print { @@ -5182,15 +5255,12 @@ screen and (forced-colors:active) { } } -.govuk-skip-link:link, -.govuk-skip-link:visited { +.govuk-skip-link:link, .govuk-skip-link:visited { color: #0b0c0c } @media print { - - .govuk-skip-link:link, - .govuk-skip-link:visited { + .govuk-skip-link:link, .govuk-skip-link:visited { color: #000 } } @@ -5199,15 +5269,12 @@ screen and (forced-colors:active) { color: rgba(11, 12, 12, .99) } -.govuk-skip-link:active, -.govuk-skip-link:focus { +.govuk-skip-link:active, .govuk-skip-link:focus { color: #0b0c0c } @media print { - - .govuk-skip-link:active, - .govuk-skip-link:focus { + .govuk-skip-link:active, .govuk-skip-link:focus { color: #000 } } @@ -5313,17 +5380,12 @@ screen and (forced-colors:active) { } } -.govuk-summary-list__actions, -.govuk-summary-list__key, -.govuk-summary-list__value { +.govuk-summary-list__actions, .govuk-summary-list__key, .govuk-summary-list__value { margin: 0 } @media (min-width:40.0625em) { - - .govuk-summary-list__actions, - .govuk-summary-list__key, - .govuk-summary-list__value { + .govuk-summary-list__actions, .govuk-summary-list__key, .govuk-summary-list__value { display: table-cell; padding-top: 10px; padding-right: 20px; @@ -5342,8 +5404,7 @@ screen and (forced-colors:active) { } } -.govuk-summary-list__key, -.govuk-summary-list__value { +.govuk-summary-list__key, .govuk-summary-list__value { word-wrap: break-word; overflow-wrap: break-word } @@ -5423,10 +5484,7 @@ screen and (forced-colors:active) { } @media (min-width:40.0625em) { - - .govuk-summary-list--no-border .govuk-summary-list__actions, - .govuk-summary-list--no-border .govuk-summary-list__key, - .govuk-summary-list--no-border .govuk-summary-list__value { + .govuk-summary-list--no-border .govuk-summary-list__actions, .govuk-summary-list--no-border .govuk-summary-list__key, .govuk-summary-list--no-border .govuk-summary-list__value { padding-bottom: 11px } } @@ -5436,10 +5494,7 @@ screen and (forced-colors:active) { } @media (min-width:40.0625em) { - - .govuk-summary-list__row--no-border .govuk-summary-list__actions, - .govuk-summary-list__row--no-border .govuk-summary-list__key, - .govuk-summary-list__row--no-border .govuk-summary-list__value { + .govuk-summary-list__row--no-border .govuk-summary-list__actions, .govuk-summary-list__row--no-border .govuk-summary-list__key, .govuk-summary-list__row--no-border .govuk-summary-list__value { padding-bottom: 11px } } @@ -5554,8 +5609,7 @@ screen and (forced-colors:active) { } } -@media (-ms-high-contrast:none), -screen and (-ms-high-contrast:active) { +@media (-ms-high-contrast:none), screen and (-ms-high-contrast:active) { .govuk-summary-card__action { margin-bottom: 5px } @@ -5573,8 +5627,7 @@ screen and (-ms-high-contrast:active) { } } -@media (-ms-high-contrast:none), -screen and (-ms-high-contrast:active) { +@media (-ms-high-contrast:none), screen and (-ms-high-contrast:active) { .govuk-summary-card__action:last-child { margin-bottom: 0 } @@ -5644,8 +5697,7 @@ screen and (-ms-high-contrast:active) { font-weight: 700 } -.govuk-table__cell, -.govuk-table__header { +.govuk-table__cell, .govuk-table__header { padding: 10px 20px 10px 0; border-bottom: 1px solid #b1b4b6; text-align: left; @@ -5656,13 +5708,11 @@ screen and (-ms-high-contrast:active) { font-variant-numeric: tabular-nums } -.govuk-table__cell--numeric, -.govuk-table__header--numeric { +.govuk-table__cell--numeric, .govuk-table__header--numeric { text-align: right } -.govuk-table__cell:last-child, -.govuk-table__header:last-child { +.govuk-table__cell:last-child, .govuk-table__header:last-child { padding-right: 0 } @@ -5673,9 +5723,7 @@ screen and (-ms-high-contrast:active) { color: #000; } -.govuk-table__caption--l, -.govuk-table__caption--m, -.govuk-table__caption--xl { +.govuk-table__caption--l, .govuk-table__caption--m, .govuk-table__caption--xl { margin-bottom: 15px } @@ -5871,8 +5919,7 @@ screen and (-ms-high-contrast:active) { color: #003078 } -.govuk-tabs__tab:active, -.govuk-tabs__tab:focus { +.govuk-tabs__tab:active, .govuk-tabs__tab:focus { color: #0b0c0c } @@ -5916,14 +5963,14 @@ screen and (-ms-high-contrast:active) { } .govuk-frontend-supported .govuk-tabs__list-item--selected { - position: relative; - margin-top: -5px; - margin-bottom: -2px; - padding: 14px 19px 16px; - border: 1px solid #b1b4b6; - border-bottom: none; - background-color: #fff - } + position: relative; + margin-top: -5px; + margin-bottom: -2px; + padding: 14px 19px 16px; + border: 1px solid #b1b4b6; + border-bottom: none; + background-color: #fff +} .govuk-frontend-supported .govuk-tabs__list-item--selected .govuk-tabs__tab { text-decoration: none @@ -5933,16 +5980,13 @@ screen and (-ms-high-contrast:active) { margin-bottom: 0 } - .govuk-frontend-supported .govuk-tabs__tab:link, - .govuk-frontend-supported .govuk-tabs__tab:visited { + .govuk-frontend-supported .govuk-tabs__tab:link, .govuk-frontend-supported .govuk-tabs__tab:visited { color: #0b0c0c } } @media print and (min-width:40.0625em) { - - .govuk-frontend-supported .govuk-tabs__tab:link, - .govuk-frontend-supported .govuk-tabs__tab:visited { + .govuk-frontend-supported .govuk-tabs__tab:link, .govuk-frontend-supported .govuk-tabs__tab:visited { color: #000 } } @@ -5952,16 +5996,13 @@ screen and (-ms-high-contrast:active) { color: rgba(11, 12, 12, .99) } - .govuk-frontend-supported .govuk-tabs__tab:active, - .govuk-frontend-supported .govuk-tabs__tab:focus { + .govuk-frontend-supported .govuk-tabs__tab:active, .govuk-frontend-supported .govuk-tabs__tab:focus { color: #0b0c0c } } @media print and (min-width:40.0625em) { - - .govuk-frontend-supported .govuk-tabs__tab:active, - .govuk-frontend-supported .govuk-tabs__tab:focus { + .govuk-frontend-supported .govuk-tabs__tab:active, .govuk-frontend-supported .govuk-tabs__tab:focus { color: #000 } } @@ -6102,6 +6143,7 @@ screen and (-ms-high-contrast:active) { font-size: 1rem; line-height: 1.25; margin-bottom: 20px; + font-weight: 700; position: relative; padding: 10px 0 } @@ -6133,7 +6175,6 @@ screen and (-ms-high-contrast:active) { } .govuk-warning-text__icon { - font-weight: 700; box-sizing: border-box; display: inline-block; position: absolute; @@ -6171,7 +6212,8 @@ screen and (-ms-high-contrast:active) { .govuk-warning-text__text { color: #0b0c0c; display: block; - padding-left: 45px + padding-left: 45px; + font-weight: inherit } @media print { @@ -6203,42 +6245,27 @@ screen and (-ms-high-contrast:active) { user-select: none } -.govuk-visually-hidden:after, -.govuk-visually-hidden:before { +.govuk-visually-hidden:after, .govuk-visually-hidden:before { content: " " } -.govuk-visually-hidden-focusable { +.govuk-visually-hidden-focusable:not(:active):not(:focus) { position: absolute !important; width: 1px !important; height: 1px !important; margin: 0 !important; + padding: 0 !important; overflow: hidden !important; clip: rect(0 0 0 0) !important; -webkit-clip-path: inset(50%) !important; clip-path: inset(50%) !important; + border: 0 !important; white-space: nowrap !important; -webkit-user-select: none; -ms-user-select: none; user-select: none } -.govuk-visually-hidden-focusable:active, -.govuk-visually-hidden-focusable:focus { - position: static !important; - width: auto !important; - height: auto !important; - margin: inherit !important; - overflow: visible !important; - clip: auto !important; - -webkit-clip-path: none !important; - clip-path: none !important; - white-space: inherit !important; - -webkit-user-select: text; - -ms-user-select: text; - user-select: text -} - .govuk-\!-display-inline { display: inline !important } @@ -7597,8 +7624,12 @@ screen and (-ms-high-contrast:active) { font-variant-numeric: tabular-nums !important } -.govuk-\!-width-full, -.govuk-\!-width-three-quarters { +.govuk-\!-text-break-word { + word-wrap: break-word !important; + overflow-wrap: break-word !important +} + +.govuk-\!-width-full, .govuk-\!-width-three-quarters { width: 100% !important } @@ -7642,14 +7673,12 @@ screen and (-ms-high-contrast:active) { width: 100% !important } - @media (min-width:40.0625em) { .govuk-\!-width-one-quarter { width: 25% !important } } - /*Match margin in main-wrapper so "Contents" is level*/ @media (max-width:40.0625em) { .govuk-contents-box { @@ -7713,7 +7742,6 @@ screen and (-ms-high-contrast:active) { display: none; } - /*Skip link*/ .govuk-skip { position: absolute; @@ -7731,10 +7759,8 @@ screen and (-ms-high-contrast:active) { height: auto; } -/*# sourceMappingURL=govuk-frontend-5.4.0.min.css.map */ - +/*Container for value box*/ -/* Container for the value box */ .value-box-container { font-family: GDS Transport, Arial, sans-serif; font-weight: 400; @@ -7746,7 +7772,8 @@ screen and (-ms-high-contrast:active) { margin-bottom: 15px; } -/* Larger screens styling */ +/*Larger screen sizing for value box*/ + @media (min-width: 40.0625em) { .value-box-container { font-size: 1.2rem; @@ -7754,7 +7781,8 @@ screen and (-ms-high-contrast:active) { } } -/* Styling for the value inside the box */ +/*Styling value for value box*/ + .value-box-value { font-size: 1.5rem; line-height: 1; @@ -7763,10 +7791,12 @@ screen and (-ms-high-contrast:active) { display: block; } -/* Styling for the optional description */ +/*Styling for optional description for value box*/ + .value-box-description { font-size: 1rem; line-height: 1; margin-top: 10px; font-weight: 400; } +/*# sourceMappingURL=govuk-frontend-5.7.1.min.css.map */ diff --git a/inst/www/fonts/bold-affa96571d-v2.woff b/inst/www/fonts/bold-affa96571d-v2.woff old mode 100644 new mode 100755 diff --git a/inst/www/fonts/bold-b542beb274-v2.woff2 b/inst/www/fonts/bold-b542beb274-v2.woff2 old mode 100644 new mode 100755 diff --git a/inst/www/fonts/light-94a07e06a1-v2.woff2 b/inst/www/fonts/light-94a07e06a1-v2.woff2 old mode 100644 new mode 100755 diff --git a/inst/www/fonts/light-f591b13f7d-v2.woff b/inst/www/fonts/light-f591b13f7d-v2.woff old mode 100644 new mode 100755 diff --git a/inst/www/images/govuk-crest.png b/inst/www/images/govuk-crest.png deleted file mode 100644 index bed4efe..0000000 Binary files a/inst/www/images/govuk-crest.png and /dev/null differ diff --git a/inst/www/images/govuk-crest.svg b/inst/www/images/govuk-crest.svg new file mode 100644 index 0000000..db3e20a --- /dev/null +++ b/inst/www/images/govuk-crest.svg @@ -0,0 +1 @@ + \ No newline at end of file