Merge pull request #256 from nhsuk/feature/remove-inline-nhs-logo

[refs #107] Remove NHS logo SVG include
nhsuk · Nov 27, 2018 · 50da43b · 50da43b
2 parents d4b1d3a + 718e106
commit 50da43b
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 3 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "nhsuk-frontend",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "description": "The NHS website frontend styles, for creating NHS websites and services.",
   "sasslintConfig": "config/sass-lint.yml",
   "scripts": {

diff --git a/packages/components/footer/template.njk b/packages/components/footer/template.njk
@@ -4,7 +4,13 @@
       <ul class="nhsuk-footer__list">
         <li class="nhsuk-footer__logo nhsuk-footer__list-item">
           <a href="/" class="global-footer__link">
-            {% include 'assets/logos/logo-nhs.svg' %}
+            <svg class="nhsuk-logo" xmlns="http://www.w3.org/2000/svg" role="presentation" focusable="false">
+              <g fill="none">
+                <path fill="#fff" d="M0 39.842h98.203V0H0z"></path>
+                <path fill="#0058ad" d="M9.548 3.817H20.16l6.52 22.08h.09l4.465-22.08h8.021l-6.74 31.84H21.939l-6.65-22.032h-.09l-4.424 22.031H2.754l6.794-31.84m32.852.001h8.518l-2.502 12.18h10.069l2.508-12.18h8.519l-6.61 31.84h-8.518l2.826-13.638H47.135L44.31 35.656h-8.518L42.4 3.816m49.53 7.209c-1.64-.773-3.873-1.457-7.016-1.457-3.37 0-6.106.498-6.106 3.056 0 4.512 12.35 2.828 12.35 12.499 0 8.802-8.16 11.085-15.54 11.085-3.281 0-7.065-.78-9.842-1.648l2.006-6.477c1.682 1.096 5.058 1.827 7.835 1.827 2.646 0 6.789-.503 6.789-3.786 0-5.111-12.35-3.194-12.35-12.176 0-8.214 7.202-10.676 14.176-10.676 3.92 0 7.608.413 9.75 1.413l-2.052 6.34"></path>
+              </g>
+              <image xlink:href="" src="/assets/logos/fallback/logo-nhs.png"></image>
+            </svg>
             <span class="nhsuk-u-visually-hidden">NHS homepage</span>
           </a>
         </li>

diff --git a/packages/components/header/template.njk b/packages/components/header/template.njk
@@ -2,7 +2,13 @@
   <div class="nhsuk-width-container nhsuk-header__container">
     <div class="nhsuk-header__logo">
       <a href="/" class="nhsuk-header__link" aria-label="NHS homepage">
-        {% include 'assets/logos/logo-nhs.svg' %}
+        <svg class="nhsuk-logo" xmlns="http://www.w3.org/2000/svg" role="presentation" focusable="false">
+          <g fill="none">
+            <path fill="#fff" d="M0 39.842h98.203V0H0z"></path>
+            <path fill="#0058ad" d="M9.548 3.817H20.16l6.52 22.08h.09l4.465-22.08h8.021l-6.74 31.84H21.939l-6.65-22.032h-.09l-4.424 22.031H2.754l6.794-31.84m32.852.001h8.518l-2.502 12.18h10.069l2.508-12.18h8.519l-6.61 31.84h-8.518l2.826-13.638H47.135L44.31 35.656h-8.518L42.4 3.816m49.53 7.209c-1.64-.773-3.873-1.457-7.016-1.457-3.37 0-6.106.498-6.106 3.056 0 4.512 12.35 2.828 12.35 12.499 0 8.802-8.16 11.085-15.54 11.085-3.281 0-7.065-.78-9.842-1.648l2.006-6.477c1.682 1.096 5.058 1.827 7.835 1.827 2.646 0 6.789-.503 6.789-3.786 0-5.111-12.35-3.194-12.35-12.176 0-8.214 7.202-10.676 14.176-10.676 3.92 0 7.608.413 9.75 1.413l-2.052 6.34"></path>
+          </g>
+          <image xlink:href="" src="/assets/logos/fallback/logo-nhs.png"></image>
+        </svg>
       </a>
     </div>
   {% if params.showNav == "false" and params.showSearch == "false" %}