diff --git a/lang/1.php b/lang/1.php index 6a6ed5a32..4d49409f1 100644 --- a/lang/1.php +++ b/lang/1.php @@ -2190,8 +2190,8 @@ $lang = array ( "srv_hidden_text4" => "Skritih", "srv_system_text" => "Sistemsko", "srv_visible_dostop" => "Vprašanje je vidno", - "srv_previewalert" => "Trenutno ste v predogledu ankete!
Odgovori se ne bodo shranili v bazo!", - "srv_testalert" => "Trenutno ste v testnem vnosu ankete!
Odgovori se bodo shranili in bodo posebej označeni.", + "srv_previewalert" => "Trenutno ste v predogledu ankete!
Odgovori se ne bodo shranili v bazo!", + "srv_testalert" => "Trenutno ste v testnem vnosu ankete!
Odgovori se bodo shranili in bodo posebej označeni.", "srv_pagebreak_on" => "Prelom strani", "srv_pagebreak_off" => "Ni preloma strani", "srv_vrednost_correct" => "Pravilni odgovor v kvizu", @@ -6081,7 +6081,7 @@ $lang = array ( "srv_data_subnavigation_recode" => "Rekodiranje", "srv_user_banned" => "Uporabnik je blokiran", "srv_user_notbanned" => "Uporabnik je aktiven", - "srv_displayifs" => "Prikaži pogoje in bloke pred vprašanjem", + "srv_displayifs" => "Prikaži pogoje in bloke pred vpr.", "srv_user_settings" => "Nastavitve uporabnika", "srv_lock_survey_when_activate" => "Zakleni urejanje ankete", "srv_validation" => "Validacija", diff --git a/lang/2.php b/lang/2.php index c24c62513..362a66288 100644 --- a/lang/2.php +++ b/lang/2.php @@ -5975,7 +5975,7 @@ $lang = array ( "srv_data_subnavigation_recode" => "Recoding", "srv_user_banned" => "User is banned", "srv_user_notbanned" => "User is not banned", - "srv_displayifs" => "Display conditions and blocks above the question", + "srv_displayifs" => "Display conditions and blocks above quest.", "srv_user_settings" => "User settings", "srv_lock_survey_when_activate" => "Lock survey editing", "srv_validation" => "Validation", diff --git a/main/survey/app/Controllers/BodyController.php b/main/survey/app/Controllers/BodyController.php index ac6d321e9..5f43c1aff 100644 --- a/main/survey/app/Controllers/BodyController.php +++ b/main/survey/app/Controllers/BodyController.php @@ -2170,7 +2170,7 @@ class BodyController extends Controller // Preklop med preview-ji za mobilnik, tablico in pc if(!get('displayAllPages')){ - echo '' . self::$lang['srv_para_graph_device'] . ': '; + echo '
' . self::$lang['srv_para_graph_device'] . ': '; if (isset($_GET['mobile']) && $_GET['mobile'] == '1') $device_value = 1; @@ -2179,16 +2179,16 @@ class BodyController extends Controller else $device_value = 0; - echo ''; + echo '
'; // Ce imamo izklopljene mobilne prilagoditve ne pustimo preview-ja na mobile, ker itak ne prikaze scalano $mobile_friendly = SurveySetting::getInstance()->getSurveyMiscSetting('mobile_friendly'); if($mobile_friendly != '0'){ - echo ''; - echo ''; + echo '
'; + echo '
'; } - echo ''; + echo '
'; } diff --git a/public/css/main.css b/public/css/main.css index a6741706d..ba0db5c19 100644 --- a/public/css/main.css +++ b/public/css/main.css @@ -7301,6 +7301,7 @@ button.ui-datepicker-trigger::before { background-color: white; box-shadow: 0px 0px 7px rgba(0, 0, 0, 0.12); border-radius: 2px; + padding: 16px; } #preview-window.closed { background-color: transparent; @@ -7338,15 +7339,12 @@ button.ui-datepicker-trigger::before { content: "\f139"; } #preview-window span.faicon.monitor::before { - font-size: 22px; content: "\f108"; } #preview-window span.faicon.tablet::before { - font-size: 22px; content: "\f3fa"; } #preview-window span.faicon.mobile::before { - font-size: 22px; content: "\f3cd"; } #preview-window span.faicon.comment::before { @@ -7364,9 +7362,9 @@ button.ui-datepicker-trigger::before { font-family: Open Sans, Arial, Sans-Serif !important; box-sizing: border-box; width: 100%; - padding: 21px 16px; + padding-bottom: 16px; font-size: 12px; - border-bottom: 1px #1e88e5 solid; + border-bottom: 1px #E5E5E5 solid; display: flex; flex-direction: row; justify-content: space-between; @@ -7385,6 +7383,10 @@ button.ui-datepicker-trigger::before { color: #1E88E5; border-color: #1E88E5; } +#preview-window #preview_switch #nacina #normalni span.faicon, +#preview-window #preview_switch #nacina #celostranski span.faicon { + font-size: 16px !important; +} #preview-window #preview_switch #nacina #normalni a, #preview-window #preview_switch #nacina #celostranski a { color: inherit; @@ -7433,7 +7435,6 @@ button.ui-datepicker-trigger::before { #preview-window #preview-holder #preview { text-align: left; padding: 0; - margin: 15px; border: 0; } #preview-window #preview-holder #preview select { @@ -7444,7 +7445,7 @@ button.ui-datepicker-trigger::before { width: 100px; } #preview-window #preview-holder #preview p { - margin: 18px 0 !important; + margin: 16px 0 !important; padding: 0 !important; line-height: 15px !important; } @@ -7452,19 +7453,73 @@ button.ui-datepicker-trigger::before { font-size: 15px !important; } #preview-window #preview-holder #preview #preview_device { - display: block; + display: flex; + flex-direction: row; + align-items: center; height: 25px; margin: 0 0 15px 0; } -#preview-window #preview-holder #preview #preview_device span { - display: inline-block; - vertical-align: middle; - line-height: 20px; +#preview-window #preview-holder #preview #preview_device #monitor, +#preview-window #preview-holder #preview #preview_device #tablet, +#preview-window #preview-holder #preview #preview_device #mobile { + border: 1px solid #E5E5E5; + color: #A5A5A5; + padding: 6px 9px; + width: 35px; + display: flex; + justify-content: center; + align-items: center; } -#preview-window #preview-holder #preview #preview_device a { - margin-left: 20px; - vertical-align: middle; +#preview-window #preview-holder #preview #preview_device #monitor span.faicon, +#preview-window #preview-holder #preview #preview_device #tablet span.faicon, +#preview-window #preview-holder #preview #preview_device #mobile span.faicon { + color: inherit; +} +#preview-window #preview-holder #preview #preview_device #monitor.active, +#preview-window #preview-holder #preview #preview_device #tablet.active, +#preview-window #preview-holder #preview #preview_device #mobile.active { + color: #1E88E5; + background: #EEF7FF; + border-color: #1E88E5; +} +#preview-window #preview-holder #preview #preview_device #monitor { + margin-left: 24px; + border-radius: 2px 0 0 2px; +} +#preview-window #preview-holder #preview #preview_device #monitor:not(.active) { + border-right: none; +} +#preview-window #preview-holder #preview #preview_device #tablet.monitor { + border-left: none; +} +#preview-window #preview-holder #preview #preview_device #tablet.tablet { + border-right: none; +} +#preview-window #preview-holder #preview #preview_device #mobile { + border-radius: 0 2px 2px 0; +} +#preview-window #preview-holder #preview #preview_device #mobile:not(.active) { + border-left: none; +} +#preview-window #preview-holder #preview form p select { + border: 1px solid #D3D3D3; + box-sizing: border-box; + border-radius: 2px; + cursor: pointer; + background-color: #FFFFFF; + height: 30px; + font-size: 12px; + padding: 6px 7px; + margin-left: 22px; +} +#preview-window #preview-holder #preview form p select option { + color: #333; + font-size: 12px; line-height: 20px; + padding: 0; +} +#preview-window #preview-holder #preview form p select option:disabled { + color: #A0A0A0; } #preview-window #preview a, #preview-window #preview_switch a, @@ -7479,7 +7534,7 @@ button.ui-datepicker-trigger::before { } #preview-window #preview_switch input[type=radio] + span.enka-checkbox-radio:before, #preview-window #preview-holder input[type=checkbox] + span.enka-checkbox-radio:before { - color: #42A5F5; + color: #C4C4C4; vertical-align: -2px !important; font-size: 18px !important; line-height: 18px !important; @@ -7615,7 +7670,6 @@ span.faicon.empty { flex-direction: row; align-content: center; justify-content: space-between; - margin: 0 15px 15px 15px; } #comments_bottom_line .open_comment_box { display: flex; @@ -7658,8 +7712,11 @@ span.faicon.empty { line-height: 17px !important; } +#comment_dropdown_test_survey { + margin-top: 16px; +} #comment_dropdown_test_survey .first_holder_div { - margin: 0 15px 15px 15px; + margin-bottom: 16px; } #comment_dropdown_test_survey .first_holder_div textarea { height: 130px; @@ -7680,7 +7737,7 @@ span.faicon.empty { display: flex; flex-direction: row; justify-content: space-between; - margin: 0 15px 15px 15px; + margin-bottom: 0; } #comment_dropdown_test_survey .button_holder button { min-width: 0 !important; diff --git a/resources/sass/main/main/admin.scss b/resources/sass/main/main/admin.scss index 4ad78eb29..2226bec56 100644 --- a/resources/sass/main/main/admin.scss +++ b/resources/sass/main/main/admin.scss @@ -132,6 +132,8 @@ box-shadow: 0px 0px 7px rgba(0, 0, 0, 0.12); border-radius: 2px; + padding: 16px; + &.closed{ background-color: transparent; @@ -173,15 +175,12 @@ content: "\f139"; } span.faicon.monitor::before{ - font-size: 22px; content: "\f108"; } span.faicon.tablet::before{ - font-size: 22px; content: "\f3fa"; } span.faicon.mobile::before{ - font-size: 22px; content: "\f3cd"; } span.faicon.comment::before{ @@ -206,11 +205,11 @@ box-sizing: border-box; width: 100%; - padding: 21px 16px; + padding-bottom: 16px; font-size: 12px; - border-bottom: 1px #1e88e5 solid; + border-bottom: 1px #E5E5E5 solid; display:flex; flex-direction: row; @@ -232,6 +231,10 @@ border-color: #1E88E5; } + span.faicon { + font-size: 16px !important; + } + a { color: inherit; } @@ -299,7 +302,6 @@ text-align: left; padding: 0; - margin: 15px; border: 0; @@ -313,7 +315,7 @@ } p{ - margin: 18px 0 !important; + margin: 16px 0 !important; padding: 0 !important; line-height: 15px !important; @@ -323,22 +325,91 @@ } #preview_device{ - display: block; + display: flex; + flex-direction: row; + align-items: center; height: 25px; margin: 0 0 15px 0; - span{ - display: inline-block; + #monitor, + #tablet, + #mobile { + border: 1px solid #E5E5E5; + color: #A5A5A5; + padding: 6px 9px; + + width: 35px; + display: flex; + justify-content: center; + align-items: center; + + span.faicon { + color: inherit; + } + + &.active { + color: #1E88E5; + background: #EEF7FF; + border-color: #1E88E5; + } - vertical-align: middle; - line-height: 20px; } - a{ - margin-left: 20px; - vertical-align: middle; - line-height: 20px; + #monitor { + margin-left: 24px; + border-radius: 2px 0 0 2px; + &:not(.active) { + border-right: none; + } + } + + #tablet { + &.monitor { + border-left: none; + } + &.tablet { + border-right: none; + } + } + + #mobile { + border-radius: 0 2px 2px 0; + &:not(.active) { + border-left: none; + } + } + + + } + + form { + p { + select { + border: 1px solid #D3D3D3; + box-sizing: border-box; + border-radius: 2px; + cursor: pointer; + + background-color: #FFFFFF; + + height: 30px; + font-size: 12px; + padding: 6px 7px; + + margin-left: 22px; + + option { + color: #333; + font-size: 12px; + line-height: 20px; + padding: 0; + + &:disabled{ + color: #A0A0A0; + } + } + } } } } @@ -359,7 +430,7 @@ #preview_switch input[type="radio"] + span.enka-checkbox-radio:before, #preview-holder input[type="checkbox"] + span.enka-checkbox-radio:before{ - color: #42A5F5; + color: #C4C4C4; vertical-align: -2px !important; font-size: 18px !important; line-height: 18px !important; diff --git a/resources/sass/main/main/test_survey_comments.scss b/resources/sass/main/main/test_survey_comments.scss index f6da9f8c4..f87931c39 100644 --- a/resources/sass/main/main/test_survey_comments.scss +++ b/resources/sass/main/main/test_survey_comments.scss @@ -53,8 +53,6 @@ $status-blue: #EAF9FE; align-content: center; justify-content: space-between; - margin: 0 15px 15px 15px; - .open_comment_box { display: flex; flex-direction: row; @@ -108,11 +106,13 @@ $status-blue: #EAF9FE; } #comment_dropdown_test_survey { + + margin-top: 16px; //Polje, ki se odpre .first_holder_div { - margin: 0 15px 15px 15px; + margin-bottom: 16px; textarea { height: 130px; @@ -142,7 +142,7 @@ $status-blue: #EAF9FE; flex-direction: row; justify-content: space-between; - margin: 0 15px 15px 15px; + margin-bottom: 0; button { min-width: 0 !important;