Permalink
Browse files

firefox, cmon

  • Loading branch information...
1 parent 5f286f4 commit e94e81495131a68652d267a800fc4860f7f5da3d @qrush qrush committed Apr 30, 2012
Showing with 15 additions and 28 deletions.
  1. +4 −20 assets/index.coffee
  2. +2 −2 assets/index.scss
  3. +1 −1 index.html
  4. +6 −3 javascripts/index.js
  5. +2 −2 stylesheets/index.css
View
@@ -6,11 +6,6 @@ $ ->
$window.resize ->
RepositionNav()
- #$('#intro').parallax("50%", 0, 0.1, true)
- #$('#where').parallax("50%", 800, 0.1, true)
- #$('#plans').parallax("50%", 1300, 0.1, true)
- #$('#community').parallax("50%", 1800, 0.1, true)
- #$('#contact').parallax("50%", 2300, 0.1, true)
$header = $('h1')
$herd = $('#herd')
@@ -23,22 +18,11 @@ $ ->
$window.bind 'scroll', ->
pos = $window.scrollTop()
if pos <= 800
- $header.css 'background-position-x': pos - 72
+ $header.css 'background-position': "#{pos - 72}px 107%"
if pos >= 861 and pos <= 1800
currentPosition = Math.floor((pos - 860) / 2) + 1
- $herd.css 'background-position-y': currentPosition
+ $herd.css 'background-position': "0 #{currentPosition}px"
- #if pos >= 300 and pos <= 1300
- #currentPosition = Math.floor((pos - 300) / 50) + 1
- #if currentPosition != lastPosition
- # normalPosition = 16
-
- # if currentPosition < 10
- # normalPosition -= 10 - currentPosition
-
- # if currentPosition > 11
- # normalPosition -= currentPosition - 10
-
- # map.setCenterZoom(location, normalPosition)
- # lastPosition = currentPosition
+ $("#map").click (event) ->
+ window.location = $(this).find("a").attr("href")
View
@@ -115,8 +115,7 @@ section {
text-align: right;
padding-bottom: 110px;
background-image: url(/images/coworkbuffalo.png);
- background-position-y: 288px;
- background-position-x: 50px;
+ background-position: 0% 107%;
background-repeat: repeat-x;
span {
@@ -174,6 +173,7 @@ section {
}
#map {
+ cursor: pointer;
float: right;
margin-top: 50px;
View
@@ -24,7 +24,7 @@
<article>
<div id="map">
<div id="tile"></div>
- <a href="http://g.co/maps/uy4h5">Get some directions.</a>
+ <a id="directions" href="http://g.co/maps/uy4h5">Get some directions.</a>
</div>
<h2>info</h2>
<p>You can find us at 225 Delaware Avenue above Spot Coffee, 9am-5pm on weekdays.</p>
@@ -14,19 +14,22 @@ $(function() {
location = new MM.Location(42.890595, -78.876607);
map.setCenterZoom(location, 16);
lastPosition = 0;
- return $window.bind('scroll', function() {
+ $window.bind('scroll', function() {
var currentPosition, pos;
pos = $window.scrollTop();
if (pos <= 800) {
$header.css({
- 'background-position-x': pos - 72
+ 'background-position': "" + (pos - 72) + "px 107%"
});
}
if (pos >= 861 && pos <= 1800) {
currentPosition = Math.floor((pos - 860) / 2) + 1;
return $herd.css({
- 'background-position-y': currentPosition
+ 'background-position': "0 " + currentPosition + "px"
});
}
});
+ return $("#map").click(function(event) {
+ return window.location = $(this).find("a").attr("href");
+ });
});
@@ -81,8 +81,7 @@ section {
text-align: right;
padding-bottom: 110px;
background-image: url(/images/coworkbuffalo.png);
- background-position-y: 288px;
- background-position-x: 50px;
+ background-position: 0% 107%;
background-repeat: repeat-x; }
#intro article h1 span {
font-size: 189px;
@@ -135,6 +134,7 @@ section {
-moz-opacity: 0.4; }
#map {
+ cursor: pointer;
float: right;
margin-top: 50px; }
#map #tile {

0 comments on commit e94e814

Please sign in to comment.