tweaked css to align some elements

alhockly · alhockly · commit 9c53e389afab · 2019-02-27T02:13:32.000Z
diff --git a/css/index.css b/css/index.css
@@ -46,6 +46,7 @@ body {
 
 .bordered{
 	border:solid 3px #ffffff;
+	padding:8px;
 }
 
 div.title{
@@ -220,10 +221,9 @@ div.torrents {
     position: absolute;
     top: 140px;
     left: 20px;
-	max-width:560px;
+	max-width:570px;
 	max-height:420px;
     transform: translate(-1%,-1%);
-    padding: 5px;
 	font-family: 'Cousine', monospace;
 	font-size: 12px;
 	font-weight: bold;
@@ -234,11 +234,13 @@ div.torrents {
 #collection{
 	position:absolute;
 	bottom:20px;
-	left: 510px;
+	left: 610px;
 	text-align: center;
-	padding: 8px;
+	//padding: 8px;
 	line-height: 2.5;
 	height: 130px;
+	width:140px;
+	font-size:12px;
 }
 
 .green-week{
@@ -270,16 +272,19 @@ div.weatherpane {
   bottom: 20px;
   left: 20px;
   transform: translate(-1%,-1%);
-  padding: 5px;
-	//width:560px;
+  //padding: 8px;
+	width:570px;
 	height: 130px;
 }
 
-div.weather {
-	width:100%;
-	padding-left:5px;
-	padding-right:5px;
+#weather {
+	//width:100%;
+	//padding-left:5px;
+	//padding-right:5px;
 	display:inline-block;
+
+
+
 	margin: 0 auto;
 	font-size: 10px;
 	font-weight: bold;
@@ -295,7 +300,7 @@ div.weatherbox{
 	padding-left: 5px;
 	margin-left: 10px;
 	margin-right: 10px;
-
+	font-size: 10px;
 }
 
 p.temp{
@@ -312,7 +317,7 @@ div.dateAndClock {
   bottom: 20px;
   right: 20px;
   transform: translate(-1%,-1%);
-  padding: 8px;
+  //padding: 8px;
 	height: 130px;
 }
 
diff --git a/index.html b/index.html
@@ -13,7 +13,7 @@
 
 <body>
 	<script src="js/GetAccuweatherKeys.js"> </script>
-	<script src="js/getweatherAccu.js"> </script>
+
 	<script src="js/GetTransportKeys.js"> </script>
 	<div  class="busnorthbox bordered">
 	<p class="tittle">Buses to Colchester:</p>
@@ -44,6 +44,7 @@
 	<div id="weather" class="weather">
 
 	</div>
+		<script src="js/getweatherAccu.js"> </script>
 	</div>
 	<!-- <script src="js/getweather.js"> </script> -->
 	
diff --git a/js/CollectionDay.js b/js/CollectionDay.js
@@ -73,7 +73,7 @@ function displayCollection(){
     //odd is blue, even is green
     if (day == 2 || day == 3){
         PrintCollection(date,Week)
-        console.log("print")
+        //console.log("print")
     }
 
     else {
diff --git a/js/SongKickAPI.js b/js/SongKickAPI.js
@@ -58,7 +58,7 @@ function printEvent(artist,venue,date){
 }
 
 function printDate(date){
-	console.log(date);
+	//console.log(date);
 	//var textDate= new Date(date).toString().split(" ");
 	var textDate=date.split("-")[2];	
 	textDate+=" "+getMonthName(date.split("-")[1]);
diff --git a/js/getweatherAccu.js b/js/getweatherAccu.js
@@ -1,6 +1,10 @@
 function Getweather() {
     GetWeatherCredentials(function() {
         var element = document.getElementById("weather");
+        if(element==null){
+        	console.log("couldnt get weather element by Id")
+        	return -1;
+		}
         element.innerHTML = "";
 
         var xmlhttp = new XMLHttpRequest();

Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,7 @@ function displayCollection(){`
`73`	`73`	`//odd is blue, even is green`
`74`	`74`	`if (day == 2 \|\| day == 3){`
`75`	`75`	`PrintCollection(date,Week)`
`76`		`- console.log("print")`
	`76`	`+ //console.log("print")`
`77`	`77`	`}`
`78`	`78`
`79`	`79`	`else {`
Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ function printEvent(artist,venue,date){`
`58`	`58`	`}`
`59`	`59`
`60`	`60`	`function printDate(date){`
`61`		`- console.log(date);`
	`61`	`+ //console.log(date);`
`62`	`62`	`//var textDate= new Date(date).toString().split(" ");`
`63`	`63`	`var textDate=date.split("-")[2];`
`64`	`64`	`textDate+=" "+getMonthName(date.split("-")[1]);`