Skip to content

Commit 7aa7726

Browse files
Merge branch 'gmaps3_port'
Conflicts: js/mobile.js js/tracker.js Conflicts were because of a single ',' *sigh*
2 parents 0b1a46d + e96ba5f commit 7aa7726

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+458
-1513
lines changed

build.sh

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,6 @@ rm -f mobile.js
1818
cat jquery* iscroll.js >> mobile.js
1919

2020
# compile the rest
21-
java -jar "../tools/yuicompressor-2.4.8pre.jar" --type=js --disable-optimizations --nomunge BDCCCircle.js >> mobile.js
22-
java -jar "../tools/yuicompressor-2.4.8pre.jar" --type=js --disable-optimizations --nomunge PolylineEncoder.js >> mobile.js
23-
java -jar "../tools/yuicompressor-2.4.8pre.jar" --type=js --disable-optimizations --nomunge balloonmarker.js >> mobile.js
2421
java -jar "../tools/yuicompressor-2.4.8pre.jar" --type=js --disable-optimizations --nomunge chasecar.lib.js >> mobile.js
2522
java -jar "../tools/yuicompressor-2.4.8pre.jar" --type=js --disable-optimizations --nomunge tracker.js >> mobile.js
2623
java -jar "../tools/yuicompressor-2.4.8pre.jar" --type=js --disable-optimizations --nomunge app.js >> mobile.js

css/main.css

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,10 @@ html, body {
1111
overflow: hidden;
1212
}
1313

14+
#map img {
15+
max-width: none;
16+
}
17+
1418
#loading {
1519
position: absolute;
1620
z-index: 99;

css/mobile.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

img/markers/antenna-green.png

3.59 KB

img/markers/antenna-grey.png

3.69 KB

img/markers/antenna-red.png

3.6 KB

img/markers/balloon-adafruit.png

9.05 KB

img/markers/balloon-blue.png

7.13 KB

img/markers/balloon-buzz.png

10.3 KB

img/markers/balloon-green.png

7.07 KB

0 commit comments

Comments
 (0)