diff options
| author | Eugen <eugen@zeonfederated.com> | 2016-11-02 17:41:32 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-02 17:41:32 +0100 |
| commit | 77045d088608eec16548a0dfb693a6307881048d (patch) | |
| tree | 26181e12c375d346bd0a570ff5c71587d0569d31 | |
| parent | e7723ab6625d3cd48b44ddbd340854ea960706f6 (diff) | |
| parent | bc1dba22c51e48ec6680e48cb2792513404b810f (diff) | |
Merge pull request #130 from fhemberger/feature/manifest
Add touch icons for Chrome, iOS and Windows 10
| -rw-r--r-- | app/views/layouts/application.html.haml | 5 | ||||
| -rw-r--r-- | public/android-chrome-192x192.png | bin | 0 -> 14577 bytes | |||
| -rw-r--r-- | public/apple-touch-icon.png | bin | 0 -> 11810 bytes | |||
| -rw-r--r-- | public/browserconfig.xml | 9 | ||||
| -rw-r--r-- | public/manifest.json | 14 | ||||
| -rw-r--r-- | public/mstile-150x150.png | bin | 0 -> 6916 bytes |
6 files changed, 28 insertions, 0 deletions
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml index 89c7b14c4..3ec743768 100644 --- a/app/views/layouts/application.html.haml +++ b/app/views/layouts/application.html.haml @@ -5,6 +5,11 @@ %meta{:name => 'viewport', :content => 'width=device-width, initial-scale=1'}/ %meta{'http-equiv' => 'X-UA-Compatible', :content => 'IE=edge'}/ + %link{:rel => "apple-touch-icon", :sizes => "180x180", :href => "/assets/apple-touch-icon.png"}/ + %link{:rel => "manifest", :href => "/assets/manifest.json"}/ + %meta{:name => "msapplication-config", :content => "/assets/browserconfig.xml"}/ + %meta{:name => "theme-color", :content => "#ffffff"}/ + %title = "#{yield(:page_title)} - " if content_for?(:page_title) Mastodon diff --git a/public/android-chrome-192x192.png b/public/android-chrome-192x192.png new file mode 100644 index 000000000..f059bbc46 --- /dev/null +++ b/public/android-chrome-192x192.png Binary files differdiff --git a/public/apple-touch-icon.png b/public/apple-touch-icon.png new file mode 100644 index 000000000..c1a191302 --- /dev/null +++ b/public/apple-touch-icon.png Binary files differdiff --git a/public/browserconfig.xml b/public/browserconfig.xml new file mode 100644 index 000000000..77318233c --- /dev/null +++ b/public/browserconfig.xml @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8"?> +<browserconfig> + <msapplication> + <tile> + <square150x150logo src="/assets/mstile-150x150.png"/> + <TileColor>#2b5797</TileColor> + </tile> + </msapplication> +</browserconfig> diff --git a/public/manifest.json b/public/manifest.json new file mode 100644 index 000000000..173270f03 --- /dev/null +++ b/public/manifest.json @@ -0,0 +1,14 @@ +{ + "name": "Mastodon", + "description": "Mastodon is a free, open-source social network server.", + "icons": [ + { + "src": "\/assets\/android-chrome-192x192.png", + "sizes": "192x192", + "type": "image\/png" + } + ], + "theme_color": "#ffffff", + "display": "standalone", + "start_url": "/#/statuses/home" +} diff --git a/public/mstile-150x150.png b/public/mstile-150x150.png new file mode 100644 index 000000000..57eae8355 --- /dev/null +++ b/public/mstile-150x150.png Binary files differ |
