Merge branch 'dev' into weather

This commit is contained in:
Raphael Maenle 2020-10-02 22:43:49 +02:00
commit a26016bcaa
4 changed files with 5 additions and 2 deletions

View File

@ -76,6 +76,7 @@ hour&minutes
font-style: bold;
float: left;
color: white;
visibility: hidden;
}
#str-minutes {

View File

@ -6,6 +6,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
<meta name="description" content="Canvas Watch - Canvas API & Time API" />
<title>Canvas Watch</title>
<link rel="stylesheet" type="text/css" href="css/style.css" />
</head>
@ -25,7 +26,6 @@
</div>
<script src="js/app.js"></script>
</body>

View File

@ -892,4 +892,4 @@ document.addEventListener('timetick', function(ev) {
/* Update the UI */
drawWatchContent();
});
});

2
js/jquery-3.5.1.min.js vendored Normal file

File diff suppressed because one or more lines are too long