Revert "Update layouts assets path"

This reverts commit bb7cd78.
DFE-Digital · Oct 19, 2023 · fd58119 · fd58119
1 parent f9e0fae
commit fd58119
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 14 deletions.
diff --git a/app/assets/config/manifest.js b/app/assets/config/manifest.js
@@ -2,4 +2,4 @@
 //= link_tree ../builds
 //= link_tree ../../javascript .js
 //= link_tree ../../../vendor/javascript .js
-//= link_tree ../../../vendor/assets
+//= link_tree ../../../node_modules
diff --git a/app/views/layouts/admin.html.erb b/app/views/layouts/admin.html.erb
@@ -13,12 +13,12 @@
 
     <meta http-equiv="X-UA-Compatible" content="IE=edge" />
 
-    <link rel="shortcut icon" sizes="16x16 32x32 48x48" href="<%= asset_url('images/favicon.ico') %>" type="image/x-icon" />
-    <link rel="mask-icon" href="<%= asset_url('images/govuk-mask-icon.svg') %>" color="blue">
-    <link rel="apple-touch-icon" sizes="180x180" href="<%= asset_url('images/govuk-apple-touch-icon-180x180.png') %>">
-    <link rel="apple-touch-icon" sizes="167x167" href="<%= asset_url('images/govuk-apple-touch-icon-167x167.png') %>">
-    <link rel="apple-touch-icon" sizes="152x152" href="<%= asset_url('images/govuk-apple-touch-icon-152x152.png') %>">
-    <link rel="apple-touch-icon" href="<%= asset_url('images/govuk-apple-touch-icon.png') %>">
+    <link rel="shortcut icon" sizes="16x16 32x32 48x48" href="<%= asset_url('govuk-frontend/govuk/assets/images/favicon.ico') %>" type="image/x-icon" />
+    <link rel="mask-icon" href="<%= asset_url('govuk-frontend/govuk/assets/images/govuk-mask-icon.svg') %>" color="blue">
+    <link rel="apple-touch-icon" sizes="180x180" href="<%= asset_url('govuk-frontend/govuk/assets/images/govuk-apple-touch-icon-180x180.png') %>">
+    <link rel="apple-touch-icon" sizes="167x167" href="<%= asset_url('govuk-frontend/govuk/assets/images/govuk-apple-touch-icon-167x167.png') %>">
+    <link rel="apple-touch-icon" sizes="152x152" href="<%= asset_url('govuk-frontend/govuk/assets/images/govuk-apple-touch-icon-152x152.png') %>">
+    <link rel="apple-touch-icon" href="<%= asset_url('govuk-frontend/govuk/assets/images/govuk-apple-touch-icon.png') %>">
     <%= stylesheet_link_tag 'application', 'data-turbolinks-track': 'reload' %>
 
     <%= javascript_importmap_tags %>

diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
@@ -13,18 +13,18 @@
 
     <meta http-equiv="X-UA-Compatible" content="IE=edge" />
 
-    <link rel="shortcut icon" sizes="16x16 32x32 48x48" href="<%= asset_url('images/favicon.ico') %>" type="image/x-icon" />
-    <link rel="mask-icon" href="<%= asset_url('images/govuk-mask-icon.svg') %>" color="blue">
-    <link rel="apple-touch-icon" sizes="180x180" href="<%= asset_url('images/govuk-apple-touch-icon-180x180.png') %>">
-    <link rel="apple-touch-icon" sizes="167x167" href="<%= asset_url('images/govuk-apple-touch-icon-167x167.png') %>">
-    <link rel="apple-touch-icon" sizes="152x152" href="<%= asset_url('images/govuk-apple-touch-icon-152x152.png') %>">
-    <link rel="apple-touch-icon" href="<%= asset_url('images/govuk-apple-touch-icon.png') %>">
+    <link rel="shortcut icon" sizes="16x16 32x32 48x48" href="<%= asset_url('govuk-frontend/govuk/assets/images/favicon.ico') %>" type="image/x-icon" />
+    <link rel="mask-icon" href="<%= asset_url('govuk-frontend/govuk/assets/images/govuk-mask-icon.svg') %>" color="blue">
+    <link rel="apple-touch-icon" sizes="180x180" href="<%= asset_url('govuk-frontend/govuk/assets/images/govuk-apple-touch-icon-180x180.png') %>">
+    <link rel="apple-touch-icon" sizes="167x167" href="<%= asset_url('govuk-frontend/govuk/assets/images/govuk-apple-touch-icon-167x167.png') %>">
+    <link rel="apple-touch-icon" sizes="152x152" href="<%= asset_url('govuk-frontend/govuk/assets/images/govuk-apple-touch-icon-152x152.png') %>">
+    <link rel="apple-touch-icon" href="<%= asset_url('govuk-frontend/govuk/assets/images/govuk-apple-touch-icon.png') %>">
 
     <%= stylesheet_link_tag 'application', 'data-turbolinks-track': 'reload' %>
 
     <%= javascript_importmap_tags %>
 
-    <meta property="og:image" content="<%= asset_url('images/govuk-opengraph-image.png') %>">
+    <meta property="og:image" content="<%= asset_url('govuk-frontend/govuk/assets/images/govuk-opengraph-image.png') %>">
   </head>
 
   <body class="govuk-template__body app-body-class">