manuel/uhr
1
0
Fork 0
Code Issues 5 Pull requests Releases Wiki Activity

Merge branch 'develop' into feature/ios-app

Browse source 
Conflicts:
	index.html
This commit is contained in:
Manuel Friedli 2014-06-20 01:43:41 +02:00
commit ad50e9237a
4 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
apple-touch-icon-precomposed.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 3.3 KiB

BIN
icon.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 5.9 KiB

2
index.html
View file

@ -28,7 +28,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
<link rel="stylesheet" type="text/css" href="uhr-white.css" /> <link rel="stylesheet" type="text/css" href="uhr-white.css" />
<link rel="shortcut icon" type="image/png" href="favicon.png" /> <link rel="shortcut icon" type="image/png" href="favicon.png" />
<meta http-equiv="content-type" content="text/html; charset=UTF-8" /> <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
<link rel="apple-touch-icon-precomposed" href="icon.png" /> <link rel="apple-touch-icon-precomposed" href="apple-touch-icon-precomposed.png" />
<link rel="apple-touch-startup-image" href="splash.png" /> <link rel="apple-touch-startup-image" href="splash.png" />
<meta name="apple-mobile-web-app-capable" content="yes" /> <meta name="apple-mobile-web-app-capable" content="yes" />
<meta name="apple-mobile-web-app-status-bar-style" content="black" /> <meta name="apple-mobile-web-app-status-bar-style" content="black" />

2
manifest.appcache
View file

@ -3,8 +3,8 @@ CACHE MANIFEST
COPYING COPYING
README.md README.md
apple-touch-icon-precomposed.png
favicon.png favicon.png
icon.png
index.html index.html
jquery-2.1.0.min.js jquery-2.1.0.min.js
jquery-cookie-1.4.0.js jquery-cookie-1.4.0.js