diff --git a/admin/survey/Branching.php b/admin/survey/Branching.php
index 3765c87e4..a0442ccb0 100644
--- a/admin/survey/Branching.php
+++ b/admin/survey/Branching.php
@@ -7391,9 +7391,7 @@ class Branching {
echo '
'.$lang['urejanje_pogoj_popup_vrednost'].'
';
echo '';
- echo ''.$lang['urejanje_podif_alert'].'';
-
- echo '
';
+ echo ''.$lang['urejanje_podif_alert'].'';
$sql = sisplet_query("SELECT naslov FROM srv_vrednost WHERE id='$vrednost'");
$row = mysqli_fetch_assoc($sql);
diff --git a/public/css/admin_new.css b/public/css/admin_new.css
index 8ad00fa43..fc3bcdd7b 100644
--- a/public/css/admin_new.css
+++ b/public/css/admin_new.css
@@ -8462,8 +8462,8 @@ fieldset.statusProfileFieldset .setting_holder.disabled .setting_item label {
div#div_cp_preview_content div#div_condition_editing_container,
div#div_condition_editing div#div_condition_editing_container {
- background-color: #F2F2F2;
- padding: 16px;
+ background-color: #EEF7FF;
+ padding: 12px;
}
div#div_cp_preview_content div#div_condition_editing_container div#div_condition_editing_inner div.condition_editing_preview div.condition_editing_naslov_holder div#div_condition_editing_conditions .clr_if,
div#div_cp_preview_content div#div_condition_editing_container div#div_condition_editing_inner div.condition_editing_preview div.condition_editing_naslov_holder div#div_condition_editing_conditions .colorif,
@@ -18583,22 +18583,6 @@ and open the template in the editor.
left: -29px;
font-weight: bold;
}
-#branching #div_condition_editing {
- display: none;
- height: auto;
- width: 800px;
-}
-#branching #div_condition_editing div#div_condition_editing_container {
- margin-bottom: 44px;
-}
-#branching #div_condition_editing .error_display {
- background-color: transparent;
-}
-#branching #div_condition_editing .condition_editing_vrednost_title {
- margin: -5px 0 15px 5px;
- font-size: 14px;
- font-weight: 600;
-}
#branching .error_display {
display: block;
line-height: 24px;
@@ -18635,6 +18619,23 @@ and open the template in the editor.
border-top: 1px solid #1E88E5;
}
+#div_condition_editing {
+ display: none;
+ height: auto;
+ width: 800px;
+}
+#div_condition_editing div#div_condition_editing_container {
+ margin-bottom: 44px;
+}
+#div_condition_editing .error_display {
+ background-color: transparent;
+}
+#div_condition_editing .condition_editing_vrednost_title {
+ margin: 8px 0;
+ font-size: 14px;
+ font-weight: 600;
+}
+
#div_condition_editing_inner .condition_editing_body,
#div_condition_editing_inner .quota_editing_body,
#div_condition_editing_inner .calculation_editing_body,
diff --git a/resources/sass/admin_new/components/popup/page_specific.scss b/resources/sass/admin_new/components/popup/page_specific.scss
index d050de656..b1c9dc952 100644
--- a/resources/sass/admin_new/components/popup/page_specific.scss
+++ b/resources/sass/admin_new/components/popup/page_specific.scss
@@ -413,8 +413,8 @@ fieldset.statusProfileFieldset {
div#div_cp_preview_content,
div#div_condition_editing {
div#div_condition_editing_container{
- background-color: $light-gray2;
- padding: 16px;
+ background-color: $medium-blue;
+ padding: 12px;
div#div_condition_editing_inner {
diff --git a/resources/sass/admin_new/pages/survey_edit/conditions.scss b/resources/sass/admin_new/pages/survey_edit/conditions.scss
index dee5d56c8..53d0cbdcc 100644
--- a/resources/sass/admin_new/pages/survey_edit/conditions.scss
+++ b/resources/sass/admin_new/pages/survey_edit/conditions.scss
@@ -459,25 +459,6 @@ and open the template in the editor.
}
- #div_condition_editing {
- display: none;
-
- height: auto;
- width: 800px;
-
- div#div_condition_editing_container {
- margin-bottom: 44px;
- }
- .error_display {
- background-color: transparent;
- }
- .condition_editing_vrednost_title {
- margin: -5px 0 15px 5px;
- font-size: 14px;
- font-weight: 600;
- }
- }
-
.error_display {
display: block;
line-height: 24px;
@@ -521,6 +502,29 @@ and open the template in the editor.
}
+
+#div_condition_editing {
+ display: none;
+
+ height: auto;
+ width: 800px;
+
+ div#div_condition_editing_container {
+ margin-bottom: 44px;
+ }
+
+ .error_display {
+ background-color: transparent;
+ }
+
+ .condition_editing_vrednost_title {
+ margin: 8px 0;
+ font-size: 14px;
+ font-weight: 600;
+ }
+}
+
+
//IF - vsebina pogoja, kalkulacije, kvote
#div_condition_editing_inner,
#quota_editing_inner,