From 113a3b4c8eed9078242ca817b9b3aa43e1904301 Mon Sep 17 00:00:00 2001 From: kasarla shirisha Date: Thu, 23 Aug 2018 00:10:03 +0530 Subject: [PATCH] #1947 fixed content-wrapper height (#1948) * fixed content-wrapper height * updated content wrapper height --- build/js/Layout.js | 2 +- dist/js/adminlte.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/js/Layout.js b/build/js/Layout.js index 7f9cb026c..0e8b4c6ec 100644 --- a/build/js/Layout.js +++ b/build/js/Layout.js @@ -97,7 +97,7 @@ } else { var postSetHeight; - if (windowHeight >= sidebarHeight) { + if (windowHeight >= sidebarHeight + headerHeight) { $(Selector.contentWrapper).css('min-height', windowHeight - neg); postSetHeight = windowHeight - neg; } else { diff --git a/dist/js/adminlte.js b/dist/js/adminlte.js index 4290bb21c..9165aff28 100644 --- a/dist/js/adminlte.js +++ b/dist/js/adminlte.js @@ -614,7 +614,7 @@ throw new Error('AdminLTE requires jQuery') } else { var postSetHeight; - if (windowHeight >= sidebarHeight) { + if (windowHeight >= sidebarHeight + headerHeight) { $(Selector.contentWrapper).css('min-height', windowHeight - neg); postSetHeight = windowHeight - neg; } else {