Merge branch 'master' of https://github.com/okfocus/portfolio

3 files changed, 8 insertions, 2 deletions

diff --git a/public/assets/js/lib/NavView.js b/public/assets/js/lib/NavView.js
index a9fba25..b2fe341 100644
--- a/public/assets/js/lib/NavView.js
+++ b/public/assets/js/lib/NavView.js
@@ -49,7 +49,6 @@ var NavView = View.extend({
       return
     }
 
-    console.log(view.page_number, view.project_id)
     direction = direction || "down"
 
     addClassForPeriod( document.body, direction, app.navigation_delay )
@@ -59,4 +58,9 @@ var NavView = View.extend({
     app.view = view
   },
   
+  setActive: function(id){
+    this.$(".active").removeClass("active")
+    this.$("[data-id=" + id + "]").addClass("active")
+  },
+  
 })
\ No newline at end of file
diff --git a/public/assets/js/lib/ProjectView.js b/public/assets/js/lib/ProjectView.js
index 061dcee..6ae581e 100644
--- a/public/assets/js/lib/ProjectView.js
+++ b/public/assets/js/lib/ProjectView.js
@@ -44,6 +44,8 @@ var ProjectView = View.extend({
     else {
       app.router.pushState("/project/" + this.project_id)
     }
+    
+    app.nav.setActive( this.project_id )
 
     this.showing = true
     addClassForPeriod( this.el, "showing", app.navigation_delay, function(){
diff --git a/public/assets/ok.css b/public/assets/ok.css
index eb5dbba..221dd56 100644
--- a/public/assets/ok.css
+++ b/public/assets/ok.css
@@ -531,7 +531,7 @@ button.previous {
 }
 
 .resizing .top {
-    background: url(img/tomato20dancing.gif)center;
+    background: url(img/tomato20dancing.gif) center !important;
 }
 
 .bottom {