diff --git a/admin/survey/Branching.php b/admin/survey/Branching.php index cd9188ec8..ceeea736a 100644 --- a/admin/survey/Branching.php +++ b/admin/survey/Branching.php @@ -445,7 +445,7 @@ class Branching { $userAccess = UserAccess::getInstance($global_user_id); echo '
'.$lang['srv_condition'].'
'; - echo '
'; + echo '
'; echo '
'.$lang['srv_block_random_blocks'].'
'; //echo '
'; diff --git a/public/css/admin_new.css b/public/css/admin_new.css index 0d193a99c..340c7d24f 100644 --- a/public/css/admin_new.css +++ b/public/css/admin_new.css @@ -9987,11 +9987,13 @@ header #top_line #enka_nav .anketa_header_upgrade_package button { } .toolbox .toolbox_item.user_access_locked { - background-color: #FFF0C5; - border-bottom: 1px #FFC700 solid; + background-color: #FFF0C5 !important; } .toolbox .toolbox_item.user_access_locked:hover { - background-color: #FFC700; + background-color: #FFC700 !important; +} +.toolbox .toolbox_border.user_access_locked { + border-color: #FFC700 !important; } #toolbox_add_advanced .segment_option.user_access_locked { @@ -10201,6 +10203,26 @@ header #top_line #enka_nav .anketa_header_upgrade_package button { margin-right: 16px; } +#folderSwitch.user_access_locked { + justify-content: center !important; + background-color: #FFF0C5 !important; + border: 1px #FFC700 solid !important; +} +#folderSwitch.user_access_locked:hover { + background-color: #FFC700 !important; +} + +#hover_export .user_access_locked { + color: #FFC700 !important; +} +#hover_export .user_access_locked .faicon:before { + color: #FFC700 !important; +} + +#analiza_right_options.user_access_locked #div_analiza_filtri_right span { + color: #FFC700 !important; +} + /* Specific pages scss */ @@ -13730,6 +13752,11 @@ div.drop_setting_transition { width: 200px; margin-top: 4px; } +.toolbox_preview .tip_preview_sub p.user_access_warning_text { + margin-top: 16px; + font-size: 14px; + font-weight: 600; +} .toolbox_item.clone-dragging, .segment_option.clone-dragging { diff --git a/resources/sass/admin_new/components/payments/payments.scss b/resources/sass/admin_new/components/payments/payments.scss index ac5f1941e..712295143 100644 --- a/resources/sass/admin_new/components/payments/payments.scss +++ b/resources/sass/admin_new/components/payments/payments.scss @@ -19,13 +19,16 @@ header #top_line #enka_nav .anketa_header_upgrade_package { .toolbox{ .toolbox_item.user_access_locked{ - background-color: #FFF0C5; - border-bottom: 1px $yellow solid; + background-color: #FFF0C5 !important; &:hover{ - background-color: $yellow; + background-color: $yellow !important; } - } + } + + .toolbox_border.user_access_locked{ + border-color: $yellow !important; + } } // Zaklenjene vsebine v toolboxu za dodajanje vprasanja @@ -78,3 +81,32 @@ header #top_line #enka_nav .anketa_header_upgrade_package { } } + +// Vklop map v mojih anketah +#folderSwitch.user_access_locked{ + justify-content: center !important; + + background-color: #FFF0C5 !important; + border: 1px $yellow solid !important; + + &:hover{ + background-color: $yellow !important; + } +} + + +// Hover izvozi +#hover_export .user_access_locked{ + color: $yellow !important; + + .faicon:before{ + color: $yellow !important; + } +} + +// Filtri +#analiza_right_options.user_access_locked #div_analiza_filtri_right span{ + color: $yellow !important; +} + + diff --git a/resources/sass/admin_new/pages/survey_edit/toolbox.scss b/resources/sass/admin_new/pages/survey_edit/toolbox.scss index 17c275bc0..b6b669dd5 100644 --- a/resources/sass/admin_new/pages/survey_edit/toolbox.scss +++ b/resources/sass/admin_new/pages/survey_edit/toolbox.scss @@ -622,6 +622,13 @@ } } } + + p.user_access_warning_text{ + margin-top: 16px; + + font-size: 14px; + font-weight: 600; + } } }