merge

2 files changed, 5 insertions, 4 deletions

diff --git a/public/assets/js/app.js b/public/assets/js/app.js
index 22215ae..2151dab 100644
--- a/public/assets/js/app.js
+++ b/public/assets/js/app.js
@@ -63,10 +63,10 @@ var app = (function() {
   }
   
   app.resize = function(){
-    $(".cell, .next, .previous").css({ 'display': 'none' })
+    $(".active .cell,.active  .next,.active .previous").css({ 'display': 'none' })
     $('body').addClass('resizing')
     debounce(function() {
-      $(".item").addClass("hidden")
+      $(".active.item").addClass("hidden")
       setTimeout(function(){
         $(".item").each(function(i){
           var height = window.innerHeight - $(this).find(".bottom").height()
@@ -75,7 +75,7 @@ var app = (function() {
         app.view.$el.removeClass("hidden")
         // $('.top').flickity('resize')
         $('body').removeClass('resizing')
-      }, 20)
+      }, 400)
     }, 400)
   }
 
diff --git a/public/assets/js/lib/ProjectView.js b/public/assets/js/lib/ProjectView.js
index 107c3d5..726a430 100644
--- a/public/assets/js/lib/ProjectView.js
+++ b/public/assets/js/lib/ProjectView.js
@@ -22,7 +22,7 @@ var ProjectView = View.extend({
     app.header.updateSlideCount( 1 )
     $('body').removeClass('navopen')
     this.$el.removeClass("hidden")
-    
+    this.$el.addClass("active")
     if (this.project_id == "cover") {
       app.router.pushState("/")
     }
@@ -39,6 +39,7 @@ var ProjectView = View.extend({
   hide: function(){
     addClassForPeriod( this.el, "hiding", app.navigation_delay, function(){
       this.$el.addClass("hidden")
+      this.$el.removeClass("active")
     }.bind(this) )
   },