Merge branch 'master' into warningManuellePosteringer

navikt · Oct 12, 2023 · 51ddda0 · 51ddda0
2 parents 35039f3 + c6f7679
commit 51ddda0
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 0 deletions.
diff --git a/build_n_deploy/webpack/webpack.common.js b/build_n_deploy/webpack/webpack.common.js
@@ -47,6 +47,7 @@ const common = {
             template: path.join(process.cwd(), 'src/frontend/index.html'),
             inject: 'body',
             alwaysWriteToDisk: true,
+            favicon: path.join(process.cwd(), '/src/frontend/favicon.ico'),
         }),
         new ForkTsCheckerWebpackPlugin({
             async: true,

diff --git a/src/frontend/favicon.ico b/src/frontend/favicon.ico
diff --git a/src/frontend/index.html b/src/frontend/index.html
@@ -4,6 +4,7 @@
 <head>
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <link rel="shortcut icon" href="favicon.ico" type="image/png/ico" />
     <style>
         @import url('https://fonts.googleapis.com/css?family=Source+Sans+Pro');
     </style>