Merge pull request #198 from LukePrior/testing

Initial historic launch data support

Author: LukePrior

build.sh

@@ -24,6 +24,7 @@ java -jar "../tools/yuicompressor-2.4.8.jar" --type=js --disable-optimizations -
 java -jar "../tools/yuicompressor-2.4.8.jar" --type=js --disable-optimizations --nomunge chasecar.lib.js | sed "s/{VER}/$VERSION/" >> mobile.js
 java -jar "../tools/yuicompressor-2.4.8.jar" --type=js --disable-optimizations --nomunge tracker.js >> mobile.js
 java -jar "../tools/yuicompressor-2.4.8.jar" --type=js --disable-optimizations --nomunge app.js >> mobile.js
+java -jar "../tools/yuicompressor-2.4.8.jar" --type=js --disable-optimizations --nomunge colour-map.js >> mobile.js
 
 #compile plot lib and config
 java -jar "../tools/yuicompressor-2.4.8.jar" --type=js --disable-optimizations --nomunge _jquery.flot.js >> init_plot.js

css/base.css

@@ -99,7 +99,7 @@
 	blockquote cite:before { content: "\2014 \0020"; }
 	blockquote cite a, blockquote cite a:visited, blockquote cite a:visited { color: #555; }
 
-	hr { border: solid #ddd; border-width: 1px 0 0; clear: both; margin: 10px 0 30px; height: 0; }
+	hr { border: solid #ddd; border-width: 1px 0 0; clear: both; height: 0; }
 
 
 /* #Links
@@ -152,6 +152,7 @@
 	  border: 1px solid #aaa;
 	  border-top: 1px solid #ccc;
 	  border-left: 1px solid #ccc;
+	  margin-right: 1px;
 	  -moz-border-radius: 3px;
 	  -webkit-border-radius: 3px;
 	  border-radius: 3px;
@@ -162,7 +163,6 @@
 	  text-decoration: none;
 	  text-shadow: 0 1px rgba(255, 255, 255, .75);
 	  cursor: pointer;
-	  margin-bottom: 20px;
 	  line-height: normal;
 	  padding: 8px 10px;
 	  font-family: "HelveticaNeue", "Helvetica Neue", Helvetica, Arial, sans-serif; }
@@ -229,8 +229,6 @@
 /* #Forms
 ================================================== */
 
-	form {
-		margin-bottom: 20px; }
 	fieldset {
 		margin-bottom: 20px; }
 	input[type="text"],
@@ -247,10 +245,7 @@
 		font: 13px "HelveticaNeue", "Helvetica Neue", Helvetica, Arial, sans-serif;
 		color: #888;
 		margin: 0;
-		width: 210px;
 		max-width: 100%;
-		display: block;
-		margin-bottom: 20px;
 		background: #fff; }
 	select {
 		padding: 0; }

css/layout.css

@@ -80,12 +80,6 @@ header h1{
     margin-bottom: 0 !important;
 }
 
-.form.row select {
-    /* base.css makes this different to input for some reason. */
-    padding: 5px 4px;
-    width: 220px;
-}
-
 .validated input{
     float: left;
 }

index.html

@@ -359,6 +359,7 @@ <h3>Report Recovery</h3>
     </div>
     <!-- Was 3.31-->
     <script src="https://www.google.com/recaptcha/api.js" async defer></script>
+    <script src="https://sdk.amazonaws.com/js/aws-sdk-2.1029.0.min.js"></script>
     <script type="text/javascript" language="javascript" src="js/leaflet.js"></script>
     <script type="text/javascript" language="javascript" src="js/Leaflet.fullscreen.min.js"></script>
     <script type="text/javascript" language="javascript" src="js/L.Terminator.js"></script>