Merge branch 'develop' into feature/no-external-links
Conflicts: index.html
This commit is contained in:
commit
bc37a5cfa9
25 changed files with 1166 additions and 1022 deletions
120
index.html
120
index.html
|
|
@ -15,68 +15,66 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||
-->
|
||||
<html manifest="manifest.appcache">
|
||||
<head>
|
||||
<title>Bärneruhr - Die Zeit im Wort</title>
|
||||
<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
|
||||
<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="css/uhr.css" />
|
||||
<link rel="stylesheet" type="text/css" href="css/uhr-black.css" data-class="black" data-name="Schwarz" />
|
||||
<link rel="stylesheet" type="text/css" href="css/uhr-white.css" data-class="white" data-name="Weiss" />
|
||||
<link rel="stylesheet" type="text/css" href="css/uhr-red.css" data-class="red" data-name="Rot" />
|
||||
<link rel="stylesheet" type="text/css" href="css/uhr-yellow.css" data-class="yellow" data-name="Gelb" />
|
||||
<link rel="stylesheet" type="text/css" href="css/uhr-green.css" data-class="green" data-name="Grün" />
|
||||
<link rel="stylesheet" type="text/css" href="css/uhr-blue.css" data-class="blue" data-name="Blau" />
|
||||
<link rel="stylesheet" type="text/css" href="css/uhr-pink.css" data-class="pink" data-name="Pink" />
|
||||
<link rel="shortcut icon" type="image/png" href="resources/favicon.png" />
|
||||
<link rel="apple-touch-icon-precomposed" href="resources/apple-touch-icon-precomposed.png" />
|
||||
<script type="text/javascript" src="lib/jquery-2.1.0.min.js"></script>
|
||||
<script type="text/javascript" src="lib/jquery-ui-1.10.4.custom.min.js"></script>
|
||||
<script type="text/javascript" src="lib/jquery-cookie-1.4.0.js"></script>
|
||||
<script type="text/javascript" src="js/uhr.js"></script>
|
||||
<script type="text/javascript" src="js/uhr-de_CH.js"></script>
|
||||
<script type="text/javascript" src="js/uhr-de_CH_genau.js"></script>
|
||||
<script type="text/javascript" src="js/uhr-de_CH-seconds.js"></script>
|
||||
<script type="text/javascript" src="js/uhr-de.js"></script>
|
||||
<script type="text/javascript" src="js/uhr-en.js"></script>
|
||||
<script type="text/javascript" src="js/uhr-fr.js"></script>
|
||||
<script type="text/javascript" src="js/uhr-it.js"></script>
|
||||
<script type="text/javascript">
|
||||
(function(doc, nav, standalone) {
|
||||
if ((standalone in nav) && nav[standalone]) {
|
||||
var curnode;
|
||||
var loc = doc.location;
|
||||
var stop = /^(a|html)$/i;
|
||||
doc.addEventListener('click', function(e) {
|
||||
curnode = e.target;
|
||||
while (!(stop).test(curnode.nodeName)) {
|
||||
curnode = curnode.parentNode;
|
||||
}
|
||||
if ('href' in curnode && (curnode.href.indexOf('http') || ~curnode.href.indexOf(location.host))) {
|
||||
e.preventDefault();
|
||||
location.href=curnode.href;
|
||||
}
|
||||
}, false);
|
||||
}
|
||||
}(document, window.navigator, 'standalone'));
|
||||
</script>
|
||||
<title>Bärneruhr - Die Zeit im Wort</title>
|
||||
<meta http-equiv="content-type" content="text/html; charset=UTF-8"/>
|
||||
<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="css/uhr.css"/>
|
||||
<link rel="stylesheet" type="text/css" href="css/uhr-black.css" data-class="black" data-name="Schwarz"/>
|
||||
<link rel="stylesheet" type="text/css" href="css/uhr-white.css" data-class="white" data-name="Weiss"/>
|
||||
<link rel="stylesheet" type="text/css" href="css/uhr-red.css" data-class="red" data-name="Rot"/>
|
||||
<link rel="stylesheet" type="text/css" href="css/uhr-yellow.css" data-class="yellow" data-name="Gelb"/>
|
||||
<link rel="stylesheet" type="text/css" href="css/uhr-green.css" data-class="green" data-name="Grün"/>
|
||||
<link rel="stylesheet" type="text/css" href="css/uhr-blue.css" data-class="blue" data-name="Blau"/>
|
||||
<link rel="stylesheet" type="text/css" href="css/uhr-pink.css" data-class="pink" data-name="Pink"/>
|
||||
<link rel="shortcut icon" type="image/png" href="resources/favicon.png"/>
|
||||
<link rel="apple-touch-icon-precomposed" href="resources/apple-touch-icon-precomposed.png"/>
|
||||
<script type="text/javascript" src="lib/jquery-2.1.0.min.js"></script>
|
||||
<script type="text/javascript" src="lib/jquery-ui-1.10.4.custom.min.js"></script>
|
||||
<script type="text/javascript" src="lib/jquery-cookie-1.4.0.js"></script>
|
||||
<script type="text/javascript" src="js/uhr.js"></script>
|
||||
<script type="text/javascript" src="js/uhr-de_CH.js"></script>
|
||||
<script type="text/javascript" src="js/uhr-de_CH_genau.js"></script>
|
||||
<script type="text/javascript" src="js/uhr-de_CH-seconds.js"></script>
|
||||
<script type="text/javascript" src="js/uhr-de.js"></script>
|
||||
<script type="text/javascript" src="js/uhr-en.js"></script>
|
||||
<script type="text/javascript" src="js/uhr-fr.js"></script>
|
||||
<script type="text/javascript" src="js/uhr-it.js"></script>
|
||||
<script type="text/javascript">
|
||||
(function(doc, nav, standalone) {
|
||||
if ((standalone in nav) && nav[standalone]) {
|
||||
var curnode;
|
||||
var loc = doc.location;
|
||||
var stop = /^(a|html)$/i;
|
||||
doc.addEventListener('click', function(e) {
|
||||
curnode = e.target;
|
||||
while (!(stop).test(curnode.nodeName)) {
|
||||
curnode = curnode.parentNode;
|
||||
}
|
||||
if ('href' in curnode && (curnode.href.indexOf('http') || ~curnode.href.indexOf(location.host))) {
|
||||
e.preventDefault();
|
||||
location.href=curnode.href;
|
||||
}
|
||||
}, false);
|
||||
}
|
||||
}(document, window.navigator, 'standalone'));
|
||||
</script>
|
||||
</head>
|
||||
<body style="padding:0;margin:0;">
|
||||
<div id="uhr"></div>
|
||||
<p id="disclaimer">Created by <a href="http://www.fritteli.ch/">fritteli</a>, inspired by <a href="http://www.qlocktwo.com/">QLOCKTWO</a>. <a href="info/">Read more!</a> - <a href="showcase">View full showcase!</a></p>
|
||||
<script type="text/javascript">
|
||||
(function($) {
|
||||
var width = $(window).width();
|
||||
var height = $(window).height();
|
||||
var size = Math.min(width, height) + 'px';
|
||||
$('#uhr').uhr({
|
||||
width: size,
|
||||
color: 'black',
|
||||
language: 'de_CH',
|
||||
controls: true
|
||||
});
|
||||
})(jQuery);
|
||||
</script>
|
||||
<div id="uhr"></div>
|
||||
<p id="disclaimer">Created by <a href="http://www.fritteli.ch/">fritteli</a>, inspired by <a href="http://www.qlocktwo.com/">QLOCKTWO</a>. <a
|
||||
href="info/">Read more!</a> - <a href="showcase">View full showcase!</a></p>
|
||||
<script type="text/javascript">
|
||||
(function($) {
|
||||
var width = $(window).width();
|
||||
var height = $(window).height();
|
||||
var size = Math.min(width, height) + 'px';
|
||||
$('#uhr').uhr({
|
||||
width: size
|
||||
});
|
||||
})(jQuery);
|
||||
</script>
|
||||
</body>
|
||||
</html>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue