@@ -44,7 +44,7 @@
|
<% unless withdrawn_request.candidate_cancellation.viewed? %>
- UNVIEWED
+ Unviewed
<% end %>
|
diff --git a/app/views/shared/application/_phase_banner.html.erb b/app/views/shared/application/_phase_banner.html.erb
index 011d1c0600..50332d15b6 100644
--- a/app/views/shared/application/_phase_banner.html.erb
+++ b/app/views/shared/application/_phase_banner.html.erb
@@ -1,7 +1,7 @@
- beta
+ Beta
This is a new service. <%= link_to 'Give feedback', feedback_path %>
diff --git a/app/views/shared/candidates/_alert_notification.html.erb b/app/views/shared/candidates/_alert_notification.html.erb
index 352dc368df..650077724c 100644
--- a/app/views/shared/candidates/_alert_notification.html.erb
+++ b/app/views/shared/candidates/_alert_notification.html.erb
@@ -1,7 +1,7 @@
!
- Warning
+ Warning
In light of measures in place due to the response to coronavirus (COVID-19) school experience may be affected. Some schools are offering online alternatives which can be found in the schools detail page.
diff --git a/app/webpacker/packs/application.js b/app/webpacker/packs/application.js
index e9c2fb3997..620b5ed823 100644
--- a/app/webpacker/packs/application.js
+++ b/app/webpacker/packs/application.js
@@ -1,4 +1,4 @@
-require.context("govuk-frontend/govuk/assets");
+require.context("govuk-frontend/dist/govuk/assets");
require.context('../images', true);
import "../stylesheets/application.scss";
diff --git a/app/webpacker/packs/gtm.js b/app/webpacker/packs/gtm.js
index 20828a47d2..079d034bca 100644
--- a/app/webpacker/packs/gtm.js
+++ b/app/webpacker/packs/gtm.js
@@ -1,13 +1,13 @@
-import Gtm from '../gtm'
+import Gtm from '../gtm';
-const gtmData = document.querySelector('[data-gtm-id]')?.dataset
+const gtmData = document.querySelector('[data-gtm-id]')?.dataset;
if (gtmData != null) {
- const { gtmId, gtmNonce, gtmEnabled} = gtmData
+ const { gtmId, gtmNonce, gtmEnabled } = gtmData;
if (gtmEnabled == 'true') {
- const gtm = new Gtm(gtmId, gtmNonce)
+ const gtm = new Gtm(gtmId, gtmNonce);
- gtm.init()
+ gtm.init();
}
}
diff --git a/app/webpacker/stylesheets/application.scss b/app/webpacker/stylesheets/application.scss
index 6f9a435b7b..6d5388e585 100644
--- a/app/webpacker/stylesheets/application.scss
+++ b/app/webpacker/stylesheets/application.scss
@@ -8,6 +8,7 @@
$govuk-font-url-function: frontend-font-url;
$govuk-image-url-function: frontend-image-url;
+$govuk-new-typography-scale: false;
$govuk-global-styles: true;
$govuk-grid-widths: (
@@ -25,7 +26,7 @@ $govuk-grid-widths: (
full: 100%
);
-@import "~govuk-frontend/govuk/all";
+@import "~govuk-frontend/dist/govuk/all";
@import "accessible-autocomplete" ;
@import "global-styles" ;
@import "contents-list" ;
@@ -70,3 +71,6 @@ $govuk-grid-widths: (
.govuk-accordion__controls {
margin-bottom: 1em;
}
+input[type="checkbox"] {
+ width: 15%;
+}
diff --git a/app/webpacker/stylesheets/global-styles.scss b/app/webpacker/stylesheets/global-styles.scss
index 2741911219..8048088827 100644
--- a/app/webpacker/stylesheets/global-styles.scss
+++ b/app/webpacker/stylesheets/global-styles.scss
@@ -81,10 +81,6 @@ dl.govuk-summary-list {
background-color: $govuk-button-secondary-colour;
box-shadow: 0 $button-shadow-size 0 $govuk-button-secondary-shadow-colour; // s0
- @include govuk-if-ie8 {
- border-bottom: $button-shadow-size solid $govuk-button-secondary-shadow-colour;
- }
-
&:hover,
&:focus {
background-color: $govuk-button-secondary-hover-colour;
diff --git a/config/shakapacker.yml b/config/shakapacker.yml
index 4d253e7582..bee0c29e9a 100644
--- a/config/shakapacker.yml
+++ b/config/shakapacker.yml
@@ -10,7 +10,7 @@ default: &default
# Additional paths webpack should look up modules
# ['app/assets', 'engine/foo/app/assets']
- additional_paths: ['node_modules/govuk-frontend/govuk']
+ additional_paths: ['node_modules/govuk-frontend/dist/govuk']
# Reload manifest.json on all requests so we reload latest compiled packs
cache_manifest: false
diff --git a/features/step_definitions/common_steps.rb b/features/step_definitions/common_steps.rb
index d16c06afcc..a2d2b43bdb 100644
--- a/features/step_definitions/common_steps.rb
+++ b/features/step_definitions/common_steps.rb
@@ -105,7 +105,7 @@
Then("the main site header should be {string}") do |title_text|
expect(page).to have_css(
- ".govuk-header .govuk-header__content .govuk-header__link--service-name",
+ ".govuk-header .govuk-header__content .govuk-header__service-name",
text: title_text
)
end
diff --git a/package.json b/package.json
index d7eb12fb52..3b8abedb5a 100644
--- a/package.json
+++ b/package.json
@@ -24,8 +24,8 @@
"css-loader": "^6.8.1",
"css-minimizer-webpack-plugin": "^5.0.1",
"custom-event-polyfill": "^1.0.7",
+ "govuk-frontend": "5.2.0",
"express": "4.19.2",
- "govuk-frontend": "^4.0.1",
"js-cookie": "^3.0.5",
"json5": "2.2.3",
"mini-css-extract-plugin": "^2.7.6",
diff --git a/spec/helpers/schools/bookings_helper_spec.rb b/spec/helpers/schools/bookings_helper_spec.rb
index 3ce576f700..b71640a732 100644
--- a/spec/helpers/schools/bookings_helper_spec.rb
+++ b/spec/helpers/schools/bookings_helper_spec.rb
@@ -9,7 +9,7 @@
it do
is_expected.to \
- have_css('strong.govuk-tag', text: 'YES')
+ have_css('strong.govuk-tag', text: 'Yes')
end
end
@@ -18,7 +18,7 @@
it do
is_expected.to \
- have_css('strong.govuk-tag.govuk-tag--grey', text: 'NO')
+ have_css('strong.govuk-tag.govuk-tag--grey', text: 'No')
end
end
@@ -27,7 +27,7 @@
it do
is_expected.to \
- have_css('strong.govuk-tag.govuk-tag--red', text: 'CANCELLED')
+ have_css('strong.govuk-tag.govuk-tag--red', text: 'Cancelled')
end
end
@@ -35,7 +35,7 @@
let(:booking) { create(:bookings_booking, :accepted) }
it do
is_expected.to \
- have_css('strong.govuk-tag.govuk-tag--default', text: 'NOT SET')
+ have_css('strong.govuk-tag.govuk-tag--light-blue', text: 'Not set')
end
end
end
diff --git a/spec/helpers/schools/placement_dates_helper_spec.rb b/spec/helpers/schools/placement_dates_helper_spec.rb
index 54de18fab9..dfdfd6bc7f 100644
--- a/spec/helpers/schools/placement_dates_helper_spec.rb
+++ b/spec/helpers/schools/placement_dates_helper_spec.rb
@@ -7,7 +7,7 @@
context "when placement date is available (inside availability window)" do
let(:placement_date) { create(:bookings_placement_date, :active) }
- it { is_expected.to have_css "strong", text: "Open", class: "govuk-tag govuk-tag--available" }
+ it { is_expected.to have_css "strong", text: "Open", class: "govuk-tag govuk-tag--green" }
end
context "when placement date is active but not available" do
@@ -19,13 +19,13 @@
context "when placement date is active and end of availability is not in the future" do
let(:placement_date) { create(:bookings_placement_date, :active, date: Date.tomorrow, end_availability_offset: 1) }
- it { is_expected.to have_css "strong", text: "Closed", class: "govuk-tag govuk-tag--taken" }
+ it { is_expected.to have_css "strong", text: "Closed", class: "govuk-tag govuk-tag--red" }
end
context "when placement date is inactive" do
let(:placement_date) { create(:bookings_placement_date, :inactive) }
- it { is_expected.to have_css "strong", text: "Closed", class: "govuk-tag govuk-tag--taken" }
+ it { is_expected.to have_css "strong", text: "Closed", class: "govuk-tag govuk-tag--red" }
end
end
diff --git a/yarn.lock b/yarn.lock
index ec5270ff42..7b8c0ad5e5 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3300,10 +3300,10 @@ globals@^11.1.0:
resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e"
integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==
-govuk-frontend@^4.0.1:
- version "4.8.0"
- resolved "https://registry.yarnpkg.com/govuk-frontend/-/govuk-frontend-4.8.0.tgz#df4e56c762e93aae74fed214bb6be08e13783772"
- integrity sha512-NOmPJxL8IYq1HSNHYKx9XY2LLTxuwb+IFASiGQO4sgJ8K7AG66SlSeqARrcetevV8zOf+i1z+MbJJ2O7//OxAw==
+govuk-frontend@5.2.0:
+ version "5.2.0"
+ resolved "https://registry.yarnpkg.com/govuk-frontend/-/govuk-frontend-5.2.0.tgz#f8e0bf98b771b8ee1501fd45bbba24a091f3846d"
+ integrity sha512-beD3wztHpkKz6JUpPwnwop1ejb4rTFMPLCutKLCIDmUS4BPpW59ggVUfctsRqHd2Zjw9wxljdRdeIJ8AZFyyTw==
graceful-fs@^4.1.2, graceful-fs@^4.2.4, graceful-fs@^4.2.9:
version "4.2.11"
|