Permalink
Browse files

Merge branch 'master' of github.com:Kriesse/playbagrewind

  • Loading branch information...
2 parents fc42d8e + f0a6214 commit 0b015266583261c00a4bcdc255888e9ddd1b2378 @no-location no-location committed May 29, 2011
Showing with 21 additions and 33 deletions.
  1. +0 −22 assets/snippets.txt
  2. BIN assets/sprite2.psd
  3. BIN img/mhd_pttrn.png
  4. +7 −6 index.html
  5. +14 −5 stylesheets/custom.css
View
@@ -1,22 +0,0 @@
-// custom marker
-var theMarker = new google.maps.MarkerImage(
- 'img/marker.png',
- new google.maps.Size(40,35),
- new google.maps.Point(0,0),
- new google.maps.Point(0,35)
-);
-var theMarkerShadow = new google.maps.MarkerImage(
- 'img/shadow.png',
- new google.maps.Size(62,35),
- new google.maps.Point(0, 0),
- new google.maps.Point(0,35)
-);
-marker = new google.maps.Marker({
- draggable: true,
- raiseOnDrag: false,
- icon: theMarker,
- shadow: theMarkerShadow,
- shape: shape,
- map: map,
- position: center
-});
View
Deleted file not rendered
View
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
@@ -34,10 +34,11 @@
</div>
</header>
-
<section>
<div class="container map">
- <div id="map_canvas"></div>
+ <div class="map_wrapper">
+ <div id="map_canvas"></div>
+ </div>
</div>
</section>
@@ -95,7 +96,6 @@
<ul class="inline_list item_list">
<li>
- <a class="anchor" name="row1">First row of Objects</a>
<object height="219" width="219"> <param name="movie" value="http://player.soundcloud.com/player.swf?url=http%3A%2F%2Fapi.soundcloud.com%2Ftracks%2F16108749&amp;auto_play=false&amp;player_type=artwork&amp;color=000000"></param> <param name="allowscriptaccess" value="always"></param> <embed allowscriptaccess="always" height="219" src="http://player.soundcloud.com/player.swf?url=http%3A%2F%2Fapi.soundcloud.com%2Ftracks%2F16108749&amp;auto_play=false&amp;player_type=artwork&amp;color=000000" type="application/x-shockwave-flash" width="219"></embed> </object>
<ul>
<li class="created">created by: <a href="#">Espy</a></li>
@@ -128,7 +128,6 @@
</li>
<li>
- <a class="anchor" name="row2">Second row of Objects</a>
<img src="img/placeholder.jpg" alt="Item 01" />
<ul>
<li>created by: <a href="#">Espy</a></li>
@@ -236,8 +235,10 @@
var liID = meta.text();
var target = $("#gallery ul").children("li:eq("+liID+")");
target.addClass("tapeHighlight");
+ var scrollTarget = $(target).offset().top - 400;
+ console.log("scrollTarget "+scrollTarget);
$('html,body').animate({
- scrollTop: '+=' + $(target).offset().top + 'px'
+ scrollTop: '+=' + scrollTarget + 'px'
}, 'slow');
});
})
@@ -300,7 +301,7 @@
});
var MHDB002Infowindow = new google.maps.InfoWindow({
- content:"Lalala <a href='http://google.com'>google</a>"
+ content:'<span class="hidden meta">2</span><h4>We Know What Works</h4><p>This snippet of sound was taken from a found audio cassette tape that was recycled into the art object you are probably standing in front of right now.</p><a href="#row1" class="highlight-link">Listen to the tape</a>'
});
var MHDB003Marker = new google.maps.Marker({
View
@@ -153,9 +153,10 @@ h1 strong {
background-position: 50% -6em;
}
-.item_list li {
+.item_list > li {
width: 220px;
- margin-right: 20px;
+ margin-right: 5px;
+ border: 5px solid #FFF;
}
.item_list ul {
@@ -307,6 +308,11 @@ li.last,
/* map active visual cue */
+.map_wrapper {
+ padding: 6px 0;
+ background: transparent url(../img/mhd_pttrn.png) repeat 0 0;
+}
+
.map.container {
padding: 4px;
-webkit-transition: border 1.0s ease-in-out;
@@ -358,8 +364,11 @@ li.last,
overflow:visible;
}
-
-
.tapeHighlight{
- border: 5px solid red;
+ background: #EEE;
+ border: 5px solid #333 !important;
+}
+
+.hidden{
+ display:none;
}

0 comments on commit 0b01526

Please sign in to comment.