diff --git a/public/src/ajaxify.js b/public/src/ajaxify.js index 38300a481d..57e94c03dc 100644 --- a/public/src/ajaxify.js +++ b/public/src/ajaxify.js @@ -81,9 +81,9 @@ var ajaxify = {}; callback(); } - app.process_page(); - jQuery('#content, #footer').stop(true, true).fadeIn(200, function () { + + app.process_page(); if (window.location.hash) hash = window.location.hash; if (hash) diff --git a/public/src/templates.js b/public/src/templates.js index 9d92f8bdda..25ed9a5d94 100644 --- a/public/src/templates.js +++ b/public/src/templates.js @@ -182,30 +182,30 @@ translator.translate(templates[tpl_url].parse(template_data), function (translatedTemplate) { document.getElementById('content').innerHTML = translatedTemplate; - }); - jQuery('#content [template-variable]').each(function (index, element) { - var value = null; - - switch (element.getAttribute('template-type')) { - case 'boolean': - value = (element.value === 'true' || element.value === '1') ? true : false; - break; - case 'int': // Intentional fall-through - case 'integer': - value = parseInt(element.value); - break; - default: - value = element.value; - break; - } + jQuery('#content [template-variable]').each(function (index, element) { + var value = null; + + switch (element.getAttribute('template-type')) { + case 'boolean': + value = (element.value === 'true' || element.value === '1') ? true : false; + break; + case 'int': // Intentional fall-through + case 'integer': + value = parseInt(element.value); + break; + default: + value = element.value; + break; + } - templates.set(element.getAttribute('template-variable'), value); - }); + templates.set(element.getAttribute('template-variable'), value); + }); - if (callback) { - callback(true); - } + if (callback) { + callback(true); + } + }); } } diff --git a/public/themes/vanilla/category.less b/public/themes/vanilla/category.less index 8e5f5887e7..52d2f89a06 100644 --- a/public/themes/vanilla/category.less +++ b/public/themes/vanilla/category.less @@ -112,7 +112,7 @@ } .recent-replies { - overflow-y: auto; + overflow-y: hidden; overflow-x: hidden; ul { @@ -126,7 +126,6 @@ li { clear: both; line-height: 17px; - margin-bottom: 1em; &:last-child { margin-bottom: 0;