From c487ddf18e4c2e9a47af0566423b652561d8f85e Mon Sep 17 00:00:00 2001 From: Nathan Leniz Date: Wed, 4 Feb 2015 14:59:45 -0500 Subject: [PATCH] Cleaning up bonfire.js --- controllers/bonfire.js | 4 ++-- public/css/main.less | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/controllers/bonfire.js b/controllers/bonfire.js index 0dd5552de0..837af5e722 100644 --- a/controllers/bonfire.js +++ b/controllers/bonfire.js @@ -73,7 +73,8 @@ exports.returnIndividualBonfire = function(req, res, next) { if (err) { next(err); } - var dashedNameFull = bonfire[bonfireNumber].name.toLowerCase().replace(/\s/g, '-'); + bonfire = bonfire.pop() + var dashedNameFull = bonfire.name.toLowerCase().replace(/\s/g, '-'); if (dashedNameFull != dashedName) { return res.redirect('/bonfires/' + dashedNameFull); } @@ -83,7 +84,6 @@ exports.returnIndividualBonfire = function(req, res, next) { }); return res.redirect('/bonfires') } else { - bonfire = bonfire.pop(); res.render('bonfire/show', { completedWith: null, title: bonfire.name, diff --git a/public/css/main.less b/public/css/main.less index 15e5746484..c6df2e4d46 100644 --- a/public/css/main.less +++ b/public/css/main.less @@ -656,11 +656,13 @@ iframe.iphone { position: absolute; top: 70px; right: 25px; + overflow-y: scroll; } @media(max-width: 991px) { width: 100%; border-radius: 5px; - + overflow-y: visible; + } }