Merge pull request #180 from Adamant-im/fix_favicons

Fix favicons

public/index.html

@@ -6,36 +6,35 @@
     <meta name="viewport" content="width=device-width,initial-scale=1.0">
     <meta name="apple-itunes-app" content="app-id=1341473829">
     <link rel="icon" href="favicon.ico">
-    <link rel="mask-icon" href="./img/icons/safari-pinned-tab.svg" color="#5bbad5">
-    <link rel="apple-touch-icon-precomposed" sizes="57x57" href="./img/icons/apple-touch-icon-57x57.png" />
-    <link rel="apple-touch-icon-precomposed" sizes="114x114" href="./img/icons/apple-touch-icon-114x114.png" />
-    <link rel="apple-touch-icon-precomposed" sizes="72x72" href="./img/icons/apple-touch-icon-72x72.png" />
-    <link rel="apple-touch-icon-precomposed" sizes="144x144" href="./img/icons/apple-touch-icon-144x144.png" />
-    <link rel="apple-touch-icon-precomposed" sizes="60x60" href="./img/icons/apple-touch-icon-60x60.png" />
-    <link rel="apple-touch-icon-precomposed" sizes="120x120" href="./img/icons/apple-touch-icon-120x120.png" />
-    <link rel="apple-touch-icon-precomposed" sizes="76x76" href="./img/icons/apple-touch-icon-76x76.png" />
-    <link rel="apple-touch-icon-precomposed" sizes="152x152" href="./img/icons/apple-touch-icon-152x152.png" />
-    <link rel="apple-touch-icon-precomposed" sizes="180x180" href="./img/icons/apple-touch-icon-180x180.png" />
-
-    <link rel="icon" type="image/png" href="./img/icons/favicons/favicon-196x196.png" sizes="196x196" />
-    <link rel="icon" type="image/png" href="./img/icons/favicons/favicon-96x96.png" sizes="96x96" />
-    <link rel="icon" type="image/png" href="./img/icons/favicons/favicon-32x32.png" sizes="32x32" />
-    <link rel="icon" type="image/png" href="./img/icons/favicons/favicon-16x16.png" sizes="16x16" />
-    <link rel="icon" type="image/png" href="./img/icons/favicons/favicon-128.png" sizes="128x128" />
+    <link rel="mask-icon" href="<%= htmlWebpackPlugin.files.publicPath %>img/icons/safari-pinned-tab.svg" color="#5bbad5">
+    <link rel="apple-touch-icon-precomposed" sizes="57x57" href="<%= htmlWebpackPlugin.files.publicPath %>img/icons/apple-touch-icon-57x57.png" />
+    <link rel="apple-touch-icon-precomposed" sizes="114x114" href="<%= htmlWebpackPlugin.files.publicPath %>img/icons/apple-touch-icon-114x114.png" />
+    <link rel="apple-touch-icon-precomposed" sizes="72x72" href="<%= htmlWebpackPlugin.files.publicPath %>img/icons/apple-touch-icon-72x72.png" />
+    <link rel="apple-touch-icon-precomposed" sizes="144x144" href="<%= htmlWebpackPlugin.files.publicPath %>img/icons/apple-touch-icon-144x144.png" />
+    <link rel="apple-touch-icon-precomposed" sizes="60x60" href="<%= htmlWebpackPlugin.files.publicPath %>img/icons/apple-touch-icon-60x60.png" />
+    <link rel="apple-touch-icon-precomposed" sizes="120x120" href="<%= htmlWebpackPlugin.files.publicPath %>img/icons/apple-touch-icon-120x120.png" />
+    <link rel="apple-touch-icon-precomposed" sizes="76x76" href="<%= htmlWebpackPlugin.files.publicPath %>img/icons/apple-touch-icon-76x76.png" />
+    <link rel="apple-touch-icon-precomposed" sizes="152x152" href="<%= htmlWebpackPlugin.files.publicPath %>img/icons/apple-touch-icon-152x152.png" />
+    <link rel="apple-touch-icon-precomposed" sizes="180x180" href="<%= htmlWebpackPlugin.files.publicPath %>img/icons/apple-touch-icon-180x180.png" />
+
+    <link rel="icon" type="image/png" href="<%= htmlWebpackPlugin.files.publicPath %>img/icons/favicons/favicon-96x96.png" sizes="96x96" />
+    <link rel="icon" type="image/png" href="<%= htmlWebpackPlugin.files.publicPath %>img/icons/favicons/favicon-32x32.png" sizes="32x32" />
+    <link rel="icon" type="image/png" href="<%= htmlWebpackPlugin.files.publicPath %>img/icons/favicons/favicon-16x16.png" sizes="16x16" />
+    <link rel="icon" type="image/png" href="<%= htmlWebpackPlugin.files.publicPath %>img/icons/favicons/favicon-128.png" sizes="128x128" />
 
     <meta name="application-name" content="ADAMANT Messenger"/>
     <meta name="msapplication-TileColor" content="#2b5797" />
-    <meta name="msapplication-TileImage" content="./img/icons/mstile-144x144.png" />
-    <meta name="msapplication-square70x70logo" content="./img/icons/mstile-70x70.png" />
-    <meta name="msapplication-square150x150logo" content="./img/icons/mstile-150x150.png" />
-    <meta name="msapplication-wide310x150logo" content="./img/icons/mstile-310x150.png" />
-    <meta name="msapplication-square310x310logo" content="./img/icons/mstile-310x310.png" />
+    <meta name="msapplication-TileImage" content="<%= htmlWebpackPlugin.files.publicPath %>img/icons/mstile-144x144.png" />
+    <meta name="msapplication-square70x70logo" content="<%= htmlWebpackPlugin.files.publicPath %>img/icons/mstile-70x70.png" />
+    <meta name="msapplication-square150x150logo" content="<%= htmlWebpackPlugin.files.publicPath %>img/icons/mstile-150x150.png" />
+    <meta name="msapplication-wide310x150logo" content="<%= htmlWebpackPlugin.files.publicPath %>img/icons/mstile-310x150.png" />
+    <meta name="msapplication-square310x310logo" content="<%= htmlWebpackPlugin.files.publicPath %>img/icons/mstile-310x310.png" />
     <link rel="apple-touch-icon" sizes="180x180" href="<%= htmlWebpackPlugin.files.publicPath %>apple-touch-icon.png">
     <title>ADAMANT Messenger</title>
 
     <meta name="theme-color" content="#ffffff">
 
-    <!--[if IE]><link rel="shortcut icon" href="./favicon.ico?v=2"><![endif]-->
+    <!--[if IE]><link rel="shortcut icon" href="<%= htmlWebpackPlugin.files.publicPath %>favicon.ico?v=2"><![endif]-->
     <!-- Add to home screen for Android and modern mobile browsers -->
     <link rel="manifest" href="<%= htmlWebpackPlugin.files.publicPath %>manifest.json">