From e69ec9ce4b4afbf1910c617bebdad02c1bce69ed Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Tue, 14 Apr 2015 19:09:06 -0400
Subject: fix shape appearance bug?

---
 site/public/assets/javascripts/_env.js | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'site/public/assets/javascripts/_env.js')

diff --git a/site/public/assets/javascripts/_env.js b/site/public/assets/javascripts/_env.js
index f30d62d..7ff471d 100644
--- a/site/public/assets/javascripts/_env.js
+++ b/site/public/assets/javascripts/_env.js
@@ -99,12 +99,11 @@ environment.ready = function(){
 	})
 
 	$(".toggleRapper").click(toggle_menu)
-	$(".toplogo").click(hide_entry)
 	$(document).on("click", ".project", function(){
     var page = "/" + $(this).data("type") + "/" + $(this).data("id")
 	  load_hash(page)
 	})
-	$(".logo").click(function(e){
+	$(".toplogo,.logo").click(function(e){
 	  e.preventDefault()
 	  hide_entry()
 	})
@@ -285,8 +284,10 @@ function display_entry ($el) {
 
   $("#entry_container").scrollTop(0)
   $("#entry_container").addClass("visible")
-  controls.setZoom(100000)
-  setTimeout(function(){ controls.zoom(100) }, 100)
+  $("#scene").addClass("fade")
+  setTimeout(function(){
+    $("#scene").hide()
+  }, 200)
 }
 function hide_entry () {
   $("nav .active").removeClass("active")
@@ -317,6 +318,7 @@ function toggle_menu (){
   }
   if (! menu_open && ! entry_open) {
     window.location.hash = "#"
+    console.log("what")
     $("#scene").show()
     $("#entry_container").empty()
     controls.zoom(1500)
-- 
cgit v1.2.3-70-g09d2