diff --git a/css/main.css b/css/main.css
index e77ede52..66cd1317 100644
--- a/css/main.css
+++ b/css/main.css
@@ -67,6 +67,16 @@ body, html {
bottom: 50px;
}
+.xxsmall
+{
+ font-size: 15px;
+ letter-spacing: 0px;
+ font-family: "HelveticaNeue-Medium";
+}
+.xxsmall .wi {
+ line-height: 15px;
+}
+
.xsmall
{
font-size: 20px;
@@ -124,10 +134,19 @@ body, html {
margin-right: 10px;
}
+.time .sec {
+ font-size: 25px;
+ color: #666;
+ padding-left: 5px;
+ position: relative;
+ top: -35px;
+}
+
.forecast-table {
float: right;
text-align: right;
font-size: 20px;
+ line-height: 20px;
}
.forecast-table .day, .forecast-table .temp-min, .forecast-table .temp-max
{
@@ -146,6 +165,8 @@ body, html {
}
.calendar-table {
+ font-size: 14px;
+ line-height: 20px;
margin-top: 10px;
}
.calendar-table .days {
diff --git a/index.php b/index.php
index 25da06c3..6a74a336 100644
--- a/index.php
+++ b/index.php
@@ -11,8 +11,8 @@
-
-
+
+
diff --git a/js/main.js b/js/main.js
index 9c4bea89..d0e0c847 100644
--- a/js/main.js
+++ b/js/main.js
@@ -85,7 +85,7 @@ jQuery(document).ready(function($) {
$('.date').html(date);
- $('.time').html(now.toTimeString().substring(0,5));
+ $('.time').html(now.toTimeString().substring(0,5) + ''+now.toTimeString().substring(6,8)+'');
setTimeout(function() {
updateTime();
@@ -136,6 +136,8 @@ jQuery(document).ready(function($) {
(function updateCalendar()
{
table = $('').addClass('xsmall').addClass('calendar-table');
+ opacity = 1;
+
for (var i in eventList) {
var e = eventList[i];
@@ -146,10 +148,12 @@ jQuery(document).ready(function($) {
daysString = 'vandaag';
}
- var row = $('|
');
+ var row = $('|
').css('opacity',opacity);
row.append($(' | ').html(e.description).addClass('description'));
row.append($(' | ').html(daysString).addClass('days dimmed'));
table.append(row);
+
+ opacity -= 1 / eventList.length;
}
$('.calendar').updateWithText(table,1000);
@@ -229,11 +233,11 @@ jQuery(document).ready(function($) {
var windString = ' ' + kmh2beaufort(wind) ;
var sunString = ' ' + sunrise;
- if (json.sys.sunrise*1000 > now && json.sys.sunset*1000 > now) {
+ if (json.sys.sunrise*1000 < now && json.sys.sunset*1000 > now) {
sunString = ' ' + sunset;
}
- $('.sun').updateWithText(windString+' '+sunString, 1000);
+ $('.windsun').updateWithText(windString+' '+sunString, 1000);
});
setTimeout(function() {
@@ -268,16 +272,18 @@ jQuery(document).ready(function($) {
var forecastTable = $('').addClass('forecast-table');
+ var opacity = 1;
for (var i in forecastData) {
var forecast = forecastData[i];
var dt = new Date(forecast.timestamp);
- var row = $('|
');
+ var row = $('|
').css('opacity', opacity);
row.append($(' | ').addClass('day').html(dayAbbr[dt.getDay()]));
row.append($(' | ').addClass('temp-max').html(roundVal(forecast.temp_max)));
row.append($(' | ').addClass('temp-min').html(roundVal(forecast.temp_min)));
forecastTable.append(row);
+ opacity -= 0.155;
}