[refs #104] Remove dns-prefetch and reorder preconnect

Reorder the asset `preconnect` and remove unneeded `dns-prefetch` and
also reorder attributes to be consistent with those in the frontend
library.

app/views/includes/template.html

@@ -12,19 +12,20 @@
 
     <title>{% block pageTitle %}{{ serviceName }}{% endblock %}</title>
 
-    <link rel="preload" as="font" href="https://assets.nhs.uk/fonts/FrutigerLTW01-55Roman.woff2" type="font/woff2" crossorigin>
-    <link rel="preload" as="font" href="https://assets.nhs.uk/fonts/FrutigerLTW01-65Bold.woff2" type="font/woff2" crossorigin>
-    <link rel="preconnect  dns-prefetch" href="https://www.nhs.uk/">
-    <link rel="preconnect  dns-prefetch" href="https://assets.nhs.uk/" crossorigin>
+    <link href="https://www.nhs.uk/" rel="preconnect">
+    <link href="https://assets.nhs.uk/" rel="preconnect" crossorigin>
 
-    <link rel="stylesheet" href="/css/main.css">
+    <link type="font/woff2" href="https://assets.nhs.uk/fonts/FrutigerLTW01-55Roman.woff2" rel="preload" as="font" crossorigin>
+    <link type="font/woff2" href="https://assets.nhs.uk/fonts/FrutigerLTW01-65Bold.woff2" rel="preload" as="font" crossorigin>
+
+    <link href="/css/main.css" rel="stylesheet">
 
     <script src="/nhsuk-frontend/nhsuk.min.js" defer></script>
 
     {% block headIcons %}
       <!--[if IE]><link rel="shortcut icon" href="/nhsuk-frontend/assets/favicons/favicon.ico"><![endif]-->
-      <link rel="apple-touch-icon" href="/nhsuk-frontend/assets/favicons/apple-touch-icon.png">
-      <link rel="icon" href="/nhsuk-frontend/assets/favicons/favicon.png">
+      <link href="/nhsuk-frontend/assets/favicons/apple-touch-icon.png" rel="apple-touch-icon">
+      <link href="/nhsuk-frontend/assets/favicons/favicon.png" rel="icon">
     {% endblock %}
   </head>
 

docs/views/layout.html

@@ -36,8 +36,8 @@
 {% from 'textarea/macro.njk' import textarea %}
 
 {% block headCSS %}
-  <link rel="stylesheet" href="/css/main.css">
-  <link rel="stylesheet" href="/css/docs.css">
+  <link href="/css/main.css" rel="stylesheet">
+  <link href="/css/docs.css" rel="stylesheet">
 {% endblock %}
 
 {% block pageTitle %}

docs/views/template.html

@@ -12,21 +12,22 @@
 
     <title>{% block pageTitle %}NHS.UK prototype kit{% endblock %}</title>
 
-    <link rel="preload" as="font" href="https://assets.nhs.uk/fonts/FrutigerLTW01-55Roman.woff2" type="font/woff2" crossorigin>
-    <link rel="preload" as="font" href="https://assets.nhs.uk/fonts/FrutigerLTW01-65Bold.woff2" type="font/woff2" crossorigin>
-    <link rel="preconnect  dns-prefetch" href="https://www.nhs.uk/">
-    <link rel="preconnect  dns-prefetch" href="https://assets.nhs.uk/" crossorigin>
+    <link href="https://www.nhs.uk/" rel="preconnect">
+    <link href="https://assets.nhs.uk/" rel="preconnect" crossorigin>
+
+    <link type="font/woff2" href="https://assets.nhs.uk/fonts/FrutigerLTW01-55Roman.woff2" rel="preload" as="font" crossorigin>
+    <link type="font/woff2" href="https://assets.nhs.uk/fonts/FrutigerLTW01-65Bold.woff2" rel="preload" as="font" crossorigin>
 
     {% block headCSS %}
-      <link rel="stylesheet" href="/css/main.css">
+      <link href="/css/main.css" rel="stylesheet">
     {% endblock %}
 
     <script src="/nhsuk-frontend/nhsuk.min.js" defer></script>
 
     {% block headIcons %}
       <!--[if IE]><link rel="shortcut icon" href="/nhsuk-frontend/assets/favicons/favicon.ico"><![endif]-->
-      <link rel="apple-touch-icon" href="/nhsuk-frontend/assets/favicons/apple-touch-icon.png">
-      <link rel="icon" href="/nhsuk-frontend/assets/favicons/favicon.png">
+      <link href="/nhsuk-frontend/assets/favicons/apple-touch-icon.png" rel="apple-touch-icon">
+      <link href="/nhsuk-frontend/assets/favicons/favicon.png" rel="icon">
     {% endblock %}
   </head>