summaryrefslogtreecommitdiff
path: root/public/assets/js
diff options
context:
space:
mode:
authorJules Laplace <jules@okfoc.us>2016-03-30 13:47:30 -0400
committerJules Laplace <jules@okfoc.us>2016-03-30 13:47:30 -0400
commit0663f93a09b49ccf6681926fffe00858cddf2176 (patch)
treee78d01f2d21ecc5b4a0db285d4e0c587d9c9fe7b /public/assets/js
parentac14d77fdb071828806bebf1920e1b150f3c6359 (diff)
parent15e6d6b768ac1f82fed65e1439962c0c26557ea5 (diff)
merge
Diffstat (limited to 'public/assets/js')
-rw-r--r--public/assets/js/app.js14
1 files changed, 12 insertions, 2 deletions
diff --git a/public/assets/js/app.js b/public/assets/js/app.js
index c21ed73..3669bf7 100644
--- a/public/assets/js/app.js
+++ b/public/assets/js/app.js
@@ -74,7 +74,7 @@ var app = (function() {
height -= $("nav").height() // account for top bar
}
$(".previous, .next, .cell, .top, .flickity-viewport", this).css({ 'height': height })
- $(".bottom", this).css({ 'top': height })
+ $(".bottom", this).css({ 'top': height + 13 })
})
app.view.$el.removeClass("hidden")
// $('.top').flickity('resize')
@@ -93,7 +93,17 @@ $(".item").each(function(i){
height -= $("nav").height() // account for top bar
}
$(".cell, .top", this).css({ 'height': height })
- $(".bottom", this).css({ 'top': height + 20 })
+ 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 })
+ }
+ else {
+ $(".bottom", this).css({ 'top': height + 19 })
+ }
})
$('.top').each(function(){