martin/silvrgit
martin/silvrgit
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

hopefully a better font

Browse Source
This commit is contained in:
Martin Donnelly 2016-04-19 16:24:02 +01:00
parent 3f96a4daa6
commit 23fb067da2
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/css/clock.css
View File

@ -1,10 +1,10 @@
@media (min-width:800px) { @media (min-width:800px) {
body { body {
font-family: 'Roboto Slab', "Helvetica Neue", Helvetica, Arial; font-family: 'Roboto Slab', "Helvetica Neue", Helvetica, Arial, sans-serif;
} }
#clock { #clock {
font-family: 'Share Tech Mono'; font-family: 'Ubuntu Condensed', monospace, monospace;
position: absolute; position: absolute;
top: 0; top: 0;
left: 0; left: 0;
@ -54,13 +54,13 @@
@media (min-width:1024px){ @media (min-width:1024px){
body { body {
font-family: 'Roboto Slab', "Helvetica Neue", Helvetica, Arial; font-family: 'Roboto Slab', "Helvetica Neue", Helvetica, Arial, sans-serif;
background-color: #212121; background-color: #212121;
color: #fff; color: #fff;
} }
#clock { #clock {
font-family: 'Share Tech Mono'; font-family: 'Ubuntu Condensed', monospace, monospace;
position: absolute; position: absolute;
top: 0; top: 0;
left: 0; left: 0;
@ -106,19 +106,18 @@
text-transform: capitalize; text-transform: capitalize;
} }
} }
@media (min-width:1280px){ @media (min-width:1280px){
body { body {
font-family: 'Roboto Slab', "Helvetica Neue", Helvetica, Arial; font-family: 'Roboto Slab', "Helvetica Neue", Helvetica, Arial, sans-serif;
background-color: #212121; background-color: #212121;
color: #fff; color: #fff;
} }
#clock { #clock {
font-family: 'Share Tech Mono'; font-family: 'Ubuntu Condensed', monospace, monospace;
position: absolute; position: absolute;
top: 0; top: 0;
left: 0; left: 0;

3
app/js/clock.js
View File

@ -29,7 +29,8 @@
success: function(data) { success: function(data) {
console.log(data); console.log(data);
storedData = data; storedData = data;
startWeather(); // startWeather();
updateWeather();
}, },
error: function(xhr, type) { error: function(xhr, type) {
console.log("ajax error"); console.log("ajax error");

4
views/pages/clock.ejs
View File

@ -6,7 +6,7 @@
<meta http-equiv="content-type" content="text/html; charset=iso-8859-1"> <meta http-equiv="content-type" content="text/html; charset=iso-8859-1">
<meta name="viewport" content="width=360; initial-scale=1;"> <meta name="viewport" content="width=360; initial-scale=1;">
<link href="//fonts.googleapis.com/css?family=Roboto+Slab:400,300,700" rel="stylesheet" type="text/css"> <link href="//fonts.googleapis.com/css?family=Roboto+Slab:400,300,700" rel="stylesheet" type="text/css">
<link href='//fonts.googleapis.com/css?family=Share+Tech+Mono' rel='stylesheet' type='text/css'> <link href='https://fonts.googleapis.com/css?family=Ubuntu+Condensed' rel='stylesheet' type='text/css'>
<link rel="stylesheet" type="text/css" href="css/clock.css"> <link rel="stylesheet" type="text/css" href="css/clock.css">
<script src="//cdnjs.cloudflare.com/ajax/libs/zepto/1.1.4/zepto.min.js"></script> <script src="//cdnjs.cloudflare.com/ajax/libs/zepto/1.1.4/zepto.min.js"></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/sugar/1.4.1/sugar.min.js"></script> <script src="//cdnjs.cloudflare.com/ajax/libs/sugar/1.4.1/sugar.min.js"></script>
@ -51,4 +51,4 @@
<div id="misc"></div> <div id="misc"></div>
</body> </body>
<script src="js/clock.js"></script> <script src="js/clock.js"></script>
</html> </html>