From 23fb067da296f9c7b8f9f1eb1d74ebb8080b7e4b Mon Sep 17 00:00:00 2001 From: Martin Donnelly Date: Tue, 19 Apr 2016 16:24:02 +0100 Subject: [PATCH] hopefully a better font --- app/css/clock.css | 13 ++++++------- app/js/clock.js | 3 ++- views/pages/clock.ejs | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/app/css/clock.css b/app/css/clock.css index 546b6d2..3a42b07 100644 --- a/app/css/clock.css +++ b/app/css/clock.css @@ -1,10 +1,10 @@ @media (min-width:800px) { body { - font-family: 'Roboto Slab', "Helvetica Neue", Helvetica, Arial; + font-family: 'Roboto Slab', "Helvetica Neue", Helvetica, Arial, sans-serif; } #clock { - font-family: 'Share Tech Mono'; + font-family: 'Ubuntu Condensed', monospace, monospace; position: absolute; top: 0; left: 0; @@ -54,13 +54,13 @@ @media (min-width:1024px){ body { - font-family: 'Roboto Slab', "Helvetica Neue", Helvetica, Arial; + font-family: 'Roboto Slab', "Helvetica Neue", Helvetica, Arial, sans-serif; background-color: #212121; color: #fff; } #clock { - font-family: 'Share Tech Mono'; + font-family: 'Ubuntu Condensed', monospace, monospace; position: absolute; top: 0; left: 0; @@ -106,19 +106,18 @@ text-transform: capitalize; } - } @media (min-width:1280px){ body { - font-family: 'Roboto Slab', "Helvetica Neue", Helvetica, Arial; + font-family: 'Roboto Slab', "Helvetica Neue", Helvetica, Arial, sans-serif; background-color: #212121; color: #fff; } #clock { - font-family: 'Share Tech Mono'; + font-family: 'Ubuntu Condensed', monospace, monospace; position: absolute; top: 0; left: 0; diff --git a/app/js/clock.js b/app/js/clock.js index 4620855..891969d 100644 --- a/app/js/clock.js +++ b/app/js/clock.js @@ -29,7 +29,8 @@ success: function(data) { console.log(data); storedData = data; - startWeather(); + // startWeather(); + updateWeather(); }, error: function(xhr, type) { console.log("ajax error"); diff --git a/views/pages/clock.ejs b/views/pages/clock.ejs index 3ebbaf6..937c8a1 100644 --- a/views/pages/clock.ejs +++ b/views/pages/clock.ejs @@ -6,7 +6,7 @@ - + @@ -51,4 +51,4 @@
- \ No newline at end of file +