diff options
| author | Pierre Rudloff <contact@rudloff.pro> | 2016-07-19 18:28:04 +0200 |
|---|---|---|
| committer | Christopher Speller <crspeller@gmail.com> | 2016-07-19 12:28:04 -0400 |
| commit | 3604f925a87dfd4558cef7c3950440cf57c44ffc (patch) | |
| tree | 70775f0d9cef3a613d0ffc65fefee8f4cd4663f7 | |
| parent | 6bbf8c8348c936d480071d061314750155041560 (diff) | |
| download | chat-3604f925a87dfd4558cef7c3950440cf57c44ffc.tar.gz chat-3604f925a87dfd4558cef7c3950440cf57c44ffc.tar.bz2 chat-3604f925a87dfd4558cef7c3950440cf57c44ffc.zip | |
Fix web app manifest (#3582)
| -rw-r--r-- | webapp/config/manifest.json | 47 | ||||
| -rw-r--r-- | webapp/root.html | 2 | ||||
| -rw-r--r-- | webapp/webpack.config.js | 8 |
3 files changed, 36 insertions, 21 deletions
diff --git a/webapp/config/manifest.json b/webapp/config/manifest.json index dd95d917e..766b7006b 100644 --- a/webapp/config/manifest.json +++ b/webapp/config/manifest.json @@ -1,40 +1,49 @@ { "name": "Mattermost", + "description": "Mattermost is an open source, self-hosted Slack-alternative", "icons": [{ - "src": "/static/images/favicon/android-chrome-36x36.png", + "src": "/static/images/favicon/android-chrome-192x192.png", "type": "image/png", - "sizes": "36x36" + "sizes": "192x192" }, { - "src": "/static/images/favicon/android-chrome-48x48.png", + "src": "/static/images/favicon/apple-touch-icon-120x120.png", "type": "image/png", - "sizes": "48x48" + "sizes": "120x120" }, { - "src": "/static/images/favicon/android-chrome-72x72.png", + "src": "/static/images/favicon/apple-touch-icon-144x144.png", "type": "image/png", - "sizes": "72x72" + "sizes": "144x144" }, { - "src": "/static/images/favicon/android-chrome-96x96.png", + "src": "/static/images/favicon/apple-touch-icon-152x152.png", "type": "image/png", - "sizes": "96x96" + "sizes": "152x152" }, { - "src": "/static/images/favicon/android-chrome-144x144.png", + "src": "/static/images/favicon/apple-touch-icon-57x57.png", "type": "image/png", - "sizes": "144x144" + "sizes": "57x57" }, { - "src": "/static/images/favicon/android-chrome-192x192.png", + "src": "/static/images/favicon/apple-touch-icon-60x60.png", "type": "image/png", - "sizes": "192x192" + "sizes": "60x60" + }, { + "src": "/static/images/favicon/apple-touch-icon-72x72.png", + "type": "image/png", + "sizes": "72x72" }, { - "src": "/static/images/favicon/android-chrome-256x256.png", + "src": "/static/images/favicon/apple-touch-icon-76x76.png", "type": "image/png", - "sizes": "256x256" + "sizes": "76x76" }, { - "src": "/static/images/favicon/android-chrome-384x384.png", + "src": "/static/images/favicon/favicon-16x16.png", "type": "image/png", - "sizes": "384x384" + "sizes": "16x16" }, { - "src": "/static/images/favicon/android-chrome-512x512.png", + "src": "/static/images/favicon/favicon-32x32.png", "type": "image/png", - "sizes": "512x512" + "sizes": "32x32" + }, { + "src": "/static/images/favicon/favicon-96x96.png", + "type": "image/png", + "sizes": "96x96" }] -}
\ No newline at end of file +} diff --git a/webapp/root.html b/webapp/root.html index b48712e46..7cead1c59 100644 --- a/webapp/root.html +++ b/webapp/root.html @@ -29,7 +29,7 @@ <link rel='icon' type='image/png' sizes='32x32' href='images/favicon/favicon-32x32.png'> <link rel='icon' type='image/png' sizes='96x96' href='images/favicon/favicon-96x96.png'> <link rel='icon' type='image/png' sizes='192x192' href='images/favicon/android-chrome-192x192.png'> - <link rel='manifest' href='/static/config/manifest.json'> + <link rel='manifest' href='config/manifest.json'> <!-- Android add to homescreen --> <!-- CSS Should always go first --> diff --git a/webapp/webpack.config.js b/webapp/webpack.config.js index 10dcdcce3..4f33eaf84 100644 --- a/webapp/webpack.config.js +++ b/webapp/webpack.config.js @@ -45,9 +45,14 @@ var config = { }, { test: /\.json$/, + exclude: /manifest\.json$/, loader: 'json' }, { + test: /manifest\.json$/, + loader: 'file?name=files/[hash].[ext]' + }, + { test: /(node_modules|non_npm_dependencies)\/.+\.(js|jsx)$/, loader: 'imports', query: { @@ -86,7 +91,8 @@ var config = { new CopyWebpackPlugin([ {from: 'images/emoji', to: 'emoji'}, {from: 'images/logo-email.png', to: 'images'}, - {from: 'images/circles.png', to: 'images'} + {from: 'images/circles.png', to: 'images'}, + {from: 'images/favicon', to: 'images/favicon'} ]), new webpack.LoaderOptionsPlugin({ minimize: !DEV, |