diff --git a/packages/Webkul/Admin/src/Resources/assets/js/app.js b/packages/Webkul/Admin/src/Resources/assets/js/app.js index 99a2bfa7b..0b606fee2 100755 --- a/packages/Webkul/Admin/src/Resources/assets/js/app.js +++ b/packages/Webkul/Admin/src/Resources/assets/js/app.js @@ -9,6 +9,47 @@ Vue.prototype.$http = axios window.eventBus = new Vue(); +window.onload = function () { + st = $(document).scrollTop(); + initialScroll = st; + windowHeight = $(window).height(); + documentHeight = $(document).height(); + menubarHeight = $('ul.menubar').height(); + + // console.log(windowHeight, menubarHeight); + + if (menubarHeight > windowHeight ) { + remainent = documentHeight - menubarHeight; + travelRatio = remainent / (documentHeight - windowHeight); + } + + // if(initialScroll > windowHeight) { + // fold = + // } + + marginTopForMenubar = travelRatio * initialScroll; + + console.log(initialScroll, travelRatio, marginTopForMenubar); + + // if(menubarHeight > windowHeight && initialScroll > 0) { + // marginTopForMenubar = travelRatio * initialScroll; + // console.log(marginTopForMenubar); + // // $('.navbar-left').css('top', + 60 - marginTopForMenubar); + // } + + // $(document).scroll(function() { + // st = $(document).scrollTop(); + + // if (menubarHeight > windowHeight) { + // if (initialScroll == 0 && st < (windowHeight - 60)) { + // marginTopForMenubar = travelRatio * st; + + // $('.navbar-left').css('top', + 60 - marginTopForMenubar); + // } + // } + // }); +} + $(document).ready(function () { var lastScrollTop = 0; diff --git a/packages/Webkul/Admin/src/Resources/views/layouts/nav-aside.blade.php b/packages/Webkul/Admin/src/Resources/views/layouts/nav-aside.blade.php index 7f5c9eece..c92d6ea8d 100755 --- a/packages/Webkul/Admin/src/Resources/views/layouts/nav-aside.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/layouts/nav-aside.blade.php @@ -32,30 +32,4 @@ {{--
--}} - - -@push('scripts') - -@endpush \ No newline at end of file + \ No newline at end of file