fix galleries and all page

4 files changed, 35 insertions, 20 deletions

diff --git a/site/public/assets/javascripts/_env.js b/site/public/assets/javascripts/_env.js
index a8e1146..c7f8607 100644
--- a/site/public/assets/javascripts/_env.js
+++ b/site/public/assets/javascripts/_env.js
@@ -89,20 +89,7 @@ environment.ready = function(){
     })
 	})	
 */
-	$("nav .index").click(function (e){
-    e && e.preventDefault()
-    if (done_loading && window.location.hash == "#/index") return
-    // window.location.hash = "#/index"
-    
-	  $("nav a.active").removeClass("active")
-    open_entry()
-	  
-    $("#entry_container").removeClass("visible")
-    var $loader = $("<div>")
-    $loader.load("all .entry", function(){
-      display_entry($loader.children()[0])
-    })
-	})
+	// $("nav .index").click()
 
 	$(".toggleRapper").click(toggle_menu)
 	$(document).on("click", ".project", function(){
@@ -116,7 +103,8 @@ environment.ready = function(){
     $('.cat.active, .sub.active, .sub.a').addClass('active')
     controls.pause()
     window.location.hash = "#"
-    $(".index").trigger("click")
+    // $(".index").trigger("click")
+    load_index()
 	  // hide_entry()
 	})
 
@@ -313,6 +301,23 @@ function build_scene () {
 
 var entry_open_time = 0;
 
+function load_index (e){
+  e && e.preventDefault()
+  // if (done_loading && window.location.hash == "#/index") return
+  // window.location.hash = "#/index"
+  console.log("load index")
+  
+  $("nav a.active").removeClass("active")
+  open_entry()
+  
+  $("#entry_container").removeClass("visible")
+  var $loader = $("<div>")
+  $loader.load("all .entry", function(){
+  console.log("index did load")
+    display_entry($loader.children()[0])
+  })
+}
+
 function as_hash (txt) {
   return txt.replace(/\s/g,'_')
 }
@@ -391,7 +396,8 @@ function toggle_menu (isInitialLoad){
 
   if (menu_open && isInitialLoad !== false) {
     controls.pause()
-    $(".index").trigger("click")
+    // $(".index").trigger("click")
+    load_index()
   }
   if (! menu_open && entry_open && ! is_mobile) {
     entry_open = false
@@ -488,6 +494,7 @@ function build_gallery () {
   })
   gallery.loader.on("progress", function(imagesLoaded, loadingImage){
     $(loadingImage.img).addClass('loaded')
+    $(loadingImage.img).parent().removeClass('loading')
   })
   $(".nextbutton").click(function(){ gallery.next() })
   $(".prevbutton").click(function(){ gallery.previous() })
diff --git a/site/public/assets/style.css b/site/public/assets/style.css
index 27e3158..94cf60a 100644
--- a/site/public/assets/style.css
+++ b/site/public/assets/style.css
@@ -442,7 +442,9 @@ nav .sub.active a {
 	margin-left: 180px;	
 }
 .entry.all {
+/* 
 	width: 90%;
+ */
 }
 .entry h1{
 	margin-bottom: 1.2em;
@@ -709,6 +711,9 @@ nav .sub.active a {
 	transition:0.4s opacity ease-in;
 }
 
+.cell img.loading {
+  opacity: 0.0 !important;
+}
 .cell img.loaded {
   opacity: 0.2;
 }
@@ -803,8 +808,9 @@ nav .sub.active a {
 .project {
   float: left;
   width: 25%;
+  width: 19vw;
 	height: 200px;
-  height: 14vw;
+  height: 12.3vw;
   padding: 10px 0px 0 10px;
   cursor: pointer;
   opacity: 0.0;
@@ -927,6 +933,7 @@ nav .sub.active a {
 	
 	.project {
 		width:33.3333%;
+    height: 16.6vw;
 	}
 
 }
@@ -940,6 +947,7 @@ nav .sub.active a {
 	
 	.project {
 		width:50%;
+    height: 23vw;
 	}
 
 }
@@ -966,7 +974,7 @@ nav .sub.active a {
 	.project {
 	  width: 100%;
 	  padding: 0 0 0 25px;
-	  height: 260px;
+	  height: 55vw;
 	}
 	.menuActive #entry_container {
 		left:160px;
diff --git a/site/templates/all.liquid b/site/templates/all.liquid
index 63e5f35..73da67b 100644
--- a/site/templates/all.liquid
+++ b/site/templates/all.liquid
@@ -1,4 +1,4 @@
-<div class="all undone">
+<div class="entry all undone">
   {% for project in advertisings %}
     <div class="project" data-id="{{ project.id }}" data-type="advertising">
       <img src="{{ project.thumbnail.uri }}">
diff --git a/site/templates/project.liquid b/site/templates/project.liquid
index 8c9a26e..65587d9 100644
--- a/site/templates/project.liquid
+++ b/site/templates/project.liquid
@@ -10,7 +10,7 @@
       {% if media.token %}
         <div class="cell video" style="background-image:url({{ media.thumb }})" data-video="https://player.vimeo.com/video/{{ media.token }}" data-caption=""></div>
       {% else %}
-        <div class="cell" data-caption="{{ media.caption }}"><img src="{{ media.uri }}"></div>
+        <div class="cell loading" data-caption="{{ media.caption }}"><img src="{{ media.uri }}"></div>
       {% endif %}
     {% endfor %}
 		</div>