Merge pull request #4795 from HSLdevcom/simplify-favicon-logic

chore: clean up favicon logic
HSLdevcom · Apr 26, 2023 · bd54415 · bd54415
2 parents 88f524c + cf0994a
commit bd54415
Show file tree

Hide file tree

Showing 23 changed files with 13 additions and 54 deletions.
diff --git a/app/configurations/config.joensuu.js b/app/configurations/config.joensuu.js
@@ -23,6 +23,8 @@ export default configMerger(walttiConfig, {
 
   title: APP_TITLE,
 
+  favicon: './app/configurations/images/joensuu/favicon.png',
+
   // Navbar logo
   logo: 'joensuu/jojo-logo.png',
 

diff --git a/app/configurations/config.jyvaskyla.js b/app/configurations/config.jyvaskyla.js
@@ -56,6 +56,8 @@ export default configMerger(walttiConfig, {
 
   title: APP_TITLE,
 
+  favicon: './app/configurations/images/jyvaskyla/favicon.png',
+
   // Navbar logo
   logo: 'jyvaskyla/favicon.png',
 

diff --git a/app/configurations/config.lahti.js b/app/configurations/config.lahti.js
@@ -33,6 +33,8 @@ export default configMerger(walttiConfig, {
 
   title: APP_TITLE,
 
+  favicon: './app/configurations/images/lahti/favicon.png',
+
   // Navbar logo
   logo: 'lahti/lahti-logo.png',
   secondaryLogo: 'lahti/secondary-lahti-logo.png',

diff --git a/app/configurations/config.oulu.js b/app/configurations/config.oulu.js
@@ -34,6 +34,8 @@ export default configMerger(walttiConfig, {
 
   title: APP_TITLE,
 
+  favicon: './app/configurations/images/oulu/favicon.png',
+
   // Navbar logo
   logo: 'oulu/oulu-logo.png',
   secondaryLogo: 'oulu/secondary-oulu-logo.png',

diff --git a/app/configurations/config.pori.js b/app/configurations/config.pori.js
@@ -31,7 +31,7 @@ export default configMerger(walttiConfig, {
 
   title: APP_TITLE,
 
-  favicon: 'pori/favicon.svg',
+  favicon: './app/configurations/images/pori/favicon.png',
 
   // Navbar logo
   logo: 'pori/pori_logo.svg',

diff --git a/app/configurations/config.rovaniemi.js b/app/configurations/config.rovaniemi.js
@@ -29,6 +29,7 @@ export default configMerger(walttiConfig, {
   },
 
   title: APP_TITLE,
+  favicon: './app/configurations/images/rovaniemi/favicon.png',
   // Navbar logo
   logo: 'rovaniemi/rovaniemi-logo.svg',
   feedIds: ['Rovaniemi'],

diff --git a/app/configurations/config.tampere.js b/app/configurations/config.tampere.js
@@ -38,7 +38,7 @@ export default configMerger(walttiConfig, {
   // Navbar logo
   logo: 'tampere/tampere-logo.png',
 
-  favicon: './sass/themes/tampere/favicon.png',
+  favicon: './app/configurations/images/tampere/favicon.png',
 
   feedIds: ['tampere', 'digitraffic', 'tampereDRT'],
 

diff --git a/app/configurations/config.turku.js b/app/configurations/config.turku.js
@@ -79,6 +79,8 @@ export default configMerger(walttiConfig, {
 
   title: APP_TITLE,
 
+  favicon: './app/configurations/images/turku/favicon.png',
+
   // Navbar logo
   logo: 'turku/foli-logo.png',
 

diff --git a/sass/themes/default/favicon.png b/sass/themes/default/favicon.png
diff --git a/sass/themes/hameenlinna/favicon.png b/sass/themes/hameenlinna/favicon.png
diff --git a/sass/themes/hsl/icon_favicon-reittiopas.svg b/sass/themes/hsl/icon_favicon-reittiopas.svg
diff --git a/sass/themes/joensuu/favicon.png b/sass/themes/joensuu/favicon.png
diff --git a/sass/themes/jyvaskyla/favicon.png b/sass/themes/jyvaskyla/favicon.png
diff --git a/sass/themes/kouvola/favicon.png b/sass/themes/kouvola/favicon.png
diff --git a/sass/themes/kuopio/favicon.png b/sass/themes/kuopio/favicon.png
diff --git a/sass/themes/lahti/favicon.png b/sass/themes/lahti/favicon.png
diff --git a/sass/themes/lappeenranta/bussi_fin.jpeg b/sass/themes/lappeenranta/bussi_fin.jpeg
diff --git a/sass/themes/matka/icon_favicon-matkafi.svg b/sass/themes/matka/icon_favicon-matkafi.svg
diff --git a/sass/themes/oulu/favicon.png b/sass/themes/oulu/favicon.png
diff --git a/sass/themes/rovaniemi/favicon.png b/sass/themes/rovaniemi/favicon.png
diff --git a/sass/themes/tampere/favicon.png b/sass/themes/tampere/favicon.png
diff --git a/sass/themes/turku/favicon.png b/sass/themes/turku/favicon.png
diff --git a/sass/themes/varely/favicon.png b/sass/themes/varely/favicon.png