Skip to content

Commit

Permalink
EES-4747 update to govuk frontend v5
Browse files Browse the repository at this point in the history
  • Loading branch information
@amyb-hiveit
amyb-hiveit committed Mar 20, 2024
1 parent 286b826 commit b5b1064
Show file tree
Hide file tree
Showing 121 changed files with 145 additions and 151 deletions.
16 changes: 8 additions & 8 deletions pnpm-lock.yaml
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/explore-education-statistics-admin/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
"formik": "^2.4.2",
"fs-extra": "^9.1.0",
"geojson": "^0.5.0",
"govuk-frontend": "^4.8.0",
"govuk-frontend": "^5.2.0",
"history": "^4.10.1",
"html-webpack-plugin": "^5.5.0",
"i": "^0.3.7",
Expand Down
2 changes: 1 addition & 1 deletion src/explore-education-statistics-admin/src/App.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ function ApplicationInsightsTracking() {
});
}

document.body.classList.add('js-enabled');
document.body.classList.add('js-enabled', 'govuk-frontend-supported');
}, [appInsights, history]);

return null;
Expand Down
2 changes: 1 addition & 1 deletion src/explore-education-statistics-admin/src/components/DraggableItem.module.scss
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import '~govuk-frontend/govuk/base';
@import '~govuk-frontend/dist/govuk/base';

$vertical-spacing: govuk-spacing(3);

Expand Down
2 changes: 1 addition & 1 deletion src/explore-education-statistics-admin/src/components/DroppableArea.module.scss
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import '~govuk-frontend/govuk/base';
@import '~govuk-frontend/dist/govuk/base';

/* stylelint-disable selector-no-qualifying-type */
ol.dropArea,
Expand Down
2 changes: 1 addition & 1 deletion src/explore-education-statistics-admin/src/components/NavBar.module.scss
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import '~govuk-frontend/govuk/base';
@import '~govuk-frontend/dist/govuk/base';

.navigation {
background: govuk-colour('light-grey');
Expand Down
2 changes: 1 addition & 1 deletion src/explore-education-statistics-admin/src/components/NavLink.module.scss
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import '~govuk-frontend/govuk/base';
@import '~govuk-frontend/dist/govuk/base';

.currentPage {
border-bottom: 0.3rem solid $govuk-link-colour;
Expand Down
2 changes: 1 addition & 1 deletion src/explore-education-statistics-admin/src/components/PageHeader.module.scss
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import '~govuk-frontend/govuk/base';
@import '~govuk-frontend/dist/govuk/base';

// Setting page header colours based on environment
$envs: (
Expand Down
2 changes: 1 addition & 1 deletion src/explore-education-statistics-admin/src/components/PreviewHtml.module.scss
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import '~govuk-frontend/govuk/base';
@import '~govuk-frontend/dist/govuk/base';

.preview {
background: govuk-colour('light-grey');
Expand Down
2 changes: 1 addition & 1 deletion src/explore-education-statistics-admin/src/components/comments/Comment.module.scss
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import '~govuk-frontend/govuk/base';
@import '~govuk-frontend/dist/govuk/base';

.container {
background: govuk-colour('light-grey');
Expand Down
2 changes: 1 addition & 1 deletion src/explore-education-statistics-admin/src/components/comments/CommentAddForm.module.scss
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import '~govuk-frontend/govuk/base';
@import '~govuk-frontend/dist/govuk/base';
@import '@admin/styles/variables';

.container {
Expand Down
2 changes: 1 addition & 1 deletion src/explore-education-statistics-admin/src/components/comments/CommentsWrapper.module.scss
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import '~govuk-frontend/govuk/base';
@import '~govuk-frontend/dist/govuk/base';
@import '@admin/styles/variables';

@include govuk-media-query($from: desktop) {
Expand Down
2 changes: 1 addition & 1 deletion src/explore-education-statistics-admin/src/components/editable/BlockDraggable.module.scss
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import '~govuk-frontend/govuk/base';
@import '~govuk-frontend/dist/govuk/base';

.draggable {
background: #fff;
Expand Down
2 changes: 1 addition & 1 deletion src/explore-education-statistics-admin/src/components/editable/EditableAccordion.module.scss
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import '~govuk-frontend/govuk/base';
@import '~govuk-frontend/dist/govuk/base';

.dragover {
background: govuk-colour('light-grey');
Expand Down
2 changes: 1 addition & 1 deletion ...plore-education-statistics-admin/src/components/editable/EditableBlockWrapper.module.scss
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import '~govuk-frontend/govuk/base';
@import '~govuk-frontend/dist/govuk/base';

.buttons {
display: flex;
Expand Down
2 changes: 1 addition & 1 deletion ...plore-education-statistics-admin/src/components/editable/EditableContentBlock.module.scss
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import '~govuk-frontend/govuk/base';
@import '~govuk-frontend/dist/govuk/base';
@import '@admin/styles/variables';

$border-width: 2px;
Expand Down
2 changes: 1 addition & 1 deletion ...xplore-education-statistics-admin/src/components/editable/EditableContentForm.module.scss
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import '~govuk-frontend/govuk/base';
@import '~govuk-frontend/dist/govuk/base';
@import '@admin/styles/variables';

.form {
Expand Down
2 changes: 1 addition & 1 deletion ...ore-education-statistics-admin/src/components/editable/EditablePageModeToggle.module.scss
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import '~govuk-frontend/govuk/base';
@import '~govuk-frontend/dist/govuk/base';
@import '@admin/styles/variables';

// scroll-padding to ensure the sticky bar doesn't
Expand Down
2 changes: 1 addition & 1 deletion ...plore-education-statistics-admin/src/components/editable/ReorderableAccordion.module.scss
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import '~govuk-frontend/govuk/base';
@import '~govuk-frontend/dist/govuk/base';

// Override the default dnd style as it causes accordion sections within the dnd area to sometime open in the wrong direction.
.container [data-rbd-droppable-context-id] {
Expand Down
2 changes: 1 addition & 1 deletion src/explore-education-statistics-admin/src/components/form/FormEditor.module.scss
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import '~govuk-frontend/govuk/base';
@import '~govuk-frontend/dist/govuk/base';
@import '~explore-education-statistics-common/src/styles/mixins';

$active-colour: lighten(govuk-colour('orange'), 10);
Expand Down
2 changes: 1 addition & 1 deletion ...ation-statistics-admin/src/pages/admin-dashboard/components/TopicPublications.module.scss
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import '~govuk-frontend/govuk/base';
@import '~govuk-frontend/dist/govuk/base';

.publication {
align-items: flex-start;
Expand Down
2 changes: 1 addition & 1 deletion ...lore-education-statistics-admin/src/pages/documentation/components/StepByStep.module.scss
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import '~govuk-frontend/govuk/base';
@import '~govuk-frontend/dist/govuk/base';

.test {
border: 1px solid #f60;
Expand Down
2 changes: 1 addition & 1 deletion ...lore-education-statistics-admin/src/pages/publication/PublicationReleasesPage.module.scss
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import '~govuk-frontend/govuk/base';
@import '~govuk-frontend/dist/govuk/base';

.row {
&:focus-visible {
Expand Down
2 changes: 1 addition & 1 deletion ...ucation-statistics-admin/src/pages/publication/components/LegacyReleasesTable.module.scss
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import '~govuk-frontend/govuk/base';
@import '~govuk-frontend/dist/govuk/base';

.dragHandle {
text-align: center;
Expand Down
2 changes: 1 addition & 1 deletion ...plore-education-statistics-admin/src/pages/release/content/ReleaseContentPage.module.scss
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import '~govuk-frontend/govuk/base';
@import '~govuk-frontend/dist/govuk/base';
@import '@admin/styles/variables';

.container {
Expand Down
2 changes: 1 addition & 1 deletion ...education-statistics-admin/src/pages/release/content/components/KeyStatistics.module.scss
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import '~govuk-frontend/govuk/base';
@import '~govuk-frontend/dist/govuk/base';

.buttons {
@include govuk-media-query($from: tablet) {
Expand Down
2 changes: 1 addition & 1 deletion ...-statistics-admin/src/pages/release/data/components/ReleaseDataReorderSection.module.scss
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import '~govuk-frontend/govuk/base';
@import '~govuk-frontend/dist/govuk/base';

.table td {
vertical-align: middle;
Expand Down
2 changes: 1 addition & 1 deletion ...lore-education-statistics-admin/src/pages/release/data/components/ReorderList.module.scss
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import '~govuk-frontend/govuk/base';
@import '~govuk-frontend/dist/govuk/base';

.isExpandedItem {
background: govuk-colour('light-grey') !important;
Expand Down
2 changes: 1 addition & 1 deletion ...n-statistics-admin/src/pages/release/datablocks/components/chart/ChartBuilder.module.scss
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import '~govuk-frontend/govuk/base';
@import '~govuk-frontend/dist/govuk/base';

.previewPlaceholder {
align-items: center;
Expand Down
2 changes: 1 addition & 1 deletion ...ics-admin/src/pages/release/datablocks/components/chart/ChartDataGroupingForm.module.scss
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import '~govuk-frontend/govuk/base';
@import '~govuk-frontend/dist/govuk/base';

.container {
max-height: 70vh;
Expand Down
2 changes: 1 addition & 1 deletion ...dmin/src/pages/release/datablocks/components/chart/ChartDataSetsConfiguration.module.scss
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import '~govuk-frontend/govuk/base';
@import '~govuk-frontend/dist/govuk/base';

.formSelectRow {
align-items: flex-end;
Expand Down
2 changes: 1 addition & 1 deletion ...s-admin/src/pages/release/datablocks/components/chart/ChartDefinitionSelector.module.scss
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import '~govuk-frontend/govuk/base';
@import '~govuk-frontend/dist/govuk/base';

.buttonContainer {
display: flex;
Expand Down
2 changes: 1 addition & 1 deletion ...-admin/src/pages/release/datablocks/components/chart/ChartLegendConfiguration.module.scss
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import '~govuk-frontend/govuk/base';
@import '~govuk-frontend/dist/govuk/base';

.item {
border-bottom: 1px solid govuk-colour('mid-grey');
Expand Down
2 changes: 1 addition & 1 deletion ...ucation-statistics-admin/src/pages/release/footnotes/components/FootnotesList.module.scss
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import '~govuk-frontend/govuk/base';
@import '~govuk-frontend/dist/govuk/base';

.itemContainer {
border-top: 1px solid #b1b4b6;
Expand Down
2 changes: 1 addition & 1 deletion ...ics-admin/src/pages/release/pre-release/components/PublicPreReleaseAccessForm.module.scss
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import '~govuk-frontend/govuk/base';
@import '~govuk-frontend/dist/govuk/base';

.preview {
background: govuk-colour('light-grey');
Expand Down
2 changes: 1 addition & 1 deletion src/explore-education-statistics-admin/src/prototypes/PrototypePublicPage.module.scss
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* stylelint-disable */

@import '~govuk-frontend/govuk/base';
@import '~govuk-frontend/dist/govuk/base';

.prototypePublicPage {
:global(.govuk-header__navigation) {
Expand Down
2 changes: 1 addition & 1 deletion ...tatistics-admin/src/prototypes/components/PrototypeFormFieldSortableListGroup.module.scss
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import '~govuk-frontend/govuk/base';
@import '~govuk-frontend/dist/govuk/base';

$group-width: 320px;

Expand Down
2 changes: 1 addition & 1 deletion ...ducation-statistics-admin/src/prototypes/components/PrototypeFormSortableList.module.scss
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import '~govuk-frontend/govuk/base';
@import '~govuk-frontend/dist/govuk/base';

.focusContainer {
outline: 0;
Expand Down
2 changes: 1 addition & 1 deletion ...education-statistics-admin/src/prototypes/components/PrototypePublicationForm.module.scss
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import '~govuk-frontend/govuk/base';
@import '~govuk-frontend/dist/govuk/base';

.optionsContainer {
@include govuk-media-query($from: desktop) {
Expand Down
2 changes: 1 addition & 1 deletion ...ducation-statistics-admin/src/prototypes/components/PrototypeTableHeadersForm.module.scss
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import '~govuk-frontend/govuk/base';
@import '~govuk-frontend/dist/govuk/base';

.formContainer {
background: govuk-colour('light-grey');
Expand Down
2 changes: 1 addition & 1 deletion src/explore-education-statistics-admin/src/styles/_all.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
$govuk-new-link-styles: true;
// import the breakpoints before govuk/all so our extra values are picked up in the build.
@import '~explore-education-statistics-common/src/styles/breakpoints';
@import '~govuk-frontend/govuk/all';
@import '~govuk-frontend/dist/govuk/all';
@import '~explore-education-statistics-common/src/styles/all';
@import './variables';
@import './layout';
2 changes: 1 addition & 1 deletion src/explore-education-statistics-common/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"domhandler": "^4.2.2",
"formik": "^2.4.2",
"geojson": "^0.5.0",
"govuk-frontend": "^4.8.0",
"govuk-frontend": "^5.2.0",
"html-react-parser": "^1.3.0",
"identity-obj-proxy": "^3.0.0",
"iframe-resizer-react": "^1.0.4",
Expand Down
2 changes: 1 addition & 1 deletion src/explore-education-statistics-common/src/components/AccordionSection.module.scss
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import '~govuk-frontend/govuk/base';
@import '~govuk-frontend/dist/govuk/base';

.section {
@media print {
Expand Down
2 changes: 1 addition & 1 deletion src/explore-education-statistics-common/src/components/Banner.module.scss
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import '~govuk-frontend/govuk/base';
@import '~govuk-frontend/dist/govuk/base';

.container {
background: govuk-colour('blue');
Expand Down
2 changes: 1 addition & 1 deletion src/explore-education-statistics-common/src/components/ButtonGroup.module.scss
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import '~govuk-frontend/govuk/base';
@import '~govuk-frontend/dist/govuk/base';

.group {
align-items: center;
Expand Down
4 changes: 2 additions & 2 deletions src/explore-education-statistics-common/src/components/ButtonText.module.scss
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@import '~govuk-frontend/govuk/base';
@import '~govuk-frontend/govuk/core/links';
@import '~govuk-frontend/dist/govuk/base';
@import '~govuk-frontend/dist/govuk/core/links';

.button {
@include govuk-link-common;
Expand Down
2 changes: 1 addition & 1 deletion src/explore-education-statistics-common/src/components/ChevronCard.module.scss
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import '~govuk-frontend/govuk/base';
@import '~govuk-frontend/dist/govuk/base';

.card {
border-top: 1px solid $govuk-border-colour;
Expand Down
2 changes: 1 addition & 1 deletion src/explore-education-statistics-common/src/components/ChevronGrid.module.scss
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import '~govuk-frontend/govuk/base';
@import '~govuk-frontend/dist/govuk/base';

.grid {
list-style: none;
Expand Down
2 changes: 1 addition & 1 deletion src/explore-education-statistics-common/src/components/ContentHtml.module.scss
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import '~govuk-frontend/govuk/base';
@import '~govuk-frontend/dist/govuk/base';

.tableContainer {
margin: govuk-spacing(6) govuk-spacing(4);
Expand Down
2 changes: 1 addition & 1 deletion src/explore-education-statistics-common/src/components/CopyLinkButton.module.scss
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import '~govuk-frontend/govuk/base';
@import '~govuk-frontend/dist/govuk/base';

.message {
height: 2rem;
Expand Down
2 changes: 1 addition & 1 deletion src/explore-education-statistics-common/src/components/DetailsMenu.module.scss
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import '~govuk-frontend/govuk/base';
@import '~govuk-frontend/dist/govuk/base';

.details {
margin-bottom: govuk-spacing(2);
Expand Down
16 changes: 8 additions & 8 deletions src/explore-education-statistics-common/src/components/ErrorSummary.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,14 +67,14 @@ const ErrorSummary = ({
const ref = useRef<HTMLDivElement>(null);

useEffect(() => {
import('govuk-frontend/govuk/components/error-summary/error-summary').then(
({ default: GovUkErrorSummary }) => {
if (ref.current) {
const { handleClick } = new GovUkErrorSummary(ref.current);
ref.current.addEventListener('click', handleClick);
}
},
);
import(
'govuk-frontend/dist/govuk/components/error-summary/error-summary'
).then(({ default: GovUkErrorSummary }) => {
if (ref.current) {
const { handleClick } = new GovUkErrorSummary(ref.current);
ref.current.addEventListener('click', handleClick);
}
});
}, [ref]);

useEffect(() => {
Expand Down
2 changes: 1 addition & 1 deletion src/explore-education-statistics-common/src/components/InfoIcon.module.scss
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import '~govuk-frontend/govuk/base';
@import '~govuk-frontend/dist/govuk/base';

.infoIcon {
background-color: $govuk-link-colour;
Expand Down
2 changes: 1 addition & 1 deletion src/explore-education-statistics-common/src/components/InsetText.module.scss
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import '~govuk-frontend/govuk/base';
@import '~govuk-frontend/dist/govuk/base';

.success {
border-left-color: govuk-colour('turquoise');
Expand Down
Loading

0 comments on commit b5b1064

Please sign in to comment.