Merge branch 'develop' into feature/new-splashscreen

This commit is contained in:
Manuel Friedli 2014-09-03 15:31:04 +02:00
commit a0ca6228e2
12 changed files with 32 additions and 85 deletions

View file

@ -46,11 +46,17 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
<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 go(url) {
window.location = url;
return true;
}
</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>
onclick="go('info/')" href="#">Read more!</a></p>
<script type="text/javascript">
(function($) {
var width = $(window).width();