diff options
| author | Jules Laplace <jules@okfoc.us> | 2016-03-30 13:59:18 -0400 |
|---|---|---|
| committer | Jules Laplace <jules@okfoc.us> | 2016-03-30 13:59:18 -0400 |
| commit | 4f3eefceeabaea9b8610338b4cc5b80adbdd4e4a (patch) | |
| tree | 0d56748e89182b98747dabb3181ab4093bd01d2e /public | |
| parent | ee352086ea4d61b08b730e9b78858a5750455d6a (diff) | |
quirks if there is no brief
Diffstat (limited to 'public')
| -rw-r--r-- | public/assets/js/app.js | 19 | ||||
| -rw-r--r-- | public/assets/js/lib/NavView.js | 2 | ||||
| -rw-r--r-- | public/assets/ok.css | 8 |
3 files changed, 19 insertions, 10 deletions
diff --git a/public/assets/js/app.js b/public/assets/js/app.js index fa5dafe..3476d44 100644 --- a/public/assets/js/app.js +++ b/public/assets/js/app.js @@ -84,15 +84,20 @@ var app = (function() { } $(".cell, .top, .previous, .next, .flickity-viewport", this).css({ 'height': height }) var cellCount = $(this).find(".cell").length - if (cellCount == 0) { - console.log($(this).data("id"), "NONE") - $(".bottom", this).css({ 'top': height + 17 }) - } - else if (cellCount == 1) { - $(".bottom", this).css({ 'top': height + 13 }) + if ($.browser.mozilla) { + $(".bottom", this).css({ 'top': height + 20 }) } else { - $(".bottom", this).css({ 'top': height + 19 }) + if (cellCount == 0) { + console.log($(this).data("id"), "NONE") + $(".bottom", this).css({ 'top': height + 17 }) + } + else if (cellCount == 1) { + $(".bottom", this).css({ 'top': height + 20 }) + } + else { + $(".bottom", this).css({ 'top': height + 19 }) + } } }) } diff --git a/public/assets/js/lib/NavView.js b/public/assets/js/lib/NavView.js index 0eb4671..8050beb 100644 --- a/public/assets/js/lib/NavView.js +++ b/public/assets/js/lib/NavView.js @@ -34,7 +34,7 @@ var NavView = View.extend({ $('body').removeClass('navopen') return } - var index = Math.min( app.view.page_number + 1, app.projects.length - 1 ) + var index = app.view.page_number + 1 % app.projects.length var view = app.projects[ index ] this.swap( view, "down" ) }, diff --git a/public/assets/ok.css b/public/assets/ok.css index 0079bef..c6a4040 100644 --- a/public/assets/ok.css +++ b/public/assets/ok.css @@ -251,11 +251,14 @@ span { .item { height: 100vh; width: 100%; - display: -webkit-flex; + display: block; + transition: 150ms transform cubic-bezier(0, 0, 0, 1), 150ms opacity cubic-bezier(0, 0, 0, 1); +} +.item.intro { display: flex; + display: -webkit-flex; -webkit-flex-flow: column wrap; flex-flow: column wrap; - transition: 150ms transform cubic-bezier(0, 0, 0, 1), 150ms opacity cubic-bezier(0, 0, 0, 1); } body, @@ -381,6 +384,7 @@ nav b { width: 100%; left: 0; background: white; + display: block; } .up .showing.item { |