diff options
Diffstat (limited to 'public')
| -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 |
3 files changed, 14 insertions, 7 deletions
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; |