Merge branch 'main' into temporary_branch_that_should_not_be_merged

ministryofjustice · Jul 4, 2024 · 3a04afe · 3a04afe
2 parents 96e10d9 + 081689a
commit 3a04afe
Show file tree

Hide file tree

Showing 21 changed files with 1,395 additions and 877 deletions.
diff --git a/assets/javascript/govukFrontendInit.js b/assets/javascript/govukFrontendInit.js
@@ -0,0 +1,3 @@
+import { initAll } from 'node_modules/govuk-frontend/dist/govuk/govuk-frontend.min.js';
+
+initAll();
diff --git a/assets/javascript/mojFrontendInit.js b/assets/javascript/mojFrontendInit.js
@@ -0,0 +1 @@
+window.MOJFrontend.initAll();
diff --git a/assets/sass/components/_category.scss b/assets/sass/components/_category.scss
@@ -100,7 +100,7 @@
 
   & > *:first-child {
     margin-top: govuk-spacing(5);
-    @include govuk-typography-responsive(36);
+    @include govuk-font-size(36);
   }
 
   & > *:last-child {

diff --git a/assets/sass/components/_content-tile-large.scss b/assets/sass/components/_content-tile-large.scss
@@ -6,7 +6,7 @@
 
   & > *:first-child {
     margin-top: govuk-spacing(5);
-    @include govuk-typography-responsive(36);
+    @include govuk-font-size(36);
   }
 
   & > *:last-child {

diff --git a/assets/sass/pages/flat-content.scss b/assets/sass/pages/flat-content.scss
@@ -84,7 +84,7 @@
     display: block;
 
     p {
-      @extend .govuk-panel__body;
+      @extend .govuk-panel__body !optional;
       color: govuk-colour('white');
       font-weight: bold;
       margin-bottom: 0;

diff --git a/bin/build-css b/bin/build-css
@@ -4,7 +4,7 @@
     --no-source-map \
     --quiet-deps \
     --load-path=. \
-    --load-path=node_modules/govuk-frontend \
+    --load-path=node_modules/govuk-frontend/dist \
     --load-path=node_modules/@ministryofjustice/frontend \
         ./assets/sass/style.scss:./assets/stylesheets/application.css \
     --style compressed
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		import { initAll } from 'node_modules/govuk-frontend/dist/govuk/govuk-frontend.min.js';

		initAll();