Merge pull request #796 from nhsx/dev

Production release 20231120
nhsx · Nov 20, 2023 · 9b97d12 · 9b97d12
2 parents 9d06a9c + f8f6007
commit 9b97d12
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 13 deletions.
diff --git a/app/assets/_dev/scss/base/_header.scss b/app/assets/_dev/scss/base/_header.scss
@@ -4,12 +4,12 @@
 }
 
 .nhsuk-header__logo {
-  .nhsuk75-header__link {
+  .nhsuk-header__link {
     height: 60px;
     width: auto;
     display: block;
 
-    .nhsuk75-logo {
+    .nhsuk-logo {
       height: 60px;
       width: auto;
       border: 0;

diff --git a/app/pyproject.toml b/app/pyproject.toml
@@ -2,8 +2,8 @@
 name = "NHSX"
 version = "0.1.0"
 description = "NHSX Wagtail site"
-authors = ["[email protected]"]
-maintainers = ["[email protected]"]
+authors = ["Andy <[email protected]>"]
+maintainers = ["dragon <dragon@dxw.com>"]
 
 [tool.poetry.dependencies]
 python = "^3.7"
@@ -63,5 +63,5 @@ pytest-sugar = "*"
 
 
 [build-system]
-requires = ["poetry>=0.12"]
+requires = ["poetry=1.2.2"]
 build-backend = "poetry.masonry.api"
diff --git a/app/templates/_partials/rebrand.html b/app/templates/_partials/rebrand.html
@@ -1,5 +1,5 @@
     <div class="rebrand-banner">
       <div class="nhsuk-width-container">
-        <p><strong>NHS England - Transformation Directorate</strong></p>
+        <p><strong>Transformation Directorate</strong></p>
       </div>
     </div>
diff --git a/app/templates/wagtailnhsukfrontend/header/logo.html b/app/templates/wagtailnhsukfrontend/header/logo.html
@@ -1,9 +1,11 @@
 <div class="nhsuk-header__logo">
-  <a class="nhsuk75-header__link{% if service_name %} nhsuk-header__link--service {% endif %}" href="{{ logo_href|default:"/" }}" aria-label="{{ logo_aria_label|default:"NHS homepage" }}">
-	<svg class="nhsuk-logo" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 40 16" height="40" width="100">
-		<path fill="#fff" d="M0 0h40v16H0z"></path>
-		<path fill="#003087" d="M3.9 1.5h4.4l2.6 9h.1l1.8-9h3.3l-2.8 13H9l-2.7-9h-.1l-1.8 9H1.1M17.3 1.5h3.6l-1 4.9h4L25 1.5h3.5l-2.7 13h-3.5l1.1-5.6h-4.1l-1.2 5.6h-3.4M37.7 4.4c-.7-.3-1.6-.6-2.9-.6-1.4 0-2.5.2-2.5 1.3 0 1.8 5.1 1.2 5.1 5.1 0 3.6-3.3 4.5-6.4 4.5-1.3 0-2.9-.3-4-.7l.8-2.7c.7.4 2.1.7 3.2.7s2.8-.2 2.8-1.5c0-2.1-5.1-1.3-5.1-5 0-3.4 2.9-4.4 5.8-4.4 1.6 0 3.1.2 4 .6"></path>
-	  </svg>
+  <a class="nhsuk-header__link{% if service_name %} nhsuk-header__link--service {% endif %}" href="{{ logo_href|default:"/" }}" aria-label="{{ logo_aria_label|default:"NHS homepage" }}">
+    <svg class="nhsuk-logo" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 214.2 171.84" height="60" width="100">
+        <defs>
+            <style>.cls-1{fill:#fff}</style>
+        </defs>
+        <path class="cls-1" d="M539.41 266.2v-85H328.23v85zm-126.27-76.83l-14.58 68.45h-22.88l-14.38-47.37h-.2l-9.57 47.37h-17.35l14.7-68.45h22.95l14.1 47.46h.2l9.66-47.46zm65.43 0l-14.29 68.45h-18.43L452 228.5h-21.83l-6.11 29.32h-18.42l14.29-68.45h18.43l-5.42 26.18h21.78l5.43-26.18zm52.93 1.86l-4.44 13.63a34.87 34.87 0 00-15.18-3.13c-7.29 0-13.2 1.07-13.2 6.57 0 9.7 26.71 6.08 26.71 26.87 0 18.92-17.65 23.83-33.61 23.83a77.06 77.06 0 01-21.29-3.54l4.34-13.93c3.64 2.36 10.94 3.93 16.95 3.93 5.72 0 14.68-1.08 14.68-8.14 0-11-26.71-6.86-26.71-26.17 0-17.66 15.57-23 30.66-23 8.48 0 16.45.89 21.09 3zM325.21 297.81h24.72v6.6h-16.32v10.32h14.94v6.6h-14.94v11.76h16.44v6.59h-24.84zM356.65 308.79h7.62V313h.12c2.52-3.54 5.94-4.92 10.14-4.92 7.32 0 10.5 5.16 10.5 12.12v19.49h-8v-16.5c0-3.78-.06-8.88-5.22-8.88-5.82 0-7.08 6.3-7.08 10.26v15.11h-8zM420.49 308.79v27.89c0 8.4-3.36 16.32-16.32 16.32a27.17 27.17 0 01-10.68-2.1l.66-6.84c2.46 1.32 6.48 2.7 9 2.7 8.88 0 9.3-6.66 9.3-12h-.12c-1.5 2.64-5.1 4.92-9.6 4.92-9.12 0-12.6-7.31-12.6-15.59 0-7.44 3.84-16 13.08-16 4.08 0 7.26 1.38 9.48 4.92h.12v-4.2zm-8 15.12c0-5.28-2-9.6-6.72-9.6-5.46 0-7.2 5-7.2 9.78 0 4.2 2.22 9.36 6.84 9.36 5 0 7.04-4.38 7.04-9.54zM427.75 294.69h8v45h-8zM444.43 310.41a27.66 27.66 0 0110.74-2.34c9.41 0 13.32 3.9 13.32 13v4c0 3.12.05 5.46.12 7.74s.18 4.5.35 6.89h-7.07a34 34 0 01-.36-4.62h-.12a11 11 0 01-9.54 5.34c-5.46 0-10.8-3.3-10.8-9.18 0-4.61 2.22-7.31 5.28-8.81s7-1.8 10.38-1.8h4.44c0-5-2.22-6.66-7-6.66a16.17 16.17 0 00-9.54 3.36zm9.42 24.11a6.8 6.8 0 005.64-2.76 10.21 10.21 0 001.68-6.35h-3.48c-3.6 0-8.94.6-8.94 5.34 0 2.63 2.25 3.77 5.1 3.77zM475.21 308.79h7.62V313h.17c2.52-3.54 5.94-4.92 10.14-4.92 7.32 0 10.5 5.16 10.5 12.12v19.49h-8v-16.5c0-3.78-.06-8.88-5.22-8.88-5.82 0-7.08 6.3-7.08 10.26v15.11h-8zM531.25 336.21h-.12c-2.4 3-5.7 4.19-9.48 4.19-9.48 0-13-7.8-13-16.25s3.48-16.08 13-16.08a11 11 0 019.24 4.32h.11v-17.7h8v45h-7.79zm-7.38-2c5.34 0 7.08-5.64 7.08-10s-2-9.84-7.2-9.84-6.66 5.7-6.66 9.84 1.5 9.96 6.78 9.96z" transform="translate(-325.21 -181.16)"/>
+    </svg>
 
     {% if service_name and not transactional %}
       <span class="nhsuk-header__service-name">

diff --git a/docker/web/Dockerfile b/docker/web/Dockerfile
@@ -124,7 +124,7 @@ RUN mv ./node_modules/ /usr/srv/deps
 COPY ./app/pyproject.toml /usr/srv/app/pyproject.toml
 COPY ./app/poetry.lock /usr/srv/app/poetry.lock
 ## self update disabled currently due to causing timeout issues in the deploy
-#RUN $HOME/.local/bin/poetry self update && \
+#RUN $HOME/.local/bin/poetry self update 1.2.2 && \
 RUN $HOME/.local/bin/poetry install
 
 

diff --git a/docker/web/Dockerfile-prod b/docker/web/Dockerfile-prod
@@ -120,7 +120,7 @@ RUN mkdir -p /usr/srv/deps
 RUN mv ./node_modules/ /usr/srv/deps
 
 # POETRY (working and installed in django-base)
-RUN $HOME/.local/bin/poetry self update && \
+RUN $HOME/.local/bin/poetry self update 1.2.2 && \
     $HOME/.local/bin/poetry install