diff --git a/web/themes/asc_bootstrap/js/scripts.js b/web/themes/asc_bootstrap/js/scripts.js index 10ae0eda5cddacce637ec471b23013f21e45b855..e7b4c32ea5eff49340cf16d1faf72409c5706e01 100644 --- a/web/themes/asc_bootstrap/js/scripts.js +++ b/web/themes/asc_bootstrap/js/scripts.js @@ -23,28 +23,40 @@ jQuery(document).ready(function(){ jQuery(".path-people .main-container aside").css({'min-height':(jQuery(".path-people .main-container section").height()+'px')}); } - if(jQuery(".page-node-type-newsletter-article .main-container section").height() > jQuery(".page-node-type-newsletter-article .main-container aside").height()) { - jQuery(".page-node-type-newsletter-article .main-container aside").css({'min-height':(jQuery(".page-node-type-newsletter-article .main-container section").height()+'px')}); + if (jQuery(".page-node-type-newsletter-article .main-container aside .region-sidebar-menu").css('display') != 'none') { + if(jQuery(".page-node-type-newsletter-article .main-container section").height() > jQuery(".page-node-type-newsletter-article .main-container aside").height()) { + jQuery(".page-node-type-newsletter-article .main-container aside").css({'min-height':(jQuery(".page-node-type-newsletter-article .main-container section").height()+'px')}); + } } - if(jQuery(".page-node-type-research .main-container section").height() > jQuery(".page-node-type-research aside").height()) { - jQuery(".page-node-type-research .main-container aside").css({'min-height':(jQuery(".page-node-type-research .main-container section").height()+'px')}); + if (jQuery(".page-node-type-research .main-container aside .region-sidebar-menu").css('display') != 'none') { + if(jQuery(".page-node-type-research .main-container section").height() > jQuery(".page-node-type-research aside").height()) { + jQuery(".page-node-type-research .main-container aside").css({'min-height':(jQuery(".page-node-type-research .main-container section").height()+'px')}); + } } - if(jQuery(".page-node-type-gallery .main-container section").height() > jQuery(".page-node-type-gallery aside").height()) { - jQuery(".page-node-type-gallery .main-container aside").css({'min-height':(jQuery(".page-node-type-gallery .main-container section").height()+'px')}); + if (jQuery(".page-node-type-gallery .main-container aside .region-sidebar-menu").css('display') != 'none') { + if(jQuery(".page-node-type-gallery .main-container section").height() > jQuery(".page-node-type-gallery aside").height()) { + jQuery(".page-node-type-gallery .main-container aside").css({'min-height':(jQuery(".page-node-type-gallery .main-container section").height()+'px')}); + } } - if(jQuery(".page-node-type-course .main-container section").height() > jQuery(".page-node-type-course aside").height()) { - jQuery(".page-node-type-course .main-container aside").css({'min-height':(jQuery(".page-node-type-course .main-container section").height()+'px')}); + if (jQuery(".page-node-type-course .main-container aside .region-sidebar-menu").css('display') != 'none') { + if(jQuery(".page-node-type-course .main-container section").height() > jQuery(".page-node-type-course aside").height()) { + jQuery(".page-node-type-course .main-container aside").css({'min-height':(jQuery(".page-node-type-course .main-container section").height()+'px')}); + } } - if(jQuery(".page-node-type-departments-centers .main-container section").height() > jQuery(".page-node-type-departments-centers aside").height()) { - jQuery(".page-node-type-departments-centers .main-container aside").css({'min-height':(jQuery(".page-node-type-departments-centers .main-container section").height()+'px')}); + if (jQuery(".page-node-type-departments-centers .main-container aside ").css('float') != 'none') { + if(jQuery(".page-node-type-departments-centers .main-container section").height() > jQuery(".page-node-type-departments-centers aside").height()) { + jQuery(".page-node-type-departments-centers .main-container aside").css({'min-height':(jQuery(".page-node-type-departments-centers .main-container section").height()+'px')}); + } } - if(jQuery(".page-node-type-academic-programs .main-container section").height() > jQuery(".page-node-type-academic-programs aside").height()) { - jQuery(".page-node-type-academic-programs .main-container aside").css({'min-height':(jQuery(".page-node-type-academic-programs .main-container section").height()+'px')}); + if (jQuery(".page-node-type-academic-programs .main-container aside").css('float') != 'none') { + if(jQuery(".page-node-type-academic-programs .main-container section").height() > jQuery(".page-node-type-academic-programs aside").height()) { + jQuery(".page-node-type-academic-programs .main-container aside").css({'min-height':(jQuery(".page-node-type-academic-programs .main-container section").height()+'px')}); + } }