diff --git a/client/img/apple-touch-icon-120x120.png b/client/img/apple-touch-icon-120x120.png deleted file mode 100644 index 6d7bf410..00000000 Binary files a/client/img/apple-touch-icon-120x120.png and /dev/null differ diff --git a/client/img/favicon-alerted.ico b/client/img/favicon-alerted.ico new file mode 100644 index 00000000..f89ab90b Binary files /dev/null and b/client/img/favicon-alerted.ico differ diff --git a/client/img/favicon-normal.ico b/client/img/favicon-normal.ico new file mode 100644 index 00000000..0345f3e4 Binary files /dev/null and b/client/img/favicon-normal.ico differ diff --git a/client/img/favicon-notification.png b/client/img/favicon-notification.png deleted file mode 100644 index 1eb1e771..00000000 Binary files a/client/img/favicon-notification.png and /dev/null differ diff --git a/client/img/favicon.png b/client/img/favicon.png deleted file mode 100644 index 3dca950b..00000000 Binary files a/client/img/favicon.png and /dev/null differ diff --git a/client/img/icon-alerted-black-transparent-bg-72x72px.png b/client/img/icon-alerted-black-transparent-bg-72x72px.png new file mode 100644 index 00000000..ef63b40d Binary files /dev/null and b/client/img/icon-alerted-black-transparent-bg-72x72px.png differ diff --git a/client/img/icon-alerted-grey-bg-192x192px.png b/client/img/icon-alerted-grey-bg-192x192px.png new file mode 100644 index 00000000..2b0586cb Binary files /dev/null and b/client/img/icon-alerted-grey-bg-192x192px.png differ diff --git a/client/img/icon-black-transparent-bg.svg b/client/img/icon-black-transparent-bg.svg new file mode 100644 index 00000000..37e9c7d4 --- /dev/null +++ b/client/img/icon-black-transparent-bg.svg @@ -0,0 +1 @@ + diff --git a/client/img/logo-64.png b/client/img/logo-64.png deleted file mode 100644 index f7dd344f..00000000 Binary files a/client/img/logo-64.png and /dev/null differ diff --git a/client/img/logo-dark.svg b/client/img/logo-dark.svg deleted file mode 100644 index dd0d3016..00000000 --- a/client/img/logo-dark.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/client/img/logo-grey-bg-120x120px.png b/client/img/logo-grey-bg-120x120px.png new file mode 100644 index 00000000..bd8ae4a1 Binary files /dev/null and b/client/img/logo-grey-bg-120x120px.png differ diff --git a/client/img/logo-grey-bg-152x152px.png b/client/img/logo-grey-bg-152x152px.png new file mode 100644 index 00000000..06cc5cc1 Binary files /dev/null and b/client/img/logo-grey-bg-152x152px.png differ diff --git a/client/img/logo-grey-bg-167x167px.png b/client/img/logo-grey-bg-167x167px.png new file mode 100644 index 00000000..0dbf4092 Binary files /dev/null and b/client/img/logo-grey-bg-167x167px.png differ diff --git a/client/img/logo-grey-bg-180x180px.png b/client/img/logo-grey-bg-180x180px.png new file mode 100644 index 00000000..33c8b5aa Binary files /dev/null and b/client/img/logo-grey-bg-180x180px.png differ diff --git a/client/img/logo-grey-bg-192x192px.png b/client/img/logo-grey-bg-192x192px.png new file mode 100644 index 00000000..57f1a3f8 Binary files /dev/null and b/client/img/logo-grey-bg-192x192px.png differ diff --git a/client/img/logo-grey-bg.svg b/client/img/logo-grey-bg.svg new file mode 100644 index 00000000..f7737548 --- /dev/null +++ b/client/img/logo-grey-bg.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/client/img/logo.svg b/client/img/logo.svg deleted file mode 100644 index 2378f20c..00000000 --- a/client/img/logo.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/client/img/touch-icon-192x192.png b/client/img/touch-icon-192x192.png deleted file mode 100644 index 976f79cd..00000000 Binary files a/client/img/touch-icon-192x192.png and /dev/null differ diff --git a/client/index.html.tpl b/client/index.html.tpl index 348a168c..7ecf4569 100644 --- a/client/index.html.tpl +++ b/client/index.html.tpl @@ -18,11 +18,29 @@ The Lounge - - - + + + + + + + + + + + + + + + + + + + + + diff --git a/client/js/socket-events/msg.js b/client/js/socket-events/msg.js index 7ad281f3..d24c068d 100644 --- a/client/js/socket-events/msg.js +++ b/client/js/socket-events/msg.js @@ -187,8 +187,8 @@ function notifyMessage(targetId, channel, msg) { } else { const notify = new Notification(title, { tag: `chan-${targetId}`, - badge: "img/logo-64.png", - icon: "img/touch-icon-192x192.png", + badge: "img/icon-alerted-black-transparent-bg-72x72px.png", + icon: "img/icon-alerted-grey-bg-192x192px.png", body: body, timestamp: timestamp, }); diff --git a/client/manifest.json b/client/manifest.json index de7bafd3..93ffc34a 100644 --- a/client/manifest.json +++ b/client/manifest.json @@ -4,24 +4,33 @@ "description": "Self-hosted web IRC client", "start_url": ".", "display": "standalone", - "theme_color": "#455164", - "background_color": "#455164", + "theme_color": "#415363", + "background_color": "#415363", "icons": [ { - "src": "img/touch-icon-192x192.png", - "sizes": "192x192", - "type": "image/png" + "src": "img/logo-grey-bg-120x120px.png", + "sizes": "120x120" }, { - "src": "img/apple-touch-icon-120x120.png", - "sizes": "120x120", - "type": "image/png" + "src": "img/logo-grey-bg-152x152px.png", + "sizes": "152x152" }, { - "src": "img/favicon.png", - "sizes": "64x64", - "type": "image/png" + "src": "img/logo-grey-bg-167x167px.png", + "sizes": "167x167" + }, + { + "src": "img/logo-grey-bg-180x180px.png", + "sizes": "180x180" + }, + { + "src": "img/logo-grey-bg-192x192px.png", + "sizes": "192x192" + }, + { + "src": "img/logo-grey-bg.svg", + "sizes": "193x193" } ] } diff --git a/client/service-worker.js b/client/service-worker.js index 4afaf2c8..cd0af83f 100644 --- a/client/service-worker.js +++ b/client/service-worker.js @@ -32,8 +32,8 @@ function showNotification(event, payload) { return self.registration.showNotification(payload.title, { tag: `chan-${payload.chanId}`, - badge: "img/logo-64.png", - icon: "img/touch-icon-192x192.png", + badge: "img/icon-alerted-black-transparent-bg-72x72px.png", + icon: "img/icon-alerted-grey-bg-192x192px.png", body: payload.body, timestamp: payload.timestamp, }); diff --git a/test/plugins/link.js b/test/plugins/link.js index a2499489..22a9c633 100644 --- a/test/plugins/link.js +++ b/test/plugins/link.js @@ -14,7 +14,7 @@ describe("Link plugin", function() { beforeEach(function(done) { app = util.createWebserver(); app.get("/real-test-image.png", function(req, res) { - res.sendFile(path.resolve(__dirname, "../../client/img/apple-touch-icon-120x120.png")); + res.sendFile(path.resolve(__dirname, "../../client/img/logo-grey-bg-120x120px.png")); }); this.connection = app.listen(9002, done); diff --git a/test/plugins/storage.js b/test/plugins/storage.js index 05a1a304..441deb60 100644 --- a/test/plugins/storage.js +++ b/test/plugins/storage.js @@ -11,11 +11,11 @@ const link = require("../../src/plugins/irc-events/link.js"); describe("Image storage", function() { this.slow(200); - const testImagePath = path.resolve(__dirname, "../../client/img/apple-touch-icon-120x120.png"); + const testImagePath = path.resolve(__dirname, "../../client/img/logo-grey-bg-120x120px.png"); const correctImageHash = crypto.createHash("sha256").update(fs.readFileSync(testImagePath)).digest("hex"); const correctImageURL = `storage/${correctImageHash.substring(0, 2)}/${correctImageHash.substring(2, 4)}/${correctImageHash.substring(4)}.png`; - const testSvgPath = path.resolve(__dirname, "../../client/img/logo.svg"); + const testSvgPath = path.resolve(__dirname, "../../client/img/logo-grey-bg.svg"); const correctSvgHash = crypto.createHash("sha256").update(fs.readFileSync(testSvgPath)).digest("hex"); const correctSvgURL = `storage/${correctSvgHash.substring(0, 2)}/${correctSvgHash.substring(2, 4)}/${correctSvgHash.substring(4)}.svg`;