diff --git a/app/assets/fonts/bold-affa96571d-v2.woff b/app/assets/fonts/bold-affa96571d-v2.woff deleted file mode 100755 index 48fbcf59c0..0000000000 Binary files a/app/assets/fonts/bold-affa96571d-v2.woff and /dev/null differ diff --git a/app/assets/fonts/bold-b542beb274-v2.woff2 b/app/assets/fonts/bold-b542beb274-v2.woff2 deleted file mode 100755 index 81fd14985d..0000000000 Binary files a/app/assets/fonts/bold-b542beb274-v2.woff2 and /dev/null differ diff --git a/app/assets/fonts/light-94a07e06a1-v2.woff2 b/app/assets/fonts/light-94a07e06a1-v2.woff2 deleted file mode 100755 index 1eb101571b..0000000000 Binary files a/app/assets/fonts/light-94a07e06a1-v2.woff2 and /dev/null differ diff --git a/app/assets/fonts/light-f591b13f7d-v2.woff b/app/assets/fonts/light-f591b13f7d-v2.woff deleted file mode 100755 index 3b26d5ffda..0000000000 Binary files a/app/assets/fonts/light-f591b13f7d-v2.woff and /dev/null differ diff --git a/app/assets/images/.keep b/app/assets/images/.keep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/app/assets/images/ccs-opengraph-image.png b/app/assets/images/ccs-opengraph-image.png new file mode 100644 index 0000000000..eba8eb170f Binary files /dev/null and b/app/assets/images/ccs-opengraph-image.png differ diff --git a/app/assets/stylesheets/_settings.scss b/app/assets/stylesheets/_settings.scss deleted file mode 100644 index b650c48760..0000000000 --- a/app/assets/stylesheets/_settings.scss +++ /dev/null @@ -1,58 +0,0 @@ -// Override any GOVUK settings here - -$govuk-font-url-function: 'font-url'; -$govuk-image-url-function: 'image-url'; - -$govuk-global-styles: true; - -$govuk-compatibility-govukfrontendtoolkit: false; -$govuk-compatibility-govuktemplate: false; -$govuk-compatibility-govukelements: false; - -$ccs-colours: ( - "primary": #9B1A47, - "grey-1": #6f777b, - "grey-2": #bfc1c3, - "grey-3": #dee0e2, - "grey-4": #f8f8f8, - "green-2": #F0FFF1, - "green-3": #006435, - "button-green": #007E8A, - "red": #9b1a47, - "dark-red": #85163d, - "white": #ffffff, - - "mid-grey": #b1b4b6, - "black": #2f2f2f -); - -@function ccs-colour($colour) { - $colour: quote($colour); - - @if not map-has-key($ccs-colours, $colour) { - @error "Unknown colour `#{$colour}`"; - } - - @return map-get($ccs-colours, $colour); -} - -@import url('https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,600,700'); - -$govuk-font-family: "Source Sans Pro", Helvetica, Arial, sans-serif; -$govuk-font-family-print: sans-serif; - -$govuk-font-weight-light: 300; -$govuk-font-weight-regular: 400; -$govuk-font-weight-semi-bold: 600; -$govuk-font-weight-bold: 700; - -$govuk-heading-xl: 48px; -$govuk-heading-l: 27px; - -$govuk-button-background-colour: ccs-colour("button-green"); -$ccs-border-colour: ccs-colour("mid-grey"); -$ccs-brand-colour: ccs-colour("red") !default; - -#main-footer .ccs-footer__links { - text-decoration: underline; -} diff --git a/app/assets/stylesheets/ccs/_all.scss b/app/assets/stylesheets/ccs/_all.scss deleted file mode 100644 index 940d2e6aeb..0000000000 --- a/app/assets/stylesheets/ccs/_all.scss +++ /dev/null @@ -1,2 +0,0 @@ -@import "facilities-management/all"; -@import "govuk-frontend-overrides"; diff --git a/app/assets/stylesheets/ccs/_ccs.scss b/app/assets/stylesheets/ccs/_ccs.scss new file mode 100644 index 0000000000..f5cba79275 --- /dev/null +++ b/app/assets/stylesheets/ccs/_ccs.scss @@ -0,0 +1,59 @@ +.error-box { + display: flex; + flex-direction: column; + height: 100vh; +} + +.error-content { + flex: 1 0 auto; +} + +.button_as_link { + font-size: 1em; + border: 0; + text-decoration: underline; + color: $govuk-link-colour; + background-color: inherit; + padding: 0; + margin: 0; + + &:link { + color: $govuk-link-colour; + } + + &:visited { + color: $govuk-link-visited-colour; + } + + &:hover:not(:focus), + &:active:not(:focus) { + color: $govuk-link-hover-colour; + } + + &:hover { + cursor: pointer; + } +} + +.supplier-rates-td { + border: none !important; +} + +.govuk-brand-light-grey-benchmark { + color: #6f777b !important; +} + +%govuk-section-break--s { + @include govuk-responsive-margin(2, "top"); + @include govuk-responsive-margin(2, "bottom"); +} + +.govuk-section-break--s { + @extend %govuk-section-break--s; +} + +.ccs-no-underline, +.govuk-warning-text abbr, +abbr { + text-decoration: none; +} diff --git a/app/assets/stylesheets/ccs/_govuk-frontend-overrides.scss b/app/assets/stylesheets/ccs/_govuk-frontend-overrides.scss deleted file mode 100644 index 52b95f2939..0000000000 --- a/app/assets/stylesheets/ccs/_govuk-frontend-overrides.scss +++ /dev/null @@ -1,92 +0,0 @@ -.govuk-label--s { - font-weight : 600; - } - -.button_as_link { - font-size: 1em; - border: 0; - text-decoration: underline; - color: $govuk-link-colour; - background-color: inherit; - padding: 0; - margin: 0; - - &:link { - color: $govuk-link-colour - } - - &:visited { - color: $govuk-link-visited-colour - } - - &:hover:not(:focus), - &:active:not(:focus) { - color: $govuk-link-hover-colour - } - - &:hover { - cursor: pointer; - } -} - -.govuk-align-center-table__td { - text-align: center !important; -} -.govuk-align-left-table__td { - text-align: left !important; -} -.supplier-rates-td { - border: none !important; -} -.govuk-brand-light-grey { - color: #cecece !important; -} -.govuk-brand-light-grey-benchmark { - color:#6F777B !important; -} -.govuk-header_muted { - color: #6F777B; -} -.bg_gov-mssg { - background-color: #6F777B; - color: #FFFFFF; - padding: 5px; -} -.govuk-border-bottom_none { - border-bottom: 0px !important; -} - -body.js-enabled #ccs-accordion-with-basket { - .basket, - .govuk-checkboxes .ccs-select-all, - .govuk-checkboxes > div + p { - display : block; - } -} - -%govuk-section-break--s { - @include govuk-responsive-margin(2, "top"); - @include govuk-responsive-margin(2, "bottom"); -} - -.govuk-section-break--s { - @extend %govuk-section-break--s; -} - -.govuk-template { - background-color: #ffffff; -} - -.error-box { - display: flex; - flex-direction: column; - height: 100vh; -} - -.error-content { - flex: 1 0 auto; -} - -.govuk-no-border th, .govuk-no-border td { - border: 0 !important; -} diff --git a/app/assets/stylesheets/ccs/facilities-management/_all.scss b/app/assets/stylesheets/ccs/facilities-management/_all.scss deleted file mode 100644 index a4462cef1a..0000000000 --- a/app/assets/stylesheets/ccs/facilities-management/_all.scss +++ /dev/null @@ -1,9 +0,0 @@ -@import "dashboard-section.scss"; -@import "filter-component.scss"; -@import "panel.scss"; -@import "procurement-buildings.scss"; -@import "service-specification.scss"; -@import "summary-box"; -@import "summary-list.scss"; -@import "supplier_lot_data"; -@import "supplier-lot-list.scss"; diff --git a/app/assets/stylesheets/ccs/facilities-management/_filter-component.scss b/app/assets/stylesheets/ccs/facilities-management/_filter-component.scss deleted file mode 100644 index 5d83f5bf43..0000000000 --- a/app/assets/stylesheets/ccs/facilities-management/_filter-component.scss +++ /dev/null @@ -1,19 +0,0 @@ -.filter-component-container-grey { - background-color: #F8F8F8; - margin: 5px; - overflow-x: hidden; -} - -.filter-component-container { - border-style: solid; - border-width: 1px; - border-color: #f3f2f1; - padding-top: 10px; - min-width: 300px; -} - -.filter-component-container details { - background-color: govuk-colour("white"); - padding: govuk-spacing(2); - margin: govuk-spacing(2); -} diff --git a/app/assets/stylesheets/ccs/facilities-management/_procurement-buildings.scss b/app/assets/stylesheets/ccs/facilities-management/_procurement-buildings.scss deleted file mode 100644 index 28263e1268..0000000000 --- a/app/assets/stylesheets/ccs/facilities-management/_procurement-buildings.scss +++ /dev/null @@ -1,7 +0,0 @@ -.procurement-add-buildings-container { - border-style: solid; - border-width: 1px; - border-color: #b1b4b6; - padding-top: 10px; - padding-bottom: 10px; -} diff --git a/app/assets/stylesheets/ccs/facilities-management/_summary-list.scss b/app/assets/stylesheets/ccs/facilities-management/_summary-list.scss deleted file mode 100644 index e215fd4a1a..0000000000 --- a/app/assets/stylesheets/ccs/facilities-management/_summary-list.scss +++ /dev/null @@ -1,4 +0,0 @@ -.ccs-summary-list__value { - min-width:10em; - text-align:right; -} \ No newline at end of file diff --git a/app/assets/stylesheets/ccs/facilities-management/_supplier-lot-list.scss b/app/assets/stylesheets/ccs/facilities-management/_supplier-lot-list.scss deleted file mode 100644 index ffa0cc29ab..0000000000 --- a/app/assets/stylesheets/ccs/facilities-management/_supplier-lot-list.scss +++ /dev/null @@ -1,15 +0,0 @@ -.supplier-lot-list { - @media (max-width: 90em) { - margin-bottom: 50px; - } - - @media (max-width: 1000px) { - margin-bottom: 20px; - } -} - -#supplier-lot-list__container, .filter-pane { - @media (max-width: 1000px) { - width: 100%; - } -} diff --git a/app/assets/stylesheets/components/_all.scss b/app/assets/stylesheets/components/_all.scss index cfe9999271..e70bf8fcd5 100644 --- a/app/assets/stylesheets/components/_all.scss +++ b/app/assets/stylesheets/components/_all.scss @@ -1,17 +1,17 @@ -/* Import from Govuk frontend, refer to govuk-frontend/govuk/components/_all.scss */ -@import "govuk-frontend/govuk/components/all"; - -/* Override with my own components */ +// /* Override GOV.UK/add our CCS components */ +@import "basket/basket"; +@import "checkbox-accordion/checkbox-accordion"; +@import "dashboard-section/dashboard-section"; @import "header/header"; @import "footer/footer"; -@import "details/details"; -@import "documents/documents"; -@import "inset-text/inset-text"; -@import "label/label"; +@import "info-panel/info-panel"; @import "logo/logo"; @import "notification-banner/notification-banner"; +@import "panel/panel"; +@import "password-rules/password-rules"; +@import "progress-bar/progress-bar"; +@import "service-specification/service-specification"; +@import "step-by-step-nav/step-by-step-nav"; +@import "summary-box/summary-box"; +@import "supplier-lot-data/supplier-lot-data"; @import "supplier-record/supplier-record"; -@import "typography/typography"; -/* CCS override and bespoke styles; re-used globally across all modules */ -@import "ccs-global/ccs-global"; -@import "step-by-step-nav/all"; diff --git a/app/assets/stylesheets/components/basket/_basket.scss b/app/assets/stylesheets/components/basket/_basket.scss new file mode 100644 index 0000000000..6bafb18f56 --- /dev/null +++ b/app/assets/stylesheets/components/basket/_basket.scss @@ -0,0 +1,83 @@ +#css-list-basket { + display: none; + + .govuk-heading-m { + margin-left: govuk-spacing(2); + margin-bottom: 0; + } + + #removeAll { + margin: govuk-spacing(2) 0 govuk-spacing(3) govuk-spacing(2); + display: inline-block; + } + + & > .govuk-button { + width: 100%; + } + + & > div { + background-color: ccs-colour("light-grey"); + padding: govuk-spacing(3); + } + + ul.govuk-list { + margin: 0; + + li { + @include govuk-clearfix; + + background-color: govuk-colour("white"); + margin-bottom: 0; + padding: govuk-spacing(2) govuk-spacing(2); + border-top: 1px solid ccs-colour("mid-grey"); + + &:first-child { + border-top: none; + } + + span { + text-align: left; + font-size: 1rem; + top: 0; + top: 0; + float: left; + padding-top: 2px; + width: 66%; + } + + a { + width: 33%; + text-align: right; + font-size: 14px; + font-size: 0.9rem; + position: relative; + top: -2px; + display: inline-block; + } + } + + li:first-child { + border-bottom: none; + } + + @media (max-width: 768px) { + li { + span, + a { + width: 100% !important; + text-align: left !important; + } + } + } + } + + @media (max-width: 641px) { + & > .govuk-button { + display: inline-block; + } + } +} + +body.js-enabled #css-list-basket { + display: block; +} diff --git a/app/assets/stylesheets/components/ccs-global/_ccs-global.scss b/app/assets/stylesheets/components/ccs-global/_ccs-global.scss deleted file mode 100644 index cfdbccbd1b..0000000000 --- a/app/assets/stylesheets/components/ccs-global/_ccs-global.scss +++ /dev/null @@ -1,838 +0,0 @@ -%ccs-font-21 { - font-size : 21px; - font-size : 1.3125rem; - line-height : 1.5; - } - -%ccs-labels-m { - font-size : 17px; - font-size : 1.0625rem; - } - -%clearfix { - &::after { - content : ''; - clear : both; - display : table; - } - } - - -#wrapper { - display : flex; - flex-direction : column; - width : 100%; - min-height: auto !important; - } - -#main-footer { - overflow : hidden; - } - -@media (min-width : 1025px) { - .govuk-width-container { - flex-grow : 1; - width : 100%; - } - } - - - -.ccs-font-weight-semi-bold { - font-weight : 600; - } - -.ccs-landing-pg-content { - padding-bottom : 60px; - } - -.ccs-no-underline, -.govuk-warning-text abbr, -abbr { - text-decoration : none; - } - -.ccs-remove { - display : block; - position : absolute; - left : -3000px; - top : -3000px; - } - -legend + p.ccs-legend-download { - margin-top : -#{govuk-spacing(2)}; - margin-bottom : govuk-spacing(6); - } - -.ccs-next { - text-decoration : none !important; - padding : govuk-spacing(4) 0; - display : block; - width : 100%; - text-align : right; - clear : left; - } - -form.ccs-form { - .govuk-input, - .govuk-textarea, - .govuk-radios__input, - .govuk-input[type="number"], - .js-enabled .govuk-tabs__list, - .js-enabled .govuk-tabs__panel, - .js-enabled .govuk-tabs__tab[aria-selected="true"] { - &:not(:focus) { - border-width : 2px !important; - } - - &:focus { - border-width : 4px !important; - } - } - - .govuk-radios__input + .govuk-radios__label::before { - border-width : 1.6px; - } - - .ccs-govuk-checkboxes--thin { - .govuk-checkboxes__input + .govuk-checkboxes__label::before { - border-width : 1.6px; - } - } - - .js-enabled .govuk-tabs__tab[aria-selected="true"] { - margin-bottom : -2px !important; - } - - .supplier-record__file-download abbr { - position : absolute; - top : -3000px; - left : -3000px; - } - - input:-webkit-autofill, - input:-webkit-autofill:hover, - input:-webkit-autofill:focus, - input:-webkit-autofill:active { - -webkit-box-shadow : 0 0 0 30px #ffffff inset !important; - } - } - -.ccs-tag { - background-color : ccs-colour("grey-1"); - color : govuk-colour("white"); - padding : 0 govuk-spacing(1); - text-align : center; - margin-right : govuk-spacing(1); - - h1[class^="govuk-heading"] &, - h2[class^="govuk-heading"] &, - h3[class^="govuk-heading"] & { - display : inline-block; - vertical-align : middle; - font-size : 1.1rem; - margin-left : govuk-spacing(1); - } - - h1.govuk-heading-xl & { - padding : 0 govuk-spacing(2); - vertical-align : super; - font-size : 1.1rem !important; - font-weight : 600 !important; - } - - p.govuk-body & { - padding : 0 govuk-spacing(2); - } - - a.ccs-no-underline & { - margin-left : govuk-spacing(1); - } - - &-approved, &-completed { - background-color : govuk-colour("green"); - } - - &-canceled, &-failed, &-rejected { - background-color : govuk-colour("red"); - } - - &-in_review, &-in_progress, &-uploading { - background-color : ccs-colour("grey-1"); - } - - .ccs-results-list & { - padding : 0 govuk-spacing(2); - } - } - - - - -a.ccs-print-icon { - padding-left : govuk-spacing(2); - display : inline-block; - - &::before { - content : ' '; - display : inline-block; - width : govuk-spacing(4); - height : govuk-spacing(4); - position : relative; - left : -#{govuk-spacing(2)}; - top : govuk-spacing(1); - background : url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAASAgMAAAAvVbb5AAAACVBMVEX///////8KDAwmYEUdAAAAAXRSTlMAQObYZgAAADBJREFUCFtjYOBa1cDAoBkKJFYCCSYwEYpCrAICZCI0FEhkrURmQRRnrYRpW7WqAQAlGR86Ip1rwwAAAABJRU5ErkJggg==') no-repeat center center; - } - } - -ul.ccs-checklist { - list-style : none; - padding : 0; - - & > li { - - b { - display : block; - width : 33%; - float : left; - } - - ul { - list-style : none; - padding-left : 0; - float : left; - width : 66%; - padding-bottom : govuk-spacing(5); - - li { - span.ccs-y, - span.ccs-n { - text-indent : -3000px; - color : transparent; - display : inline-block; - width : govuk-spacing(4); - height : govuk-spacing(4); - margin-right : govuk-spacing(2); - position : relative; - top : 3px; - background-repeat : no-repeat; - background-size : cover; - } - - span.ccs-y { - background-image : url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAYAAACM/rhtAAACU0lEQVR4Ae3YA6xcQRQG4D+1bdtu58yza9uemefaQRk3dm3btm3btrWd4lnzdHeTbJIT7r332388sNlsDl1OoBOoywmEojAIPtUhgVAsGILZ/hVNcSggFAVq2C9dtqiicQ4B1DgRBxdRiobaFYhA3j9BXERJCrILEIL6QLKfCeMiiqZbDtSwnoa4OZgwIYOlQEjeDYJ+JImTNC8CpwtWJdfFCCdoIZZ1zmjpKIbkHSHpe9I4tiQCZxkQktpDsm8GzbocE3wyGa8kCHUriyC3WqnDubQxwelaGYEzAiLEqzQk3dL1FCEu1VM4CbeEYF8NklsDpTIbbxYgeCn94M2oF7BHCOSVk5lcc0j2xSC5dZjQOYvxbgZh7iUg6Ho8//I+BJU3w1FTMxxtjMAZAaE8i0PS1USa4jaUR5kkkguAoM8GuM0Ib541WftB/eDupPsLu4Eg15IJLF9+kPTJoFm36QGRLdkbVgTyGtCDwuADVzCYF42ZnKu3xn80SG4HhrpmT/GOGnpagWDPDEbeBYR7Fv6fnCcE+2DwzC6o1jlSveWHcq0NQS8MPngGgS6tIem9QXJ7MaJJzjQ7kyCQ6kLQyyQ+bFaS9iPEJ1eaH5oQ5Fofkl6lDscOYpR77nQ71UHwhhDsdQqTO4xwnifdj506SYJkb5KZ3DGogLyWnYshuAskvTUD0gkM8cln+cEd0tXNYMSeQrBHfrvdLEBxD434kOC0M9S1gN2vPhDIvOKsGpKdQygVdJi7GSjuG4GMvqpYAzRP0v/vgAhyK+K8fnMCnUA7128nPTg6GfvQPgAAAABJRU5ErkJggg=='); - } - - span.ccs-n { - background-image : url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAMAAAC7IEhfAAAAFVBMVEX/////VVWyDx+yDyGyDx6xDh6xDh4Sl4TlAAAAB3RSTlMAA6VWqf/8dNf9xAAAAHRJREFUeNrl1DEOACEIRNEVHe9/ZC2s/komoZWSvERF4Hs8WnSmerSLG5odbmq0i9OWcDoSTlvC/WRIR8JJgetAIpHIzFHS5RIul3C5hDMSjhLOSOM89Ef7x9TL4wvuv7DaFL7NfOMWRsEMV2lc/QLwK+XtWGhtCI1x8c/cAAAAAElFTkSuQmCC'); - } - - details { - margin-top : govuk-spacing(2); - margin-left : govuk-spacing(1); - } - } - } - - } - - @media (max-width : 641px) { - li { - b, ul { - width : 100%; - } - } - } - } - -.chooser-component { - .basket { - display : none; - - .govuk-heading-m { - margin-left : govuk-spacing(2); - margin-bottom : 0; - } - - #removeAll { - margin : govuk-spacing(2) 0 govuk-spacing(3) govuk-spacing(2); - display : inline-block; - - & .ccs-remove { - margin : 0; - } - } - - & > .govuk-button { - width : 100%; - } - - & > div { - background-color : ccs-colour("grey-4"); - padding : govuk-spacing(3); - } - - ul.govuk-list { - margin : 0; - - li { - background-color : govuk-colour("white"); - margin-bottom : 0; - padding : govuk-spacing(2) govuk-spacing(2); - border-top : 1px solid ccs-colour("grey-2"); - - &:first-child { - border-top : none; - } - - @extend %clearfix; - - span { - text-align : left; - font-size : 1rem; - top : 0; - top : 0; - float : left; - padding-top : 2px; - } - - a { - text-align : right; - font-size : 14px; - font-size : 0.9rem; - position : relative; - top : -2px; - display : inline-block; - color : $govuk-link-colour; - - &:hover { - color : $govuk-link-hover-colour; - } - - &:focus { - color: #000000; - } - } - } - - li:first-child { - border-bottom : none; - } - - @media (max-width : 768px) { - li { - span, a { - width : 100% !important; - text-align : left !important; - } - } - } - } - } - - @media (max-width : 641px) { - & > .govuk-button { - display : inline-block; - } - } -} - -.ccs-search-results { - - .ccs-search-results__sort { - float : right; - clear : left; - margin : 0 3px govuk-spacing(6) 0; - - .govuk-label { - display : inline-block; - font-weight : bold; - margin-right : 10px; - } - - .govuk-select { - min-width : 190px; - border-width : 1px; - border-radius : 5px; - } - - } - - ul.ccs-results-list { - list-style : none; - padding : 0; - clear : left; - - li.govuk-list { - float : left; - clear : left; - width : 100%; - padding : govuk-spacing(2) 0; - margin : 0; - border-bottom : 1px solid $govuk-border-colour; - - &:first-child { - border-top : 1px solid $govuk-border-colour; - } - - & > div { - padding : 0; - } - - a { - margin : 0; - } - } - - .ccs-results-list__detail { - - div { - float : right; - - span { - font-weight : bold; - } - - span span.ccs-font--wrap { - font-weight : 700; - display : block; - width : 100%; - } - } - - } - - .ccs-results-list__details { - list-style : none; - padding : 0; - margin : govuk-spacing(2) 0 0 0; - width : 100%; - - li { - margin : 0; - padding : 0; - } - } - - .mc-suppliers-average-day-rate { - list-style : none; - text-align : right; - } - - @extend %clearfix; - - @media (max-width : 641px) { - .ccs-results-list__detail div span span.ccs-font--wrap { - display : inline; - } - } - } - - .govuk-table { - margin : 0; - - .govuk-table__head .govuk-table__header { - font-weight : bold; - } - - td > a[class^="govuk-heading"] { - margin-bottom : 0; - } - - .govuk-table__header, - .govuk-table__cell { - vertical-align : top; - } - - .govuk-table__head th, - .govuk-table__body th, - .govuk-table__body td { - text-align : right; - padding-top : govuk-spacing(4); - padding-bottom : govuk-spacing(4); - } - - .govuk-table__head th:first-child, - .govuk-table__body th:first-child, - .govuk-table__body td:first-child { - text-align : left; - } - - } - - } - -.ccs-govuk-checkboxes--s { - - .govuk-checkboxes__input + .govuk-checkboxes__label::before, - .govuk-checkboxes__input { - height : 20px; - width : 20px; - top : 11px; - left : 0; - border-width : 1px; - } - - .govuk-checkboxes__input:checked + .govuk-checkboxes__label::after { - left : 3px; - top : 15px; - width : 11px; - height : 5px; - border-width : 0 0 3px 3px; - } - - .govuk-checkboxes__label { - padding : 5px; - width : 100%; - font-size : 17px; - font-size : 1.0625rem; - } - - .govuk-checkboxes__item { - margin-bottom : 0; - padding-top : 5px; - padding-right : 10px; - padding-bottom : 0; - padding-left : 25px; - } - - } - -.ccs-titles-checkboxes { - margin-bottom : govuk-spacing(8); - - .govuk-fieldset__heading { - margin-bottom : govuk-spacing(5); - } - - .govuk-radios, - .govuk-checkboxes { - .govuk-label { - font-weight : bold; - } - - .govuk-hint { - margin-bottom : govuk-spacing(1) !important; - } - - .govuk-details { - margin-left : govuk-spacing(3); - margin-right : govuk-spacing(3); - margin-bottom : govuk-spacing(1); - padding-bottom : govuk-spacing(1); - - &.govuk-details--border-bottom { - border-bottom : 1px solid ccs-colour("grey-2"); - } - } - } - } - - -.pagination--button_as_link, -.pagination-number--button_as_link { - @include govuk-font(19); - background-color: inherit; - border: none; - padding: 0!important; - color: $govuk-link-colour; - - &:hover:not(:focus), - &:active:not(:focus) { - color: $govuk-link-hover-colour - } - - &:hover { - cursor: pointer; - } -} - -.pagination--button_as_link, -.govuk-pagination__item--current .pagination-number--button_as_link { - @include govuk-typography-weight-bold; -} - -.govuk-pagination__item--current .pagination-number--button_as_link { - color: govuk-colour("white"); - - &:hover:not(:focus), - &:active:not(:focus) { - color: govuk-colour("white"); - } -} - -@media print { - #results-filters { - .results-panel { - background-color : none; - - } - } - .ccs-print-icon, - #navigation, - #ccs-clear-filters, - .govuk-button { - display : none; - } - - .ccs-at-results-filters { - font-size : 80% !important; - font-weight : normal; - } - - #main-content > .govuk-grid-row:first-child > .govuk-grid-column-two-thirds:first-child { - width : 100%; - } - } - -@media all and (-ms-high-contrast : none) { - *::-ms-backdrop, #wrapper { - flex : none; - } - *::-ms-backdrop, img[src*=".svg"] { - width : 100%; - } - *::-ms-backdrop, .ccs-logo__dfe img[src*=".svg"] { - width : 50%; - } - } - -.ccs-fieldset__heading--wide { - max-width : none; - width : 100%; - } - -table.ccs-at-govuk-table--sm { - th { - @include govuk-font($size : 16, $weight : inherit); - } - - td { - font-size : 15px; - font-size : 0.9rem; - } - } - -table.ccs-at-govuk-table--5050 { - tr th:first-child, - tr td:first-child { - font-size: 0.9rem; - width : 50%; - padding-right : govuk-spacing(2); - } - } - -table.ccs-at-govuk-table--3070 { - border-collapse: collapse; - tr th:first-child, - tr td:first-child { - width: 20%; - padding-right : govuk-spacing(2); - } - tr th:last-child, - tr td:last-child { - padding-left: 1em; - min-width : 4em; - } - tr th:nth-last-child(2), - tr td:nth-last-child(2) { - padding: 1ex 0; - min-width : 5em; - } - thead tr { - border-top : 1px solid #CCCCCC; - border-bottom : 1px solid #CCCCCC; - padding-top : 4px; - padding-bottom : 4px; - } - thead th { - text-align: left; - padding: 1ex; - } - tbody td { - padding: 1ex 1ex; - } - } -table.ccs-at-govuk-table--3070, -table.ccs-at-govuk-table--sm, -table.ccs-at-govuk-table--5050 { - th, td { - padding-top : govuk-spacing(3); - padding-bottom : govuk-spacing(3); - vertical-align : top; - } - } - - -.ccs-right-panel-sticky { - display : block; - width : 100%; - margin-bottom : govuk-spacing(3); - - & > div { - padding : govuk-spacing(4) govuk-spacing(4) govuk-spacing(2) govuk-spacing(3); - margin : 0; - } - - @media (min-width : 40.0625em) { - position : -webkit-sticky; - position : sticky; - top : 30px; - float : right; - width : 33.33333%; - - & > div { - background-color : ccs-colour("grey-4"); - margin-left : govuk-spacing(2); - } - - span { - @include govuk-font($size : 36); - display : inline-block; - width : 100%; - font-weight : bold; - } - } - } - - -.ccs-info-panel { - background-color : ccs-colour("grey-4"); - padding : govuk-spacing(3); - margin : 0 0 govuk-spacing(7) 0; - - @media (min-width : 40.0625em) { - &.ccs-info-panel--pull-up { - margin-top : -#{govuk-spacing(3)} !important; - } - } - - dl.ccs-contact-details { - dt, dd { - font-family : $govuk-font-family; - @include govuk-font($size : 19, $weight : normal); - width : 100%; - display : inline-block; - margin : 0; - } - - dt { - font-weight : bold; - margin-top : govuk-spacing(4); - - &:first-child { - margin-top : 0; - } - } - - a { - overflow-wrap : break-word; - word-wrap : break-word; - } - } - } - -#passwordrules { - li { - - &.correct { - color : govuk-colour("green"); - - span { - background-image : url("data:image/svg+xml,%3Csvg height='15' viewBox='0 0 19 15' width='19' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath d='m43.6740506 1353.95951 9.8607595-9.95951 2.4651899 2.55061-12.3259494 12.44939-6.6740506-6.74089 2.5253165-2.55061z' fill='%23006435' fill-rule='evenodd' transform='translate(-37 -1344)'/%3E%3C/svg%3E"); - } - } - - &.wrong { - color : $govuk-error-colour; - - span { - background-image : url("data:image/svg+xml,%3Csvg height='14' viewBox='0 0 14 14' width='14' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath d='m46 1385.41176-4.5882353 4.58824-2.4117647-2.41176 4.5882353-4.58824-4.5882353-4.58824 2.4117647-2.41176 4.5882353 4.58824 4.5882353-4.58824 2.4117647 2.41176-4.5882353 4.58824 4.5882353 4.58824-2.4117647 2.41176z' fill='%23b10e1e' fill-rule='evenodd' transform='matrix(-1 0 0 1 53 -1376)'/%3E%3C/svg%3E"); - } - } - - &.correct, - &.wrong { - span:first-child { - position : relative; - top : 0.2rem; - - b { - position : absolute; - left : -3000px; - top : -3000px; - } - } - } - - span { - display : inline-block; - background-image : none; - background-position : center center; - background-repeat : no-repeat; - width : 16px; - height : 16px; - - b { - display : inline-block; - margin-right : 0.3rem; - width : inherit; - height : inherit; - } - } - } - } - -.ccs-special-date-input { - width: 75px; -} - -.ccs-progress { - height: 40px; - margin-bottom: 20px; - overflow: hidden; - background: govuk-colour("light-grey"); - border-radius: 4px; - box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1); -} - -.ccs-progress-bar { - float: left; - width: 10%; - height: 100%; - font-size: 12px; - line-height: 20px; - color: #fff; - text-align: center; - background: govuk-colour("blue"); - box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15); - transition: width .6s ease, background .6s ease; - - &--succeed { - background: govuk-colour("green"); - } - - &--fail { - background: govuk-colour("red"); - } -} - -.ccs-upload-progress-container { - display: grid; - text-align: center; - grid-template-columns: 20% 20% 20% 20% 20%; - - div:not([aria-current="true"]) { - @media (max-width: 30em) { - position: absolute; - width: 1px; - height: 1px; - margin: 0; - padding: 0; - overflow: hidden; - clip: rect(0 0 0 0); - border: 0; - white-space: nowrap; - } - } -} \ No newline at end of file diff --git a/app/assets/stylesheets/components/checkbox-accordion/_checkbox-accordion.scss b/app/assets/stylesheets/components/checkbox-accordion/_checkbox-accordion.scss new file mode 100644 index 0000000000..ba39f1ccc2 --- /dev/null +++ b/app/assets/stylesheets/components/checkbox-accordion/_checkbox-accordion.scss @@ -0,0 +1,11 @@ +#ccs-accordion-with-basket .govuk-accordion__section-content div.govuk-checkboxes__divider, +#ccs-accordion-with-basket .govuk-accordion__section-content div.govuk-checkboxes__item:last-child { + display: none; +} + +body.js-enabled { + #ccs-accordion-with-basket .govuk-accordion__section-content div.govuk-checkboxes__divider, + #ccs-accordion-with-basket .govuk-accordion__section-content div.govuk-checkboxes__item:last-child { + display: block; + } +} diff --git a/app/assets/stylesheets/ccs/facilities-management/_dashboard-section.scss b/app/assets/stylesheets/components/dashboard-section/_dashboard-section.scss similarity index 88% rename from app/assets/stylesheets/ccs/facilities-management/_dashboard-section.scss rename to app/assets/stylesheets/components/dashboard-section/_dashboard-section.scss index 6221280ef0..b960c0b072 100644 --- a/app/assets/stylesheets/ccs/facilities-management/_dashboard-section.scss +++ b/app/assets/stylesheets/components/dashboard-section/_dashboard-section.scss @@ -1,5 +1,5 @@ -$ccs-dashboard-panel-border-colour: #dee0e2; -$ccs-dashboard-panel-background-colour: #f8f8f8; +$ccs-dashboard-panel-border-colour: ccs-colour("grey"); +$ccs-dashboard-panel-background-colour: ccs-colour("light-grey"); .ccs-dashboard-section__container { @extend %govuk-body-m; diff --git a/app/assets/stylesheets/components/details/_details.scss b/app/assets/stylesheets/components/details/_details.scss deleted file mode 100644 index 0caed20544..0000000000 --- a/app/assets/stylesheets/components/details/_details.scss +++ /dev/null @@ -1,7 +0,0 @@ -.govuk-details { - margin-bottom: 0; -} - -.govuk-details__text { - word-break: break-word; -} \ No newline at end of file diff --git a/app/assets/stylesheets/components/documents/_documents.scss b/app/assets/stylesheets/components/documents/_documents.scss deleted file mode 100644 index 130233869c..0000000000 --- a/app/assets/stylesheets/components/documents/_documents.scss +++ /dev/null @@ -1,5 +0,0 @@ -.documents { - background-color: #f3f2f1; - padding-top: 15px; - padding-bottom: 3px; -} diff --git a/app/assets/stylesheets/components/footer/_footer.scss b/app/assets/stylesheets/components/footer/_footer.scss index 48c838dbbf..abb87ce773 100644 --- a/app/assets/stylesheets/components/footer/_footer.scss +++ b/app/assets/stylesheets/components/footer/_footer.scss @@ -34,7 +34,7 @@ $ccs-footer-columns-to-rows-point: 501px; // alphagov/govuk_template includes a specific a:link:focus selector // designed to make unvisited links a slightly darker blue when focussed, so // we need to override the text colour for that combination of selectors. - @include govuk-compatibility(govuk_template) { + @include _govuk-compatibility(govuk_template) { &:link:focus { @include govuk-text-colour; } diff --git a/app/assets/stylesheets/components/info-panel/_info-panel.scss b/app/assets/stylesheets/components/info-panel/_info-panel.scss new file mode 100644 index 0000000000..e71fe539e1 --- /dev/null +++ b/app/assets/stylesheets/components/info-panel/_info-panel.scss @@ -0,0 +1,36 @@ +.ccs-info-panel { + background-color: ccs-colour("light-grey"); + padding: govuk-spacing(3); + margin: 0 0 govuk-spacing(7) 0; + + @media (min-width: 40.0625em) { + &.ccs-info-panel--pull-up { + margin-top: -#{govuk-spacing(3)} !important; + } + } + + dl.ccs-contact-details { + dt, + dd { + font-family: $govuk-font-family; + @include govuk-font($size: 19, $weight: normal); + width: 100%; + display: inline-block; + margin: 0; + } + + dt { + font-weight: bold; + margin-top: govuk-spacing(4); + + &:first-child { + margin-top: 0; + } + } + + a { + overflow-wrap: break-word; + word-wrap: break-word; + } + } +} diff --git a/app/assets/stylesheets/components/inset-text/_inset-text.scss b/app/assets/stylesheets/components/inset-text/_inset-text.scss deleted file mode 100644 index 83ea462355..0000000000 --- a/app/assets/stylesheets/components/inset-text/_inset-text.scss +++ /dev/null @@ -1,21 +0,0 @@ -$ccs_inset-text_bg_grey: ccs-colour("grey-4"); - -.cmp-inset-text { - margin:1em 0; - -moz-box-sizing: border-box; - -webkit-box-sizing: border-box; - box-sizing: border-box; - padding: 1rem; -} - -.cmp-inset-text--neutral { - background-color:$ccs_inset-text_bg_grey; - border-left:0; -} -.cmp-inset-text__body--neutral { - font-size: 16px; - font-weight: 400; -} -.cmp-inset-text__list-item { - font-size: 16px; -} diff --git a/app/assets/stylesheets/components/label/_label.scss b/app/assets/stylesheets/components/label/_label.scss deleted file mode 100644 index 55c15afdc5..0000000000 --- a/app/assets/stylesheets/components/label/_label.scss +++ /dev/null @@ -1,5 +0,0 @@ -.govuk-label--m { - line-height: 2; - margin-bottom: 5px; - font-weight: $govuk-font-weight-semi-bold; -} diff --git a/app/assets/stylesheets/ccs/facilities-management/_panel.scss b/app/assets/stylesheets/components/panel/_panel.scss similarity index 86% rename from app/assets/stylesheets/ccs/facilities-management/_panel.scss rename to app/assets/stylesheets/components/panel/_panel.scss index 15e173444d..8908c8cb61 100644 --- a/app/assets/stylesheets/ccs/facilities-management/_panel.scss +++ b/app/assets/stylesheets/components/panel/_panel.scss @@ -15,8 +15,8 @@ .ccs-panel--confirmation { color: govuk-colour("black"); - background: ccs-colour("green-2"); - border-left: 3px solid ccs-colour("green-3"); + background: ccs-colour("light-green"); + border-left: 3px solid ccs-colour("dark-green"); } .ccs-panel__title { diff --git a/app/assets/stylesheets/components/password-rules/_password-rules.scss b/app/assets/stylesheets/components/password-rules/_password-rules.scss new file mode 100644 index 0000000000..61f8d40619 --- /dev/null +++ b/app/assets/stylesheets/components/password-rules/_password-rules.scss @@ -0,0 +1,49 @@ +#ccs-password-rules { + li { + &.correct { + color: govuk-colour("green"); + + span { + background-image: url("data:image/svg+xml,%3Csvg height='15' viewBox='0 0 19 15' width='19' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath d='m43.6740506 1353.95951 9.8607595-9.95951 2.4651899 2.55061-12.3259494 12.44939-6.6740506-6.74089 2.5253165-2.55061z' fill='%23006435' fill-rule='evenodd' transform='translate(-37 -1344)'/%3E%3C/svg%3E"); + } + } + + &.wrong { + color: $govuk-error-colour; + + span { + background-image: url("data:image/svg+xml,%3Csvg height='14' viewBox='0 0 14 14' width='14' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath d='m46 1385.41176-4.5882353 4.58824-2.4117647-2.41176 4.5882353-4.58824-4.5882353-4.58824 2.4117647-2.41176 4.5882353 4.58824 4.5882353-4.58824 2.4117647 2.41176-4.5882353 4.58824 4.5882353 4.58824-2.4117647 2.41176z' fill='%23b10e1e' fill-rule='evenodd' transform='matrix(-1 0 0 1 53 -1376)'/%3E%3C/svg%3E"); + } + } + + &.correct, + &.wrong { + span:first-child { + position: relative; + top: 0.2rem; + + b { + position: absolute; + left: -3000px; + top: -3000px; + } + } + } + + span { + display: inline-block; + background-image: none; + background-position: center center; + background-repeat: no-repeat; + width: 16px; + height: 16px; + + b { + display: inline-block; + margin-right: 0.3rem; + width: inherit; + height: inherit; + } + } + } +} diff --git a/app/assets/stylesheets/components/progress-bar/_progress-bar.scss b/app/assets/stylesheets/components/progress-bar/_progress-bar.scss new file mode 100644 index 0000000000..a55f5d994f --- /dev/null +++ b/app/assets/stylesheets/components/progress-bar/_progress-bar.scss @@ -0,0 +1,51 @@ +.ccs-progress { + height: 40px; + margin-bottom: 20px; + overflow: hidden; + background: govuk-colour("light-grey"); + border-radius: 4px; + box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1); +} + +.ccs-progress-bar { + float: left; + width: 10%; + height: 100%; + font-size: 12px; + line-height: 20px; + color: #fff; + text-align: center; + background: govuk-colour("blue"); + box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15); + transition: + width 0.6s ease, + background 0.6s ease; + + &--succeed { + background: govuk-colour("green"); + } + + &--fail { + background: govuk-colour("red"); + } +} + +.ccs-upload-progress-container { + display: grid; + text-align: center; + grid-template-columns: 20% 20% 20% 20% 20%; + + div:not([aria-current="true"]) { + @media (max-width: 30em) { + position: absolute; + width: 1px; + height: 1px; + margin: 0; + padding: 0; + overflow: hidden; + clip: rect(0 0 0 0); + border: 0; + white-space: nowrap; + } + } +} diff --git a/app/assets/stylesheets/ccs/facilities-management/_service-specification.scss b/app/assets/stylesheets/components/service-specification/_service-specification.scss similarity index 100% rename from app/assets/stylesheets/ccs/facilities-management/_service-specification.scss rename to app/assets/stylesheets/components/service-specification/_service-specification.scss diff --git a/app/assets/stylesheets/components/step-by-step-nav/_all.scss b/app/assets/stylesheets/components/step-by-step-nav/_all.scss deleted file mode 100644 index 56bbf7ac9b..0000000000 --- a/app/assets/stylesheets/components/step-by-step-nav/_all.scss +++ /dev/null @@ -1,3 +0,0 @@ -@import "./step-by-step-nav-header"; -@import "./step-by-step-nav-related"; -@import "./step-by-step-nav"; diff --git a/app/assets/stylesheets/components/step-by-step-nav/_step-by-step-nav-main.scss b/app/assets/stylesheets/components/step-by-step-nav/_step-by-step-nav-main.scss new file mode 100644 index 0000000000..cd7546bfa8 --- /dev/null +++ b/app/assets/stylesheets/components/step-by-step-nav/_step-by-step-nav-main.scss @@ -0,0 +1,538 @@ +$stroke-width: 1px; +$number-circle-size: 30px; +$number-circle-size-large: 35px; +$top-border: solid 1px govuk-colour("mid-grey", $legacy: "grey-3"); + +@mixin step-nav-vertical-line($line-style: solid) { + content: ""; + position: absolute; + z-index: 2; + width: 0; + height: 100%; + border-left: $line-style $stroke-width govuk-colour("mid-grey", $legacy: "grey-2"); + background: govuk-colour("white"); +} + +@mixin step-nav-line-position { + left: 0; + margin-left: govuk-em(($number-circle-size / 2) - ($stroke-width / 2), 16); +} + +@mixin step-nav-line-position-large { + left: 0; + margin-left: govuk-em(($number-circle-size-large / 2) - ($stroke-width / 2), 16); +} + +// custom mixin as govuk-font does undesirable things at different breakpoints +// we want to ensure that both large and small step navs have the same size font on mobile +// this will stop text resizing if compatibility mode is turned off +@mixin step-nav-font($size, $tablet-size: $size, $weight: normal, $line-height: 1.3, $tablet-line-height: $line-height) { + @include govuk-typography-common; + font-size: $size + px; + font-weight: $weight; + line-height: $line-height; + + @include govuk-media-query($from: tablet) { + font-size: $tablet-size + px; + line-height: $tablet-line-height; + } +} + +// Adds a focus state for the chevron icon so that it turns black on button focus +@mixin step-nav-chevron-focus-state { + .gem-c-step-nav__chevron-stroke { + stroke: govuk-colour("black"); + } +} + +.gem-c-step-nav { + margin-bottom: govuk-spacing(6); + + &.gem-c-step-nav--large { + @include govuk-media-query($from: tablet) { + margin-bottom: govuk-spacing(9); + } + } + + .js-enabled &.js-hidden { + display: none; + } +} + +.gem-c-step-nav__controls { + padding: 3px 3px 0 0; +} + +.gem-c-step-nav____title-text-focus { + margin-bottom: 13px; + display: inline-block; +} + +// Create Chevron icon aligned with text +.gem-c-step-nav__chevron { + box-sizing: border-box; + display: inline-block; + position: relative; + // Set size using rems to make the icon scale with text if user resizes text in their browser + width: govuk-px-to-rem(20px); + height: govuk-px-to-rem(20px); + border: govuk-px-to-rem(1px) solid; + border-radius: 50%; + + vertical-align: text-top; + + // Reduce size, alter alignment + .gem-c-step-nav--large & { + vertical-align: top; + } + + // Create inner chevron arrow + &:after { + content: ""; + box-sizing: border-box; + display: block; + position: absolute; + bottom: govuk-px-to-rem(5px); + left: govuk-px-to-rem(6px); + width: govuk-px-to-rem(6px); + height: govuk-px-to-rem(6px); + -webkit-transform: rotate(-45deg); /* Ch <36, Saf 5.1+, iOS < 9.2, An =<4.4.4 */ + -ms-transform: rotate(-45deg); /* IE 9 */ + transform: rotate(-45deg); + border-top: govuk-px-to-rem(2px) solid; + border-right: govuk-px-to-rem(2px) solid; + } +} + +// Rotate icon to create "Down" version +.gem-c-step-nav__chevron--down { + -webkit-transform: rotate(180deg); /* Ch <36, Saf 5.1+, iOS < 9.2, An =<4.4.4 */ + -ms-transform: rotate(180deg); /* IE 9 */ + transform: rotate(180deg); +} + +.gem-c-step-nav__button { + color: $govuk-link-colour; + cursor: pointer; + background: none; + border: 0; + margin: 0; + + &:hover { + background: govuk-colour("light-grey"); + // Chevron icon interaction states + .gem-c-step-nav__chevron { + color: govuk-colour("black"); + background: govuk-colour("black"); + } + + .gem-c-step-nav__chevron:after { + color: govuk-colour("light-grey"); + } + + .gem-c-step-nav__button-text { + color: $govuk-text-colour; + } + } + + &:focus { + outline: 0; + // Chevron icon interaction states + .gem-c-step-nav__chevron { + color: govuk-colour("black"); + background: govuk-colour("black"); + } + + .gem-c-step-nav__chevron:after { + color: $govuk-focus-colour; + } + + .gem-c-step-nav____title-text-focus, + .gem-c-step-nav__toggle-link-focus { + @include govuk-focused-text; + } + + .gem-c-step-nav__toggle-link-focus { + padding-bottom: 2px; + } + } +} + +// removes extra dotted outline from buttons in Firefox +// on focus (standard yellow outline unaffected) +.gem-c-step-nav__button::-moz-focus-inner { + border: 0; +} + +.gem-c-step-nav__button--title { + @include step-nav-font(19, $weight: bold, $line-height: 1.2); + display: inline-block; + padding: govuk-spacing(1) 0 0; + text-align: left; + color: govuk-colour("black"); + width: 100%; + + .gem-c-step-nav--large & { + @include step-nav-font(19, $tablet-size: 24, $weight: bold); + + @include govuk-media_query($from: tablet) { + padding-top: govuk-spacing(2); + } + } +} + +.gem-c-step-nav__button--controls { + @include step-nav-font(15); + position: relative; + z-index: 1; // this and relative position stops focus outline underlap with border of accordion + margin: .5em 0 14px; + padding: govuk-spacing(1) 0 govuk-spacing(1); + + .gem-c-step-nav--large & { + @include step-nav-font(15, $tablet-size: 19); + } + + &:focus { + @include govuk-focused-text; + + .gem-c-step-nav__button-text { + text-decoration: none; + } + } +} + +.gem-c-step-nav__button-text { + display: inline-block; + text-align: left; + min-width: govuk-em(35, 14); + margin-left: govuk-spacing(1); + + .gem-c-step-nav--large & { + min-width: govuk-em(40, 16); + margin-left: govuk-spacing(1); + } +} + +.gem-c-step-nav__button-text--all { + min-width: govuk-em(87, 14); + + .gem-c-step-nav--large & { + min-width: govuk-em(100, 16); + } +} + +.gem-c-step-nav__steps { + padding: 0; + margin: 0; +} + +.gem-c-step-nav__step { + position: relative; + padding-left: govuk-em(govuk-spacing(6) + govuk-spacing(3), 16); + list-style: none; + + // line down the side of a step + &:after { + @include step-nav-vertical-line; + @include step-nav-line-position; + top: govuk-em(govuk-spacing(3), 16); + } + + .gem-c-step-nav--large & { + @include govuk-media-query($from: tablet) { + padding-left: govuk-em(govuk-spacing(9), 16); + + &:after { // stylelint-disable-line max-nesting-depth + @include step-nav-line-position-large; + top: govuk-em(govuk-spacing(6), 16); + } + } + } +} + +.gem-c-step-nav__step:last-child { + // little dash at the bottom of the line + &:before { + content: ""; + position: absolute; + z-index: 6; + bottom: 0; + left: 0; + margin-left: $number-circle-size / 4; + width: $number-circle-size / 2; + height: 0; + border-bottom: solid $stroke-width govuk-colour("mid-grey", $legacy: "grey-2"); + } + + &:after { + height: -webkit-calc(100% - #{govuk-spacing(3)}); // fallback for iphone 4 + height: calc(100% - #{govuk-spacing(3)}); + } + + .gem-c-step-nav__help:after { + height: 100%; + } + + .gem-c-step-nav--large & { + @include govuk-media-query($from: tablet) { + &:before { + margin-left: $number-circle-size-large / 4; + width: $number-circle-size-large / 2; + } + + &:after { + height: calc(100% - #{govuk-spacing(6)}); + } + } + } +} + +.gem-c-step-nav__step--active { + &:last-child:before, + .gem-c-step-nav__circle--number, + &:after, + .gem-c-step-nav__help:after { + border-color: govuk-colour("black"); + } +} + +.gem-c-step-nav__circle { + box-sizing: border-box; + position: absolute; + z-index: 5; + top: 3px; + left: 0; + width: govuk-em($number-circle-size, 16); + height: govuk-em($number-circle-size, 16); + color: govuk-colour("black"); + background: govuk-colour("white"); + border-radius: 100px; + text-align: center; + + .gem-c-step-nav--large & { + @include govuk-media-query($from: tablet) { + top: 11px; + width: govuk-em($number-circle-size-large, 19); + height: govuk-em($number-circle-size-large, 19); + } + } +} + +.gem-c-step-nav__circle--number { + @include step-nav-font(16, $weight: bold, $line-height: 29px); + border: solid $stroke-width govuk-colour("mid-grey", $legacy: "grey-2"); + + .gem-c-step-nav--large & { + @include step-nav-font(16, $tablet-size: 19, $weight: bold, $line-height: 29px, $tablet-line-height: 34px); + } + + .gem-c-step-nav__step--active & { + background-color: govuk-colour("black"); + + .gem-c-step-nav__circle-background { + text-shadow: none; + color: govuk-colour("white"); + } + } +} + +.gem-c-step-nav__circle--logic { + @include step-nav-font(19, $weight: bold, $line-height: 28px); + left: 3px; + width: govuk-em($number-circle-size, 19); + height: govuk-em($number-circle-size, 19); + + .gem-c-step-nav--large & { + @include step-nav-font(19, $tablet-size: 24, $weight: bold, $line-height: 28px, $tablet-line-height: 34px); + + @include govuk-media-query($from: tablet) { + width: govuk-em($number-circle-size-large, 24); + height: govuk-em($number-circle-size-large, 24); + } + } +} + +// makes sure logic text expands to the left if text size is zoomed, preventing overlap +.gem-c-step-nav__circle-inner { + float: right; + min-width: 100%; +} + +.gem-c-step-nav__circle-background { + $shadow-offset: .1em; + $shadow-colour: govuk-colour("white"); + + // to make numbers readable for users zooming text only in browsers such as Firefox + text-shadow: 0 -#{$shadow-offset} 0 $shadow-colour, $shadow-offset 0 0 $shadow-colour, 0 $shadow-offset 0 $shadow-colour, -#{$shadow-offset} 0 0 $shadow-colour; +} + +.gem-c-step-nav__circle-step-label, +.gem-c-step-nav__circle-step-colon { + @include govuk-visually-hidden; +} + +.gem-c-step-nav__header { + border-top: $top-border; + padding: govuk-spacing(1) 0 govuk-spacing(6); + + .gem-c-step-nav--large & { + padding-top: govuk-spacing(2); + } + + .js-enabled & { + padding: 0; + } + + .gem-c-step-nav--active & { + cursor: pointer; + } +} + +.gem-c-step-nav__title { + @include govuk-text-colour; + @include step-nav-font(19, $weight: bold, $line-height: 1.4); + margin: 0; + + .gem-c-step-nav--large & { + @include step-nav-font(19, $tablet-size: 24, $weight: bold, $line-height: 1.4); + } +} + +.gem-c-step-nav__toggle-link { + @include step-nav-font(15, $line-height: 1.2); + display: block; + color: $govuk-link-colour; + text-transform: capitalize; + padding-bottom: govuk-spacing(6); + + .gem-c-step-nav--large & { + @include step-nav-font(15, $tablet-size: 19, $line-height: 1.2); + } +} + +.gem-c-step-nav__panel { + @include govuk-text-colour; + @include step-nav-font(16); + padding-bottom: govuk-spacing(5); + + .gem-c-step-nav--large & { + @include step-nav-font(16, $tablet-size: 19); + } + + .js-enabled &.js-hidden { + display: none; + } +} + +// contents of the steps, such as paragraphs and links + +.gem-c-step-nav__paragraph { + padding-bottom: govuk-spacing(3); + margin: 0; + font-size: inherit; + + + .gem-c-step-nav__list { + margin-top: -5px; + } + + .gem-c-step-nav--large & { + @include govuk-media-query($from: tablet) { + padding-bottom: govuk-spacing(6); + } + } + + .gem-c-step-nav--large & + .gem-c-step-nav__list { + @include govuk-media-query($from: tablet) { + margin-top: -govuk-spacing(3); + } + } +} + +.gem-c-step-nav__list { + padding: 0; + padding-bottom: 10px; + list-style: none; + + .gem-c-step-nav--large & { + @include govuk-media-query($from: tablet) { + padding-bottom: 20px; + } + } +} + +.gem-c-step-nav__list--choice { + $links-margin: 20px; + + margin-left: $links-margin; + list-style: disc; + + .gem-c-step-nav__list-item--active:before { + left: -(govuk-spacing(6) + govuk-spacing(3)) - $links-margin; + } + + .gem-c-step-nav--large & { + @include govuk-media-query($from: tablet) { + .gem-c-step-nav__list-item--active:before { + left: -(govuk-spacing(9)) - $links-margin; + } + } + } +} + +.gem-c-step-nav__list-item { + margin-bottom: 10px; +} + +.gem-c-step-nav__link { + @include govuk-link-common; + @include govuk-link-style-default; +} + +.gem-c-step-nav__link-active-context { + @include govuk-visually-hidden; +} + +.gem-c-step-nav__list-item--active { + position: relative; + + &:before { + box-sizing: border-box; + content: ""; + position: absolute; + z-index: 5; + top: .6em; // position the dot to align with the first row of text in the link + left: -(govuk-spacing(6) + govuk-spacing(3)); + margin-top: -($stroke-width / 2); + margin-left: ($number-circle-size / 2); + width: $number-circle-size / 2; + height: $stroke-width; + background: govuk-colour("black"); + } + + .gem-c-step-nav--large & { + @include govuk-media-query($from: tablet) { + &:before { + left: -(govuk-spacing(9)); + margin-left: ($number-circle-size-large / 2); + } + } + } + + .gem-c-step-nav__link { + @include govuk-link-style-text; + } +} + +.gem-c-step-nav__context { + display: inline-block; + font-weight: normal; + color: govuk-colour("dark-grey", $legacy: "grey-1"); + + &:before { + content: " \2013\00a0"; // dash followed by   + } +} + +.gem-c-step-nav__list--no-marker { + list-style-type: none; +} diff --git a/app/assets/stylesheets/components/step-by-step-nav/_step-by-step-nav.scss b/app/assets/stylesheets/components/step-by-step-nav/_step-by-step-nav.scss index cd7546bfa8..558e81990a 100644 --- a/app/assets/stylesheets/components/step-by-step-nav/_step-by-step-nav.scss +++ b/app/assets/stylesheets/components/step-by-step-nav/_step-by-step-nav.scss @@ -1,538 +1,3 @@ -$stroke-width: 1px; -$number-circle-size: 30px; -$number-circle-size-large: 35px; -$top-border: solid 1px govuk-colour("mid-grey", $legacy: "grey-3"); - -@mixin step-nav-vertical-line($line-style: solid) { - content: ""; - position: absolute; - z-index: 2; - width: 0; - height: 100%; - border-left: $line-style $stroke-width govuk-colour("mid-grey", $legacy: "grey-2"); - background: govuk-colour("white"); -} - -@mixin step-nav-line-position { - left: 0; - margin-left: govuk-em(($number-circle-size / 2) - ($stroke-width / 2), 16); -} - -@mixin step-nav-line-position-large { - left: 0; - margin-left: govuk-em(($number-circle-size-large / 2) - ($stroke-width / 2), 16); -} - -// custom mixin as govuk-font does undesirable things at different breakpoints -// we want to ensure that both large and small step navs have the same size font on mobile -// this will stop text resizing if compatibility mode is turned off -@mixin step-nav-font($size, $tablet-size: $size, $weight: normal, $line-height: 1.3, $tablet-line-height: $line-height) { - @include govuk-typography-common; - font-size: $size + px; - font-weight: $weight; - line-height: $line-height; - - @include govuk-media-query($from: tablet) { - font-size: $tablet-size + px; - line-height: $tablet-line-height; - } -} - -// Adds a focus state for the chevron icon so that it turns black on button focus -@mixin step-nav-chevron-focus-state { - .gem-c-step-nav__chevron-stroke { - stroke: govuk-colour("black"); - } -} - -.gem-c-step-nav { - margin-bottom: govuk-spacing(6); - - &.gem-c-step-nav--large { - @include govuk-media-query($from: tablet) { - margin-bottom: govuk-spacing(9); - } - } - - .js-enabled &.js-hidden { - display: none; - } -} - -.gem-c-step-nav__controls { - padding: 3px 3px 0 0; -} - -.gem-c-step-nav____title-text-focus { - margin-bottom: 13px; - display: inline-block; -} - -// Create Chevron icon aligned with text -.gem-c-step-nav__chevron { - box-sizing: border-box; - display: inline-block; - position: relative; - // Set size using rems to make the icon scale with text if user resizes text in their browser - width: govuk-px-to-rem(20px); - height: govuk-px-to-rem(20px); - border: govuk-px-to-rem(1px) solid; - border-radius: 50%; - - vertical-align: text-top; - - // Reduce size, alter alignment - .gem-c-step-nav--large & { - vertical-align: top; - } - - // Create inner chevron arrow - &:after { - content: ""; - box-sizing: border-box; - display: block; - position: absolute; - bottom: govuk-px-to-rem(5px); - left: govuk-px-to-rem(6px); - width: govuk-px-to-rem(6px); - height: govuk-px-to-rem(6px); - -webkit-transform: rotate(-45deg); /* Ch <36, Saf 5.1+, iOS < 9.2, An =<4.4.4 */ - -ms-transform: rotate(-45deg); /* IE 9 */ - transform: rotate(-45deg); - border-top: govuk-px-to-rem(2px) solid; - border-right: govuk-px-to-rem(2px) solid; - } -} - -// Rotate icon to create "Down" version -.gem-c-step-nav__chevron--down { - -webkit-transform: rotate(180deg); /* Ch <36, Saf 5.1+, iOS < 9.2, An =<4.4.4 */ - -ms-transform: rotate(180deg); /* IE 9 */ - transform: rotate(180deg); -} - -.gem-c-step-nav__button { - color: $govuk-link-colour; - cursor: pointer; - background: none; - border: 0; - margin: 0; - - &:hover { - background: govuk-colour("light-grey"); - // Chevron icon interaction states - .gem-c-step-nav__chevron { - color: govuk-colour("black"); - background: govuk-colour("black"); - } - - .gem-c-step-nav__chevron:after { - color: govuk-colour("light-grey"); - } - - .gem-c-step-nav__button-text { - color: $govuk-text-colour; - } - } - - &:focus { - outline: 0; - // Chevron icon interaction states - .gem-c-step-nav__chevron { - color: govuk-colour("black"); - background: govuk-colour("black"); - } - - .gem-c-step-nav__chevron:after { - color: $govuk-focus-colour; - } - - .gem-c-step-nav____title-text-focus, - .gem-c-step-nav__toggle-link-focus { - @include govuk-focused-text; - } - - .gem-c-step-nav__toggle-link-focus { - padding-bottom: 2px; - } - } -} - -// removes extra dotted outline from buttons in Firefox -// on focus (standard yellow outline unaffected) -.gem-c-step-nav__button::-moz-focus-inner { - border: 0; -} - -.gem-c-step-nav__button--title { - @include step-nav-font(19, $weight: bold, $line-height: 1.2); - display: inline-block; - padding: govuk-spacing(1) 0 0; - text-align: left; - color: govuk-colour("black"); - width: 100%; - - .gem-c-step-nav--large & { - @include step-nav-font(19, $tablet-size: 24, $weight: bold); - - @include govuk-media_query($from: tablet) { - padding-top: govuk-spacing(2); - } - } -} - -.gem-c-step-nav__button--controls { - @include step-nav-font(15); - position: relative; - z-index: 1; // this and relative position stops focus outline underlap with border of accordion - margin: .5em 0 14px; - padding: govuk-spacing(1) 0 govuk-spacing(1); - - .gem-c-step-nav--large & { - @include step-nav-font(15, $tablet-size: 19); - } - - &:focus { - @include govuk-focused-text; - - .gem-c-step-nav__button-text { - text-decoration: none; - } - } -} - -.gem-c-step-nav__button-text { - display: inline-block; - text-align: left; - min-width: govuk-em(35, 14); - margin-left: govuk-spacing(1); - - .gem-c-step-nav--large & { - min-width: govuk-em(40, 16); - margin-left: govuk-spacing(1); - } -} - -.gem-c-step-nav__button-text--all { - min-width: govuk-em(87, 14); - - .gem-c-step-nav--large & { - min-width: govuk-em(100, 16); - } -} - -.gem-c-step-nav__steps { - padding: 0; - margin: 0; -} - -.gem-c-step-nav__step { - position: relative; - padding-left: govuk-em(govuk-spacing(6) + govuk-spacing(3), 16); - list-style: none; - - // line down the side of a step - &:after { - @include step-nav-vertical-line; - @include step-nav-line-position; - top: govuk-em(govuk-spacing(3), 16); - } - - .gem-c-step-nav--large & { - @include govuk-media-query($from: tablet) { - padding-left: govuk-em(govuk-spacing(9), 16); - - &:after { // stylelint-disable-line max-nesting-depth - @include step-nav-line-position-large; - top: govuk-em(govuk-spacing(6), 16); - } - } - } -} - -.gem-c-step-nav__step:last-child { - // little dash at the bottom of the line - &:before { - content: ""; - position: absolute; - z-index: 6; - bottom: 0; - left: 0; - margin-left: $number-circle-size / 4; - width: $number-circle-size / 2; - height: 0; - border-bottom: solid $stroke-width govuk-colour("mid-grey", $legacy: "grey-2"); - } - - &:after { - height: -webkit-calc(100% - #{govuk-spacing(3)}); // fallback for iphone 4 - height: calc(100% - #{govuk-spacing(3)}); - } - - .gem-c-step-nav__help:after { - height: 100%; - } - - .gem-c-step-nav--large & { - @include govuk-media-query($from: tablet) { - &:before { - margin-left: $number-circle-size-large / 4; - width: $number-circle-size-large / 2; - } - - &:after { - height: calc(100% - #{govuk-spacing(6)}); - } - } - } -} - -.gem-c-step-nav__step--active { - &:last-child:before, - .gem-c-step-nav__circle--number, - &:after, - .gem-c-step-nav__help:after { - border-color: govuk-colour("black"); - } -} - -.gem-c-step-nav__circle { - box-sizing: border-box; - position: absolute; - z-index: 5; - top: 3px; - left: 0; - width: govuk-em($number-circle-size, 16); - height: govuk-em($number-circle-size, 16); - color: govuk-colour("black"); - background: govuk-colour("white"); - border-radius: 100px; - text-align: center; - - .gem-c-step-nav--large & { - @include govuk-media-query($from: tablet) { - top: 11px; - width: govuk-em($number-circle-size-large, 19); - height: govuk-em($number-circle-size-large, 19); - } - } -} - -.gem-c-step-nav__circle--number { - @include step-nav-font(16, $weight: bold, $line-height: 29px); - border: solid $stroke-width govuk-colour("mid-grey", $legacy: "grey-2"); - - .gem-c-step-nav--large & { - @include step-nav-font(16, $tablet-size: 19, $weight: bold, $line-height: 29px, $tablet-line-height: 34px); - } - - .gem-c-step-nav__step--active & { - background-color: govuk-colour("black"); - - .gem-c-step-nav__circle-background { - text-shadow: none; - color: govuk-colour("white"); - } - } -} - -.gem-c-step-nav__circle--logic { - @include step-nav-font(19, $weight: bold, $line-height: 28px); - left: 3px; - width: govuk-em($number-circle-size, 19); - height: govuk-em($number-circle-size, 19); - - .gem-c-step-nav--large & { - @include step-nav-font(19, $tablet-size: 24, $weight: bold, $line-height: 28px, $tablet-line-height: 34px); - - @include govuk-media-query($from: tablet) { - width: govuk-em($number-circle-size-large, 24); - height: govuk-em($number-circle-size-large, 24); - } - } -} - -// makes sure logic text expands to the left if text size is zoomed, preventing overlap -.gem-c-step-nav__circle-inner { - float: right; - min-width: 100%; -} - -.gem-c-step-nav__circle-background { - $shadow-offset: .1em; - $shadow-colour: govuk-colour("white"); - - // to make numbers readable for users zooming text only in browsers such as Firefox - text-shadow: 0 -#{$shadow-offset} 0 $shadow-colour, $shadow-offset 0 0 $shadow-colour, 0 $shadow-offset 0 $shadow-colour, -#{$shadow-offset} 0 0 $shadow-colour; -} - -.gem-c-step-nav__circle-step-label, -.gem-c-step-nav__circle-step-colon { - @include govuk-visually-hidden; -} - -.gem-c-step-nav__header { - border-top: $top-border; - padding: govuk-spacing(1) 0 govuk-spacing(6); - - .gem-c-step-nav--large & { - padding-top: govuk-spacing(2); - } - - .js-enabled & { - padding: 0; - } - - .gem-c-step-nav--active & { - cursor: pointer; - } -} - -.gem-c-step-nav__title { - @include govuk-text-colour; - @include step-nav-font(19, $weight: bold, $line-height: 1.4); - margin: 0; - - .gem-c-step-nav--large & { - @include step-nav-font(19, $tablet-size: 24, $weight: bold, $line-height: 1.4); - } -} - -.gem-c-step-nav__toggle-link { - @include step-nav-font(15, $line-height: 1.2); - display: block; - color: $govuk-link-colour; - text-transform: capitalize; - padding-bottom: govuk-spacing(6); - - .gem-c-step-nav--large & { - @include step-nav-font(15, $tablet-size: 19, $line-height: 1.2); - } -} - -.gem-c-step-nav__panel { - @include govuk-text-colour; - @include step-nav-font(16); - padding-bottom: govuk-spacing(5); - - .gem-c-step-nav--large & { - @include step-nav-font(16, $tablet-size: 19); - } - - .js-enabled &.js-hidden { - display: none; - } -} - -// contents of the steps, such as paragraphs and links - -.gem-c-step-nav__paragraph { - padding-bottom: govuk-spacing(3); - margin: 0; - font-size: inherit; - - + .gem-c-step-nav__list { - margin-top: -5px; - } - - .gem-c-step-nav--large & { - @include govuk-media-query($from: tablet) { - padding-bottom: govuk-spacing(6); - } - } - - .gem-c-step-nav--large & + .gem-c-step-nav__list { - @include govuk-media-query($from: tablet) { - margin-top: -govuk-spacing(3); - } - } -} - -.gem-c-step-nav__list { - padding: 0; - padding-bottom: 10px; - list-style: none; - - .gem-c-step-nav--large & { - @include govuk-media-query($from: tablet) { - padding-bottom: 20px; - } - } -} - -.gem-c-step-nav__list--choice { - $links-margin: 20px; - - margin-left: $links-margin; - list-style: disc; - - .gem-c-step-nav__list-item--active:before { - left: -(govuk-spacing(6) + govuk-spacing(3)) - $links-margin; - } - - .gem-c-step-nav--large & { - @include govuk-media-query($from: tablet) { - .gem-c-step-nav__list-item--active:before { - left: -(govuk-spacing(9)) - $links-margin; - } - } - } -} - -.gem-c-step-nav__list-item { - margin-bottom: 10px; -} - -.gem-c-step-nav__link { - @include govuk-link-common; - @include govuk-link-style-default; -} - -.gem-c-step-nav__link-active-context { - @include govuk-visually-hidden; -} - -.gem-c-step-nav__list-item--active { - position: relative; - - &:before { - box-sizing: border-box; - content: ""; - position: absolute; - z-index: 5; - top: .6em; // position the dot to align with the first row of text in the link - left: -(govuk-spacing(6) + govuk-spacing(3)); - margin-top: -($stroke-width / 2); - margin-left: ($number-circle-size / 2); - width: $number-circle-size / 2; - height: $stroke-width; - background: govuk-colour("black"); - } - - .gem-c-step-nav--large & { - @include govuk-media-query($from: tablet) { - &:before { - left: -(govuk-spacing(9)); - margin-left: ($number-circle-size-large / 2); - } - } - } - - .gem-c-step-nav__link { - @include govuk-link-style-text; - } -} - -.gem-c-step-nav__context { - display: inline-block; - font-weight: normal; - color: govuk-colour("dark-grey", $legacy: "grey-1"); - - &:before { - content: " \2013\00a0"; // dash followed by   - } -} - -.gem-c-step-nav__list--no-marker { - list-style-type: none; -} +@import "./step-by-step-nav-header"; +@import "./step-by-step-nav-main"; +@import "./step-by-step-nav-related"; diff --git a/app/assets/stylesheets/ccs/facilities-management/_summary-box.scss b/app/assets/stylesheets/components/summary-box/_summary-box.scss similarity index 84% rename from app/assets/stylesheets/ccs/facilities-management/_summary-box.scss rename to app/assets/stylesheets/components/summary-box/_summary-box.scss index 27fdeda173..747db63d68 100644 --- a/app/assets/stylesheets/ccs/facilities-management/_summary-box.scss +++ b/app/assets/stylesheets/components/summary-box/_summary-box.scss @@ -1,7 +1,7 @@ .ccs-summary-box { @extend %govuk-body-m; - background-color: #f8f8f8; + background-color: ccs-colour("light-grey"); padding: govuk-spacing(3); } @@ -27,7 +27,7 @@ } .ccs-summary-box__content { - background-color: #ffffff; + background-color: ccs-colour("white"); padding: govuk-spacing(2); & details { diff --git a/app/assets/stylesheets/ccs/facilities-management/_supplier_lot_data.scss b/app/assets/stylesheets/components/supplier-lot-data/_supplier-lot-data.scss similarity index 100% rename from app/assets/stylesheets/ccs/facilities-management/_supplier_lot_data.scss rename to app/assets/stylesheets/components/supplier-lot-data/_supplier-lot-data.scss diff --git a/app/assets/stylesheets/components/supplier-record/_supplier-record.scss b/app/assets/stylesheets/components/supplier-record/_supplier-record.scss index 124eee821c..08b8a7c1f0 100644 --- a/app/assets/stylesheets/components/supplier-record/_supplier-record.scss +++ b/app/assets/stylesheets/components/supplier-record/_supplier-record.scss @@ -1,29 +1,3 @@ -.supplier-record { - padding-bottom: 20px; -} - -.supplier-record__supplier-name { - margin-bottom: 5px; -} - -.supplier-record__branch { - margin-bottom: 0; -} - -.supplier-record__branch-name { - font-weight: $govuk-font-weight-regular; -} - -.supplier-record__header-group { - margin-bottom: 20px -} - -.supplier-record__markup-rate, -.supplier-record__distance { - font-weight: $govuk-font-weight-semi-bold;; - margin-bottom: 0; -} - .supplier-record__file-download { display: inline-block; position: relative; @@ -46,7 +20,7 @@ text-align: center; line-height: 2.45; text-transform: uppercase; - font-weight: $govuk-font-weight-semi-bold; + font-weight: $govuk-font-weight-bold; content: ""; padding-left: 5px; padding-right: 5px; @@ -81,41 +55,3 @@ background-color: #0D85CD; content: ".ODT"; } - -.supplier-record__print-option { - min-height: 35px; -} - -.supplier-record__calculator { - margin: 0; - background: ccs-colour("grey-4"); -} - -.supplier-record__calculator--muted p { - color: ccs-colour("grey-2"); -} - -.supplier-record__worker-cost, -.supplier-record__agency-fee -{ - margin: 10px 0 0 0; - font-size: 24px; -} - -strong.supplier-record__finders-fee-percentage { - line-height: 1 !important; -} - -@media print { - .supplier-record { - page-break-inside: avoid; - } - - .supplier-record__distance, - .supplier-record__distance-units, - .supplier-record__markup-rate-units, - .supplier-record__markup-rate { - display: inline; - } - -} diff --git a/app/assets/stylesheets/components/typography/_typography.scss b/app/assets/stylesheets/components/typography/_typography.scss deleted file mode 100644 index d02b5a7a36..0000000000 --- a/app/assets/stylesheets/components/typography/_typography.scss +++ /dev/null @@ -1,20 +0,0 @@ -strong { - font-weight: $govuk-font-weight-semi-bold; -} -.govuk-heading-xl { - font-weight: $govuk-font-weight-light; - margin-bottom: 36px; - line-height: 1.15; - - @media (min-width: 300px) and (max-width: 640px){ - word-break: break-all; - } -} -.govuk-heading-l, -.govuk-heading-m, -.govuk-heading-s { - font-weight: $govuk-font-weight-semi-bold; -} -.cmp-start-page__sub-heading { - margin-top: 40px; -} \ No newline at end of file diff --git a/app/assets/stylesheets/main.scss b/app/assets/stylesheets/main.scss index d356f76485..1740b639d5 100644 --- a/app/assets/stylesheets/main.scss +++ b/app/assets/stylesheets/main.scss @@ -1,17 +1,11 @@ -// We import the GOVUK settings and then override the ones we need to in -// our own settings file. -@import "govuk-frontend/govuk/settings/all"; -@import "settings"; +// Import our settings for CCS and GOV.UK +@import "settings/all"; -// Import the other sections -@import "govuk-frontend/govuk/tools/all"; -@import "govuk-frontend/govuk/helpers/all"; -@import "govuk-frontend/govuk/core/all"; -@import "govuk-frontend/govuk/objects/all"; -// We are importing all the GOVUK components within the components folder +// Import the govuk-frontend assets +@import "govuk-frontend/govuk/all"; + +// Import the additional CCS components @import "components/all"; -@import "govuk-frontend/govuk/utilities/all"; -@import "govuk-frontend/govuk/overrides/all"; // Import additional CCS SCSS -@import "ccs/all"; +@import "ccs/ccs"; diff --git a/app/assets/stylesheets/settings/_all.scss b/app/assets/stylesheets/settings/_all.scss new file mode 100644 index 0000000000..8d49f4e00a --- /dev/null +++ b/app/assets/stylesheets/settings/_all.scss @@ -0,0 +1,2 @@ +@import "ccs/ccs"; +@import "govuk/govuk"; diff --git a/app/assets/stylesheets/settings/ccs/_ccs.scss b/app/assets/stylesheets/settings/ccs/_ccs.scss new file mode 100644 index 0000000000..eda84ca3a9 --- /dev/null +++ b/app/assets/stylesheets/settings/ccs/_ccs.scss @@ -0,0 +1,26 @@ +$ccs-colours: ( + "light-green": #F0FFF1, + "dark-green": #006435, + "button-green": #007e8a, + "red": #9b1a47, + "dark-red": #85163d, + "black": #2f2f2f, + "dark-grey": #6f777b, + "mid-grey": #b1b4b6, + "grey": #dee0e2, + "light-grey": #f8f8f8, + "white": #ffffff, +); + +@function ccs-colour($colour) { + $colour: quote($colour); + + @if not map-has-key($ccs-colours, $colour) { + @error "Unknown colour `#{$colour}`"; + } + + @return map-get($ccs-colours, $colour); +} + +$ccs-border-colour: ccs-colour("mid-grey"); +$ccs-brand-colour: ccs-colour("red") !default; diff --git a/app/assets/stylesheets/settings/govuk/_govuk.scss b/app/assets/stylesheets/settings/govuk/_govuk.scss new file mode 100644 index 0000000000..7226e99180 --- /dev/null +++ b/app/assets/stylesheets/settings/govuk/_govuk.scss @@ -0,0 +1,13 @@ +// Override font and image url functions due to location of those assets +$govuk-assets-path: "assets/govuk-frontend/govuk/assets/"; + +// Make sure that all p tags and a tags have the GOV.UK Styles by default +$govuk-global-styles: true; + +// Set the button colour for the app +$govuk-button-background-colour: ccs-colour("button-green"); + +@import url('https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,600,700'); + +$govuk-font-family: "Source Sans Pro", Helvetica, Arial, sans-serif; +$govuk-font-family-print: sans-serif; diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 3f2cc93645..3ff7b5f1ac 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -54,13 +54,6 @@ def determine_non_admin_after_sign_in delegate :ccs_homepage_url, to: Marketplace helper_method :ccs_homepage_url - # <%= hidden_field_tag 'current_choices', TransientSessionInfo[session.id].to_json %> - # to copy the cached choices - def set_current_choices - TransientSessionInfo[session.id] = JSON.parse(params['current_choices']) if params['current_choices'] - TransientSessionInfo[session.id] = JSON.parse(flash['current_choices']) if flash['current_choices'] && params['current_choices'].nil? - end - protected def configure_permitted_parameters diff --git a/app/javascript/packs/ccs.ts b/app/javascript/packs/ccs.ts index f4b35ba06d..2d2ad39914 100644 --- a/app/javascript/packs/ccs.ts +++ b/app/javascript/packs/ccs.ts @@ -11,7 +11,6 @@ import initLimitInputToInteger from '../src/facilitiesManagement/integerInput' import initManagementReport from '../src/facilitiesManagement/rm3830/admin/managementReport' import initNumberWithCommas from '../src/facilitiesManagement/numberWithCommas' import initPasswordStrength from '../src/shared/passwordStrength' -import initResultsToggle from '../src/facilitiesManagement/procurements/resultsToggle' import initRM3830AdminAdminUpload from '../src/facilitiesManagement/rm3830/admin/adminUploadProgress' import initSelectRegion from '../src/facilitiesManagement/procurements/selectRegion' import initStepByStepNav from '../src/shared/stepByStepNav' @@ -20,7 +19,6 @@ import initSupplierDataSnapshot from '../src/facilitiesManagement/rm6232/admin/s $(document).on('turbolinks:load', () => { // Facilities Management - Procurements TS initChooseServicesForBuilding() - initResultsToggle() initSelectRegion() // Facilities Management - RM3830 - Admin TS diff --git a/app/javascript/src/facilitiesManagement/procurements/resultsToggle.ts b/app/javascript/src/facilitiesManagement/procurements/resultsToggle.ts deleted file mode 100644 index 55a15406a0..0000000000 --- a/app/javascript/src/facilitiesManagement/procurements/resultsToggle.ts +++ /dev/null @@ -1,26 +0,0 @@ -const initResultsToggle = (): void => { - const $resultsFilterButton: JQuery = $('#results-filter-button') - - $resultsFilterButton.on('click', (event: JQuery.ClickEvent) => { - event.preventDefault() - - const $requirementsPlane: JQuery = $('#requirements-list') - const $suppliersPlane: JQuery = $('#supplier-lot-list__container') - - const isHidden: boolean = $requirementsPlane.is(':hidden') - const currentText: string = $resultsFilterButton.text() - - if (isHidden) { - $requirementsPlane.show() - $suppliersPlane.addClass('govuk-grid-column-two-thirds').removeClass('govuk-grid-column-full') - } else { - $requirementsPlane.hide() - $suppliersPlane.addClass('govuk-grid-column-full').removeClass('govuk-grid-column-two-thirds') - } - - $resultsFilterButton.text($resultsFilterButton.attr('alt-text') ?? '') - $resultsFilterButton.attr('alt-text', currentText) - }) -} - -export default initResultsToggle diff --git a/app/javascript/src/shared/checkboxAccordion.ts b/app/javascript/src/shared/checkboxAccordion.ts index 4542bd9842..4fab57a21f 100644 --- a/app/javascript/src/shared/checkboxAccordion.ts +++ b/app/javascript/src/shared/checkboxAccordion.ts @@ -162,7 +162,7 @@ class BasketItem implements BasketItemInterface { } class Basket implements BasketInterface { - private readonly $basket: JQuery = $('.basket') + private readonly $basket: JQuery = $('#css-list-basket') private readonly $itemList: JQuery = this.$basket.find('ul') private readonly $numberOfItems: JQuery = this.$basket.find('h3') private readonly $removeAllLink: JQuery = this.$basket.find('div > a') as JQuery @@ -213,7 +213,6 @@ class Basket implements BasketInterface { isShown = false } else if (numberOfItems === 1) { numberOfItemsText = this.textOptions.single_item - isShown = false } else { numberOfItemsText = this.textOptions.plural_items } @@ -223,7 +222,7 @@ class Basket implements BasketInterface { } private readonly toggleRemoveAllButton = (isShown: boolean): void => { - isShown ? this.$removeAllLink.show() : this.$removeAllLink.hide() + this.$removeAllLink.toggle(isShown) } private readonly removeAll = (event: JQuery.ClickEvent): void => { diff --git a/app/javascript/src/shared/passwordStrength.ts b/app/javascript/src/shared/passwordStrength.ts index af8e0329a2..45073800e8 100644 --- a/app/javascript/src/shared/passwordStrength.ts +++ b/app/javascript/src/shared/passwordStrength.ts @@ -7,11 +7,10 @@ const runTests = ($input: JQuery, theTests: Array<[RegExp, JQuery { - if (test[0].test(inputText)) { - test[1].removeClass('wrong').addClass('correct') - } else { - test[1].removeClass('correct').addClass('wrong') - } + const testPassed: boolean = test[0].test(inputText) + + test[1].toggleClass('wrong', !testPassed) + test[1].toggleClass('correct', testPassed) }) } @@ -20,7 +19,7 @@ const passwordStrength = ($input: JQuery, theTests: Array<[RegExp, } const initPasswordStrength = (): void => { - if ($('#passwordrules').length) { + if ($('#ccs-password-rules').length) { const theTests: Array<[RegExp, JQuery]> = [ [cReg, $('#passeight')], [pReg, $('#passsymbol')], diff --git a/app/services/transient_session_info.rb b/app/services/transient_session_info.rb deleted file mode 100644 index 318b96c85d..0000000000 --- a/app/services/transient_session_info.rb +++ /dev/null @@ -1,28 +0,0 @@ -class TransientSessionInfo - @dict = {} - - class << self - attr_reader :dict - - def self.initialize - @dict = {} - end - end - - def self.[](key1, key2 = nil) - return @dict[key1] if key2.nil? - return nil unless @dict[key1] - - @dict[key1][key2] - end - - def self.[]=(key1, key2 = nil, value) - @dict ||= {} - @dict[key1] ||= {} - if key2 - @dict[key1][key2] = value - else - @dict[key1] = value - end - end -end diff --git a/app/views/facilities_management/rm3830/admin/service_rates/_call-off-benchmark-rates.html.erb b/app/views/facilities_management/rm3830/admin/service_rates/_call-off-benchmark-rates.html.erb index 5c475c747a..12dbcedf55 100644 --- a/app/views/facilities_management/rm3830/admin/service_rates/_call-off-benchmark-rates.html.erb +++ b/app/views/facilities_management/rm3830/admin/service_rates/_call-off-benchmark-rates.html.erb @@ -70,7 +70,7 @@ <% end %>

<%= t('.heading_two') %>

-

+

<%= t('.benchmark_text') %>

diff --git a/app/views/facilities_management/rm6232/home/index.html.erb b/app/views/facilities_management/rm6232/home/index.html.erb index 5f41c8b544..8d20a90566 100644 --- a/app/views/facilities_management/rm6232/home/index.html.erb +++ b/app/views/facilities_management/rm6232/home/index.html.erb @@ -11,14 +11,18 @@
-

<%= t('.subheading') %>

+

+ <%= t('.subheading') %> +

  • <%= t('.usagelist.item_1') %>
  • <%= t('.usagelist.item_2') %>
  • <%= t('.usagelist.item_3') %>
-

<%= t('.beforeyoustart') %>

+

+ <%= t('.beforeyoustart') %> +

<%= t('.youneedtoknow') %>

  • <%= t('.startlist.item_1') %>
    • diff --git a/app/views/facilities_management/rm6232/journey/choose_locations.html.erb b/app/views/facilities_management/rm6232/journey/choose_locations.html.erb index f6d90758fd..b0ac6f2f68 100644 --- a/app/views/facilities_management/rm6232/journey/choose_locations.html.erb +++ b/app/views/facilities_management/rm6232/journey/choose_locations.html.erb @@ -2,91 +2,89 @@ <% content_for :page_title, t('.question') %>
    -
    -
    - <%= form_with url: @form_path, method: :get, html: { specialvalidation: true, novalidate: true } do |f| %> -
    - <%= hidden_fields_for_previous_steps_and_responses(@journey) %> - <%= govuk_form_group(:region_codes, model: @journey) do |error_message|%> - <%= govuk_fieldset( - legend: { - text: t('.heading'), - is_page_heading: true, - classes: 'govuk-fieldset__legend--l' - } - ) do %> -

    - <%= t('.question') %> -

    -
    - <%= t('.subtitle') %> -
    - <%= govuk_details(t('.need_help')) do %> -

    - <%= t('.the_regions') %> -

    -

    - <%= t('.more_information.sentence_html', ons_link: link_to(t('.more_information.link_text'), t('.more_information.link_url'), class: 'govuk-link govuk-link--no-visited-state')) %> -

    - <% end %> -
    - <%= error_message %> -
    - <%= govuk_accordion( - 'choose-locations', - accordion_region_items(@journey.current_step.region_codes, with_overseas: true).map do |section_id, section| - { - heading: section[:name], - content: govuk_checkboxes( - :region_codes, - section[:items] + if section[:items].length > 1 - [ - { - divider: t('common.radio_driver') +
    + <%= form_with url: @form_path, method: :get, html: { specialvalidation: true, novalidate: true } do |f| %> +
    + <%= hidden_fields_for_previous_steps_and_responses(@journey) %> + <%= govuk_form_group(:region_codes, model: @journey) do |error_message|%> + <%= govuk_fieldset( + legend: { + text: t('.heading'), + is_page_heading: true, + classes: 'govuk-fieldset__legend--l' + } + ) do %> +

    + <%= t('.question') %> +

    +
    + <%= t('.subtitle') %> +
    + <%= govuk_details(t('.need_help')) do %> +

    + <%= t('.the_regions') %> +

    +

    + <%= t('.more_information.sentence_html', ons_link: link_to(t('.more_information.link_text'), t('.more_information.link_url'), class: 'govuk-link govuk-link--no-visited-state')) %> +

    + <% end %> +
    + <%= error_message %> +
    + <%= govuk_accordion( + 'choose-locations', + accordion_region_items(@journey.current_step.region_codes, with_overseas: true).map do |section_id, section| + { + heading: section[:name], + content: govuk_checkboxes( + :region_codes, + section[:items] + if section[:items].length > 1 + [ + { + divider: t('common.radio_driver') + }, + { + value: '', + label: { + text: 'Select all' }, - { - value: '', - label: { - text: 'Select all' - }, - classes: 'ccs-select-all', - attributes: { - id: "regions_#{section_id}_all", - name: "section-checkbox_select_all" - } + classes: 'ccs-select-all', + attributes: { + id: "regions_#{section_id}_all", + name: "section-checkbox_select_all" } - ] - else - [] - end, - fieldset: { - legend: { - text: t('.checkbox_legend', section: section[:name]), - classes: 'govuk-visually-hidden' } - }, - attributes: { - 'data-section': section_id, - 'data-sectionname': section[:name] + ] + else + [] + end, + fieldset: { + legend: { + text: t('.checkbox_legend', section: section[:name]), + classes: 'govuk-visually-hidden' } - ) - } - end, - classes: 'ccs-basket-accordion' - ) %> -
    - <% end %> + }, + attributes: { + 'data-section': section_id, + 'data-sectionname': section[:name] + } + ) + } + end, + classes: 'ccs-basket-accordion' + ) %> +
    <% end %> - <%= hidden_field_tag :annual_contract_value, params[:annual_contract_value] if params[:annual_contract_value] %> - <%= govuk_button(t('common.submit'), form: f, attributes: { aria: { label: t('common.submit') } }) %> -

    - <%= link_to t('.return_text'), facilities_management_rm6232_path, class: 'govuk-link' %> -

    -
    -
    - <%= render partial: 'facilities_management/shared/baskets/regions_basket' %> -
    - <% end %> -
    + <% end %> + <%= hidden_field_tag :annual_contract_value, params[:annual_contract_value] if params[:annual_contract_value] %> + <%= govuk_button(t('common.submit'), form: f, attributes: { aria: { label: t('common.submit') } }) %> +

    + <%= link_to t('.return_text'), facilities_management_rm6232_path, class: 'govuk-link' %> +

    +
    +
    + <%= render partial: 'facilities_management/shared/baskets/regions_basket' %> +
    + <% end %>
    diff --git a/app/views/facilities_management/rm6232/journey/choose_services.html.erb b/app/views/facilities_management/rm6232/journey/choose_services.html.erb index af85d4c191..705fc57920 100644 --- a/app/views/facilities_management/rm6232/journey/choose_services.html.erb +++ b/app/views/facilities_management/rm6232/journey/choose_services.html.erb @@ -2,96 +2,94 @@ <%= render partial: 'shared/error_summary', locals: { errors: @journey.errors } %>
    -
    -
    - <%= form_with url: @form_path, method: :get, html: { specialvalidation: true, novalidate: true } do |f| %> -
    - <%= hidden_fields_for_previous_steps_and_responses(@journey) %> - <%= govuk_form_group(:service_codes, model: @journey) do |error_message|%> - <%= govuk_fieldset( - legend: { - text: t('.heading'), - is_page_heading: true, - classes: 'govuk-fieldset__legend--l' - } - ) do %> -

    - <%= t('.question') %> -

    -
    - <%= t('.caption') %> -
    -

    - <%= service_specification_document('rm6232') %> -

    -
    - <%= form_tag 'choose-services/answer', method: :get do %> - <%= error_message %> -
    - <%= govuk_accordion( - 'choose-services', - rm6232_accordion_service_items(@journey.current_step.service_codes).map do |section_id, section| - { - heading: section[:name], - content: govuk_checkboxes( - :service_codes, - section[:items] + if section[:items].length > 1 - [ - { - divider: t('common.radio_driver') +
    + <%= form_with url: @form_path, method: :get, html: { specialvalidation: true, novalidate: true } do |f| %> +
    + <%= hidden_fields_for_previous_steps_and_responses(@journey) %> + <%= govuk_form_group(:service_codes, model: @journey) do |error_message|%> + <%= govuk_fieldset( + legend: { + text: t('.heading'), + is_page_heading: true, + classes: 'govuk-fieldset__legend--l' + } + ) do %> +

    + <%= t('.question') %> +

    +
    + <%= t('.caption') %> +
    +

    + <%= service_specification_document('rm6232') %> +

    +
    + <%= form_tag 'choose-services/answer', method: :get do %> + <%= error_message %> +
    + <%= govuk_accordion( + 'choose-services', + rm6232_accordion_service_items(@journey.current_step.service_codes).map do |section_id, section| + { + heading: section[:name], + content: govuk_checkboxes( + :service_codes, + section[:items] + if section[:items].length > 1 + [ + { + divider: t('common.radio_driver') + }, + { + value: '', + label: { + text: 'Select all' }, - { - value: '', - label: { - text: 'Select all' - }, - classes: 'ccs-select-all', - attributes: { - id: "services_#{section_id}_all", - name: "section-checkbox_select_all" - } + classes: 'ccs-select-all', + attributes: { + id: "services_#{section_id}_all", + name: "section-checkbox_select_all" } - ] - else - [] - end, - fieldset: { - legend: { - text: t('.checkbox_legend', section: section[:name]), - classes: 'govuk-visually-hidden' } - }, - attributes: { - 'data-section': section_id, - 'data-sectionname': section[:name] + ] + else + [] + end, + fieldset: { + legend: { + text: t('.checkbox_legend', section: section[:name]), + classes: 'govuk-visually-hidden' } - ) - } - end, - classes: 'ccs-basket-accordion' - ) %> -
    - <% end %> -
    - <% end %> + }, + attributes: { + 'data-section': section_id, + 'data-sectionname': section[:name] + } + ) + } + end, + classes: 'ccs-basket-accordion' + ) %> +
    + <% end %> +
    <% end %> -
    - <% params[:region_codes]&.split(" ") do |region_code| %> - <%= hidden_field_tag "region_codes[]", region_code %> - <% end %> - <%= hidden_field_tag :annual_contract_value, params[:annual_contract_value] if params[:annual_contract_value] %> -
    -
    - <%= govuk_button(t('common.submit'), form: f, attributes: { aria: { label: t('common.submit') } }) %> -

    - <%= link_to t('.return_text'), facilities_management_rm6232_path, class: 'govuk-link' %> -

    -
    + <% end %> +
    + <% params[:region_codes]&.split(" ") do |region_code| %> + <%= hidden_field_tag "region_codes[]", region_code %> + <% end %> + <%= hidden_field_tag :annual_contract_value, params[:annual_contract_value] if params[:annual_contract_value] %>
    -
    - <%= render partial: 'facilities_management/shared/baskets/services_basket' %> +
    + <%= govuk_button(t('common.submit'), form: f, attributes: { aria: { label: t('common.submit') } }) %> +

    + <%= link_to t('.return_text'), facilities_management_rm6232_path, class: 'govuk-link' %> +

    - <% end %> -
    +
    +
    + <%= render partial: 'facilities_management/shared/baskets/services_basket' %> +
    + <% end %>
    diff --git a/app/views/facilities_management/shared/baskets/_basket.html.erb b/app/views/facilities_management/shared/baskets/_basket.html.erb index ccf47e3339..01f40244c1 100644 --- a/app/views/facilities_management/shared/baskets/_basket.html.erb +++ b/app/views/facilities_management/shared/baskets/_basket.html.erb @@ -1,28 +1,12 @@ -
    +
    -

    - - 0 - - - <%= number_selected_text[:many] %> - +

    + +

    - + -
    -
      -
    +
      diff --git a/app/views/layouts/_password-strength.html.erb b/app/views/layouts/_password-strength.html.erb index 93e57822ad..7068bf8db7 100644 --- a/app/views/layouts/_password-strength.html.erb +++ b/app/views/layouts/_password-strength.html.erb @@ -1,4 +1,4 @@ -
        +
        • • <%= t('common.passeight') %>
          • diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 628ff57eb3..eca4ca0258 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -12,7 +12,7 @@ "> <% end %> - + "> <%= csrf_meta_tags %> <%= csp_meta_tag %> diff --git a/app/views/layouts/error.html.erb b/app/views/layouts/error.html.erb index a4c56b8cd4..dea690d6c9 100644 --- a/app/views/layouts/error.html.erb +++ b/app/views/layouts/error.html.erb @@ -12,7 +12,7 @@ "> <% end %> - + "> <%= csrf_meta_tags %> <%= csp_meta_tag %> diff --git a/config/initializers/assets.rb b/config/initializers/assets.rb index bbad68731a..479a6387e7 100644 --- a/config/initializers/assets.rb +++ b/config/initializers/assets.rb @@ -5,14 +5,12 @@ # Add additional assets to the asset load path. # Rails.application.config.assets.paths << Emoji.images_path # Add Yarn node_modules folder to the asset load path. -Rails.application.config.assets.paths += [ - Rails.root.join('node_modules'), - Rails.root.join('node_modules', 'govuk-frontend', 'assets', 'images') -] +Rails.application.config.assets.paths << Rails.root.join('node_modules') # Precompile additional assets. # application.js, application.css, and all non-JS/CSS in the app/assets # folder are already added. Rails.application.config.assets.precompile += %w[ - govuk-frontend/assets/images/* + govuk-frontend/govuk/assets/fonts/* + govuk-frontend/govuk/assets/images/* ] diff --git a/config/locales/en.yml b/config/locales/en.yml index a4ab1e3876..5841bc507b 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -166,7 +166,7 @@ en: passcap: at least one capital letter passeight: at least 8 characters passnum: at least one number - passsymbol_html: at least one symbol (eg ?, !, £, %) + passsymbol_html: at least one symbol (eg ?, !, £, %) pdf_html: PDF radio_driver: or reset_password: Reset password diff --git a/features/facilities_management/rm6232/quick_view/select_regions.feature b/features/facilities_management/rm6232/quick_view/select_regions.feature index 048bf2cb58..c0a3b00a90 100644 --- a/features/facilities_management/rm6232/quick_view/select_regions.feature +++ b/features/facilities_management/rm6232/quick_view/select_regions.feature @@ -11,12 +11,12 @@ Feature: Select regions Then I am on the 'Regions' page And I show all sections - Scenario: Region selection appears in basked + Scenario: Region selection appears in basket Then the basket should say 'No regions selected' And the remove all link should not be visible When I select 'Tees Valley and Durham' Then the basket should say '1 region selected' - And the remove all link should not be visible + And the remove all link should be visible And the following items should appear in the basket: | Tees Valley and Durham (UKC1) | When I select the following items: diff --git a/features/facilities_management/rm6232/quick_view/select_services.feature b/features/facilities_management/rm6232/quick_view/select_services.feature index 207b1087c1..bfd88bca71 100644 --- a/features/facilities_management/rm6232/quick_view/select_services.feature +++ b/features/facilities_management/rm6232/quick_view/select_services.feature @@ -12,7 +12,7 @@ Feature: Select services And the remove all link should not be visible When I select 'Building Management System (BMS) maintenance' Then the basket should say '1 service selected' - And the remove all link should not be visible + And the remove all link should be visible And the following items should appear in the basket: | Building Management System (BMS) maintenance | When I select the following items: diff --git a/features/support/pages/quick_view.rb b/features/support/pages/quick_view.rb index 13f5e0ab45..fe089723ff 100644 --- a/features/support/pages/quick_view.rb +++ b/features/support/pages/quick_view.rb @@ -1,9 +1,9 @@ module Pages class QuickView < SitePrism::Page - section :basket, '.basket' do + section :basket, '#css-list-basket' do elements :selection, 'ul > li > div:nth-of-type(2)' element :selection_count, 'h3' - element :remove_all, 'a[aria-label="Remove all"]' + element :remove_all, '#removeAll' end end end diff --git a/public/apple-touch-icon-precomposed.png b/public/apple-touch-icon-precomposed.png deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/public/apple-touch-icon.png b/public/apple-touch-icon.png deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/public/favicon.ico b/public/favicon.ico deleted file mode 100644 index e69de29bb2..0000000000