Merge pull request #7342 from dgt41/isisSafariRuberBandFix

Isis fix for safari bug #5970
joomla · Jul 7, 2015 · aad5ab3 · aad5ab3
2 parents 72ac015 + 3f9ee3b
commit aad5ab3
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/administrator/templates/isis/index.php b/administrator/templates/isis/index.php
@@ -309,6 +309,9 @@ function processScrollInit()
 				if ($('.subhead').length) {
 					navTop = $('.subhead').length && $('.subhead').offset().top - <?php echo ($displayHeader || !$statusFixed) ? 30 : 20;?>;
 
+					// Fix the container top
+					$(".container-main").css("top", $('.subhead').height() + $('nav.navbar').height());
+
 					// Only apply the scrollspy when the toolbar is not collapsed
 					if (document.body.clientWidth > 480)
 					{
@@ -325,6 +328,9 @@ function processScroll()
 					if (scrollTop >= navTop && !isFixed) {
 						isFixed = true;
 						$('.subhead').addClass('subhead-fixed');
+
+						// Fix the container top
+						$(".container-main").css("top", $('.subhead').height() + $('nav.navbar').height());
 					} else if (scrollTop <= navTop && isFixed) {
 						isFixed = false;
 						$('.subhead').removeClass('subhead-fixed');