..F....... [ZBXNEXT-7107] updated to latest from master; resolved conflicts in:

- ui/js/common.js
- ui/js/menupopup.js

2 files changed, 47 insertions, 10 deletions

diff --git a/sass/stylesheets/sass/components/dashboard/_widget-svggraph.scss b/sass/stylesheets/sass/components/dashboard/_widget-svggraph.scss
new file mode 100755
index 00000000000..8f570c1a4f8
--- /dev/null
+++ b/sass/stylesheets/sass/components/dashboard/_widget-svggraph.scss
@@ -0,0 +1,10 @@
+// Widget configuration.
+
+.overlay-dialogue.modal-popup {
+	.dashboard-grid-widget-svggraph {
+		.table-forms-container {
+			border: 1px solid $ui-border-color;
+		}
+	}
+}
+
diff --git a/sass/stylesheets/sass/screen.scss b/sass/stylesheets/sass/screen.scss
index 6ee4c856b4e..b84e936dfa7 100644
--- a/sass/stylesheets/sass/screen.scss
+++ b/sass/stylesheets/sass/screen.scss
@@ -43,6 +43,7 @@ $browser-sprite-path: '../img/browser-sprite.png?20211222';
 @import "components/z-select";
 
 @import "components/dashboard/widget-slareport";
+@import "components/dashboard/widget-svggraph";
 
 .link-action {
 	border-bottom: 1px dotted;
@@ -3013,7 +3014,7 @@ $form-icon-btn: (
 			overflow: auto;
 			overflow-x: hidden;
 			width: 100%;
-			max-height: calc(100vh - 190px);
+			max-height: calc(100vh - 220px);
 			max-width: inherit;
 			margin: 0 -10px 8px;
 			padding: 2px 10px;
@@ -3079,22 +3080,27 @@ $form-icon-btn: (
 		}
 	}
 
-	&.sticked-to-top {
-		top: 50px;
-	}
-
 	&.modal-popup {
+		top: 50px;
 		max-width: 1024px;
 
+		&.modal-popup-small {
+			max-width: 450px;
+			width: 100%;
+		}
+
 		&.modal-popup-medium {
 			min-width: 450px;
 		}
 
-		&.modal-popup-small {
-			max-width: 450px;
+		&.modal-popup-large {
 			width: 100%;
 		}
 
+		&.modal-popup-generic {
+			min-width: 650px;
+		}
+
 		&.modal-popup-static {
 			max-width: 700px;
 			width: 100%;
@@ -3103,16 +3109,37 @@ $form-icon-btn: (
 		&.modal-popup-preprocessing {
 			max-width: 900px;
 			width: 100%;
-		}
 
-		&.modal-popup-generic {
-			min-width: 650px;
+			.preprocessing-list .step-name {
+				flex: 0 0 180px;
+			}
+
+			.preprocessing-list {
+				min-width: unset;
+				max-width: unset;
+			}
 		}
 
 		&.modal-popup-fullscreen {
 			width: calc(100vw - 40px);
 			max-width: calc(100vw - 40px);
 		}
+
+		.table-forms-container {
+			border: none;
+		}
+
+		.ui-tabs-nav {
+			position: sticky;
+			top: 0;
+			background: $header-bg-color;
+			z-index: 3;
+		}
+
+		.textarea-flexible {
+			max-height: 200px;
+			overflow-y: auto;
+		}
 	}
 
 	.hintbox-wrap {