diff --git a/admin/survey/classes/class.Prevajanje.php b/admin/survey/classes/class.Prevajanje.php index a2a6a901c..5cc28d3c3 100644 --- a/admin/survey/classes/class.Prevajanje.php +++ b/admin/survey/classes/class.Prevajanje.php @@ -198,7 +198,7 @@ class Prevajanje { echo '
'.$lang['note'].' ('.$lang['srv_internal'].'):
'; - } + echo ''.$lang['note'].' ('.$lang['srv_internal'].'):
'; echo ''.$value1.'
'; } diff --git a/public/css/admin_new.css b/public/css/admin_new.css index 61f12427d..6ab6b9985 100644 --- a/public/css/admin_new.css +++ b/public/css/admin_new.css @@ -21642,26 +21642,32 @@ div.prevajanje_holder .section .jezik_row .jezik_left div.comment_container_inli div.prevajanje_holder .section .jezik_row .jezik_right div.comment_container_inline { display: none; } -div.prevajanje_holder .section .jezik_row .jezik_left { +div.prevajanje_holder .section .jezik_row .jezik_left.vert_middle, +div.prevajanje_holder .section .jezik_row .jezik_right.vert_middle { + display: flex; + align-items: center; + padding-top: 4px; +} +div.prevajanje_holder .section .jezik_row .jezik_left:not(.settings) { pointer-events: none; color: #777777 !important; } -div.prevajanje_holder .section .jezik_row .jezik_left div.spremenljivka_content { +div.prevajanje_holder .section .jezik_row .jezik_left:not(.settings) div.spremenljivka_content { color: #777777 !important; } -div.prevajanje_holder .section .jezik_row .jezik_left div.spremenljivka_content div.spremenljivka_settings { +div.prevajanje_holder .section .jezik_row .jezik_left:not(.settings) div.spremenljivka_content div.spremenljivka_settings { color: #777777 !important; } -div.prevajanje_holder .section .jezik_row .jezik_left div.spremenljivka_content div.spremenljivka_settings div.variable_name { +div.prevajanje_holder .section .jezik_row .jezik_left:not(.settings) div.spremenljivka_content div.spremenljivka_settings div.variable_name { color: #777777 !important; } -div.prevajanje_holder .section .jezik_row .jezik_left div.spremenljivka_content div.spremenljivka_settings div.spr_settings span { +div.prevajanje_holder .section .jezik_row .jezik_left:not(.settings) div.spremenljivka_content div.spremenljivka_settings div.spr_settings span { border-color: #C4C4C4 !important; background-color: transparent !important; color: #777777 !important; } -div.prevajanje_holder .section .jezik_row .jezik_left div.spremenljivka_content div.spremenljivka_tekst_form span.faicon::before, -div.prevajanje_holder .section .jezik_row .jezik_left div.spremenljivka_content div.content_div_normalmode span.faicon::before { +div.prevajanje_holder .section .jezik_row .jezik_left:not(.settings) div.spremenljivka_content div.spremenljivka_tekst_form span.faicon::before, +div.prevajanje_holder .section .jezik_row .jezik_left:not(.settings) div.spremenljivka_content div.content_div_normalmode span.faicon::before { display: none; } div.prevajanje_holder .section.jezik_top_settings fieldset { @@ -21673,11 +21679,11 @@ div.prevajanje_holder .section.jezik_top_settings fieldset.jezik_left { } div.prevajanje_holder .section.jezik_top_settings fieldset div.lang_name { font-size: 20px; - margin-bottom: 14px; display: flex; flex-direction: row; gap: 12px; align-items: center; + margin-bottom: 16px; } div.prevajanje_holder .section.jezik_top_settings fieldset div.lang_name a { text-decoration: none; @@ -21690,14 +21696,21 @@ div.prevajanje_holder .section.jezik_top_settings fieldset div.lang_name div.act width: fit-content; box-sizing: border-box; padding: 2px 21px; - font-size: 16px !important; + font-size: 14px !important; font-weight: 400 !important; } +div.prevajanje_holder .section.jezik_top_settings fieldset div.lang_name.semi-bold, div.prevajanje_holder .section.jezik_top_settings fieldset div.lang_name:last-of-type { + margin-bottom: 0; +} div.prevajanje_holder .section.jezik_top_settings fieldset div.lang_content { display: flex; flex-direction: row; gap: 82px; - margin-bottom: 32px; + margin-top: 14px; + margin-bottom: 16px; +} +div.prevajanje_holder .section.jezik_top_settings fieldset div.lang_content:last-of-type { + margin-bottom: 0; } div.prevajanje_holder .section.jezik_top_settings fieldset div.lang_content div.lang_column { display: flex; @@ -21720,8 +21733,16 @@ div.prevajanje_holder .section.jezik_top_settings fieldset div.lang_content div. div.prevajanje_holder .section.jezik_top_settings fieldset div.lang_content div.lang_column div.lang_item:last-of-type { margin-bottom: 0; } -div.prevajanje_holder .section.jezik_top_settings fieldset.jezik_right button { - margin-top: 8px; +div.prevajanje_holder .section.jezik_top_settings fieldset div.dodaj_prevod { + margin-top: 32px; +} +div.prevajanje_holder .section.jezik_top_settings fieldset div.dodaj_prevod div.button_holder { + margin-bottom: 0; + align-items: flex-end; +} +div.prevajanje_holder .section.jezik_top_settings fieldset div.dodaj_prevod div.button_holder button { + margin-left: 18px; + height: fit-content; } div.prevajanje_holder .section.jezik_vprasanja .jezik_row { margin-bottom: 32px; diff --git a/resources/sass/admin_new/pages/survey_edit/jezik.scss b/resources/sass/admin_new/pages/survey_edit/jezik.scss index af49234c4..ad35c160e 100644 --- a/resources/sass/admin_new/pages/survey_edit/jezik.scss +++ b/resources/sass/admin_new/pages/survey_edit/jezik.scss @@ -45,36 +45,45 @@ div.prevajanje_holder { display: none; } + + &.vert_middle { + display: flex; + align-items: center; + padding-top: 4px; + } } //Disabled leva stran .jezik_left { - pointer-events: none; - color: $very-dark-gray !important; - - div.spremenljivka_content{ + + &:not(.settings) { + pointer-events: none; color: $very-dark-gray !important; - - div.spremenljivka_settings { + + div.spremenljivka_content{ color: $very-dark-gray !important; - - div.variable_name { + + div.spremenljivka_settings { color: $very-dark-gray !important; - } - - div.spr_settings { - span { - border-color: $dark-gray !important; - background-color: transparent !important; + + div.variable_name { color: $very-dark-gray !important; } + + div.spr_settings { + span { + border-color: $dark-gray !important; + background-color: transparent !important; + color: $very-dark-gray !important; + } + } } - } - - div.spremenljivka_tekst_form, - div.content_div_normalmode{ - span.faicon::before { - display: none; + + div.spremenljivka_tekst_form, + div.content_div_normalmode{ + span.faicon::before { + display: none; + } } } } @@ -94,7 +103,6 @@ div.prevajanje_holder { div.lang_name { font-size: 20px; - margin-bottom: 14px; display: flex; flex-direction: row; gap: 12px; @@ -112,16 +120,28 @@ div.prevajanje_holder { width: fit-content; box-sizing: border-box; padding: 2px 21px; - font-size: 16px !important; + font-size: 14px !important; font-weight: 400 !important; } + + margin-bottom: 16px; + + &.semi-bold, //aktivni in zadnji nimata margina + &:last-of-type { + margin-bottom: 0; + } + } div.lang_content { display: flex; flex-direction: row; gap: 82px; - margin-bottom: 32px; + margin-top: 14px; + margin-bottom: 16px; + &:last-of-type { + margin-bottom: 0; + } div.lang_column { display: flex; @@ -149,10 +169,18 @@ div.prevajanje_holder { } } } - - &.jezik_right{ - button { - margin-top: 8px; + + div.dodaj_prevod { + margin-top: 32px; + + div.button_holder { + margin-bottom: 0; + align-items: flex-end; + + button { + margin-left: 18px; + height: fit-content; + } } } }