diff options
| -rw-r--r-- | db.json | 21 | ||||
| -rw-r--r-- | index.js | 4 | ||||
| -rw-r--r-- | public/assets/js/app.js | 15 | ||||
| -rw-r--r-- | public/assets/js/lib/ProjectView.js | 2 | ||||
| -rw-r--r-- | public/assets/ok.css | 4 |
5 files changed, 32 insertions, 14 deletions
@@ -76,10 +76,19 @@ "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": "" + "video": "", + "alternateTitle": "", + "media": [ + { + "uri": "https://ltho.s3.amazonaws.com/4f0fb27a-b9c5-40a9-ace8-1c5e12d78d0b.png", + "caption": "" + } + ], + "containImage": "false", + "press": [] }, { "id": "internet-archaeology", @@ -121,7 +130,8 @@ "media": [ { "uri": "http://dumpfm.s3.amazonaws.com/images/20110102/1294001784838-dumpfm-selfharm-sassoonlogo.gif", - "caption": "" + "caption": "", + "type": "image" } ], "containImage": "false", @@ -139,8 +149,9 @@ "uri": "https://news.artnet.com/art-world/a-brief-history-of-animated-gif-art-part-two-78532" } ], - "__index": 3, - "dateCreated": "Mon, 28 Mar 2016 23:27:45 GMT" + "__index": "3", + "dateCreated": "Mon, 28 Mar 2016 23:27:45 GMT", + "alternateTitle": "" }, { "id": "spice-girls", @@ -14,8 +14,8 @@ var app = okcms.createApp({ project: 'OKFocus Portfolio', - debug: !isProduction, - production: isProduction, + debug: true, // !isProduction, + production: false, // isProduction, schemas: { page: { diff --git a/public/assets/js/app.js b/public/assets/js/app.js index 7240c89..2636332 100644 --- a/public/assets/js/app.js +++ b/public/assets/js/app.js @@ -87,18 +87,21 @@ var app = (function() { })() $(".top").each(function(){ - var height = $(this).height() - console.log(height) - $(".cell, .next", this).css({ 'height': (height + 'px') }) + var height = $(this).height() - 10 + $(".cell", this).css({ 'height': (height + 'px') }) }) -$(".item").addClass("hidden") - $('.top').flickity(app.flickity_options).on( 'cellSelect', function(e) { var gallery = $(e.target).data('flickity') app.header.updateSlideNumber( gallery.selectedIndex ) }) -$(".previous, .next").css({ 'height': ($(".top").height() + 'px') }) +$(".top").each(function(){ + var height = $(this).height() - 10 + console.log(height) + $(".previous, .next", this).css({ 'height': (height + 'px') }) +}) + +$(".item").addClass("hidden") app.init() diff --git a/public/assets/js/lib/ProjectView.js b/public/assets/js/lib/ProjectView.js index 414865f..357bbee 100644 --- a/public/assets/js/lib/ProjectView.js +++ b/public/assets/js/lib/ProjectView.js @@ -4,7 +4,7 @@ var ProjectView = View.extend({ "click": "nextOrCloseNav", "click .page-up": "previous", "click .page-down": "next", - "click .flickity-viewport": "stopPropagation", + "click .top": "stopPropagation", }, initialize: function(opt){ diff --git a/public/assets/ok.css b/public/assets/ok.css index 9dc312f..8c1ae4f 100644 --- a/public/assets/ok.css +++ b/public/assets/ok.css @@ -356,6 +356,7 @@ nav span div:last-child { /*height: 80vh;*/ flex: 1 auto; margin-top: 20px; + float: none; } nav b { @@ -364,6 +365,9 @@ nav b { /*animations*/ +.bottom { + float: none; +} .bottom * { transform:translateY(0px); transition:150ms transform, 150ms opacity; |