Merge branch 'develop' of github.com:nationalarchives/ds-wagtail into…

… feature/tna-base-docker-image

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ds-wagtail",
-  "version": "7.5.1",
+  "version": "7.6.0",
   "description": "## Local development",
   "private": true,
   "scripts": {
@@ -30,12 +30,12 @@
     "babel-loader": "~9.1",
     "jest-environment-jsdom": "~29.6",
     "prettier": "~3.0",
-    "sass": "~1.64",
+    "sass": "~1.65",
     "webpack": "~5.88",
     "webpack-cli": "~5.1"
   },
   "dependencies": {
-    "@nationalarchives/frontend": "^0.1.12-prerelease",
+    "@nationalarchives/frontend": "^0.1.14-prerelease",
     "jest": "~29.6",
     "jquery": "~3.7",
     "openseadragon": "~4.1"

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "Etna"
-version = "7.5.1"
+version = "7.6.0"
 description = ""
 authors = ["James Biggs <[email protected]>"]
 
@@ -29,12 +29,12 @@ black = "~23.7"
 ipdb = "~0.13"
 django-extensions = "~3.2"
 responses = "~0.23"
-coverage = "~7.2"
+coverage = "~7.3"
 flake8 = "~6.1"
 isort = "~5.12"
 pymdown-extensions = "~10.1"
 mkdocs-material = "~9.1"
-django-debug-toolbar = "~4.1"
+django-debug-toolbar = "~4.2"
 wagtail-factories = "~4.1"
 
 [build-system]

sass/etna.scss

@@ -32,7 +32,6 @@ These are Etna specific components, created using BEM and following our guidelin
 @import "includes/global";
 @import "includes/buttons";
 @import "includes/generic-intro";
-@import "includes/header";
 @import "includes/hero-image";
 @import "includes/jumplinks";
 @import "includes/links";
@@ -96,7 +95,6 @@ These are Etna specific components, created using BEM and following our guidelin
 @import "includes/cookie-consent";
 @import "includes/maintenance-503";
 @import "includes/beta-banner";
-@import "includes/breadcrumb";
 @import "includes/record-cta-panel";
 @import "includes/record-series-panel";
 @import "includes/home-refresh";
@@ -137,6 +135,10 @@ $largest-small-device: 992px;
 
 @import "@nationalarchives/frontend/nationalarchives/all";
 
+.tna-breadcrumbs {
+    margin-bottom: 2rem;
+}
+
 .tna-hero {
     margin-bottom: 2rem;
 }
@@ -167,3 +169,29 @@ $largest-small-device: 992px;
         margin-bottom: 0;
     }
 }
+
+.tna-message {
+    margin-top: 2rem;
+    margin-bottom: 3rem;
+}
+
+.card-group-secondary-nav,
+.generic-intro__paragraph {
+    margin-bottom: 2rem;
+}
+
+.container + .container {
+    margin-top: 2rem;
+}
+
+.featured-article__description,
+.article-container__main,
+.container,
+.search-landing-buckets__link,
+.search-buckets__link,
+.search-results-hero__form-search-box,
+.search-filters__search,
+[class^="col-"],
+[class*=" col-"] {
+    box-sizing: border-box;
+}

sass/includes/_beta-banner.scss

@@ -1,6 +1,6 @@
 .beta-banner {
     background-color: $color__cream;
-    padding: 1rem 3rem;
+    padding: 1rem 0;
 
     &__standfirst {
         margin-bottom: 1rem;

sass/includes/_buttons.scss

@@ -20,10 +20,10 @@
         outline-offset: 0.125rem;
     }
 
-    &:focus {
-        outline: 0.312rem solid $color__navy;
-        outline-offset: 0.125rem;
-    }
+    // &:focus {
+    //     outline: 0.312rem solid $color__navy;
+    //     outline-offset: 0.125rem;
+    // }
 
     &--full-width {
         width: 100%;
@@ -48,10 +48,10 @@
         outline: 0.1875rem solid $color__grey-700;
     }
 
-    &:focus {
-        outline: 0.312rem solid $color__navy;
-        outline-offset: 0.125rem;
-    }
+    // &:focus {
+    //     outline: 0.312rem solid $color__navy;
+    //     outline-offset: 0.125rem;
+    // }
 }
 
 .tna-button--yellow,