diff --git a/frontend/src/app/app.component.ts b/frontend/src/app/app.component.ts index 307789763..71f9871a9 100644 --- a/frontend/src/app/app.component.ts +++ b/frontend/src/app/app.component.ts @@ -187,6 +187,7 @@ export class AppComponent { if (!expirationToken) { this.setUserLoggedIn(false); + this.setDefaultFavicon(); } this.navigationTabs = { @@ -323,35 +324,12 @@ export class AppComponent { this.whiteLabelSettingsLoaded = true; if (whiteLabelSettings.favicon) { - const link: HTMLLinkElement | null = document.querySelector("link[rel*='icon']"); - if (link) { - link.href = whiteLabelSettings.favicon; - } else { - const newLink = document.createElement('link'); - newLink.rel = 'icon'; - newLink.href = whiteLabelSettings.favicon; - document.head.appendChild(newLink); - } + const newLink = document.createElement('link'); + newLink.rel = 'icon'; + newLink.href = whiteLabelSettings.favicon; + document.head.appendChild(newLink); } else { - const faviconIco = document.createElement('link'); - faviconIco.rel = 'icon'; - faviconIco.type = 'image/x-icon'; - faviconIco.href = 'assets/favicon.ico'; - - const favicon16 = document.createElement('link'); - favicon16.rel = 'icon'; - favicon16.type = 'image/png'; - favicon16.setAttribute('sizes', '16x16'); - favicon16.href = 'assets/favicon-16x16.png'; - - const favicon32 = document.createElement('link'); - favicon32.rel = 'icon'; - favicon32.type = 'image/png'; - favicon32.setAttribute('sizes', '32x32'); - favicon32.href = 'assets/favicon-32x32.png'; - - document.head.appendChild(favicon16); - document.head.appendChild(favicon32); + this.setDefaultFavicon(); } }); this._uiSettings.getUiSettings().subscribe((settings) => { @@ -406,4 +384,27 @@ export class AppComponent { } }); } + + private setDefaultFavicon() { + const faviconIco = document.createElement('link'); + faviconIco.rel = 'icon'; + faviconIco.type = 'image/x-icon'; + faviconIco.href = 'assets/favicon.ico'; + + const favicon16 = document.createElement('link'); + favicon16.rel = 'icon'; + favicon16.type = 'image/png'; + favicon16.setAttribute('sizes', '16x16'); + favicon16.href = 'assets/favicon-16x16.png'; + + const favicon32 = document.createElement('link'); + favicon32.rel = 'icon'; + favicon32.type = 'image/png'; + favicon32.setAttribute('sizes', '32x32'); + favicon32.href = 'assets/favicon-32x32.png'; + + document.head.appendChild(faviconIco); + document.head.appendChild(favicon16); + document.head.appendChild(favicon32); + } } diff --git a/frontend/src/assets/favicon-16x16.png b/frontend/src/assets/favicon-16x16.png index 422998948..32d982a90 100644 Binary files a/frontend/src/assets/favicon-16x16.png and b/frontend/src/assets/favicon-16x16.png differ diff --git a/frontend/src/assets/favicon-32x32.png b/frontend/src/assets/favicon-32x32.png index 20f50f5f3..9632d5607 100644 Binary files a/frontend/src/assets/favicon-32x32.png and b/frontend/src/assets/favicon-32x32.png differ diff --git a/frontend/src/assets/favicon.ico b/frontend/src/assets/favicon.ico index 1b0fdf486..a1212a5fc 100644 Binary files a/frontend/src/assets/favicon.ico and b/frontend/src/assets/favicon.ico differ diff --git a/frontend/src/assets/favicon.svg b/frontend/src/assets/favicon.svg index d4b69aad2..8a65ca9cc 100644 --- a/frontend/src/assets/favicon.svg +++ b/frontend/src/assets/favicon.svg @@ -1,4 +1,4 @@ - + diff --git a/frontend/src/index.html b/frontend/src/index.html index 5b77d5c38..c5fb38a6d 100644 --- a/frontend/src/index.html +++ b/frontend/src/index.html @@ -8,7 +8,7 @@ + -->