Commit bfb9d6a5 authored by  JosephK's avatar JosephK
Browse files

Merge branch 'master' into 'master'

Fix preload warning + favicon.ico 404

See merge request framasoft/accueil!108
parents ccfa9c86 2d8a4d79
......@@ -70,12 +70,12 @@ export default {
/* Fill with empty string */
while (preloadList.length < nodes) {
preloadList.push('');
preloadList.push('/favicon.ico');
}
for (let i = 0; i < preloadList.length; i += 1) {
let type = '';
if (/\.(png|jpg|gif|webp)$/.test(preloadList[i])) { type = 'image'; }
if (/\.(png|jpg|gif|webp|ico)$/.test(preloadList[i])) { type = 'image'; }
if (/\.(ttf|eot|woff|woff2)$/.test(preloadList[i])) { type = 'font'; }
if (/\.(webm|mp4)$/.test(preloadList[i])) { type = 'video'; }
......
......@@ -13,6 +13,7 @@ commons: # import everything if empty
# - country
- doc
# - emoji
- flag
- git
- icon
- license
......
......@@ -102,7 +102,7 @@ legals:
siretNb: 500 715 776 00026
address: 'Association Framasoft<br />Pierre-Yves Gosset<br />
c/o Locaux Motiv<br />10 bis, rue Jangot<br />69007 LYON<br />FRANCE'
coprezName: Christelle Thomas, Maïtané Lenoir, Pierre-Yves Thouvenot
coprezName: Christelle Thomas, Maïtané Lenoir, Pierre-Yves Thouvenot, Rodolphe Lemétayer
asso:
files: https://soutenir.framasoft.org/sites/default/files/
partners:
......
......@@ -23,16 +23,16 @@
<meta name="twitter:title" content="">
<meta name="twitter:image" content="">
<link id="preload-0" rel="preload" href="" as="">
<link id="preload-1" rel="preload" href="" as="">
<link id="preload-2" rel="preload" href="" as="">
<link id="preload-3" rel="preload" href="" as="">
<link id="preload-4" rel="preload" href="" as="">
<link id="preload-5" rel="preload" href="" as="">
<link id="preload-6" rel="preload" href="" as="">
<link id="preload-7" rel="preload" href="" as="">
<link id="preload-8" rel="preload" href="" as="">
<link id="preload-9" rel="preload" href="" as="">
<link id="preload-0" rel="preload" href="/favicon.ico" as="image">
<link id="preload-1" rel="preload" href="/favicon.ico" as="image">
<link id="preload-2" rel="preload" href="/favicon.ico" as="image">
<link id="preload-3" rel="preload" href="/favicon.ico" as="image">
<link id="preload-4" rel="preload" href="/favicon.ico" as="image">
<link id="preload-5" rel="preload" href="/favicon.ico" as="image">
<link id="preload-6" rel="preload" href="/favicon.ico" as="image">
<link id="preload-7" rel="preload" href="/favicon.ico" as="image">
<link id="preload-8" rel="preload" href="/favicon.ico" as="image">
<link id="preload-9" rel="preload" href="/favicon.ico" as="image">
</head>
<body>
<div id="app"></div>
......
......@@ -28,7 +28,7 @@ for (let i = 0; i < process.argv.length; i += 1) {
}
}
const assets = [];
const assets = [{ from: path.resolve(__dirname, './app/assets/img/icons/favicon.ico'), to: 'favicon.ico' }];
fs.readdirSync('./app/assets').forEach((file) => {
if (!/scss/.test(file)) {
assets.push({ from: path.resolve(__dirname, `./app/assets/${file}`), to: file });
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment