diff options
| -rw-r--r-- | package.json | 2 | ||||
| -rw-r--r-- | public/assets/js/app.js | 11 | ||||
| -rw-r--r-- | public/assets/js/lib/NavView.js | 8 | ||||
| -rw-r--r-- | public/assets/js/lib/ProjectView.js | 13 | ||||
| -rw-r--r-- | public/assets/ok.css | 3 |
5 files changed, 20 insertions, 17 deletions
diff --git a/package.json b/package.json index d5c04db..8144865 100644 --- a/package.json +++ b/package.json @@ -19,7 +19,7 @@ "dotenv": "^2.0.0", "flickity": "^1.2.1", "object-assign": "^2.0.0", - "okcms": "git+ssh://git@github.com:okfocus/okcms.git#v0.1.21" + "okcms": "git+ssh://git@github.com:okfocus/okcms.git#v0.1.22" }, "homepage": "https://github.com/okfocus/portfolio" } diff --git a/public/assets/js/app.js b/public/assets/js/app.js index ba7c247..bfd317b 100644 --- a/public/assets/js/app.js +++ b/public/assets/js/app.js @@ -80,8 +80,10 @@ var app = (function() { })() -$(".top").each(function(){ - var height = $(this).height() - 10 +var heights = [] +$(".top").each(function(i){ + var height = $(this).height() + heights[i] = height $(".cell", this).css({ 'height': (height + 'px') }) }) @@ -90,9 +92,8 @@ $('.top').flickity(app.flickity_options).on( 'cellSelect', function(e) { app.header.updateSlideNumber( gallery.selectedIndex ) }) -$(".top").each(function(){ - var height = $(this).height() - 10 - console.log(height) +$(".top").each(function(i){ + var height = heights[i] $(".previous, .next", this).css({ 'height': (height + 'px') }) }) diff --git a/public/assets/js/lib/NavView.js b/public/assets/js/lib/NavView.js index ae60bdf..0eb4671 100644 --- a/public/assets/js/lib/NavView.js +++ b/public/assets/js/lib/NavView.js @@ -20,12 +20,20 @@ var NavView = View.extend({ }, previous: function(){ + if ($('body').hasClass('navopen')) { + $('body').removeClass('navopen') + return + } var index = Math.max( app.view.page_number - 1, 0 ) var view = app.projects[ index ] this.swap( view, "up" ) }, next: function(){ + if ($('body').hasClass('navopen')) { + $('body').removeClass('navopen') + return + } var index = Math.min( app.view.page_number + 1, app.projects.length - 1 ) var view = app.projects[ index ] this.swap( view, "down" ) diff --git a/public/assets/js/lib/ProjectView.js b/public/assets/js/lib/ProjectView.js index 357bbee..1528f10 100644 --- a/public/assets/js/lib/ProjectView.js +++ b/public/assets/js/lib/ProjectView.js @@ -1,7 +1,7 @@ var ProjectView = View.extend({ events: { - "click": "nextOrCloseNav", + "click": "next", "click .page-up": "previous", "click .page-down": "next", "click .top": "stopPropagation", @@ -46,15 +46,10 @@ var ProjectView = View.extend({ e.stopPropagation() app.nav.previous() }, - - nextOrCloseNav: function(e){ + + next: function(e){ e.stopPropagation() - if ($('body').hasClass('navopen')) { - $('body').removeClass('navopen') - } - else { - app.nav.next() - } + app.nav.next() }, }) diff --git a/public/assets/ok.css b/public/assets/ok.css index 8c1ae4f..f762d89 100644 --- a/public/assets/ok.css +++ b/public/assets/ok.css @@ -412,6 +412,7 @@ nav b { position: absolute; z-index: 3; bottom:0; + left: 0; margin-left: 20vw; cursor: url(img/d.png)32 64, pointer; } @@ -485,9 +486,7 @@ button.previous { /*height: 20vh;*/ flex: 0 auto; overflow: hidden; -/* padding: 5px 0; - */ cursor: url(img/d.png)32 64, pointer; } |
