Merge pull request #3126 from thelounge/xpaw/favicon-root

Move favicon.ico to the root folder
This commit is contained in:
Pavel Djundik 2019-03-18 13:56:39 +02:00 committed by GitHub
commit 68de8cdd22
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 1 deletions

View File

Before

Width:  |  Height:  |  Size: 22 KiB

After

Width:  |  Height:  |  Size: 22 KiB

View File

@ -20,7 +20,7 @@
<title>The Lounge</title> <title>The Lounge</title>
<!-- Browser tab icon --> <!-- Browser tab icon -->
<link id="favicon" rel="icon" sizes="16x16 32x32 64x64" href="img/favicon-normal.ico" data-other="img/favicon-alerted.ico" type="image/x-icon"> <link id="favicon" rel="icon" sizes="16x16 32x32 64x64" href="favicon.ico" data-other="img/favicon-alerted.ico" type="image/x-icon">
<!-- Safari pinned tab icon --> <!-- Safari pinned tab icon -->
<link rel="mask-icon" href="img/icon-black-transparent-bg.svg" color="#415363"> <link rel="mask-icon" href="img/icon-black-transparent-bg.svg" color="#415363">

View File

@ -12,6 +12,13 @@ describe("public folder", function() {
expect(fs.existsSync(path.join(publicFolder, "fonts", "fa-solid-900.woff2"))).to.be.true; expect(fs.existsSync(path.join(publicFolder, "fonts", "fa-solid-900.woff2"))).to.be.true;
}); });
it("files in root folder are copied", function() {
expect(fs.existsSync(path.join(publicFolder, "favicon.ico"))).to.be.true;
expect(fs.existsSync(path.join(publicFolder, "robots.txt"))).to.be.true;
expect(fs.existsSync(path.join(publicFolder, "service-worker.js"))).to.be.true;
expect(fs.existsSync(path.join(publicFolder, "thelounge.webmanifest"))).to.be.true;
});
it("index HTML file is not copied", function() { it("index HTML file is not copied", function() {
expect(fs.existsSync(path.join(publicFolder, "index.html"))).to.be.false; expect(fs.existsSync(path.join(publicFolder, "index.html"))).to.be.false;
expect(fs.existsSync(path.join(publicFolder, "index.html.tpl"))).to.be.false; expect(fs.existsSync(path.join(publicFolder, "index.html.tpl"))).to.be.false;
@ -22,6 +29,11 @@ describe("public folder", function() {
expect(fs.existsSync(path.join(publicFolder, "js", "bundle.vendor.js"))).to.be.true; expect(fs.existsSync(path.join(publicFolder, "js", "bundle.vendor.js"))).to.be.true;
}); });
it("style files are built", function() {
expect(fs.existsSync(path.join(publicFolder, "css", "style.css"))).to.be.true;
expect(fs.existsSync(path.join(publicFolder, "css", "style.css.map"))).to.be.true;
});
it("javascript map is created", function() { it("javascript map is created", function() {
expect(fs.existsSync(path.join(publicFolder, "js", "bundle.js.map"))).to.be.true; expect(fs.existsSync(path.join(publicFolder, "js", "bundle.js.map"))).to.be.true;
}); });