diff --git a/index.php b/index.php index 9c8d347..bcb8ec1 100644 --- a/index.php +++ b/index.php @@ -11,15 +11,15 @@ RPi Home Hub v0.1 -
-
+
+

/r/showerthoughts

-
+
@@ -45,7 +45,7 @@ data-widget-id="685044306260918273" href="https://twitter.com/TwitterDev" data-chrome="nofooter noborders noheader transparent" - height="385"> + height="400"> Tweets by @Politiet
@@ -71,7 +71,7 @@
-->
- +
+ diff --git a/scripts/addWeatherInfo.js b/scripts/addWeatherInfo.js index b879e2c..8f5b9db 100644 --- a/scripts/addWeatherInfo.js +++ b/scripts/addWeatherInfo.js @@ -8,8 +8,9 @@ $.get('weatherData.txt', function(data) { elem.setAttribute("alt", weatherData[1]); document.getElementById("weatherImg").appendChild(elem); - document.getElementById("weatherTempValue").innerHTML = "

Temperatur

'; - document.getElementById("weatherRainfall").innerHTML = "

Nedbør" + weatherData[3] + '

'; - document.getElementById("weatherWind").innerHTML = "

Vind

" + weatherData[5] + '

'; + document.getElementById("weatherTempValue").innerHTML = "

Temp

" + weatherData[2] + '°

'; + document.getElementById("weatherRainfall").innerHTML = "

Nedbør

" + weatherData[3] + '°

'; + // document.getElementById("weatherRainfall").innerHTML = "

Nedbør

" + weatherData[3] + '

'; + // document.getElementById("weatherWind").innerHTML = "

Vind

" + weatherData[5] + '

'; // document.getElementById("weatherWindDirection").innerHTML = "

Vind rettning

" + weatherData[6] + '

'; -}); \ No newline at end of file +}); diff --git a/style.css b/style.css index 01b23ce..a3343f4 100644 --- a/style.css +++ b/style.css @@ -36,7 +36,6 @@ html, body { } .weatherReport { - margin-right: -30px; margin-left: -30px; } diff --git a/topSubPost.txt b/topSubPost.txt index 33c0152..7275f1e 100644 --- a/topSubPost.txt +++ b/topSubPost.txt @@ -1 +1 @@ -"No Man's Land" is a great name for a lesbian bar \ No newline at end of file +"It's not a pyramid scheme" is a phrase almost exclusively used by people involved in pyramid schemes \ No newline at end of file diff --git a/weatherData.txt b/weatherData.txt index 857d910..0d5adf4 100644 --- a/weatherData.txt +++ b/weatherData.txt @@ -1,7 +1,7 @@ day -Snow.png --6 -0.4 - 0.7 mm -Gentle breeze -6 m/s -northeast +Cloudy.png +19 +0 mm +Light air +1 m/s +west-northwest