Merge remote-tracking branch 'upstream/pull/5732'

[rails.git] / app / assets / favicons / manifest.json.erb

diff --git a/app/assets/favicons/manifest.json.erb b/app/assets/favicons/manifest.json.erb
index 8938f2cd95dc0cc7683682968ade8c13c1983d0d..1666333a4e78893cd47d68401a1e1271ed4f067a 100644 (file)
--- a/app/assets/favicons/manifest.json.erb
+++ b/app/assets/favicons/manifest.json.erb
@@ -1,41 +1,14 @@
 {
        "name": "OpenStreetMap",
 {
        "name": "OpenStreetMap",

-       "icons": [
-               {
-                       "src": "<%= image_path("android-chrome-36x36.png").gsub("/", "\\/") %>",
-                       "sizes": "36x36",
-                       "type": "image\/png",
-                       "density": "0.75"
-               },
-               {
-                       "src": "<%= image_path("android-chrome-48x48.png").gsub("/", "\\/") %>",
-                       "sizes": "48x48",
-                       "type": "image\/png",
-                       "density": "1.0"
-               },
-               {
-                       "src": "<%= image_path("android-chrome-72x72.png").gsub("/", "\\/") %>",
-                       "sizes": "72x72",
-                       "type": "image\/png",
-                       "density": "1.5"
-               },
-               {
-                       "src": "<%= image_path("android-chrome-96x96.png").gsub("/", "\\/") %>",
-                       "sizes": "96x96",
-                       "type": "image\/png",
-                       "density": "2.0"
-               },
-               {
-                       "src": "<%= image_path("android-chrome-144x144.png").gsub("/", "\\/") %>",
-                       "sizes": "144x144",
-                       "type": "image\/png",
-                       "density": "3.0"
-               },
-               {
-                       "src": "<%= image_path("android-chrome-192x192.png").gsub("/", "\\/") %>",
-                       "sizes": "192x192",
-                       "type": "image\/png",
-                       "density": "4.0"
-               }
-       ]
+       "short_name": "OSM",
+       "icons": <%= [36, 48, 72, 96, 144, 192].map { |res| {
+                       src: image_path("android-chrome-#{res}x#{res}.png").gsub("/", "\\/"),
+                       sizes: "#{res}x#{res}",
+                       type: "image/png",
+                       density: res.to_f / 48
+               } }.to_json %>,
+       "start_url": "/",
+       "theme_color": "#7ebc6f",
+       "background_color": "#fff",
+       "display": "minimal-ui"

 }
 }