Merge branch 'feature/uhrclassautomatic' of /var/lib/git/repositories/manuel/uhr into develop

This commit is contained in:
Manuel Friedli 2013-11-29 14:35:31 +01:00
commit 46eef92c4a
3 changed files with 3 additions and 2 deletions

View file

@ -28,7 +28,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
<meta http-equiv="content-type" content="text/html; charset=UTF-8" /> <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
</head> </head>
<body> <body>
<div id="uhr" class="uhr"></div> <div id="uhr"></div>
<p id="disclaimer">Created by fritteli, inspired by <a href="http://www.qlocktwo.com/">QLOCKTWO</a>. <p id="disclaimer">Created by fritteli, inspired by <a href="http://www.qlocktwo.com/">QLOCKTWO</a>.
<script type="text/javascript" src="uhr-de_CH.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-de.js"></script>

View file

@ -1,5 +1,5 @@
CACHE MANIFEST CACHE MANIFEST
# 3.0.2 # 3.0.3
COPYING COPYING
index.html index.html

1
uhr.js
View file

@ -155,6 +155,7 @@ Uhr.prototype.createHTMLElements = function(clockarea) {
this.createThemeSwitch(); this.createThemeSwitch();
} }
Uhr.prototype.createClockarea = function(clockarea) { Uhr.prototype.createClockarea = function(clockarea) {
clockarea.addClass('uhr');
clockarea.empty(); clockarea.empty();
clockarea.append('<span class="item dot dot1"></span>'); clockarea.append('<span class="item dot dot1"></span>');
clockarea.append('<span class="item dot dot2"></span>'); clockarea.append('<span class="item dot dot2"></span>');