From f1201b4a81c57648c80a3a23d6f06c6f9349c2e1 Mon Sep 17 00:00:00 2001 From: Alex Jurubita Date: Tue, 25 Jun 2019 15:58:09 +0100 Subject: [PATCH 01/27] Update govuk-frontent to 3.0 --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index 04d4eac335..dfd8893062 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4,7 +4,7 @@ "lockfileVersion": 1, "dependencies": { "accessible-autocomplete": { - "version": "git://github.com/alphagov/accessible-autocomplete.git#0c518b4fa79b9a95b544410858486ed9e6403c84", + "version": "git://github.com/alphagov/accessible-autocomplete.git#3523dd9fffc70cbd9f6f555f75863c33a709f49e", "from": "git://github.com/alphagov/accessible-autocomplete.git#add-multiselect-support", "requires": { "preact": "^8.3.1" @@ -871,9 +871,9 @@ } }, "govuk-frontend": { - "version": "2.11.0", - "resolved": "https://registry.npmjs.org/govuk-frontend/-/govuk-frontend-2.11.0.tgz", - "integrity": "sha512-kZR0ZrSju+Jqh8o5niKklj8/m5XmsNNUSQLL4M4urnMcrLypwW2dU3RkR8UCnzS2DDy4BTHb7CZw0VjQPoi3jg==" + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/govuk-frontend/-/govuk-frontend-3.0.0.tgz", + "integrity": "sha512-GCrEeaQZEnsthNtfmOUFlgsieNjHOeoamSWMdD4Gdq0RPxCA9uzfrT2i3jVnlBORekKjOL0C8eFZQBSNnjtz2A==" }, "graceful-fs": { "version": "4.1.15", diff --git a/package.json b/package.json index 694a5648a2..9101a563c0 100644 --- a/package.json +++ b/package.json @@ -15,7 +15,7 @@ "dependencies": { "accessible-autocomplete": "git://github.com/alphagov/accessible-autocomplete.git#add-multiselect-support", "axe-core": "3.2.2", - "govuk-frontend": "2.11.0", + "govuk-frontend": "3.0.0", "jquery": "1.12.4" }, "devDependencies": { From cb93bb99c1b859f5931a4311900e98949fca423f Mon Sep 17 00:00:00 2001 From: Alex Jurubita Date: Tue, 25 Jun 2019 15:58:22 +0100 Subject: [PATCH 02/27] Update file paths to govuk-frontend --- .../govuk_publishing_components/all_components.js | 2 +- .../govuk_publishing_components/components/accordion.js | 2 +- .../components/character-count.js | 2 +- .../govuk_publishing_components/components/checkboxes.js | 2 +- .../components/error-summary.js | 2 +- .../govuk_publishing_components/components/radio.js | 2 +- app/assets/stylesheets/component_guide/application.scss | 8 ++++---- .../govuk_publishing_components/_all_components.scss | 2 +- .../components/_accordion.scss | 2 +- .../components/_back-link.scss | 2 +- .../components/_breadcrumbs.scss | 2 +- .../govuk_publishing_components/components/_button.scss | 4 ++-- .../components/_character-count.scss | 2 +- .../components/_checkboxes.scss | 2 +- .../components/_date-input.scss | 2 +- .../govuk_publishing_components/components/_details.scss | 2 +- .../components/_error-message.scss | 2 +- .../components/_error-summary.scss | 2 +- .../govuk_publishing_components/components/_fieldset.scss | 2 +- .../components/_file-upload.scss | 2 +- .../govuk_publishing_components/components/_hint.scss | 2 +- .../govuk_publishing_components/components/_input.scss | 2 +- .../components/_inset-text.scss | 2 +- .../govuk_publishing_components/components/_label.scss | 2 +- .../components/_layout-footer.scss | 2 +- .../components/_layout-for-admin.scss | 2 +- .../components/_layout-header.scss | 4 ++-- .../govuk_publishing_components/components/_panel.scss | 2 +- .../components/_phase-banner.scss | 2 +- .../govuk_publishing_components/components/_radio.scss | 2 +- .../govuk_publishing_components/components/_select.scss | 2 +- .../components/_skip-link.scss | 2 +- .../govuk_publishing_components/components/_table.scss | 2 +- .../govuk_publishing_components/components/_tabs.scss | 2 +- .../govuk_publishing_components/components/_textarea.scss | 2 +- .../components/_warning-text.scss | 2 +- .../components/govspeak/_button.scss | 2 +- .../components/helpers/_brand-colours.scss | 4 ++-- config/initializers/assets.rb | 5 +++-- 39 files changed, 47 insertions(+), 46 deletions(-) diff --git a/app/assets/javascripts/govuk_publishing_components/all_components.js b/app/assets/javascripts/govuk_publishing_components/all_components.js index 1ebd1dbf8d..0351d88f06 100644 --- a/app/assets/javascripts/govuk_publishing_components/all_components.js +++ b/app/assets/javascripts/govuk_publishing_components/all_components.js @@ -1,6 +1,6 @@ // = require_tree ./lib // = require_tree ./components -// = require govuk-frontend/all.js +// = require govuk/all.js // Initialise all GOVUKFrontend components window.GOVUKFrontend.initAll() diff --git a/app/assets/javascripts/govuk_publishing_components/components/accordion.js b/app/assets/javascripts/govuk_publishing_components/components/accordion.js index 5af5570c5a..4bfc836ba9 100644 --- a/app/assets/javascripts/govuk_publishing_components/components/accordion.js +++ b/app/assets/javascripts/govuk_publishing_components/components/accordion.js @@ -1,2 +1,2 @@ // This component relies on JavaScript from GOV.UK Frontend -// = require govuk-frontend/components/accordion/accordion.js +// = require govuk/components/accordion/accordion.js diff --git a/app/assets/javascripts/govuk_publishing_components/components/character-count.js b/app/assets/javascripts/govuk_publishing_components/components/character-count.js index 08a81a1987..6f7315a069 100644 --- a/app/assets/javascripts/govuk_publishing_components/components/character-count.js +++ b/app/assets/javascripts/govuk_publishing_components/components/character-count.js @@ -1,2 +1,2 @@ // This component relies on JavaScript from GOV.UK Frontend -// = require govuk-frontend/components/character-count/character-count.js +// = require govuk/components/character-count/character-count.js diff --git a/app/assets/javascripts/govuk_publishing_components/components/checkboxes.js b/app/assets/javascripts/govuk_publishing_components/components/checkboxes.js index cfbb26797c..7a956d56ba 100644 --- a/app/assets/javascripts/govuk_publishing_components/components/checkboxes.js +++ b/app/assets/javascripts/govuk_publishing_components/components/checkboxes.js @@ -1,5 +1,5 @@ /* eslint-env jquery */ -// = require govuk-frontend/components/checkboxes/checkboxes.js +// = require govuk/components/checkboxes/checkboxes.js window.GOVUK = window.GOVUK || {} window.GOVUK.Modules = window.GOVUK.Modules || {}; diff --git a/app/assets/javascripts/govuk_publishing_components/components/error-summary.js b/app/assets/javascripts/govuk_publishing_components/components/error-summary.js index 238daf9a9b..e59cbc91bc 100644 --- a/app/assets/javascripts/govuk_publishing_components/components/error-summary.js +++ b/app/assets/javascripts/govuk_publishing_components/components/error-summary.js @@ -1,2 +1,2 @@ // This component relies on JavaScript from GOV.UK Frontend -// = require govuk-frontend/components/error-summary/error-summary.js +// = require govuk/components/error-summary/error-summary.js diff --git a/app/assets/javascripts/govuk_publishing_components/components/radio.js b/app/assets/javascripts/govuk_publishing_components/components/radio.js index 88f0eab62d..960cef74ce 100644 --- a/app/assets/javascripts/govuk_publishing_components/components/radio.js +++ b/app/assets/javascripts/govuk_publishing_components/components/radio.js @@ -1,2 +1,2 @@ // This component relies on JavaScript from GOV.UK Frontend -// = require govuk-frontend/components/radios/radios.js +// = require govuk/components/radios/radios.js diff --git a/app/assets/stylesheets/component_guide/application.scss b/app/assets/stylesheets/component_guide/application.scss index 790c5f4e30..d9e7092402 100644 --- a/app/assets/stylesheets/component_guide/application.scss +++ b/app/assets/stylesheets/component_guide/application.scss @@ -2,10 +2,10 @@ @import "govuk_publishing_components/components/helpers/govuk-frontend-settings"; @import "govuk_publishing_components/components/helpers/markdown-typography"; -@import "govuk-frontend/settings/all"; -@import "govuk-frontend/tools/all"; -@import "govuk-frontend/helpers/all"; -@import "govuk-frontend/core/all"; +@import "govuk/settings/all"; +@import "govuk/tools/all"; +@import "govuk/helpers/all"; +@import "govuk/core/all"; @include _govuk-font-face-nta; diff --git a/app/assets/stylesheets/govuk_publishing_components/_all_components.scss b/app/assets/stylesheets/govuk_publishing_components/_all_components.scss index 0e258e4f60..d88feeaaf1 100644 --- a/app/assets/stylesheets/govuk_publishing_components/_all_components.scss +++ b/app/assets/stylesheets/govuk_publishing_components/_all_components.scss @@ -6,7 +6,7 @@ @import "components/helpers/govuk-frontend-settings"; // Include common imports used by many components -@import "govuk-frontend/all"; +@import "govuk/all"; // `govuk_frontend_toolkit` @import "measurements"; diff --git a/app/assets/stylesheets/govuk_publishing_components/components/_accordion.scss b/app/assets/stylesheets/govuk_publishing_components/components/_accordion.scss index d856ed27a9..d11ebeece4 100644 --- a/app/assets/stylesheets/govuk_publishing_components/components/_accordion.scss +++ b/app/assets/stylesheets/govuk_publishing_components/components/_accordion.scss @@ -1,4 +1,4 @@ -@import "govuk-frontend/components/accordion/accordion"; +@import "govuk/components/accordion/accordion"; .govuk-accordion--condensed { .govuk-accordion__section-button { diff --git a/app/assets/stylesheets/govuk_publishing_components/components/_back-link.scss b/app/assets/stylesheets/govuk_publishing_components/components/_back-link.scss index bf4a14365e..02fc7b99da 100644 --- a/app/assets/stylesheets/govuk_publishing_components/components/_back-link.scss +++ b/app/assets/stylesheets/govuk_publishing_components/components/_back-link.scss @@ -1 +1 @@ -@import "govuk-frontend/components/back-link/back-link"; +@import "govuk/components/back-link/back-link"; diff --git a/app/assets/stylesheets/govuk_publishing_components/components/_breadcrumbs.scss b/app/assets/stylesheets/govuk_publishing_components/components/_breadcrumbs.scss index fae0095e14..e26b919089 100644 --- a/app/assets/stylesheets/govuk_publishing_components/components/_breadcrumbs.scss +++ b/app/assets/stylesheets/govuk_publishing_components/components/_breadcrumbs.scss @@ -1,4 +1,4 @@ -@import "govuk-frontend/components/breadcrumbs/breadcrumbs"; +@import "govuk/components/breadcrumbs/breadcrumbs"; .gem-c-breadcrumbs--inverse .govuk-breadcrumbs__list-item .govuk-breadcrumbs__link { &:link, diff --git a/app/assets/stylesheets/govuk_publishing_components/components/_button.scss b/app/assets/stylesheets/govuk_publishing_components/components/_button.scss index 1e980ad293..6a50105653 100644 --- a/app/assets/stylesheets/govuk_publishing_components/components/_button.scss +++ b/app/assets/stylesheets/govuk_publishing_components/components/_button.scss @@ -1,4 +1,4 @@ -@import "govuk-frontend/components/button/button"; +@import "govuk/components/button/button"; $gem-secondary-button-colour: #00823b; $gem-secondary-button-hover-colour: darken($gem-secondary-button-colour, 5%); @@ -110,7 +110,7 @@ $gem-quiet-button-hover-colour: darken($gem-quiet-button-colour, 5%); // Begin adjustments for font baseline offset // These should be removed when the font is updated with the correct baseline -// For the 1px addition please see https://github.com/alphagov/govuk-frontend/pull/365#discussion_r154349428 +// For the 1px addition please see https://github.com/alphagov/govuk/pull/365#discussion_r154349428 $offset: 2; diff --git a/app/assets/stylesheets/govuk_publishing_components/components/_character-count.scss b/app/assets/stylesheets/govuk_publishing_components/components/_character-count.scss index 531bc4551c..a01f8d3ccf 100644 --- a/app/assets/stylesheets/govuk_publishing_components/components/_character-count.scss +++ b/app/assets/stylesheets/govuk_publishing_components/components/_character-count.scss @@ -1 +1 @@ -@import "govuk-frontend/components/character-count/character-count"; +@import "govuk/components/character-count/character-count"; diff --git a/app/assets/stylesheets/govuk_publishing_components/components/_checkboxes.scss b/app/assets/stylesheets/govuk_publishing_components/components/_checkboxes.scss index aabced4432..248f5f8b24 100644 --- a/app/assets/stylesheets/govuk_publishing_components/components/_checkboxes.scss +++ b/app/assets/stylesheets/govuk_publishing_components/components/_checkboxes.scss @@ -1,4 +1,4 @@ -@import "govuk-frontend/components/checkboxes/checkboxes"; +@import "govuk/components/checkboxes/checkboxes"; .govuk-checkboxes--nested { margin-left: -(govuk-spacing(4) + 2px); //22px diff --git a/app/assets/stylesheets/govuk_publishing_components/components/_date-input.scss b/app/assets/stylesheets/govuk_publishing_components/components/_date-input.scss index 68249f2c38..a1dead0849 100644 --- a/app/assets/stylesheets/govuk_publishing_components/components/_date-input.scss +++ b/app/assets/stylesheets/govuk_publishing_components/components/_date-input.scss @@ -1,4 +1,4 @@ -@import "govuk-frontend/components/date-input/date-input"; +@import "govuk/components/date-input/date-input"; // Add spacing between input items on narrow containers when they collapse under each other .govuk-date-input { diff --git a/app/assets/stylesheets/govuk_publishing_components/components/_details.scss b/app/assets/stylesheets/govuk_publishing_components/components/_details.scss index caddf4f03d..3a5c4b4f23 100644 --- a/app/assets/stylesheets/govuk_publishing_components/components/_details.scss +++ b/app/assets/stylesheets/govuk_publishing_components/components/_details.scss @@ -1 +1 @@ -@import "govuk-frontend/components/details/details"; +@import "govuk/components/details/details"; diff --git a/app/assets/stylesheets/govuk_publishing_components/components/_error-message.scss b/app/assets/stylesheets/govuk_publishing_components/components/_error-message.scss index a27d67d696..5988838340 100644 --- a/app/assets/stylesheets/govuk_publishing_components/components/_error-message.scss +++ b/app/assets/stylesheets/govuk_publishing_components/components/_error-message.scss @@ -1 +1 @@ -@import "govuk-frontend/components/error-message/error-message"; +@import "govuk/components/error-message/error-message"; diff --git a/app/assets/stylesheets/govuk_publishing_components/components/_error-summary.scss b/app/assets/stylesheets/govuk_publishing_components/components/_error-summary.scss index 5a0f81d0cb..68b9d9c6de 100644 --- a/app/assets/stylesheets/govuk_publishing_components/components/_error-summary.scss +++ b/app/assets/stylesheets/govuk_publishing_components/components/_error-summary.scss @@ -1,4 +1,4 @@ -@import "govuk-frontend/components/error-summary/error-summary"; +@import "govuk/components/error-summary/error-summary"; .gem-c-error-summary__list-item { @include govuk-font($size: 19, $weight: bold); diff --git a/app/assets/stylesheets/govuk_publishing_components/components/_fieldset.scss b/app/assets/stylesheets/govuk_publishing_components/components/_fieldset.scss index 6e44d6cedd..0fb0708d40 100644 --- a/app/assets/stylesheets/govuk_publishing_components/components/_fieldset.scss +++ b/app/assets/stylesheets/govuk_publishing_components/components/_fieldset.scss @@ -1 +1 @@ -@import "govuk-frontend/components/fieldset/fieldset"; +@import "govuk/components/fieldset/fieldset"; diff --git a/app/assets/stylesheets/govuk_publishing_components/components/_file-upload.scss b/app/assets/stylesheets/govuk_publishing_components/components/_file-upload.scss index 34f97e4773..19958142df 100644 --- a/app/assets/stylesheets/govuk_publishing_components/components/_file-upload.scss +++ b/app/assets/stylesheets/govuk_publishing_components/components/_file-upload.scss @@ -1 +1 @@ -@import "govuk-frontend/components/file-upload/file-upload"; +@import "govuk/components/file-upload/file-upload"; diff --git a/app/assets/stylesheets/govuk_publishing_components/components/_hint.scss b/app/assets/stylesheets/govuk_publishing_components/components/_hint.scss index 84c26f503f..97b2dad377 100644 --- a/app/assets/stylesheets/govuk_publishing_components/components/_hint.scss +++ b/app/assets/stylesheets/govuk_publishing_components/components/_hint.scss @@ -1 +1 @@ -@import "govuk-frontend/components/hint/hint"; +@import "govuk/components/hint/hint"; diff --git a/app/assets/stylesheets/govuk_publishing_components/components/_input.scss b/app/assets/stylesheets/govuk_publishing_components/components/_input.scss index 7e932b543c..9bbef3122b 100644 --- a/app/assets/stylesheets/govuk_publishing_components/components/_input.scss +++ b/app/assets/stylesheets/govuk_publishing_components/components/_input.scss @@ -1,4 +1,4 @@ -@import "govuk-frontend/components/input/input"; +@import "govuk/components/input/input"; .gem-c-input--search-icon { background: govuk-colour("white") url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 36 36' width='40' height='40'%3E%3Cpath d='M25.7 24.8L21.9 21c.7-1 1.1-2.2 1.1-3.5 0-3.6-2.9-6.5-6.5-6.5S10 13.9 10 17.5s2.9 6.5 6.5 6.5c1.6 0 3-.6 4.1-1.5l3.7 3.7 1.4-1.4zM12 17.5c0-2.5 2-4.5 4.5-4.5s4.5 2 4.5 4.5-2 4.5-4.5 4.5-4.5-2-4.5-4.5z' fill='currentColor'%3E%3C/path%3E%3C/svg%3E") no-repeat -5px -3px; diff --git a/app/assets/stylesheets/govuk_publishing_components/components/_inset-text.scss b/app/assets/stylesheets/govuk_publishing_components/components/_inset-text.scss index 57f05b355f..000d817447 100644 --- a/app/assets/stylesheets/govuk_publishing_components/components/_inset-text.scss +++ b/app/assets/stylesheets/govuk_publishing_components/components/_inset-text.scss @@ -1 +1 @@ -@import "govuk-frontend/components/inset-text/inset-text"; +@import "govuk/components/inset-text/inset-text"; diff --git a/app/assets/stylesheets/govuk_publishing_components/components/_label.scss b/app/assets/stylesheets/govuk_publishing_components/components/_label.scss index 1003734a0e..c3094139f0 100644 --- a/app/assets/stylesheets/govuk_publishing_components/components/_label.scss +++ b/app/assets/stylesheets/govuk_publishing_components/components/_label.scss @@ -1 +1 @@ -@import "govuk-frontend/components/label/label"; +@import "govuk/components/label/label"; diff --git a/app/assets/stylesheets/govuk_publishing_components/components/_layout-footer.scss b/app/assets/stylesheets/govuk_publishing_components/components/_layout-footer.scss index 747f5ed85f..b2fabd583b 100644 --- a/app/assets/stylesheets/govuk_publishing_components/components/_layout-footer.scss +++ b/app/assets/stylesheets/govuk_publishing_components/components/_layout-footer.scss @@ -1 +1 @@ -@import "govuk-frontend/components/footer/footer"; +@import "govuk/components/footer/footer"; diff --git a/app/assets/stylesheets/govuk_publishing_components/components/_layout-for-admin.scss b/app/assets/stylesheets/govuk_publishing_components/components/_layout-for-admin.scss index d49d82607e..af753c5ab5 100644 --- a/app/assets/stylesheets/govuk_publishing_components/components/_layout-for-admin.scss +++ b/app/assets/stylesheets/govuk_publishing_components/components/_layout-for-admin.scss @@ -1 +1 @@ -// uses govuk-frontend/all +// uses govuk/all diff --git a/app/assets/stylesheets/govuk_publishing_components/components/_layout-header.scss b/app/assets/stylesheets/govuk_publishing_components/components/_layout-header.scss index 28afd63ce3..07eff56a3a 100644 --- a/app/assets/stylesheets/govuk_publishing_components/components/_layout-header.scss +++ b/app/assets/stylesheets/govuk_publishing_components/components/_layout-header.scss @@ -1,5 +1,5 @@ -@import "govuk-frontend/components/header/header"; -@import "govuk-frontend/components/tag/tag"; +@import "govuk/components/header/header"; +@import "govuk/components/tag/tag"; .gem-c-layout-header--production .govuk-header__container { border-bottom-color: govuk-colour("bright-red"); diff --git a/app/assets/stylesheets/govuk_publishing_components/components/_panel.scss b/app/assets/stylesheets/govuk_publishing_components/components/_panel.scss index 56a8c8d509..c8302d8da0 100644 --- a/app/assets/stylesheets/govuk_publishing_components/components/_panel.scss +++ b/app/assets/stylesheets/govuk_publishing_components/components/_panel.scss @@ -1,4 +1,4 @@ -@import "govuk-frontend/components/panel/panel"; +@import "govuk/components/panel/panel"; .gem-c-panel__prepend { @include govuk-font($size: 24, $weight: bold); diff --git a/app/assets/stylesheets/govuk_publishing_components/components/_phase-banner.scss b/app/assets/stylesheets/govuk_publishing_components/components/_phase-banner.scss index 2323cd7884..2e461693a9 100644 --- a/app/assets/stylesheets/govuk_publishing_components/components/_phase-banner.scss +++ b/app/assets/stylesheets/govuk_publishing_components/components/_phase-banner.scss @@ -1,4 +1,4 @@ -@import "govuk-frontend/components/phase-banner/phase-banner"; +@import "govuk/components/phase-banner/phase-banner"; .gem-c-phase-banner { .govuk-phase-banner__content__app-name { diff --git a/app/assets/stylesheets/govuk_publishing_components/components/_radio.scss b/app/assets/stylesheets/govuk_publishing_components/components/_radio.scss index 13d60ad50d..91aaa27f68 100644 --- a/app/assets/stylesheets/govuk_publishing_components/components/_radio.scss +++ b/app/assets/stylesheets/govuk_publishing_components/components/_radio.scss @@ -1 +1 @@ -@import "govuk-frontend/components/radios/radios"; +@import "govuk/components/radios/radios"; diff --git a/app/assets/stylesheets/govuk_publishing_components/components/_select.scss b/app/assets/stylesheets/govuk_publishing_components/components/_select.scss index df2cf07fc8..3c70195cb7 100644 --- a/app/assets/stylesheets/govuk_publishing_components/components/_select.scss +++ b/app/assets/stylesheets/govuk_publishing_components/components/_select.scss @@ -1,4 +1,4 @@ -@import "govuk-frontend/components/select/select"; +@import "govuk/components/select/select"; .gem-c-select__select--full-width { width: 100%; diff --git a/app/assets/stylesheets/govuk_publishing_components/components/_skip-link.scss b/app/assets/stylesheets/govuk_publishing_components/components/_skip-link.scss index ca5a70559d..bb5b2712bb 100644 --- a/app/assets/stylesheets/govuk_publishing_components/components/_skip-link.scss +++ b/app/assets/stylesheets/govuk_publishing_components/components/_skip-link.scss @@ -1 +1 @@ -@import "govuk-frontend/components/skip-link/skip-link"; +@import "govuk/components/skip-link/skip-link"; diff --git a/app/assets/stylesheets/govuk_publishing_components/components/_table.scss b/app/assets/stylesheets/govuk_publishing_components/components/_table.scss index 3bf6a323f9..cecbfaa80e 100644 --- a/app/assets/stylesheets/govuk_publishing_components/components/_table.scss +++ b/app/assets/stylesheets/govuk_publishing_components/components/_table.scss @@ -1,4 +1,4 @@ -@import "govuk-frontend/components/table/table"; +@import "govuk/components/table/table"; $table-border-width: 1px; $table-border-colour: govuk-colour("grey-2"); diff --git a/app/assets/stylesheets/govuk_publishing_components/components/_tabs.scss b/app/assets/stylesheets/govuk_publishing_components/components/_tabs.scss index cabddd3888..622741f426 100644 --- a/app/assets/stylesheets/govuk_publishing_components/components/_tabs.scss +++ b/app/assets/stylesheets/govuk_publishing_components/components/_tabs.scss @@ -1,4 +1,4 @@ -@import "govuk-frontend/components/tabs/tabs"; +@import "govuk/components/tabs/tabs"; .js-enabled { .gem-c-tabs__panel--no-border { diff --git a/app/assets/stylesheets/govuk_publishing_components/components/_textarea.scss b/app/assets/stylesheets/govuk_publishing_components/components/_textarea.scss index 7c7c9d99ef..1dc0f83e64 100644 --- a/app/assets/stylesheets/govuk_publishing_components/components/_textarea.scss +++ b/app/assets/stylesheets/govuk_publishing_components/components/_textarea.scss @@ -1,4 +1,4 @@ -@import "govuk-frontend/components/textarea/textarea"; +@import "govuk/components/textarea/textarea"; .gem-c-textarea .govuk-textarea { margin-bottom: 0; diff --git a/app/assets/stylesheets/govuk_publishing_components/components/_warning-text.scss b/app/assets/stylesheets/govuk_publishing_components/components/_warning-text.scss index 1bb2948048..70cb06cc58 100644 --- a/app/assets/stylesheets/govuk_publishing_components/components/_warning-text.scss +++ b/app/assets/stylesheets/govuk_publishing_components/components/_warning-text.scss @@ -1,4 +1,4 @@ -@import "govuk-frontend/components/warning-text/warning-text"; +@import "govuk/components/warning-text/warning-text"; .gem-c-warning-text__text--no-indent { padding-left: 0; diff --git a/app/assets/stylesheets/govuk_publishing_components/components/govspeak/_button.scss b/app/assets/stylesheets/govuk_publishing_components/components/govspeak/_button.scss index f7d7945646..dc95041044 100644 --- a/app/assets/stylesheets/govuk_publishing_components/components/govspeak/_button.scss +++ b/app/assets/stylesheets/govuk_publishing_components/components/govspeak/_button.scss @@ -1,4 +1,4 @@ -@import "govuk-frontend/components/button/button"; +@import "govuk/components/button/button"; // scss-lint:disable PlaceholderInExtend // sass-lint:disable placeholder-in-extend diff --git a/app/assets/stylesheets/govuk_publishing_components/components/helpers/_brand-colours.scss b/app/assets/stylesheets/govuk_publishing_components/components/helpers/_brand-colours.scss index 5480dbdfdd..e2092dbb19 100644 --- a/app/assets/stylesheets/govuk_publishing_components/components/helpers/_brand-colours.scss +++ b/app/assets/stylesheets/govuk_publishing_components/components/helpers/_brand-colours.scss @@ -1,5 +1,5 @@ -@import "govuk-frontend/settings/colours-organisations"; -@import "govuk-frontend/helpers/colour"; +@import "govuk/settings/colours-organisations"; +@import "govuk/helpers/colour"; @mixin organisation-brand-colour { @each $organisation in map-keys($govuk-colours-organisations) { diff --git a/config/initializers/assets.rb b/config/initializers/assets.rb index 120a41d20e..2dcf4a2edd 100644 --- a/config/initializers/assets.rb +++ b/config/initializers/assets.rb @@ -34,7 +34,8 @@ ) Rails.application.config.assets.paths += %W( - #{__dir__}/../../node_modules/govuk-frontend/assets/images - #{__dir__}/../../node_modules/govuk-frontend/assets/fonts + #{__dir__}/../../node_modules/govuk-frontend/govuk/assets/images + #{__dir__}/../../node_modules/govuk-frontend/govuk/assets/fonts + #{__dir__}/../../node_modules/govuk-frontend/ #{__dir__}/../../node_modules/ ) From 5c244dd33e98e83a2cc9224bcab7cc11de72bb37 Mon Sep 17 00:00:00 2001 From: Alex Jurubita Date: Tue, 25 Jun 2019 15:58:49 +0100 Subject: [PATCH 03/27] Update govuk-grid-row on feedback component --- .../govuk_publishing_components/components/_feedback.scss | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/app/assets/stylesheets/govuk_publishing_components/components/_feedback.scss b/app/assets/stylesheets/govuk_publishing_components/components/_feedback.scss index 9a229b2871..06c5ca9633 100644 --- a/app/assets/stylesheets/govuk_publishing_components/components/_feedback.scss +++ b/app/assets/stylesheets/govuk_publishing_components/components/_feedback.scss @@ -33,10 +33,12 @@ } } -@include govuk-grid-row($class: "gem-c-feedback__grid-row"); +.gem-c-feedback__grid-row { + @extend %govuk-grid-row; +} .gem-c-feedback__column-two-thirds { - @include govuk-grid-column(two-thirds, $class: false) + @include govuk-grid-column(two-thirds) } .gem-c-feedback__prompt { From 2b6dc6d4122d5b945d7bcc33dd9f78f2d098f4d6 Mon Sep 17 00:00:00 2001 From: Alex Jurubita Date: Tue, 25 Jun 2019 16:00:01 +0100 Subject: [PATCH 04/27] Update $govuk-border-width-narrow variable name --- .../govuk_publishing_components/components/_feedback.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/stylesheets/govuk_publishing_components/components/_feedback.scss b/app/assets/stylesheets/govuk_publishing_components/components/_feedback.scss index 06c5ca9633..8c9f0c9f8d 100644 --- a/app/assets/stylesheets/govuk_publishing_components/components/_feedback.scss +++ b/app/assets/stylesheets/govuk_publishing_components/components/_feedback.scss @@ -105,7 +105,7 @@ .gem-c-feedback__error-summary { margin-bottom: govuk-spacing(3); padding: govuk-spacing(3); - border: solid $govuk-border-width-mobile $govuk-error-colour; + border: solid $govuk-border-width-narrow $govuk-error-colour; clear: both; &:focus { From 28471e220bc2b9b8befd96dbff69e7faaff96aa5 Mon Sep 17 00:00:00 2001 From: Alex Jurubita Date: Tue, 25 Jun 2019 16:10:36 +0100 Subject: [PATCH 05/27] Replace govuk-focusable mixins --- .../components/_modal-dialogue.scss | 9 +++++++-- .../components/_search.scss | 11 +++++++++-- .../components/_step-by-step-nav.scss | 4 +++- .../components/_table.scss | 6 ++++-- .../components/helpers/_markdown-typography.scss | 5 ++++- 5 files changed, 27 insertions(+), 8 deletions(-) diff --git a/app/assets/stylesheets/govuk_publishing_components/components/_modal-dialogue.scss b/app/assets/stylesheets/govuk_publishing_components/components/_modal-dialogue.scss index 0531eedfa8..e7a550b852 100644 --- a/app/assets/stylesheets/govuk_publishing_components/components/_modal-dialogue.scss +++ b/app/assets/stylesheets/govuk_publishing_components/components/_modal-dialogue.scss @@ -31,9 +31,12 @@ $govuk-modal-wide-breakpoint: $govuk-page-width + $govuk-modal-margin * 2 + $gov overflow-y: auto; border: 0; + &:focus { + outline: $govuk-focus-width solid $govuk-focus-colour; + } + @include govuk-font($size: 19); @include govuk-text-colour; - @include govuk-focusable; @include govuk-media-query($from: tablet) { position: relative; top: inherit; @@ -127,7 +130,6 @@ $govuk-modal-wide-breakpoint: $govuk-page-width + $govuk-modal-margin * 2 + $gov background: none; cursor: pointer; - @include govuk-focusable-fill; @include govuk-font($size: 36, $weight: bold, $line-height: 1.3); @include govuk-media-query($until: tablet) { font-size: 36px; @@ -136,7 +138,10 @@ $govuk-modal-wide-breakpoint: $govuk-page-width + $govuk-modal-margin * 2 + $gov &:focus, &:hover { + @include govuk-focused-text; + outline: none; + box-shadow: none; color: govuk-colour("black"); background: $govuk-focus-colour; } diff --git a/app/assets/stylesheets/govuk_publishing_components/components/_search.scss b/app/assets/stylesheets/govuk_publishing_components/components/_search.scss index 6fd5e82d38..2a34d58915 100644 --- a/app/assets/stylesheets/govuk_publishing_components/components/_search.scss +++ b/app/assets/stylesheets/govuk_publishing_components/components/_search.scss @@ -17,7 +17,6 @@ $large-input-size: 50px; .gem-c-search__input[type="search"] { // overly specific to prevent some overrides from outside @include govuk-font($size: 19, $line-height: (28 / 19)); - @include govuk-focusable; padding: 6px; margin: .5em 0; @@ -30,14 +29,22 @@ $large-input-size: 50px; -webkit-appearance: none; -moz-appearance: none; appearance: none; + + &:focus { + outline: $govuk-focus-width solid $govuk-focus-colour; + outline-offset: inherit; + } } .gem-c-search__submit { - @include govuk-focusable; padding: 6px; border: 0; cursor: pointer; border-radius: 0; + + &:focus { + outline: $govuk-focus-width solid $govuk-focus-colour; + } } .js-enabled { diff --git a/app/assets/stylesheets/govuk_publishing_components/components/_step-by-step-nav.scss b/app/assets/stylesheets/govuk_publishing_components/components/_step-by-step-nav.scss index 829626fa0e..287a3b03eb 100644 --- a/app/assets/stylesheets/govuk_publishing_components/components/_step-by-step-nav.scss +++ b/app/assets/stylesheets/govuk_publishing_components/components/_step-by-step-nav.scss @@ -237,7 +237,9 @@ $top-border: solid 2px $grey-3; } .gem-c-step-nav__button { - @include govuk-focusable; + &:focus { + outline: $govuk-focus-width solid $govuk-focus-colour; + } } &:hover { diff --git a/app/assets/stylesheets/govuk_publishing_components/components/_table.scss b/app/assets/stylesheets/govuk_publishing_components/components/_table.scss index cecbfaa80e..13e541c64d 100644 --- a/app/assets/stylesheets/govuk_publishing_components/components/_table.scss +++ b/app/assets/stylesheets/govuk_publishing_components/components/_table.scss @@ -33,12 +33,15 @@ $table-row-even-background-colour: govuk-colour("grey-4"); .app-table__sort-link { @include govuk-link-style-no-visited-state; - @include govuk-focusable-fill; position: relative; padding-right: $sort-link-arrow-size; color: $govuk-link-colour; text-decoration: none; + &:focus { + @include govuk-focused-text; + } + &::after { content: ""; position: absolute; @@ -124,4 +127,3 @@ $table-row-even-background-colour: govuk-colour("grey-4"); border: 0; } } - diff --git a/app/assets/stylesheets/govuk_publishing_components/components/helpers/_markdown-typography.scss b/app/assets/stylesheets/govuk_publishing_components/components/helpers/_markdown-typography.scss index 038ba46cbc..b3adbc78e4 100644 --- a/app/assets/stylesheets/govuk_publishing_components/components/helpers/_markdown-typography.scss +++ b/app/assets/stylesheets/govuk_publishing_components/components/helpers/_markdown-typography.scss @@ -76,7 +76,10 @@ a { @include govuk-link-style-default; - @include govuk-focusable-fill; + + &:focus { + @include govuk-focused-text; + } } // Lists From 97cf20c0cfd6dcd2860bb4ad9a26527901c846ca Mon Sep 17 00:00:00 2001 From: Alex Jurubita Date: Tue, 25 Jun 2019 16:18:59 +0100 Subject: [PATCH 06/27] Update font-face mixin --- app/assets/stylesheets/component_guide/application.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/stylesheets/component_guide/application.scss b/app/assets/stylesheets/component_guide/application.scss index d9e7092402..849f99a2a5 100644 --- a/app/assets/stylesheets/component_guide/application.scss +++ b/app/assets/stylesheets/component_guide/application.scss @@ -7,7 +7,7 @@ @import "govuk/helpers/all"; @import "govuk/core/all"; -@include _govuk-font-face-nta; +@include _govuk-font-face-gds-transport; .component-guide-wrapper { padding-bottom: $govuk-gutter * 1.5; From 9ee4c9558a7ae8bdd91ebd9f0fcd3d3ab157c2c4 Mon Sep 17 00:00:00 2001 From: Alex Jurubita Date: Tue, 25 Jun 2019 16:23:07 +0100 Subject: [PATCH 07/27] Replace feedback grid with govuk-frontend grid --- .../govuk_publishing_components/components/_feedback.scss | 4 ---- .../components/feedback/_problem_form.html.erb | 2 +- .../components/feedback/_survey_signup_form.html.erb | 2 +- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/app/assets/stylesheets/govuk_publishing_components/components/_feedback.scss b/app/assets/stylesheets/govuk_publishing_components/components/_feedback.scss index 8c9f0c9f8d..7b3f3b578a 100644 --- a/app/assets/stylesheets/govuk_publishing_components/components/_feedback.scss +++ b/app/assets/stylesheets/govuk_publishing_components/components/_feedback.scss @@ -33,10 +33,6 @@ } } -.gem-c-feedback__grid-row { - @extend %govuk-grid-row; -} - .gem-c-feedback__column-two-thirds { @include govuk-grid-column(two-thirds) } diff --git a/app/views/govuk_publishing_components/components/feedback/_problem_form.html.erb b/app/views/govuk_publishing_components/components/feedback/_problem_form.html.erb index d458f4f2c2..fc8b4102a9 100644 --- a/app/views/govuk_publishing_components/components/feedback/_problem_form.html.erb +++ b/app/views/govuk_publishing_components/components/feedback/_problem_form.html.erb @@ -12,7 +12,7 @@ aria-expanded="true" role="button">Close -