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

- sass/stylesheets/sass/screen.scss
- ui/include/classes/mvc/CRouter.php
- ui/include/classes/validators/CApiInputValidator.php
- ui/include/defines.inc.php
- ui/screenconf.php
- ui/tests/unit/include/classes/validators/CApiInputValidatorTest.php

4 files changed, 72 insertions, 4 deletions

diff --git a/sass/stylesheets/sass/hc-dark.scss b/sass/stylesheets/sass/hc-dark.scss
index 89f2711efc2..3cc5494068a 100644
--- a/sass/stylesheets/sass/hc-dark.scss
+++ b/sass/stylesheets/sass/hc-dark.scss
@@ -1379,6 +1379,18 @@ td.inactive-bg {
 	}
 }
 
+.icon-user {
+	&::before {
+		background-position: -379px -46px;
+	}
+}
+
+.icon-user-group {
+	&::before {
+		background-position: -379px -8px;
+	}
+}
+
 .icon-actions-number-red {
 	&::before {
 		background-position: -524px -325px;
diff --git a/sass/stylesheets/sass/hc-light.scss b/sass/stylesheets/sass/hc-light.scss
index a45d6399daf..ec45e5bc82e 100644
--- a/sass/stylesheets/sass/hc-light.scss
+++ b/sass/stylesheets/sass/hc-light.scss
@@ -1224,6 +1224,18 @@ td.inactive-bg {
 	}
 }
 
+.icon-user {
+	&::before {
+		background-position: -419px -46px;
+	}
+}
+
+.icon-user-group {
+	&::before {
+		background-position: -419px -8px;
+	}
+}
+
 .problem-icon-list {
 	.problem-icon-list-item {
 		background: transparent;
diff --git a/sass/stylesheets/sass/layout/_form-grid.scss b/sass/stylesheets/sass/layout/_form-grid.scss
index 2ffff652033..508b11bc6c2 100644
--- a/sass/stylesheets/sass/layout/_form-grid.scss
+++ b/sass/stylesheets/sass/layout/_form-grid.scss
@@ -10,6 +10,12 @@
 		word-wrap: break-word;
 	}
 
+	&.form-grid-offset {
+		> label {
+			min-width: 185px;
+		}
+	}
+
 	.form-actions,
 	.form-field,
 	.field-fluid {
diff --git a/sass/stylesheets/sass/screen.scss b/sass/stylesheets/sass/screen.scss
index 7aef1b0e028..fb6cf5b5313 100644
--- a/sass/stylesheets/sass/screen.scss
+++ b/sass/stylesheets/sass/screen.scss
@@ -1513,6 +1513,7 @@ form {
 }
 
 .radio-list-control {
+	display: inline-block;
 	white-space: nowrap;
 
 	li {
@@ -1606,6 +1607,10 @@ form {
 			@extend %form-disabled;
 		}
 	}
+
+	+ .icon-info {
+		margin-left: 5px;
+	}
 }
 
 label {
@@ -3049,8 +3054,8 @@ $form-icon-btn: (
 			width: 100%;
 			max-height: calc(100vh - 190px);
 			max-width: inherit;
-			margin: 0 -10px 10px;
-			padding: 0 10px;
+			margin: 0 -10px 8px;
+			padding: 2px 10px;
 			position: relative;
 			@extend %webkit-scrollbar;
 
@@ -3190,7 +3195,7 @@ $form-icon-btn: (
 	}
 
 	.dashboard-widget-head {
-		margin: -10px -10px 6px;
+		margin: -10px -10px 4px;
 	}
 
 	.maps-container {
@@ -5497,7 +5502,9 @@ svg {
 .icon-actions-number-gray,
 .icon-actions-number-yellow,
 .icon-actions-number-red,
-.icon-description {
+.icon-description,
+.icon-user,
+.icon-user-group {
 	display: inline-block;
 	position: relative;
 	height: 18px;
@@ -5632,6 +5639,30 @@ svg {
 	}
 }
 
+.icon-user,
+.icon-user-group {
+	height: 16px;
+	width: 16px;
+	vertical-align: top;
+
+	&::before {
+		height: inherit;
+		width: inherit;
+	}
+}
+
+.icon-user {
+	&::before {
+		background-position: -339px -46px;
+	}
+}
+
+.icon-user-group {
+	&::before {
+		background-position: -339px -8px;
+	}
+}
+
 #expressions_list .ui-sortable-helper {
 	display: table;
 }
@@ -6465,6 +6496,13 @@ z-select,
 	}
 }
 
+.subscriptions-table {
+
+	th {
+		color: $font-alt-color;
+	}
+}
+
 .import-compare {
 	display: flex;
 	max-height: calc(100vh - 190px);