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

Merge branch 'feature/splashscreen' of git.friedli.info:manuel/uhr into feature/splashscreen

Browse source 
Conflicts:
	index.html
This commit is contained in:
Manuel Friedli 2014-06-28 16:57:38 +02:00
commit 8ba7f1ba0f
9 changed files with 141 additions and 68 deletions
Download patch file Download diff file Expand all files Collapse all files

24
index.html
View file

@ -16,23 +16,20 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
<html>
<head>
<title>Bärneruhr - Die Zeit im Wort</title>
<script type="text/javascript" src="jquery-2.1.0.min.js"></script>
<script type="text/javascript" src="jquery-ui-1.10.4.custom.min.js"></script>
<script type="text/javascript" src="jquery-cookie-1.4.0.js"></script>
<script type="text/javascript" src="uhr.js"></script>
<link rel="stylesheet" type="text/css" href="uhr.css" />
<link rel="stylesheet" type="text/css" href="uhr-black.css" />
<link rel="stylesheet" type="text/css" href="uhr-blue.css" />
<link rel="stylesheet" type="text/css" href="uhr-green.css" />
<link rel="stylesheet" type="text/css" href="uhr-red.css" />
<link rel="stylesheet" type="text/css" href="uhr-white.css" />
<link rel="shortcut icon" type="image/png" href="favicon.png" />
<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
<link rel="apple-touch-icon-precomposed" href="apple-touch-icon-precomposed.png" />
<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-title" content="Bärneruhr" />
<meta name="viewport" content="width=device-width,user-scalable=no,initial-scale=1" />
<link rel="stylesheet" type="text/css" href="uhr.css" />
<link rel="stylesheet" type="text/css" href="uhr-black.css" data-class="black" data-name="Schwarz" />
<link rel="shortcut icon" type="image/png" href="favicon.png" />
<link rel="apple-touch-icon-precomposed" href="apple-touch-icon-precomposed.png" />
<script type="text/javascript" src="jquery-2.1.0.min.js"></script>
<script type="text/javascript" src="jquery-ui-1.10.4.custom.min.js"></script>
<script type="text/javascript" src="jquery-cookie-1.4.0.js"></script>
<script type="text/javascript" src="uhr.js"></script>
</head>
<body style="padding:0;margin:0;">
<div id="uhr"></div>
@ -44,12 +41,11 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
var height = $(window).height();
var size = (width < height ? width : height) + 'px';
$('#uhr').uhr({
width: '320px',
width: size,
color: 'black',
language: 'de_CH',
force: true,
controls: false,
time: new Date()
controls: false
});
})(jQuery);
</script>