From 6a20a3a4820bcc22e6d268ac7291ca5dbb3ef2ea Mon Sep 17 00:00:00 2001 From: IgorA100 Date: Wed, 13 Mar 2024 15:38:47 +0300 Subject: [PATCH 1/8] Fix scrool bar You should not hardcode "overflow-y: scroll;" because if the table contains few rows, then we do not need a scroll bar. Also, the scroll bar must be used only in case of stickiness, otherwise there will be duplication of scroll bars in the absence of stickiness. --- web/skins/classic/css/base/views/console.css | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/web/skins/classic/css/base/views/console.css b/web/skins/classic/css/base/views/console.css index 1e2ac7162..da266d1dd 100644 --- a/web/skins/classic/css/base/views/console.css +++ b/web/skins/classic/css/base/views/console.css @@ -118,7 +118,10 @@ form[name="monitorForm"] { } #monitorList { flex: 1 1 auto; - overflow-y: auto; +/* overflow-y: scroll; */ +} +body.sticky #monitorList { + overflow: auto; } #contentButtons { float: none; From 452576ad5eef734d804e56f03662ce1ffc50d8fa Mon Sep 17 00:00:00 2001 From: IgorA100 Date: Wed, 13 Mar 2024 15:57:44 +0300 Subject: [PATCH 2/8] Fix: change class "table-responsive-sm-2" to "table-responsive" And always specify the object ID before its class --- web/skins/classic/views/console.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/skins/classic/views/console.php b/web/skins/classic/views/console.php index 621afa45d..4526086ed 100644 --- a/web/skins/classic/views/console.php +++ b/web/skins/classic/views/console.php @@ -169,7 +169,7 @@ echo $navbar ?> -
+
-
+
From 1d81af50b93e6fbd4b5d641d17f27c0102c02d48 Mon Sep 17 00:00:00 2001 From: IgorA100 Date: Wed, 13 Mar 2024 16:07:22 +0300 Subject: [PATCH 3/8] Fixing table header when using sticky --- web/skins/classic/css/base/views/console.css | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/web/skins/classic/css/base/views/console.css b/web/skins/classic/css/base/views/console.css index da266d1dd..d9a686789 100644 --- a/web/skins/classic/css/base/views/console.css +++ b/web/skins/classic/css/base/views/console.css @@ -123,6 +123,10 @@ form[name="monitorForm"] { body.sticky #monitorList { overflow: auto; } +body.sticky #monitorList thead { + position: sticky; + top: -1px; +} #contentButtons { float: none; display: flex; From ef3245fe2b683912770d9e4c436872a169ec4a58 Mon Sep 17 00:00:00 2001 From: IgorA100 Date: Wed, 13 Mar 2024 16:11:21 +0300 Subject: [PATCH 4/8] Moved class "pt-2" in other DIV Necessary for correct table scrolling --- web/skins/classic/views/console.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/web/skins/classic/views/console.php b/web/skins/classic/views/console.php index 4526086ed..1c69b01f9 100644 --- a/web/skins/classic/views/console.php +++ b/web/skins/classic/views/console.php @@ -231,7 +231,8 @@ echo $navbar ?> -
+
+
From 6b8fe26be6d11541cdecf950ee888eb88df154a5 Mon Sep 17 00:00:00 2001 From: IgorA100 Date: Wed, 13 Mar 2024 16:26:25 +0300 Subject: [PATCH 5/8] empty line --- web/skins/classic/views/console.php | 1 - 1 file changed, 1 deletion(-) diff --git a/web/skins/classic/views/console.php b/web/skins/classic/views/console.php index 5efa855e4..b89040dbf 100644 --- a/web/skins/classic/views/console.php +++ b/web/skins/classic/views/console.php @@ -256,7 +256,6 @@ ob_start(); data-show-columns="true" > - From 91955b491d0125e9b1bec64f2b4b4855267ee020 Mon Sep 17 00:00:00 2001 From: IgorA100 Date: Thu, 14 Mar 2024 11:50:51 +0300 Subject: [PATCH 6/8] Remove class "pt-2" The ".contentButtons" style will be changed in the CSS --- web/skins/classic/views/console.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/skins/classic/views/console.php b/web/skins/classic/views/console.php index b89040dbf..b36117a02 100644 --- a/web/skins/classic/views/console.php +++ b/web/skins/classic/views/console.php @@ -169,7 +169,7 @@ echo $navbar ?> -
+
Date: Thu, 14 Mar 2024 11:54:50 +0300 Subject: [PATCH 7/8] Fix previous commit --- web/skins/classic/views/console.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/web/skins/classic/views/console.php b/web/skins/classic/views/console.php index b36117a02..fe4b5c32b 100644 --- a/web/skins/classic/views/console.php +++ b/web/skins/classic/views/console.php @@ -169,7 +169,7 @@ echo $navbar ?>
-
+
-
Date: Thu, 14 Mar 2024 11:58:30 +0300 Subject: [PATCH 8/8] For #contentButtons add margin-bottom: 8px; Now the vertical margin will be symmetrical. --- web/skins/classic/css/base/skin.css | 1 + 1 file changed, 1 insertion(+) diff --git a/web/skins/classic/css/base/skin.css b/web/skins/classic/css/base/skin.css index 32ff1ff6b..9d71525c5 100644 --- a/web/skins/classic/css/base/skin.css +++ b/web/skins/classic/css/base/skin.css @@ -589,6 +589,7 @@ body.sticky #page { #contentButtons { margin-top: 8px; + margin-bottom: 8px; float: right; }