From 220b87d46c0c1bc0ede20ff92b562a7122882d44 Mon Sep 17 00:00:00 2001
From: Anton Sarukhanov <code@ant.sr>
Date: Wed, 4 May 2016 17:44:28 -0400
Subject: [PATCH] CSS improvements, embed defaults
---
static/css/combined.css | 2 +-
static/css/map.css | 2 +-
static/css/predictions.css | 12 +++++++-----
templates/combined.html | 2 +-
templates/map.html | 2 +-
templates/modal-embed.html | 4 ++--
6 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/static/css/combined.css b/static/css/combined.css
index 06aaf8d..cf2b835 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 c3b91b1..f14f382 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 74b3c17..872932d 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 4bc43ca..ea2f4e7 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 2e56c85..c4f0704 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 122708c..d588e59 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">
--
GitLab