Skip to content

Commit 43690f6

Browse files
Merge 'beta', hash url + search bar
c73bd25 - update gmap static; removed console.log c22909f - hide home menu button when using panels f392993 - added search box 95f786e - removed leftover console.log; fix lookangles clear bd1a870 - fix focus param in hash url not working properly b654512 - lowered width of time&angles boxes by 30px 6f52b79 - path infocard should say 'via' instead of 'by' a1a0851 - move top menu to the right side d543f83 - round coords to 5 decimal places, ~1m res 897149b - replace whitespace with underscore for mode param c463601 - make docid queries work 8e96de2 - round map center coords to 5 decimal places 1d34e6b - added hash urls
2 parents 668295b + c73bd25 commit 43690f6

File tree

6 files changed

+461
-153
lines changed

6 files changed

+461
-153
lines changed

cache.manifest-dev

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ CACHE MANIFEST
22
# version {VERSION}
33

44
# gogole maps files
5-
http://maps.gstatic.com/cat_js/maps-api-v3/api/js/17/19/%7Bmain,common,controls,ga,geometry,infowindow,kml,map,marker,onion,overlay,poly,stats,util,weather,weather_impl%7D.js
5+
http://maps.gstatic.com/cat_js/maps-api-v3/api/js/17/21/%7Bmain,common,controls,ga,geometry,infowindow,kml,map,marker,onion,overlay,poly,stats,util,weather,weather_impl%7D.js
66
http://fonts.googleapis.com/css?family=Roboto:300,400,500,700
77
http://maps.gstatic.com/mapfiles/undo_poly.png
88
http://maps.gstatic.com/mapfiles/mv/imgs8.png

css/main.css

Lines changed: 79 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,15 @@ body {
2020
font-family: "Roboto", Ariel, sans-serif;
2121
}
2222

23+
.noselect {
24+
-webkit-touch-callout: none;
25+
-webkit-user-select: none;
26+
-khtml-user-select: none;
27+
-moz-user-select: none;
28+
-ms-user-select: none;
29+
user-select: none;
30+
}
31+
2332
.rfloat {
2433
float: right;
2534
}
@@ -51,7 +60,7 @@ body {
5160
background-color: #fff;
5261
position: absolute;
5362
height: 28px;
54-
width: 225px;
63+
width: 195px;
5564
border-radius: 20px;
5665
box-shadow: 0 0 5px #888;
5766
font-size: 11px;
@@ -69,7 +78,7 @@ body {
6978
.slickbox div {
7079
font-size: 14px;
7180
margin-top: 3px;
72-
width: 180px;
81+
width: 150px;
7382
text-align: center;
7483
}
7584

@@ -96,27 +105,27 @@ body {
96105
fill: #c00;
97106
}
98107
#timebox .current {
99-
margin-left: 5px;
108+
margin-left: 11px;
100109
}
101110
#timebox .local {
102-
margin-left: 15px;
111+
margin-left: 5px;
103112
}
104113

105114
.slickbox .azimuth {
106115
margin-left: 9px;
107-
width: 100;
116+
width: 91px;
108117
}
109118
.slickbox .bearing {
110119
margin-right: 5px;
111-
width: 70px;
120+
width: 60px;
112121
}
113122
.slickbox .elevation {
114123
margin-left: 5px;
115-
width: 100px;
124+
width: 95px;
116125
}
117126
.slickbox .range {
118127
margin-right: 5px;
119-
width: 70px;
128+
width: 60px;
120129
}
121130

122131
#mapscreen {
@@ -180,9 +189,9 @@ header {
180189
line-height: normal;
181190
margin-top: 6px;
182191
position: absolute;
183-
right: 30px;
192+
left: 225px;
184193
height: 40px;
185-
text-align: right;
194+
text-align: left;
186195
cursor: pointer;
187196
}
188197
header > div {
@@ -210,6 +219,29 @@ header > div {
210219
overflow: hidden;
211220
}
212221

222+
header .search {
223+
float: left;
224+
width: 190px;
225+
margin-top: 10px;
226+
}
227+
228+
header .search form {
229+
position: relative;
230+
}
231+
header .search form input {
232+
position: absolute;
233+
border-radius: 100px;
234+
}
235+
header .search form input[type='text'] {
236+
left: 0;
237+
padding-left: 10px;
238+
padding-right: 35px;
239+
width: 143px;
240+
}
241+
header .search form input[type='submit'] {
242+
right: 0;
243+
}
244+
213245
.nav {
214246
list-style: none outside none;
215247
margin: 0;
@@ -218,13 +250,13 @@ header > div {
218250
display: block;
219251
min-width: 40px;
220252
width: auto;
221-
float: left;
253+
float: right;
222254
margin: 5px 0px;
223255
}
224256

225257
#locate-me {
226258
position: absolute;
227-
right: 0px;
259+
left: 195px;
228260
top: 12px;
229261
font-size: 25px;
230262
height: 25px;
@@ -599,6 +631,39 @@ header > div {
599631
display: none;
600632
}
601633

634+
@media only screen and (min-width: 900px) {
635+
.nav .home {
636+
display: none;
637+
}
638+
}
639+
640+
@media only screen and (max-width: 600px) {
641+
#app_name {
642+
left: 150px;
643+
}
644+
#locate-me {
645+
left: 120px;
646+
}
647+
header .search {
648+
width: 110px;
649+
}
650+
header .search form input[type='text'] {
651+
width: 63px;
652+
}
653+
}
654+
655+
@media only screen and (max-width: 500px) {
656+
#app_name {
657+
left: 30px;
658+
}
659+
#locate-me {
660+
left: 0px;
661+
}
662+
header .search {
663+
display: none;
664+
}
665+
}
666+
602667
@media only screen and (min-width: 361px) {
603668
.portrait { display: none; }
604669
.landscape { display: block; }
@@ -693,7 +758,7 @@ header > div {
693758
}
694759
#main .data dl > dt {
695760
color: #000;
696-
line-height: 11px;
761+
l120ne-height: 11px;
697762
margin-top: 15px;
698763
font-weight: bold;
699764
font-size: 14px;
@@ -713,7 +778,7 @@ header > div {
713778
display: none;
714779
}
715780
#app_name {
716-
right: 0px;
781+
left: 0px;
717782
}
718783
}
719784

index.html

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,13 @@
3535

3636
<header style="display: none">
3737
<div class="container">
38-
<ol class="nav">
38+
<div class="search">
39+
<form>
40+
<input type='text' value="" />
41+
<input type='submit' value="S" />
42+
</form>
43+
</div>
44+
<ol class="nav noselect">
3945
<li class="home"><i class="icon-habhub"></i></li>
4046
<li class="chasecar" style="display: none"><i class="icon-car"></i></li>
4147
<li class="settings"><i class="icon-settings"></i></li>
@@ -52,7 +58,7 @@
5258
<li class="about last"><i class="icon-question"></i></li>
5359
</ol>
5460
<span id="locate-me" style="display: none"><i class="icon-target"></i></span>
55-
<span id="app_name"><b>mobile<br/>tracker</b></span>
61+
<span id="app_name"><b>no<br/>location</b></span>
5662
</div>
5763
</header>
5864

@@ -262,7 +268,7 @@ <h2>Chase car mode</h2>
262268
<svg width="40" height="40" viewbox="0 0 200 200" xmlns="http://www.w3.org/2000/svg" version="1.1" version="1.1" class="lfloat">
263269
<path d="M99.812,43.188c-2.77,0-5,2.032-5,4.562v40.875c-4.315,1.97-7.312,6.321-7.312,11.375,0,6.9,5.596,12.5,12.5,12.5,1.05,0,2.06-0.16,3.03-0.41l23.35,23.35c2.23,2.24,5.93,2.13,8.28-0.22s2.42-6.04,0.18-8.28l-23-23c0.42-1.24,0.66-2.56,0.66-3.94,0-5.202-3.17-9.68-7.69-11.562v-40.688c0-2.53-2.23-4.562-4.998-4.562zm-5.906-23c0.031-0.003,0.063,0.002,0.094,0v14.374c0,0.236,0.202,0.438,0.438,0.438h11.122c0.24,0,0.44-0.202,0.44-0.438v-14.343c39.4,2.921,70.86,34.381,73.78,73.781h-14.34c-0.24,0-0.44,0.171-0.44,0.406v11.154c0,0.24,0.2,0.44,0.44,0.44h14.34c-2.92,39.4-34.38,70.86-73.78,73.78v-14.37c0-0.24-0.2-0.41-0.44-0.41h-11.122c-0.236,0-0.438,0.17-0.438,0.41v14.37c-39.4-2.92-70.86-34.38-73.781-73.78h14.343c0.236,0,0.438-0.2,0.438-0.44v-11.154c0-0.235-0.202-0.406-0.438-0.406h-14.343c2.918-39.372,34.33-70.848,73.687-73.812zm6.094-10.188c-49.706,0-90,40.294-90,90,0,49.71,40.294,90,90,90,49.71,0,90-40.29,90-90,0-49.706-40.29-90-90-90zm0-10c55.23,0,100,44.772,100,100,0,55.23-44.77,100-100,100-55.228,0-100-44.77-100-100,0-55.228,44.772-100,100-100z"></path>
264270
</svg>
265-
<span class="current lfloat">Current: ???</span>
271+
<span class="current lfloat">UTC: ???</span>
266272
<span class="local lfloat">Local: ???</span>
267273
</div>
268274

0 commit comments

Comments
 (0)