diff --git a/google/maps.js b/google/maps.js index f48c55b..db1c07d 100644 --- a/google/maps.js +++ b/google/maps.js @@ -8,10 +8,10 @@ function directionsURL(inCommand) { var link = "https://www.google.com/maps/embed/v1/directions?key=AIzaSyCZCgZY7ZlSMk1DW0NEEoHZ9qwdSL4AR1k&origin="+origin+"&destination="+dest mapsFrame.src = link; $('#map').delay(3000).fadeIn(); - $('#search-cont').delay(2700).animate({'margin-top' : '-=200px'}); + $('#search-cont').delay(2700).animate({'margin-top' : '-200px'}); $('#input').mousedown(function() { $('#map').fadeOut(500); - $('#search-cont').animate({'margin-top' : '+=200px'}); + $('#search-cont').animate({'margin-top' : '5%'}); $('#input').unbind(); }); } diff --git a/index.html b/index.html index a7a4665..b475780 100644 --- a/index.html +++ b/index.html @@ -17,19 +17,17 @@ -
+
+ +
@@ -63,7 +61,7 @@

gcal | googlecalendar



mapsd | directions


skype

-


[mm/dd/yy] [00:00] [00:00]



[address] to [address] [method of travel]


[username]

+


[mm/dd/yy] [00:00] [00:00]



[address] to [address]


[username]

diff --git a/main.css b/main.css index 82298e4..672a9a7 100644 --- a/main.css +++ b/main.css @@ -47,6 +47,9 @@ div.main-bg { margin-right: -50%; transform: translate(-50%, -50%); } +#search-cont { + position: fixed; +} .stylish-input-group .input-group-addon{ @@ -140,3 +143,12 @@ p.text { right:0; top: 0; } +#SkypeButton_Call_justinkimchi77_1 { + position: absolute; + top: 45%; + left: 50%; + margin-right: -50%; + transform: translate(-50%, -50%); + z-index: 20; + display: none; +} diff --git a/main.js b/main.js index 85c8cc5..4750da6 100644 --- a/main.js +++ b/main.js @@ -56,7 +56,7 @@ function captureInput() { else if (command == "skype") { console.log('launched skype app'); //skypeCall(actualCommand); - document.getElementById('SkypeButton_Call_justinkimchi77_1').click(); + $('#SkypeButton_Call_justinkimchi77_1').fadeIn(); } else if (gapi.auth2.getAuthInstance().isSignedIn.get()) { console.log('already signed in'); diff --git a/test.html b/test.html index 6f7ab16..6f83ba5 100644 --- a/test.html +++ b/test.html @@ -16,19 +16,8 @@ }); } skypeCall(friend); - jQuery('body').trigger("click");
- -