diff --git a/admin/survey/SurveyAdmin.php b/admin/survey/SurveyAdmin.php index bc88bb1a1..fbada67d0 100644 --- a/admin/survey/SurveyAdmin.php +++ b/admin/survey/SurveyAdmin.php @@ -412,7 +412,7 @@ class SurveyAdmin echo ' '; // urejanje pogojev -- v tem pogledu se uporabi za urejanje vrednosti v editorju - echo '
'; + echo ''; echo ''; diff --git a/public/css/admin_new.css b/public/css/admin_new.css index 296a7ca2f..bac61db5f 100644 --- a/public/css/admin_new.css +++ b/public/css/admin_new.css @@ -8460,21 +8460,27 @@ fieldset.statusProfileFieldset .setting_holder.disabled .setting_item label { border-bottom: none; } -div.popup_right div#div_cp_preview_content div#div_condition_editing_container { +div#div_cp_preview_content div#div_condition_editing_container, +div#div_condition_editing div#div_condition_editing_container { background-color: #F2F2F2; padding: 16px; } -div.popup_right 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.popup_right 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 { +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, +div#div_condition_editing 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_condition_editing 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 { color: #1E88E5; } -div.popup_right div#div_cp_preview_content div#div_condition_editing_container div#div_condition_editing_inner div.condition_editing_body { +div#div_cp_preview_content div#div_condition_editing_container div#div_condition_editing_inner div.condition_editing_body, +div#div_condition_editing div#div_condition_editing_container div#div_condition_editing_inner div.condition_editing_body { margin-top: 16px !important; } -div.popup_right div#div_cp_preview_content div#div_condition_editing_container div#div_condition_editing_inner div.condition_editing_body div.condition_editing_row div.white_holder { +div#div_cp_preview_content div#div_condition_editing_container div#div_condition_editing_inner div.condition_editing_body div.condition_editing_row div.white_holder, +div#div_condition_editing div#div_condition_editing_container div#div_condition_editing_inner div.condition_editing_body div.condition_editing_row div.white_holder { padding: 16px; } -div.popup_right div#div_cp_preview_content div#div_condition_editing_container div#div_condition_editing_inner div.div_condition_editing_operators { +div#div_cp_preview_content div#div_condition_editing_container div#div_condition_editing_inner div.div_condition_editing_operators, +div#div_condition_editing div#div_condition_editing_container div#div_condition_editing_inner div.div_condition_editing_operators { margin: 0; } diff --git a/resources/sass/admin_new/components/popup/page_specific.scss b/resources/sass/admin_new/components/popup/page_specific.scss index 5738d4966..a5efd3f9b 100644 --- a/resources/sass/admin_new/components/popup/page_specific.scss +++ b/resources/sass/admin_new/components/popup/page_specific.scss @@ -402,38 +402,37 @@ fieldset.statusProfileFieldset { } //Pogoji -div.popup_right { - div#div_cp_preview_content { - div#div_condition_editing_container{ - background-color: $light-gray2; - padding: 16px; +div#div_cp_preview_content, +div#div_condition_editing { + div#div_condition_editing_container{ + background-color: $light-gray2; + padding: 16px; - div#div_condition_editing_inner { + div#div_condition_editing_inner { + + div.condition_editing_preview { + div.condition_editing_naslov_holder { + div#div_condition_editing_conditions { + .clr_if, + .colorif { + color: $blue; + } + } + } + } + + div.condition_editing_body { + margin-top: 16px !important; - div.condition_editing_preview { - div.condition_editing_naslov_holder { - div#div_condition_editing_conditions { - .clr_if, - .colorif { - color: $blue; - } - } + div.condition_editing_row { + div.white_holder { + padding: 16px; } } + } - div.condition_editing_body { - margin-top: 16px !important; - - div.condition_editing_row { - div.white_holder { - padding: 16px; - } - } - } - - div.div_condition_editing_operators { - margin: 0; - } + div.div_condition_editing_operators { + margin: 0; } } }