Merge branch 'develop' of github.com:tracim/tracim into develop

tracim · Dec 3, 2019 · 1446251 · 1446251
2 parents 4e6b5dc + d6f9b8d
commit 1446251
Show file tree

Hide file tree

Showing 10 changed files with 70 additions and 2 deletions.
diff --git a/frontend/dist/assets/images/favicon/favicon.ico b/frontend/dist/assets/images/favicon/favicon.ico
diff --git a/frontend/dist/assets/images/favicon/tracim_16x16.png b/frontend/dist/assets/images/favicon/tracim_16x16.png
diff --git a/frontend/dist/assets/images/favicon/tracim_32x32.png b/frontend/dist/assets/images/favicon/tracim_32x32.png
diff --git a/frontend/dist/assets/images/favicon/tracim_64x64.png b/frontend/dist/assets/images/favicon/tracim_64x64.png
diff --git a/frontend/dist/assets/images/favicon/tracim_apple_touch_icon.png b/frontend/dist/assets/images/favicon/tracim_apple_touch_icon.png
diff --git a/frontend/dist/assets/images/favicon/tracim_safari_pinned_tab.svg b/frontend/dist/assets/images/favicon/tracim_safari_pinned_tab.svg
diff --git a/frontend/dist/assets/images/logo-tracim.png b/frontend/dist/assets/images/logo-tracim.png
diff --git a/frontend/dist/index.html b/frontend/dist/index.html
@@ -4,7 +4,10 @@
   <meta charset='utf-8' />
   <meta name='viewport' content='width=device-width, user-scalable=no'>
   <title>Tracim</title>
-  <link rel='shortcut icon' type='image/x-icon' href='/assets/favicon.ico'>
+  <link rel="icon" type="image/png" sizes="64x64" href="/assets/images/favicon/tracim_64x64.png">
+  <link rel="icon" type="image/png" sizes="32x32" href="/assets/images/favicon/tracim_32x32.png">
+  <link rel="icon" type="image/png" sizes="16x16" href="/assets/images/favicon/tracim_16x16.png">
+
   <link rel='manifest' href='/assets/manifest.json'>
 
   <link rel='stylesheet' type='text/css' href='/assets/font/font-awesome-4.7.0/css/font-awesome.css'>

diff --git a/frontend/dist/index.mak b/frontend/dist/index.mak
@@ -5,7 +5,9 @@
     <meta name='viewport' content='width=device-width, user-scalable=no'>
 
     <title>${website_title}</title>
-    <link rel='shortcut icon' type='image/x-icon' href='/assets/favicon.ico' >
+    <link rel="icon" type="image/png" sizes="64x64" href="/assets/images/favicon/tracim_64x64.png">
+    <link rel="icon" type="image/png" sizes="32x32" href="/assets/images/favicon/tracim_32x32.png">
+    <link rel="icon" type="image/png" sizes="16x16" href="/assets/images/favicon/tracim_16x16.png">
     <link rel='manifest' href='/assets/manifest.json'>
 
     <link rel='stylesheet' type='text/css' href='/assets/font/font-awesome-4.7.0/css/font-awesome.css'>

diff --git a/frontend/src/img/logo-tracim.png b/frontend/src/img/logo-tracim.png