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 | |
| parent | ee352086ea4d61b08b730e9b78858a5750455d6a (diff) | |
quirks if there is no brief
| -rw-r--r-- | db.json | 13 | ||||
| -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 |
4 files changed, 26 insertions, 16 deletions
@@ -21,7 +21,7 @@ "uri": "http://nytimes.com/" } ], - "__index": "1", + "__index": 0, "dateCreated": "Sat, 26 Mar 2016 20:34:21 GMT", "client": "Annapurna Pictures", "containImage": "false", @@ -76,7 +76,7 @@ "uri": "https://ltho.s3.amazonaws.com/e12aee73-07a1-41f4-a54f-8b8c09f167f9.png", "caption": "" }, - "__index": "2", + "__index": 2, "dateCreated": "Mon, 28 Mar 2016 17:19:36 GMT", "iframe": "http://okfoc.us", "video": "", @@ -149,7 +149,7 @@ "uri": "https://news.artnet.com/art-world/a-brief-history-of-animated-gif-art-part-two-78532" } ], - "__index": "3", + "__index": 3, "dateCreated": "Mon, 28 Mar 2016 23:27:45 GMT", "alternateTitle": "" }, @@ -160,7 +160,7 @@ "client": "MOMA", "link": "http://moonpies.org", "NatureOfWork": "bam\r\ntoons\r\npoo", - "brief": "yes", + "brief": "The Spice Girls were an English pop girl group formed in 1994. The group consists of Melanie Brown (\"Scary Spice\"), Melanie Chisholm (\"Sporty Spice\"), Emma Bunton (\"Baby Spice\"), Geri Halliwell (\"Ginger Spice\"), and Victoria Beckham, née Adams (\"Posh Spice\"). They were signed to Virgin Records and released their debut single \"Wannabe\" in 1996, which hit number one in 37 countries and established them as a global phenomenon. ", "media": [ { "uri": "https://ltho.s3.amazonaws.com/6e924d4d-0f0d-4f72-a098-200bb663cd25.png", @@ -169,14 +169,15 @@ } ], "containImage": "false", - "__index": "0", + "__index": "1", "dateCreated": "Tue, 29 Mar 2016 15:45:57 GMT", "press": [ { "text": "google", "uri": "google.com" } - ] + ], + "alternateTitle": "" } ], "page": [ 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 { |
