From 4a68821deea952778f729242e6346a2306ba222f Mon Sep 17 00:00:00 2001 From: Pablo Vazquez Date: Mon, 4 Sep 2017 12:24:56 +0200 Subject: [PATCH] JS: Fix 50px offset on containerResizeY --- src/scripts/tutti/1_project-navigation.js | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/scripts/tutti/1_project-navigation.js b/src/scripts/tutti/1_project-navigation.js index 1cf457eb..1496c1a3 100644 --- a/src/scripts/tutti/1_project-navigation.js +++ b/src/scripts/tutti/1_project-navigation.js @@ -146,15 +146,17 @@ function setJSONCookie(cookieToChange, cookieItem, cookieData){ function containerResizeY(window_height){ - var container_offset = $('#project-container').offset(); + var project_container = document.getElementById('project-container'); + var container_offset = project_container.offsetTop; + var nav_header_height = $('#project_nav-header').height(); var container_height = window_height - container_offset.top; - var container_height_wheader = window_height - container_offset.top - $('#project_nav-header').height(); - var window_height_minus_nav = window_height - $('#project_nav-header').height() - 50; // 50 is global top navbar + var container_height_wheader = window_height - container_offset.top - nav_header_height; + var window_height_minus_nav = window_height - nav_header_height - 1; // 1 is border width $('#project_context-header').width($('#project_context-container').width()); if ($(window).width() > 768) { - $('#project_nav-container, #project_tree, .project_split').css( + $('#project-container, #project_nav-container, #project_tree, .project_split').css( {'max-height': window_height_minus_nav + 'px', 'height': window_height_minus_nav + 'px'} );