Merge branch 'master' of github.com:kaezarrex/alison-main

kaezarrex · Sep 19, 2011 · 4b9894a · 4b9894a
2 parents 67c7868 + f30f4fc
commit 4b9894a
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 1 deletion.
diff --git a/css/main.css b/css/main.css
@@ -70,7 +70,7 @@ footer p {
 a {
     text-decoration: none;
     color: #B6E9C0;
-}   
+}
 
 a.selected {
     color: white;
@@ -121,6 +121,10 @@ span.first-word {
     text-align: right;
 }
 
+#side-nav a {
+    color: white;
+}
+
 #gallery {
     width: 730px;
     position: relative;
@@ -130,6 +134,10 @@ span.first-word {
     margin-bottom: 40px;
 }
 
+#thumbs {
+    overflow: hidden;
+}
+
 #thumbs ul li {
     display: inline-block;
     margin: 20px;

diff --git a/js/portfolio.js b/js/portfolio.js
@@ -1,4 +1,31 @@
 $(function(){
 
+    var init = function() {
+        var $thumbs = $('#thumbs');
+
+        $thumbs.height($($thumbs.children().get(0)).height());
+    },
+
+    bindEvents = function() {
+
+        $('#side-nav a').click(function(event){
+            var $target = $(event.target.hash),
+                $thumbs = $('#thumbs');
+
+            event.preventDefault();
+
+            $thumbs.height($target.height());
+            $thumbs.scrollTop($target.position().top + $thumbs.scrollTop());
+
+            //$thumbs.animate({
+            //    height: $target.height(),
+            //    scrollTop: $target.position().top + $thumbs.scrollTop()
+            //}, 500);
+        });
+
+    };
+
+    bindEvents();
+    init();
 
 });