From d262c4bc519c81bfe06e1a31977e712dda8dbfe3 Mon Sep 17 00:00:00 2001 From: Yuri Kuznetsov Date: Mon, 25 Jul 2022 11:57:03 +0300 Subject: [PATCH] sticky top small screen fix --- client/src/views/record/detail.js | 4 ++++ client/src/views/record/list.js | 8 ++++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/client/src/views/record/detail.js b/client/src/views/record/detail.js index 5356976992..c6faef8ab1 100644 --- a/client/src/views/record/detail.js +++ b/client/src/views/record/detail.js @@ -1116,6 +1116,10 @@ function (Dep, ViewRecordHelper, ActionItemSetup) { return; } + if (isSmallScreen && $('#navbar .navbar-body').hasClass('in')) { + return; + } + if (scrollTop > stickTop) { if (!$containers.hasClass('stick-sub')) { $containers.addClass('stick-sub'); diff --git a/client/src/views/record/list.js b/client/src/views/record/list.js index 4b2d7f18ed..4a6786a5ed 100644 --- a/client/src/views/record/list.js +++ b/client/src/views/record/list.js @@ -623,11 +623,11 @@ function (Dep, MassActionHelper, ExportHelper) { let screenWidthXs = this.getThemeManager().getParam('screenWidthXs'); let navbarHeight = this.getThemeManager().getParam('navbarHeight'); + let isSmallWindow = $(window.document).width() < screenWidthXs; + let getOffsetTop = (element) => { let offsetTop = 0; - let isSmallWindow = $(window.document).width() < screenWidthXs; - let withHeader = !isSmallWindow && !isModal; do { @@ -685,6 +685,10 @@ function (Dep, MassActionHelper, ExportHelper) { let stickTop = buttonsTop; let edge = middleTop + $middle.outerHeight(true); + if (isSmallWindow && $('#navbar .navbar-body').hasClass('in')) { + return; + } + if (scrollTop >= edge) { $stickedBar.removeClass('hidden');