Merge branch 'feature/cookie' of /var/lib/git/repositories/manuel/uhr into develop
This commit is contained in:
commit
558de1d49c
2 changed files with 12 additions and 12 deletions
20
index.html
20
index.html
|
@ -1,16 +1,16 @@
|
|||
<!DOCTYPE html>
|
||||
<html manifest="manifest.appcache">
|
||||
<head>
|
||||
<title>Die Zeit als Wort - in HTML, CSS und JS</title>
|
||||
<script type="text/javascript" src="jquery-2.0.3.min.js"></script>
|
||||
<script type="text/javascript" src="jquery.cookie.js"></script>
|
||||
<script type="text/javascript" src="uhr.js"></script>
|
||||
<script type="text/javascript" src="uhr-de_CH.js"></script>
|
||||
<script type="text/javascript" src="uhr-de.js"></script>
|
||||
<script type="text/javascript" src="uhr-en.js"></script>
|
||||
<link rel="stylesheet" type="text/css" href="uhr.css" />
|
||||
<link rel="stylesheet" type="text/css" href="uhr-black.css" id="theme" />
|
||||
<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
|
||||
<title>Die Zeit als Wort - in HTML, CSS und JS</title>
|
||||
<script type="text/javascript" src="jquery-2.0.3.min.js"></script>
|
||||
<script type="text/javascript" src="jquery.cookie.js"></script>
|
||||
<script type="text/javascript" src="uhr.js"></script>
|
||||
<script type="text/javascript" src="uhr-de_CH.js"></script>
|
||||
<script type="text/javascript" src="uhr-de.js"></script>
|
||||
<script type="text/javascript" src="uhr-en.js"></script>
|
||||
<link rel="stylesheet" type="text/css" href="uhr.css" />
|
||||
<link rel="stylesheet" type="text/css" href="uhr-black.css" id="theme" />
|
||||
<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
|
||||
</head>
|
||||
<body>
|
||||
<div id="uhr">
|
||||
|
|
4
uhr.js
4
uhr.js
|
@ -125,9 +125,9 @@ function renderLayout() {
|
|||
}
|
||||
}
|
||||
}
|
||||
function Letter(value, style = '') {
|
||||
function Letter(value, style) {
|
||||
this.value = value;
|
||||
this.style = style;
|
||||
this.style = style || '';
|
||||
this.getStyle = function() {
|
||||
return "item letter " + style;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue