diff options
| author | “Ryder <“r@okfoc.us”> | 2016-03-29 16:39:19 -0400 |
|---|---|---|
| committer | “Ryder <“r@okfoc.us”> | 2016-03-29 16:39:19 -0400 |
| commit | ef1735b99dc0335797730826e6eb083fe6268d43 (patch) | |
| tree | 181af40d22064e51f5ee21ed662e356e237a0520 /public/assets/js | |
| parent | 6b84198c7c3eeadec90c8a856218c96acf942e45 (diff) | |
| parent | 20c26d2a907a8605cbae072f0e9c04a64d2c7c4e (diff) | |
Merge branch 'master' of https://github.com/okfocus/portfolio
Diffstat (limited to 'public/assets/js')
| -rw-r--r-- | public/assets/js/app.js | 7 | ||||
| -rw-r--r-- | public/assets/js/lib/ProjectView.js | 1 |
2 files changed, 7 insertions, 1 deletions
diff --git a/public/assets/js/app.js b/public/assets/js/app.js index 29224fe..56cb4c5 100644 --- a/public/assets/js/app.js +++ b/public/assets/js/app.js @@ -80,7 +80,12 @@ var app = (function() { })() -$(".cell, .next").css({ 'height': ($(".top").height() + 'px') }) +$(".top").each(function(){ + var height = $(this).height() + console.log(height) + $(".cell, .next", this).css({ 'height': (height + 'px') }) +}) + $(".item").addClass("hidden") $('.top').flickity(app.flickity_options).on( 'cellSelect', function(e) { diff --git a/public/assets/js/lib/ProjectView.js b/public/assets/js/lib/ProjectView.js index 3bef408..414865f 100644 --- a/public/assets/js/lib/ProjectView.js +++ b/public/assets/js/lib/ProjectView.js @@ -4,6 +4,7 @@ var ProjectView = View.extend({ "click": "nextOrCloseNav", "click .page-up": "previous", "click .page-down": "next", + "click .flickity-viewport": "stopPropagation", }, initialize: function(opt){ |