Merge pull request #243 from whiteout-io/dev/WO-591

Dev/wo 591
This commit is contained in:
Tankred Hase 2015-01-08 15:09:05 +01:00
commit 00914cb3be
28 changed files with 61 additions and 9 deletions

View File

@ -400,7 +400,7 @@ module.exports = function(grunt) {
icons: {
files: [{
expand: true,
src: ['img/icons/*.svg','!img/icons/all.svg'],
src: ['img/icons/*.svg', '!img/icons/all.svg'],
cwd: 'src/',
dest: 'compile/'
}]
@ -527,7 +527,32 @@ module.exports = function(grunt) {
'js/mailreader-parser-worker.browserified.js',
'js/mailreader-parser-worker.min.js.map',
'js/tcp-socket-tls-worker.browserified.js',
'js/tcp-socket-tls-worker.min.js.map'
'js/tcp-socket-tls-worker.min.js.map',
'img/icon-100-ios.png',
'img/icon-114-ios.png',
'img/icon-120-ios.png',
'img/icon-128-chrome.png',
'img/icon-144-android.png',
'img/icon-144-ios.png',
'img/icon-152-ios.png',
'img/icon-180-ios.png',
'img/icon-192-android.png',
'img/icon-29-ios.png',
'img/icon-36-android.png',
'img/icon-40-ios.png',
'img/icon-48-android.png',
'img/icon-50-ios.png',
'img/icon-57-ios.png',
'img/icon-58-ios.png',
'img/icon-60-android.png',
'img/icon-60-ios.png',
'img/icon-72-android.png',
'img/icon-72-ios.png',
'img/icon-76-ios.png',
'img/icon-78-android.png',
'img/icon-80-ios.png',
'img/icon-87-ios.png',
'img/icon-96-android.png'
],
master: ['index.html']
},

BIN
src/img/icon-100-ios.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.7 KiB

BIN
src/img/icon-114-ios.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 14 KiB

BIN
src/img/icon-144-ios.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.6 KiB

BIN
src/img/icon-180-ios.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 24 KiB

View File

Before

Width:  |  Height:  |  Size: 22 KiB

After

Width:  |  Height:  |  Size: 22 KiB

BIN
src/img/icon-29-ios.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

BIN
src/img/icon-36-android.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.6 KiB

BIN
src/img/icon-40-ios.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.7 KiB

BIN
src/img/icon-48-android.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.4 KiB

BIN
src/img/icon-50-ios.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.4 KiB

BIN
src/img/icon-57-ios.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.8 KiB

BIN
src/img/icon-58-ios.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.8 KiB

BIN
src/img/icon-60-android.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.2 KiB

BIN
src/img/icon-60-ios.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.0 KiB

BIN
src/img/icon-72-android.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.8 KiB

BIN
src/img/icon-72-ios.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.8 KiB

BIN
src/img/icon-76-ios.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.0 KiB

BIN
src/img/icon-78-android.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.8 KiB

BIN
src/img/icon-80-ios.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.4 KiB

BIN
src/img/icon-87-ios.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.6 KiB

BIN
src/img/icon-96-android.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.3 KiB

View File

@ -18,7 +18,7 @@
<!-- standard homescreen link -->
<meta name="mobile-web-app-capable" content="yes">
<!-- standard icon (retina) -->
<link rel="icon" sizes="196x196" href="img/icon-196.png">
<link rel="icon" sizes="196x196" href="img/icon-196-universal.png">
<!-- Viewport and styles -->
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0">

View File

@ -5,10 +5,8 @@
"manifest_version": 2,
"offline_enabled": true,
"icons": {
"120": "img/icon-120-ios.png",
"152": "img/icon-152-ios.png",
"128": "img/icon-128-chrome.png",
"196": "img/icon-196.png"
"196": "img/icon-196-universal.png"
},
"permissions": [
"unlimitedStorage",

View File

@ -1,13 +1,42 @@
{
"packageId": "io.whiteout.WhiteoutMail",
"versionCode": 12,
"CFBundleVersion": "1.1.1",
"CFBundleVersion": "1",
"ios": {
"oauth2": {
"client_id": "440907777130-m0cn01eot554ik1h70hfcmvidnq61oer.apps.googleusercontent.com"
}
},
"icons": {
"29": "img/icon-29-ios.png",
"40": "img/icon-40-ios.png",
"50": "img/icon-50-ios.png",
"57": "img/icon-57-ios.png",
"58": "img/icon-58-ios.png",
"60": "img/icon-60-ios.png",
"72": "img/icon-72-ios.png",
"76": "img/icon-76-ios.png",
"80": "img/icon-80-ios.png",
"87": "img/icon-87-ios.png",
"100": "img/icon-100-ios.png",
"114": "img/icon-114-ios.png",
"120": "img/icon-120-ios.png",
"144": "img/icon-144-ios.png",
"152": "img/icon-152-ios.png",
"180": "img/icon-180-ios.png"
},
},
"android": {}
"android": {
"icons": {
"36": "img/icon-36-android.png",
"48": "img/icon-48-android.png",
"60": "img/icon-60-android.png",
"72": "img/icon-72-android.png",
"78": "img/icon-78-android.png",
"96": "img/icon-96-android.png",
"144": "img/icon-144-android.png",
"192": "img/icon-192-android.png"
},
}
}