diff options
| -rw-r--r-- | site/public/assets/javascripts/_env.js | 14 | ||||
| -rw-r--r-- | site/public/assets/style.css | 66 | ||||
| -rw-r--r-- | site/templates/all.liquid | 2 |
3 files changed, 43 insertions, 39 deletions
diff --git a/site/public/assets/javascripts/_env.js b/site/public/assets/javascripts/_env.js index 60f6528..860222f 100644 --- a/site/public/assets/javascripts/_env.js +++ b/site/public/assets/javascripts/_env.js @@ -85,8 +85,8 @@ environment.ready = function(){ display_entry($loader.children()[0]) }) }) - $("nav .index").click(function(e){ - e.preventDefault() + $("nav .index").click(function (e){ + e && e.preventDefault() if (done_loading && window.location.hash == "#/index") return // window.location.hash = "#/index" @@ -109,7 +109,12 @@ environment.ready = function(){ }) $(".toplogo,.logo").click(function(e){ e.preventDefault() - hide_entry() + $(".active").removeClass('active') + $('.cat.active, .sub.active, .sub.a').addClass('active') + controls.pause() + window.location.hash = "#" + $(".index").trigger("click") + // hide_entry() }) Share.init() @@ -330,7 +335,7 @@ function display_entry ($el) { $(".entry").addClass("ready") if ($(".entry").hasClass("all")) { setTimeout(function(){ - $(".entry").addClass("done") + $(".entry").removeClass("undone") }, 500) } }, 100) @@ -431,7 +436,6 @@ function build_gallery () { }) gallery.on("cellSelect", function(){ - console.log("DUH") $caption.html( $(gallery.selectedElement).data("caption") ) videos.forEach(function(player){ player.api('pause') diff --git a/site/public/assets/style.css b/site/public/assets/style.css index 8c7594d..7a7f2b0 100644 --- a/site/public/assets/style.css +++ b/site/public/assets/style.css @@ -779,9 +779,9 @@ nav .sub.active a { .ready .project { opacity: 0.8; } -.done.ready .project { - -webkit-transition-delay: 0 !important; - transition-delay: 0 !important; +.ready .project { + -webkit-transition-delay: 0s !important; + transition-delay: 0s !important; } .project span { position: relative; @@ -795,36 +795,36 @@ nav .sub.active a { .project:hover span { opacity: 1; } -.project:nth-child(1) { transition-delay:0.05s; } -.project:nth-child(2) { transition-delay:0.1s; } -.project:nth-child(3) { transition-delay:0.15s; } -.project:nth-child(4) { transition-delay:0.2s; } -.project:nth-child(5) { transition-delay:0.25s; } -.project:nth-child(6) { transition-delay:0.3s; } -.project:nth-child(7) { transition-delay:0.35s; } -.project:nth-child(8) { transition-delay:0.4s; } -.project:nth-child(9) { transition-delay:0.45s; } -.project:nth-child(10) { transition-delay:0.5s; } -.project:nth-child(11) { transition-delay:0.55s; } -.project:nth-child(12) { transition-delay:0.6s; } -.project:nth-child(13) { transition-delay:0.65s; } -.project:nth-child(14) { transition-delay:0.7s; } -.project:nth-child(15) { transition-delay:0.75s; } -.project:nth-child(16) { transition-delay:0.8s; } -.project:nth-child(17) { transition-delay:0.85s; } -.project:nth-child(18) { transition-delay:0.9s; } -.project:nth-child(19) { transition-delay:0.95s; } -.project:nth-child(20) { transition-delay:1.00s; } -.project:nth-child(21) { transition-delay:1.05s; } -.project:nth-child(22) { transition-delay:1.1s; } -.project:nth-child(23) { transition-delay:1.15s; } -.project:nth-child(24) { transition-delay:1.2s; } -.project:nth-child(25) { transition-delay:1.25s; } -.project:nth-child(26) { transition-delay:1.3s; } -.project:nth-child(27) { transition-delay:1.35s; } -.project:nth-child(28) { transition-delay:1.4s; } -.project:nth-child(29) { transition-delay:1.45s; } -.project:nth-child(30) { transition-delay:1.50s; } +.undone .project:nth-child(1) { transition-delay:0.05s; } +.undone .project:nth-child(2) { transition-delay:0.1s; } +.undone .project:nth-child(3) { transition-delay:0.15s; } +.undone .project:nth-child(4) { transition-delay:0.2s; } +.undone .project:nth-child(5) { transition-delay:0.25s; } +.undone .project:nth-child(6) { transition-delay:0.3s; } +.undone .project:nth-child(7) { transition-delay:0.35s; } +.undone .project:nth-child(8) { transition-delay:0.4s; } +.undone .project:nth-child(9) { transition-delay:0.45s; } +.undone .project:nth-child(10) { transition-delay:0.5s; } +.undone .project:nth-child(11) { transition-delay:0.55s; } +.undone .project:nth-child(12) { transition-delay:0.6s; } +.undone .project:nth-child(13) { transition-delay:0.65s; } +.undone .project:nth-child(14) { transition-delay:0.7s; } +.undone .project:nth-child(15) { transition-delay:0.75s; } +.undone .project:nth-child(16) { transition-delay:0.8s; } +.undone .project:nth-child(17) { transition-delay:0.85s; } +.undone .project:nth-child(18) { transition-delay:0.9s; } +.undone .project:nth-child(19) { transition-delay:0.95s; } +.undone .project:nth-child(20) { transition-delay:1.00s; } +.undone .project:nth-child(21) { transition-delay:1.05s; } +.undone .project:nth-child(22) { transition-delay:1.1s; } +.undone .project:nth-child(23) { transition-delay:1.15s; } +.undone .project:nth-child(24) { transition-delay:1.2s; } +.undone .project:nth-child(25) { transition-delay:1.25s; } +.undone .project:nth-child(26) { transition-delay:1.3s; } +.undone .project:nth-child(27) { transition-delay:1.35s; } +.undone .project:nth-child(28) { transition-delay:1.4s; } +.undone .project:nth-child(29) { transition-delay:1.45s; } +.undone .project:nth-child(30) { transition-delay:1.50s; } #entry_container.visible { top: 0%; diff --git a/site/templates/all.liquid b/site/templates/all.liquid index f29a78f..73da67b 100644 --- a/site/templates/all.liquid +++ b/site/templates/all.liquid @@ -1,4 +1,4 @@ -<div class="entry all"> +<div class="entry all undone"> {% for project in advertisings %} <div class="project" data-id="{{ project.id }}" data-type="advertising"> <img src="{{ project.thumbnail.uri }}"> |