Skip to content

Commit

Permalink
Fix web app manifest (mattermost#3582)
Browse files Browse the repository at this point in the history
  • Loading branch information
Rudloff authored and crspeller committed Jul 19, 2016
1 parent 5088172 commit d554926
Show file tree
Hide file tree
Showing 3 changed files with 36 additions and 21 deletions.
47 changes: 28 additions & 19 deletions config/manifest.json
Original file line number Diff line number Diff line change
@@ -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"
}]
}
}
2 changes: 1 addition & 1 deletion root.html
Original file line number Diff line number Diff line change
Expand Up @@ -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 -->
Expand Down
8 changes: 7 additions & 1 deletion webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,13 @@ 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',
Expand Down Expand Up @@ -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,
Expand Down

0 comments on commit d554926

Please sign in to comment.