jinql
/
gentelella
mirror of https://github.com/ColorlibHQ/gentelella
1
0
Fork 0
Code Issues Releases Wiki Activity

#675 page length for bs4 ~ still needs some testing

pull/776/head
razvanaldea89 2019-02-19 10:46:35 +02:00
parent 30c1e50983
commit 246f195211
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
build/js/custom.js
View File

@ -45,17 +45,19 @@ $(document).ready(function() {
// TODO: This is some kind of easy fix, maybe we can improve this // TODO: This is some kind of easy fix, maybe we can improve this
var setContentHeight = function () { var setContentHeight = function () {
// reset height // reset height
$RIGHT_COL.css('min-height', $(window).height()); //TODO don't think we need commented text below this anymore. To be deleted
//$RIGHT_COL.css('min-height', $(window).height());
var bodyHeight = $BODY.outerHeight(), /*var bodyHeight = $BODY.outerHeight(),
footerHeight = $BODY.hasClass('footer_fixed') ? -10 : $FOOTER.height(), footerHeight = $BODY.hasClass('footer_fixed') ? -10 : $FOOTER.height(),
leftColHeight = $LEFT_COL.eq(1).height() + $SIDEBAR_FOOTER.height(), leftColHeight = $LEFT_COL.eq(1).height() + $SIDEBAR_FOOTER.height(),
contentHeight = bodyHeight < leftColHeight ? leftColHeight : bodyHeight; contentHeight = bodyHeight < leftColHeight ? leftColHeight : bodyHeight;
// normalize content // normalize content
contentHeight -= $NAV_MENU.height() + footerHeight; contentHeight -= $NAV_MENU.height() + footerHeight;*/
$RIGHT_COL.css('min-height', contentHeight); //TODO don't think we need commented text below this anymore. To be deleted
//$RIGHT_COL.css('min-height', contentHeight);
}; };
$SIDEBAR_MENU.find('a').on('click', function(ev) { $SIDEBAR_MENU.find('a').on('click', function(ev) {

2
production/fixed_sidebar.html
View File

@ -176,7 +176,7 @@
<!-- /menu footer buttons --> <!-- /menu footer buttons -->
</div> </div>
</div> </div>
<div class="col-lg-10 col-md-10 right_col_wrapper"> <div class="offset-md-2 col-lg-10 col-md-10 right_col_wrapper">
<div class="row"> <div class="row">
<!-- top navigation --> <!-- top navigation -->
<div class="col-lg-12 top_nav"> <div class="col-lg-12 top_nav">