From 053522228740c70e4b8c5f03e8639e661a363bb5 Mon Sep 17 00:00:00 2001 From: Jules Laplace Date: Wed, 30 Mar 2016 18:55:49 -0400 Subject: resizing better --- public/assets/js/app.js | 9 +-------- public/assets/ok.css | 8 +++++++- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/public/assets/js/app.js b/public/assets/js/app.js index 28db3f6..dba055b 100644 --- a/public/assets/js/app.js +++ b/public/assets/js/app.js @@ -62,6 +62,7 @@ var app = (function() { app.router = new SiteRouter () + app.resizeItems() app.router.launch() console.log("launched") @@ -122,14 +123,6 @@ $('.top').each(function(){ } }) -$(".item").each(function(i){ - var height = window.innerHeight - $(this).find(".bottom").height() - if (is_desktop) { - height -= $("nav").height() // account for top bar - } - $(".previous, .next, .flickity-viewport", this).css({ 'height': height }) -}) - $(".item").addClass("hidden") app.init() diff --git a/public/assets/ok.css b/public/assets/ok.css index 75aec3d..d2d3030 100644 --- a/public/assets/ok.css +++ b/public/assets/ok.css @@ -36,6 +36,9 @@ body { overflow: hidden; } +.loading #items { + opacity: 0; +} /* .hidden { @@ -560,9 +563,12 @@ button.previous { background-color: #eee; } -.resizing .top { +.resizing .item { background: url(img/tomato20dancing.gif) center !important; } +.resizing .item * { + opacity: 0; +} .bottom { /*height: 20vh;*/ -- cgit v1.2.3-70-g09d2