Merge branch 'develop' into feature/tna-base-docker-image

nationalarchives · Aug 22, 2023 · 99978ed · 99978ed
2 parents fae6529 + 295e373
commit 99978ed
Show file tree

Hide file tree

Showing 4 changed files with 62 additions and 29 deletions.
diff --git a/.platform.app.yaml b/.platform.app.yaml
@@ -52,7 +52,7 @@ hooks:
     # Install NVM
     unset NPM_CONFIG_PREFIX
     export NVM_DIR="$PLATFORM_APP_DIR/.nvm"
-    curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.3/install.sh | bash
+    curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.5/install.sh | bash
     [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"
     
     nvm install

diff --git a/README.md b/README.md
@@ -8,15 +8,7 @@ This project contains technical documentation written in Markdown in the /docs f
 https://nationalarchives.github.io/ds-wagtail/
 
 
-You can also view it locally via [mkdocs](https://www.mkdocs.org/) by running the following from a `web` container shell:
-
-```console
-$ mkdocs serve
-```
-
-The documentation will be available at:
-
-http://localhost:8001/
+You can also view it locally on http://localhost:8001/ which is booted as the `docs` container.
 
 ## Setting up a local build
 

diff --git a/sass/etna.scss b/sass/etna.scss
@@ -175,6 +175,45 @@ $largest-small-device: 992px;
     margin-bottom: 3rem;
 }
 
+.template-focused-article {
+    .tna-breadcrumbs__wrapper {
+        // ELEMENT SPECIFIC TO THIS SITE
+        background-color: #343338 !important;
+    }
+    .tna-breadcrumbs {
+        margin-bottom: 0;
+        color: #fff !important;
+
+        a {
+            color: inherit !important;
+        }
+    }
+
+    .generic-intro {
+        .tna-heading {
+            padding-top: 1rem;
+            color: #fff !important;
+        }
+    }
+
+    .generic-intro__meta {
+        padding-top: 1rem;
+        padding-bottom: 4rem;
+    }
+
+    @include media.on-larger-than-mobile {
+        .tna-header__navigation-item-link:hover,
+        .tna-header__navigation-item-link:hover:link,
+        .tna-header__navigation-item-link:hover:visited,
+        .tna-header__navigation-item-link--selected,
+        .tna-header__navigation-item-link--selected:link,
+        .tna-header__navigation-item-link--selected:visited {
+            color: #fff !important;
+            background-color: #343338 !important;
+        }
+    }
+}
+
 .card-group-secondary-nav,
 .generic-intro__paragraph {
     margin-bottom: 2rem;

diff --git a/templates/includes/breadcrumb.html b/templates/includes/breadcrumb.html
@@ -1,22 +1,24 @@
 {% if self.get_ancestors|length > 1 %}
-<div class="tna-breadcrumbs tna-container">
-    <nav class="tna-column tna-column--full" aria-label="Breadcrumb">
-        <ol class="tna-breadcrumbs__list">
-            <li class="tna-breadcrumbs__item">
-                <a href="/" class="tna-breadcrumbs__link" data-component-name="Breadcrumb" data-link-type="Breadcrumb link" data-link="Home">
-                    Home
-                </a>
-            </li>
-            {% for p in self.get_ancestors %}
-                {% if  p.depth > 2 %}
-                    <li class="tna-breadcrumbs__item">
-                        <a href="{{ p.url }}" class="tna-breadcrumbs__link" data-component-name="Breadcrumb" data-link-type="Breadcrumb link" data-link="{{ p.title }}">
-                            {{ p.title }}
-                        </a>
-                    </li>
-                {% endif %}
-            {% endfor %}
-        </ol>
-    </nav>
+<div class="tna-breadcrumbs__wrapper">
+    <div class="tna-breadcrumbs tna-container">
+        <nav class="tna-column tna-column--full" aria-label="Breadcrumb">
+            <ol class="tna-breadcrumbs__list">
+                <li class="tna-breadcrumbs__item">
+                    <a href="/" class="tna-breadcrumbs__link" data-component-name="Breadcrumb" data-link-type="Breadcrumb link" data-link="Home">
+                        Home
+                    </a>
+                </li>
+                {% for p in self.get_ancestors %}
+                    {% if  p.depth > 2 %}
+                        <li class="tna-breadcrumbs__item">
+                            <a href="{{ p.url }}" class="tna-breadcrumbs__link" data-component-name="Breadcrumb" data-link-type="Breadcrumb link" data-link="{{ p.title }}">
+                                {{ p.title }}
+                            </a>
+                        </li>
+                    {% endif %}
+                {% endfor %}
+            </ol>
+        </nav>
+    </div>
 </div>
 {% endif %}