diff --git a/content/screen.sass b/content/screen.sass index 5d78f91..357ed5c 100644 --- a/content/screen.sass +++ b/content/screen.sass @@ -33,7 +33,6 @@ li dl - dt dd margin-left: 2em @@ -75,8 +74,6 @@ a &:link, &:visited color: #36454F - &:hover - h1 a text-decoration: none @@ -110,7 +107,7 @@ blockquote margin: 0 0 1em 0 -header +body > header font-family: "Helvetica Neue", Helvetica, "Liberation Sans", "Bitstream Vera Sans", Tahoma, Geneva, Arial, sans-serif font-size: 18px color: white @@ -246,21 +243,41 @@ a #flickr clear: both + header + margin-left: 2em + + h1 + margin: 0 + padding: 0.6em 0 0 0 + + ul + display: block + // width: 5000px + height: 100px + overflow: hidden + li float: left overflow: hidden - margin: 20px 0 0 20px + margin: 1em 0 0 1em display: block position: relative height: 75px width: 75px + border: 1px solid #ccc + background: url(/images/photos.jpg) no-repeat 0 0 + + &:first-child + margin-left: 2em img + -webkit-transition: opacity 500ms position: absolute top: -75px &:hover - top: 0 + //top: 0 + opacity: 0 ul.menu diff --git a/layouts/home.html b/layouts/home.html index 5549308..5221b92 100644 --- a/layouts/home.html +++ b/layouts/home.html @@ -2,7 +2,6 @@ <%= render '_head' %> - @@ -39,11 +38,12 @@ -
- - -
+
+
+

Photos

+
+ +
<%= render '_footer' %> diff --git a/output/images/photos.jpg b/output/images/photos.jpg index feef7bf..6846fa1 100644 Binary files a/output/images/photos.jpg and b/output/images/photos.jpg differ diff --git a/output/js/home.js b/output/js/home.js index 556b54f..a79f7ba 100644 --- a/output/js/home.js +++ b/output/js/home.js @@ -6,7 +6,7 @@ jQuery(function () { }; function populate_flickr(data, text_status) { - var ul = $("ul", "#flickr"); + var ul = $("#flickr ul"); ul.empty(); jQuery.each($('photo', data), function(i, obj) { var photo = $(obj); @@ -17,6 +17,7 @@ jQuery(function () { }; var li = $(render_image(image)); $('img', li).css({left: (i * -75) + 'px'}); + li.css({"background-position-x": (i * -75) + 'px'}); ul.append(li); }); $("a[rel^='prettyPhoto']").prettyPhoto({theme: "facebook"}); diff --git a/output/photos.xml b/output/photos.xml index b5bfec3..c55e2c0 100644 --- a/output/photos.xml +++ b/output/photos.xml @@ -1,25 +1,25 @@ - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + +