Merge branch 'main' into INTR-318

uktrade · Oct 8, 2024 · 6d73bab · 6d73bab
2 parents 4633c3a + 8cde860
commit 6d73bab
Show file tree

Hide file tree

Showing 84 changed files with 1,524 additions and 1,167 deletions.
diff --git a/assets/js/init.js b/assets/js/init.js
@@ -1,5 +1,4 @@
 import * as Sentry from "@sentry/browser";
-import { BrowserTracing } from "@sentry/tracing";
 
 /**
  * Return config from meta html elements.
@@ -24,7 +23,7 @@ function sentryInit() {
     dsn,
     release: config("release"),
     environment: config("environment"),
-    integrations: [new BrowserTracing()],
+    integrations: [Sentry.browserTracingIntegration()],
     tracesSampleRate: Number(config("sentry:browser-traces-sample-rate")),
   });
 }

diff --git a/assets/stylesheets/components/_home_new.scss b/assets/stylesheets/components/_home_new.scss
@@ -55,12 +55,13 @@
   }
 
   // Adds spacing to the top level content when a flag banner is not present.
-  .dwds > .stack > :not(.govuk-phase-banner) {
+  .dwds > .content-stack > :not(.govuk-phase-banner) {
     margin-block-start: var(--space);
   }
 }
 
 .new-home {
+
   article,
   section {
     display: inline;
@@ -81,4 +82,4 @@
       margin-bottom: 10px;
     }
   }
-}
+}
diff --git a/assets/stylesheets/components/_streamfield-content.scss b/assets/stylesheets/components/_streamfield-content.scss
@@ -10,7 +10,8 @@
     @include govuk-font($size: 16, $weight: bold);
   }
 
-  p, li {
+  p,
+  li {
     @extend %govuk-body-m;
   }
 
@@ -29,30 +30,19 @@
   }
 
   table {
-       @extend .govuk-table;
+    @extend .govuk-table;
 
-       caption {
-         @extend .govuk-table__caption;
-       }
+    caption {
+      @extend .govuk-table__caption;
+    }
 
-       th {
-         @extend .govuk-table__header;
-       }
+    th {
+      @extend .govuk-table__header;
+    }
 
-       td {
-         @extend .govuk-table__cell;
-       }
-  }
-}
-
-.ws-streamfield-content__image {
-  margin: 0 0 govuk-spacing(3) 0;
-  padding: 0;
-  display: table;
-
-  img {
-    max-width: 100%;
-    height: auto;
+    td {
+      @extend .govuk-table__cell;
+    }
   }
 }
 
@@ -71,8 +61,10 @@
 
 .ws-streamfield-content__cta-link-container {
   padding-top: govuk-spacing(2);
-  a, a:visited {
+
+  a,
+  a:visited {
     color: $govuk-text-colour;
     padding: govuk-spacing(4);
   }
-}
+}