diff --git a/static/css/combined.css b/static/css/combined.css index 06aaf8d64c06181ac8a18882f8d95f1303f26ac0..cf2b835226fd9df467445c108af3c96db5451432 100644 --- a/static/css/combined.css +++ b/static/css/combined.css @@ -4,7 +4,7 @@ body { padding: 0; } .combined:not(:first-child) { - border-left: 2px solid #ccc; + border-left: 2px solid #666; } .combined.map, .combined.predictions { diff --git a/static/css/map.css b/static/css/map.css index c3b91b1383aa50dfe7d1a10cbad7d6b4676a735e..f14f38224e9a21756ee831617c8172bf8228f0fd 100644 --- a/static/css/map.css +++ b/static/css/map.css @@ -5,7 +5,7 @@ html, body { border: 0; margin: 0; padding: 0; - font-family: sans-serif; + font-family: "Helvetica Neue", Arial, Helvetica, sans-serif; font-size: 14px; } input, diff --git a/static/css/predictions.css b/static/css/predictions.css index 74b3c17c6040b18e62da683d492aa9486fd187d7..872932d9af5d52aa5cb8948b2a0a9d84f00cf30c 100644 --- a/static/css/predictions.css +++ b/static/css/predictions.css @@ -1,17 +1,19 @@ body { margin: 0; - padding: .4em; - background-color: #444; +} +.predictions { + font-family: "Helvetica Neue", Arial, Helvetica, sans-serif; + background-color: #222; color: #fff; - font-family: sans-serif; + padding: .4em; } .predictions header { text-align: center; font-weight: bold; - text-align: center; + font-size: 1.2em; } .predictions p { - + margin: .5em 0; } .predictions .prediction.lt1min { color: #f00; diff --git a/templates/combined.html b/templates/combined.html index 4bc43ca2b486c84298718dac344fc7583895a202..ea2f4e7c708033acdf1ac675f04f4e7ac8045117 100644 --- a/templates/combined.html +++ b/templates/combined.html @@ -13,7 +13,7 @@ <link href="static/css/combined.css" rel="stylesheet" /> {% endblock %} {% block body %} - <div class="combined map" id="c-map"> + <div class="combined map{% if embed %} embed{% endif %}" id="c-map"> </div> <div class="combined predictions" id="c-predictions"> </div> diff --git a/templates/map.html b/templates/map.html index 2e56c85bda0dddae9dd1e61fdc68c0a918bd4f01..c4f070413246695dbd831d68b0d967bd05e47510 100644 --- a/templates/map.html +++ b/templates/map.html @@ -11,7 +11,7 @@ <link href="static/css/map.css" rel="stylesheet" /> {% endblock %} {% block body %} - <div class="map" id="map"></div> + <div class="map{% if embed %} embed{% endif %}" id="map"></div> {# TODO: Generate these using JS, not here. #} <div id="msg"> <span id="msg-zoomForVehicles">Zoom in to see vehicles.</span> diff --git a/templates/modal-embed.html b/templates/modal-embed.html index 122708ce021bf61e0a1cb745baa46bd59c1c75b8..d588e59e3ac729110654bf819959eafbb8937e35 100644 --- a/templates/modal-embed.html +++ b/templates/modal-embed.html @@ -21,7 +21,7 @@ <select id="embed-mode"> <option value="m">Map</option> <option value="p">Predictions</option> - <option value="c">Combined</option> + <option selected value="c">Combined</option> </select> </label> </p> @@ -44,7 +44,7 @@ <legend>Size</legend> <label for="embed-width"> <span>Width:</span> - <input id="embed-width" type="number" min=200 step=50 value=400> px + <input id="embed-width" type="number" min=200 step=50 value=500> px </label> <br> <label for="embed-height">