From c1473948583911081e51cb15a58bf09863e2ab6a Mon Sep 17 00:00:00 2001 From: pero1203 Date: Wed, 2 Nov 2022 09:19:06 +0100 Subject: [PATCH] Redesign - popravki nove teme --- admin/survey/SurveyAdmin.php | 4 -- main/survey/skins/1kaBlack.css | 72 ++++++++++++---------- main/survey/skins/1kaBlue.css | 72 ++++++++++++---------- main/survey/skins/1kaGreen.css | 72 ++++++++++++---------- main/survey/skins/1kaNature.css | 72 ++++++++++++---------- main/survey/skins/1kaOffice.css | 72 ++++++++++++---------- main/survey/skins/1kaOrange.css | 72 ++++++++++++---------- main/survey/skins/1kaPurple.css | 72 ++++++++++++---------- main/survey/skins/1kaRed.css | 72 ++++++++++++---------- main/survey/skins/Cdi.css | 72 ++++++++++++---------- main/survey/skins/Fdv.css | 72 ++++++++++++---------- main/survey/skins/Uni.css | 72 ++++++++++++---------- public/css/main.css | 1 + resources/sass/main/main/admin.scss | 2 + resources/sass/main/skins/1ka/1ka.scss | 85 +++++++++++++++----------- 15 files changed, 492 insertions(+), 392 deletions(-) diff --git a/admin/survey/SurveyAdmin.php b/admin/survey/SurveyAdmin.php index a62f50ffc..c912d92ee 100644 --- a/admin/survey/SurveyAdmin.php +++ b/admin/survey/SurveyAdmin.php @@ -2992,22 +2992,18 @@ class SurveyAdmin if ($_GET['m'] == 'data') { $sas->arhivi_data(); - } else if ($_GET['m'] == 'testdata') { $sas->arhivi_testdata(); - } else if ($_GET['m'] == 'survey' || $_GET['m'] == 'survey_data') { $sas->arhivi_survey(); - } else if ($_GET['a'] == 'tracking') { if($_GET['d'] == 'download') return TrackingClass::init()->filter([20,21,22])->csvExport(); TrackingClass::init()->filter([20,21,22])->trackingDisplay(); - } else if ($_GET['a'] == 'tracking-hierarhija') { if($_GET['m'] == 'udelezenci') { diff --git a/main/survey/skins/1kaBlack.css b/main/survey/skins/1kaBlack.css index e16364329..058650f6f 100644 --- a/main/survey/skins/1kaBlack.css +++ b/main/survey/skins/1kaBlack.css @@ -122,7 +122,8 @@ h1.evalvacija { /* ie6,7 doesnt support inline-block */ display: block; width: 20px; - font-size: 11px; + font-size: 14px; + line-height: 16px; color: #6D87AF; } .header_settings_holder .progress_bar div { @@ -166,7 +167,7 @@ h1.evalvacija { /* Spremenljivke */ .spremenljivka { margin: 0; - padding: 48px 0 !important; + padding: 48px 16px !important; border-bottom: 1px #E5E5E5 solid; } .spremenljivka .naslov { @@ -203,6 +204,10 @@ h1.evalvacija { .spremenljivka .arrow:hover { color: #595959; } +.spremenljivka span.reminder { + left: 3px; + text-indent: 0; +} .spremenljivka.limited { outline: 1px #F15A24 solid; @@ -212,22 +217,42 @@ h1.evalvacija { outline: 1px #F15A24 solid; } -.spremenljivka.tip_1 .custom_radio_picture { - display: inline-block; - margin-right: 8px; +.spremenljivka.tip_1 .variabla, +.spremenljivka.tip_2 .variabla { + display: flex; + align-items: center; } -.spremenljivka.tip_1 .custom_radio_picture label { - display: inline-block !important; +.spremenljivka.tip_1 .variabla.floatLeft, +.spremenljivka.tip_2 .variabla.floatLeft { + margin-right: 16px; } - .spremenljivka.tip_1 .variabla label, .spremenljivka.tip_2 .variabla label { display: flex; line-height: 23px; } +.spremenljivka.tip_1 .variabla input[type=text].input_other, +.spremenljivka.tip_1 .variabla textarea.input_other, +.spremenljivka.tip_2 .variabla input[type=text].input_other, +.spremenljivka.tip_2 .variabla textarea.input_other { + margin: 0 0 0 8px; +} +.spremenljivka.tip_1 .custom_radio_picture, +.spremenljivka.tip_1 .visual-radio-scale, +.spremenljivka.tip_2 .custom_radio_picture, +.spremenljivka.tip_2 .visual-radio-scale { + display: inline-block; + margin-right: 8px; +} +.spremenljivka.tip_1 .custom_radio_picture label, +.spremenljivka.tip_1 .visual-radio-scale label, +.spremenljivka.tip_2 .custom_radio_picture label, +.spremenljivka.tip_2 .visual-radio-scale label { + display: inline-block !important; +} -.variabla.floatLeft { - margin-right: 16px; +.spremenljivka.tip_7 input.width_100:not(:first-of-type) { + margin-top: 16px; } .variabla.missing:first-of-type { @@ -238,20 +263,6 @@ h1.evalvacija { padding: 0; } -div.variabla { - display: flex; - align-items: center; -} - -input[type=text].input_other, -textarea.input_other { - margin: 0 0 0 8px; -} - -.variabla label.limit { - padding: 0 16px 0 8px !important; -} - div.variabla, td.variabla, td.question, @@ -294,10 +305,6 @@ table.grid_table td { padding: 12px 16px; } -span.reminder { - left: 3px; -} - /* Textboxi, textarea, select */ input, textarea, select { font-family: Source Sans Pro, sans-serif !important; @@ -531,10 +538,10 @@ textarea:focus { } .frame_dropping_titles { - width: 240px; + width: 244px; padding: 5px; margin: 0px auto 0px auto; - height: 15px; + height: 20px; text-align: center; background-color: #FFFFFF; border-top: 2px solid #b9c5d9; @@ -568,16 +575,17 @@ textarea:focus { } .frame_dropping_titles_box { - width: 240px; + width: 244px; padding: 5px; margin: 0px auto 0px auto; - height: 15px; + height: 20px; text-align: center; background-color: #FFFFFF; font-size: 16px; } .frame_dropping { + width: 234px; padding: 7px 10px 9px; } diff --git a/main/survey/skins/1kaBlue.css b/main/survey/skins/1kaBlue.css index a98096355..1f0bdcef1 100644 --- a/main/survey/skins/1kaBlue.css +++ b/main/survey/skins/1kaBlue.css @@ -122,7 +122,8 @@ h1.evalvacija { /* ie6,7 doesnt support inline-block */ display: block; width: 20px; - font-size: 11px; + font-size: 14px; + line-height: 16px; color: #6D87AF; } .header_settings_holder .progress_bar div { @@ -166,7 +167,7 @@ h1.evalvacija { /* Spremenljivke */ .spremenljivka { margin: 0; - padding: 48px 0 !important; + padding: 48px 16px !important; border-bottom: 1px #E5E5E5 solid; } .spremenljivka .naslov { @@ -203,6 +204,10 @@ h1.evalvacija { .spremenljivka .arrow:hover { color: #1360a4; } +.spremenljivka span.reminder { + left: 3px; + text-indent: 0; +} .spremenljivka.limited { outline: 1px #F15A24 solid; @@ -212,22 +217,42 @@ h1.evalvacija { outline: 1px #F15A24 solid; } -.spremenljivka.tip_1 .custom_radio_picture { - display: inline-block; - margin-right: 8px; +.spremenljivka.tip_1 .variabla, +.spremenljivka.tip_2 .variabla { + display: flex; + align-items: center; } -.spremenljivka.tip_1 .custom_radio_picture label { - display: inline-block !important; +.spremenljivka.tip_1 .variabla.floatLeft, +.spremenljivka.tip_2 .variabla.floatLeft { + margin-right: 16px; } - .spremenljivka.tip_1 .variabla label, .spremenljivka.tip_2 .variabla label { display: flex; line-height: 23px; } +.spremenljivka.tip_1 .variabla input[type=text].input_other, +.spremenljivka.tip_1 .variabla textarea.input_other, +.spremenljivka.tip_2 .variabla input[type=text].input_other, +.spremenljivka.tip_2 .variabla textarea.input_other { + margin: 0 0 0 8px; +} +.spremenljivka.tip_1 .custom_radio_picture, +.spremenljivka.tip_1 .visual-radio-scale, +.spremenljivka.tip_2 .custom_radio_picture, +.spremenljivka.tip_2 .visual-radio-scale { + display: inline-block; + margin-right: 8px; +} +.spremenljivka.tip_1 .custom_radio_picture label, +.spremenljivka.tip_1 .visual-radio-scale label, +.spremenljivka.tip_2 .custom_radio_picture label, +.spremenljivka.tip_2 .visual-radio-scale label { + display: inline-block !important; +} -.variabla.floatLeft { - margin-right: 16px; +.spremenljivka.tip_7 input.width_100:not(:first-of-type) { + margin-top: 16px; } .variabla.missing:first-of-type { @@ -238,20 +263,6 @@ h1.evalvacija { padding: 0; } -div.variabla { - display: flex; - align-items: center; -} - -input[type=text].input_other, -textarea.input_other { - margin: 0 0 0 8px; -} - -.variabla label.limit { - padding: 0 16px 0 8px !important; -} - div.variabla, td.variabla, td.question, @@ -294,10 +305,6 @@ table.grid_table td { padding: 12px 16px; } -span.reminder { - left: 3px; -} - /* Textboxi, textarea, select */ input, textarea, select { font-family: Source Sans Pro, sans-serif !important; @@ -531,10 +538,10 @@ textarea:focus { } .frame_dropping_titles { - width: 240px; + width: 244px; padding: 5px; margin: 0px auto 0px auto; - height: 15px; + height: 20px; text-align: center; background-color: #FFFFFF; border-top: 2px solid #b9c5d9; @@ -568,16 +575,17 @@ textarea:focus { } .frame_dropping_titles_box { - width: 240px; + width: 244px; padding: 5px; margin: 0px auto 0px auto; - height: 15px; + height: 20px; text-align: center; background-color: #FFFFFF; font-size: 16px; } .frame_dropping { + width: 234px; padding: 7px 10px 9px; } diff --git a/main/survey/skins/1kaGreen.css b/main/survey/skins/1kaGreen.css index c0bb7b13a..2a9f476ad 100644 --- a/main/survey/skins/1kaGreen.css +++ b/main/survey/skins/1kaGreen.css @@ -122,7 +122,8 @@ h1.evalvacija { /* ie6,7 doesnt support inline-block */ display: block; width: 20px; - font-size: 11px; + font-size: 14px; + line-height: 16px; color: #6D87AF; } .header_settings_holder .progress_bar div { @@ -166,7 +167,7 @@ h1.evalvacija { /* Spremenljivke */ .spremenljivka { margin: 0; - padding: 48px 0 !important; + padding: 48px 16px !important; border-bottom: 1px #E5E5E5 solid; } .spremenljivka .naslov { @@ -203,6 +204,10 @@ h1.evalvacija { .spremenljivka .arrow:hover { color: #43b554; } +.spremenljivka span.reminder { + left: 3px; + text-indent: 0; +} .spremenljivka.limited { outline: 1px #F15A24 solid; @@ -212,22 +217,42 @@ h1.evalvacija { outline: 1px #F15A24 solid; } -.spremenljivka.tip_1 .custom_radio_picture { - display: inline-block; - margin-right: 8px; +.spremenljivka.tip_1 .variabla, +.spremenljivka.tip_2 .variabla { + display: flex; + align-items: center; } -.spremenljivka.tip_1 .custom_radio_picture label { - display: inline-block !important; +.spremenljivka.tip_1 .variabla.floatLeft, +.spremenljivka.tip_2 .variabla.floatLeft { + margin-right: 16px; } - .spremenljivka.tip_1 .variabla label, .spremenljivka.tip_2 .variabla label { display: flex; line-height: 23px; } +.spremenljivka.tip_1 .variabla input[type=text].input_other, +.spremenljivka.tip_1 .variabla textarea.input_other, +.spremenljivka.tip_2 .variabla input[type=text].input_other, +.spremenljivka.tip_2 .variabla textarea.input_other { + margin: 0 0 0 8px; +} +.spremenljivka.tip_1 .custom_radio_picture, +.spremenljivka.tip_1 .visual-radio-scale, +.spremenljivka.tip_2 .custom_radio_picture, +.spremenljivka.tip_2 .visual-radio-scale { + display: inline-block; + margin-right: 8px; +} +.spremenljivka.tip_1 .custom_radio_picture label, +.spremenljivka.tip_1 .visual-radio-scale label, +.spremenljivka.tip_2 .custom_radio_picture label, +.spremenljivka.tip_2 .visual-radio-scale label { + display: inline-block !important; +} -.variabla.floatLeft { - margin-right: 16px; +.spremenljivka.tip_7 input.width_100:not(:first-of-type) { + margin-top: 16px; } .variabla.missing:first-of-type { @@ -238,20 +263,6 @@ h1.evalvacija { padding: 0; } -div.variabla { - display: flex; - align-items: center; -} - -input[type=text].input_other, -textarea.input_other { - margin: 0 0 0 8px; -} - -.variabla label.limit { - padding: 0 16px 0 8px !important; -} - div.variabla, td.variabla, td.question, @@ -294,10 +305,6 @@ table.grid_table td { padding: 12px 16px; } -span.reminder { - left: 3px; -} - /* Textboxi, textarea, select */ input, textarea, select { font-family: Source Sans Pro, sans-serif !important; @@ -531,10 +538,10 @@ textarea:focus { } .frame_dropping_titles { - width: 240px; + width: 244px; padding: 5px; margin: 0px auto 0px auto; - height: 15px; + height: 20px; text-align: center; background-color: #FFFFFF; border-top: 2px solid #b9c5d9; @@ -568,16 +575,17 @@ textarea:focus { } .frame_dropping_titles_box { - width: 240px; + width: 244px; padding: 5px; margin: 0px auto 0px auto; - height: 15px; + height: 20px; text-align: center; background-color: #FFFFFF; font-size: 16px; } .frame_dropping { + width: 234px; padding: 7px 10px 9px; } diff --git a/main/survey/skins/1kaNature.css b/main/survey/skins/1kaNature.css index 287316969..3b92ea8b1 100644 --- a/main/survey/skins/1kaNature.css +++ b/main/survey/skins/1kaNature.css @@ -122,7 +122,8 @@ h1.evalvacija { /* ie6,7 doesnt support inline-block */ display: block; width: 20px; - font-size: 11px; + font-size: 14px; + line-height: 16px; color: #6D87AF; } .header_settings_holder .progress_bar div { @@ -166,7 +167,7 @@ h1.evalvacija { /* Spremenljivke */ .spremenljivka { margin: 0; - padding: 48px 0 !important; + padding: 48px 16px !important; border-bottom: 1px #E5E5E5 solid; } .spremenljivka .naslov { @@ -203,6 +204,10 @@ h1.evalvacija { .spremenljivka .arrow:hover { color: #ffa608; } +.spremenljivka span.reminder { + left: 3px; + text-indent: 0; +} .spremenljivka.limited { outline: 1px #F15A24 solid; @@ -212,22 +217,42 @@ h1.evalvacija { outline: 1px #F15A24 solid; } -.spremenljivka.tip_1 .custom_radio_picture { - display: inline-block; - margin-right: 8px; +.spremenljivka.tip_1 .variabla, +.spremenljivka.tip_2 .variabla { + display: flex; + align-items: center; } -.spremenljivka.tip_1 .custom_radio_picture label { - display: inline-block !important; +.spremenljivka.tip_1 .variabla.floatLeft, +.spremenljivka.tip_2 .variabla.floatLeft { + margin-right: 16px; } - .spremenljivka.tip_1 .variabla label, .spremenljivka.tip_2 .variabla label { display: flex; line-height: 23px; } +.spremenljivka.tip_1 .variabla input[type=text].input_other, +.spremenljivka.tip_1 .variabla textarea.input_other, +.spremenljivka.tip_2 .variabla input[type=text].input_other, +.spremenljivka.tip_2 .variabla textarea.input_other { + margin: 0 0 0 8px; +} +.spremenljivka.tip_1 .custom_radio_picture, +.spremenljivka.tip_1 .visual-radio-scale, +.spremenljivka.tip_2 .custom_radio_picture, +.spremenljivka.tip_2 .visual-radio-scale { + display: inline-block; + margin-right: 8px; +} +.spremenljivka.tip_1 .custom_radio_picture label, +.spremenljivka.tip_1 .visual-radio-scale label, +.spremenljivka.tip_2 .custom_radio_picture label, +.spremenljivka.tip_2 .visual-radio-scale label { + display: inline-block !important; +} -.variabla.floatLeft { - margin-right: 16px; +.spremenljivka.tip_7 input.width_100:not(:first-of-type) { + margin-top: 16px; } .variabla.missing:first-of-type { @@ -238,20 +263,6 @@ h1.evalvacija { padding: 0; } -div.variabla { - display: flex; - align-items: center; -} - -input[type=text].input_other, -textarea.input_other { - margin: 0 0 0 8px; -} - -.variabla label.limit { - padding: 0 16px 0 8px !important; -} - div.variabla, td.variabla, td.question, @@ -294,10 +305,6 @@ table.grid_table td { padding: 12px 16px; } -span.reminder { - left: 3px; -} - /* Textboxi, textarea, select */ input, textarea, select { font-family: Source Sans Pro, sans-serif !important; @@ -531,10 +538,10 @@ textarea:focus { } .frame_dropping_titles { - width: 240px; + width: 244px; padding: 5px; margin: 0px auto 0px auto; - height: 15px; + height: 20px; text-align: center; background-color: #FFFFFF; border-top: 2px solid #b9c5d9; @@ -568,16 +575,17 @@ textarea:focus { } .frame_dropping_titles_box { - width: 240px; + width: 244px; padding: 5px; margin: 0px auto 0px auto; - height: 15px; + height: 20px; text-align: center; background-color: #FFFFFF; font-size: 16px; } .frame_dropping { + width: 234px; padding: 7px 10px 9px; } diff --git a/main/survey/skins/1kaOffice.css b/main/survey/skins/1kaOffice.css index 222195ad7..6000fbf77 100644 --- a/main/survey/skins/1kaOffice.css +++ b/main/survey/skins/1kaOffice.css @@ -122,7 +122,8 @@ h1.evalvacija { /* ie6,7 doesnt support inline-block */ display: block; width: 20px; - font-size: 11px; + font-size: 14px; + line-height: 16px; color: #6D87AF; } .header_settings_holder .progress_bar div { @@ -166,7 +167,7 @@ h1.evalvacija { /* Spremenljivke */ .spremenljivka { margin: 0; - padding: 48px 0 !important; + padding: 48px 16px !important; border-bottom: 1px #E5E5E5 solid; } .spremenljivka .naslov { @@ -203,6 +204,10 @@ h1.evalvacija { .spremenljivka .arrow:hover { color: #ffa608; } +.spremenljivka span.reminder { + left: 3px; + text-indent: 0; +} .spremenljivka.limited { outline: 1px #F15A24 solid; @@ -212,22 +217,42 @@ h1.evalvacija { outline: 1px #F15A24 solid; } -.spremenljivka.tip_1 .custom_radio_picture { - display: inline-block; - margin-right: 8px; +.spremenljivka.tip_1 .variabla, +.spremenljivka.tip_2 .variabla { + display: flex; + align-items: center; } -.spremenljivka.tip_1 .custom_radio_picture label { - display: inline-block !important; +.spremenljivka.tip_1 .variabla.floatLeft, +.spremenljivka.tip_2 .variabla.floatLeft { + margin-right: 16px; } - .spremenljivka.tip_1 .variabla label, .spremenljivka.tip_2 .variabla label { display: flex; line-height: 23px; } +.spremenljivka.tip_1 .variabla input[type=text].input_other, +.spremenljivka.tip_1 .variabla textarea.input_other, +.spremenljivka.tip_2 .variabla input[type=text].input_other, +.spremenljivka.tip_2 .variabla textarea.input_other { + margin: 0 0 0 8px; +} +.spremenljivka.tip_1 .custom_radio_picture, +.spremenljivka.tip_1 .visual-radio-scale, +.spremenljivka.tip_2 .custom_radio_picture, +.spremenljivka.tip_2 .visual-radio-scale { + display: inline-block; + margin-right: 8px; +} +.spremenljivka.tip_1 .custom_radio_picture label, +.spremenljivka.tip_1 .visual-radio-scale label, +.spremenljivka.tip_2 .custom_radio_picture label, +.spremenljivka.tip_2 .visual-radio-scale label { + display: inline-block !important; +} -.variabla.floatLeft { - margin-right: 16px; +.spremenljivka.tip_7 input.width_100:not(:first-of-type) { + margin-top: 16px; } .variabla.missing:first-of-type { @@ -238,20 +263,6 @@ h1.evalvacija { padding: 0; } -div.variabla { - display: flex; - align-items: center; -} - -input[type=text].input_other, -textarea.input_other { - margin: 0 0 0 8px; -} - -.variabla label.limit { - padding: 0 16px 0 8px !important; -} - div.variabla, td.variabla, td.question, @@ -294,10 +305,6 @@ table.grid_table td { padding: 12px 16px; } -span.reminder { - left: 3px; -} - /* Textboxi, textarea, select */ input, textarea, select { font-family: Source Sans Pro, sans-serif !important; @@ -531,10 +538,10 @@ textarea:focus { } .frame_dropping_titles { - width: 240px; + width: 244px; padding: 5px; margin: 0px auto 0px auto; - height: 15px; + height: 20px; text-align: center; background-color: #FFFFFF; border-top: 2px solid #b9c5d9; @@ -568,16 +575,17 @@ textarea:focus { } .frame_dropping_titles_box { - width: 240px; + width: 244px; padding: 5px; margin: 0px auto 0px auto; - height: 15px; + height: 20px; text-align: center; background-color: #FFFFFF; font-size: 16px; } .frame_dropping { + width: 234px; padding: 7px 10px 9px; } diff --git a/main/survey/skins/1kaOrange.css b/main/survey/skins/1kaOrange.css index 5f09b7db6..05c3b5355 100644 --- a/main/survey/skins/1kaOrange.css +++ b/main/survey/skins/1kaOrange.css @@ -122,7 +122,8 @@ h1.evalvacija { /* ie6,7 doesnt support inline-block */ display: block; width: 20px; - font-size: 11px; + font-size: 14px; + line-height: 16px; color: #6D87AF; } .header_settings_holder .progress_bar div { @@ -166,7 +167,7 @@ h1.evalvacija { /* Spremenljivke */ .spremenljivka { margin: 0; - padding: 48px 0 !important; + padding: 48px 16px !important; border-bottom: 1px #E5E5E5 solid; } .spremenljivka .naslov { @@ -203,6 +204,10 @@ h1.evalvacija { .spremenljivka .arrow:hover { color: #ff943d; } +.spremenljivka span.reminder { + left: 3px; + text-indent: 0; +} .spremenljivka.limited { outline: 1px #F15A24 solid; @@ -212,22 +217,42 @@ h1.evalvacija { outline: 1px #F15A24 solid; } -.spremenljivka.tip_1 .custom_radio_picture { - display: inline-block; - margin-right: 8px; +.spremenljivka.tip_1 .variabla, +.spremenljivka.tip_2 .variabla { + display: flex; + align-items: center; } -.spremenljivka.tip_1 .custom_radio_picture label { - display: inline-block !important; +.spremenljivka.tip_1 .variabla.floatLeft, +.spremenljivka.tip_2 .variabla.floatLeft { + margin-right: 16px; } - .spremenljivka.tip_1 .variabla label, .spremenljivka.tip_2 .variabla label { display: flex; line-height: 23px; } +.spremenljivka.tip_1 .variabla input[type=text].input_other, +.spremenljivka.tip_1 .variabla textarea.input_other, +.spremenljivka.tip_2 .variabla input[type=text].input_other, +.spremenljivka.tip_2 .variabla textarea.input_other { + margin: 0 0 0 8px; +} +.spremenljivka.tip_1 .custom_radio_picture, +.spremenljivka.tip_1 .visual-radio-scale, +.spremenljivka.tip_2 .custom_radio_picture, +.spremenljivka.tip_2 .visual-radio-scale { + display: inline-block; + margin-right: 8px; +} +.spremenljivka.tip_1 .custom_radio_picture label, +.spremenljivka.tip_1 .visual-radio-scale label, +.spremenljivka.tip_2 .custom_radio_picture label, +.spremenljivka.tip_2 .visual-radio-scale label { + display: inline-block !important; +} -.variabla.floatLeft { - margin-right: 16px; +.spremenljivka.tip_7 input.width_100:not(:first-of-type) { + margin-top: 16px; } .variabla.missing:first-of-type { @@ -238,20 +263,6 @@ h1.evalvacija { padding: 0; } -div.variabla { - display: flex; - align-items: center; -} - -input[type=text].input_other, -textarea.input_other { - margin: 0 0 0 8px; -} - -.variabla label.limit { - padding: 0 16px 0 8px !important; -} - div.variabla, td.variabla, td.question, @@ -294,10 +305,6 @@ table.grid_table td { padding: 12px 16px; } -span.reminder { - left: 3px; -} - /* Textboxi, textarea, select */ input, textarea, select { font-family: Source Sans Pro, sans-serif !important; @@ -531,10 +538,10 @@ textarea:focus { } .frame_dropping_titles { - width: 240px; + width: 244px; padding: 5px; margin: 0px auto 0px auto; - height: 15px; + height: 20px; text-align: center; background-color: #FFFFFF; border-top: 2px solid #b9c5d9; @@ -568,16 +575,17 @@ textarea:focus { } .frame_dropping_titles_box { - width: 240px; + width: 244px; padding: 5px; margin: 0px auto 0px auto; - height: 15px; + height: 20px; text-align: center; background-color: #FFFFFF; font-size: 16px; } .frame_dropping { + width: 234px; padding: 7px 10px 9px; } diff --git a/main/survey/skins/1kaPurple.css b/main/survey/skins/1kaPurple.css index dabd254ee..189069f99 100644 --- a/main/survey/skins/1kaPurple.css +++ b/main/survey/skins/1kaPurple.css @@ -122,7 +122,8 @@ h1.evalvacija { /* ie6,7 doesnt support inline-block */ display: block; width: 20px; - font-size: 11px; + font-size: 14px; + line-height: 16px; color: #6D87AF; } .header_settings_holder .progress_bar div { @@ -166,7 +167,7 @@ h1.evalvacija { /* Spremenljivke */ .spremenljivka { margin: 0; - padding: 48px 0 !important; + padding: 48px 16px !important; border-bottom: 1px #E5E5E5 solid; } .spremenljivka .naslov { @@ -203,6 +204,10 @@ h1.evalvacija { .spremenljivka .arrow:hover { color: #6642d1; } +.spremenljivka span.reminder { + left: 3px; + text-indent: 0; +} .spremenljivka.limited { outline: 1px #F15A24 solid; @@ -212,22 +217,42 @@ h1.evalvacija { outline: 1px #F15A24 solid; } -.spremenljivka.tip_1 .custom_radio_picture { - display: inline-block; - margin-right: 8px; +.spremenljivka.tip_1 .variabla, +.spremenljivka.tip_2 .variabla { + display: flex; + align-items: center; } -.spremenljivka.tip_1 .custom_radio_picture label { - display: inline-block !important; +.spremenljivka.tip_1 .variabla.floatLeft, +.spremenljivka.tip_2 .variabla.floatLeft { + margin-right: 16px; } - .spremenljivka.tip_1 .variabla label, .spremenljivka.tip_2 .variabla label { display: flex; line-height: 23px; } +.spremenljivka.tip_1 .variabla input[type=text].input_other, +.spremenljivka.tip_1 .variabla textarea.input_other, +.spremenljivka.tip_2 .variabla input[type=text].input_other, +.spremenljivka.tip_2 .variabla textarea.input_other { + margin: 0 0 0 8px; +} +.spremenljivka.tip_1 .custom_radio_picture, +.spremenljivka.tip_1 .visual-radio-scale, +.spremenljivka.tip_2 .custom_radio_picture, +.spremenljivka.tip_2 .visual-radio-scale { + display: inline-block; + margin-right: 8px; +} +.spremenljivka.tip_1 .custom_radio_picture label, +.spremenljivka.tip_1 .visual-radio-scale label, +.spremenljivka.tip_2 .custom_radio_picture label, +.spremenljivka.tip_2 .visual-radio-scale label { + display: inline-block !important; +} -.variabla.floatLeft { - margin-right: 16px; +.spremenljivka.tip_7 input.width_100:not(:first-of-type) { + margin-top: 16px; } .variabla.missing:first-of-type { @@ -238,20 +263,6 @@ h1.evalvacija { padding: 0; } -div.variabla { - display: flex; - align-items: center; -} - -input[type=text].input_other, -textarea.input_other { - margin: 0 0 0 8px; -} - -.variabla label.limit { - padding: 0 16px 0 8px !important; -} - div.variabla, td.variabla, td.question, @@ -294,10 +305,6 @@ table.grid_table td { padding: 12px 16px; } -span.reminder { - left: 3px; -} - /* Textboxi, textarea, select */ input, textarea, select { font-family: Source Sans Pro, sans-serif !important; @@ -531,10 +538,10 @@ textarea:focus { } .frame_dropping_titles { - width: 240px; + width: 244px; padding: 5px; margin: 0px auto 0px auto; - height: 15px; + height: 20px; text-align: center; background-color: #FFFFFF; border-top: 2px solid #b9c5d9; @@ -568,16 +575,17 @@ textarea:focus { } .frame_dropping_titles_box { - width: 240px; + width: 244px; padding: 5px; margin: 0px auto 0px auto; - height: 15px; + height: 20px; text-align: center; background-color: #FFFFFF; font-size: 16px; } .frame_dropping { + width: 234px; padding: 7px 10px 9px; } diff --git a/main/survey/skins/1kaRed.css b/main/survey/skins/1kaRed.css index 581d61919..0b4385185 100644 --- a/main/survey/skins/1kaRed.css +++ b/main/survey/skins/1kaRed.css @@ -122,7 +122,8 @@ h1.evalvacija { /* ie6,7 doesnt support inline-block */ display: block; width: 20px; - font-size: 11px; + font-size: 14px; + line-height: 16px; color: #6D87AF; } .header_settings_holder .progress_bar div { @@ -166,7 +167,7 @@ h1.evalvacija { /* Spremenljivke */ .spremenljivka { margin: 0; - padding: 48px 0 !important; + padding: 48px 16px !important; border-bottom: 1px #E5E5E5 solid; } .spremenljivka .naslov { @@ -203,6 +204,10 @@ h1.evalvacija { .spremenljivka .arrow:hover { color: #de5c5c; } +.spremenljivka span.reminder { + left: 3px; + text-indent: 0; +} .spremenljivka.limited { outline: 1px #F15A24 solid; @@ -212,22 +217,42 @@ h1.evalvacija { outline: 1px #F15A24 solid; } -.spremenljivka.tip_1 .custom_radio_picture { - display: inline-block; - margin-right: 8px; +.spremenljivka.tip_1 .variabla, +.spremenljivka.tip_2 .variabla { + display: flex; + align-items: center; } -.spremenljivka.tip_1 .custom_radio_picture label { - display: inline-block !important; +.spremenljivka.tip_1 .variabla.floatLeft, +.spremenljivka.tip_2 .variabla.floatLeft { + margin-right: 16px; } - .spremenljivka.tip_1 .variabla label, .spremenljivka.tip_2 .variabla label { display: flex; line-height: 23px; } +.spremenljivka.tip_1 .variabla input[type=text].input_other, +.spremenljivka.tip_1 .variabla textarea.input_other, +.spremenljivka.tip_2 .variabla input[type=text].input_other, +.spremenljivka.tip_2 .variabla textarea.input_other { + margin: 0 0 0 8px; +} +.spremenljivka.tip_1 .custom_radio_picture, +.spremenljivka.tip_1 .visual-radio-scale, +.spremenljivka.tip_2 .custom_radio_picture, +.spremenljivka.tip_2 .visual-radio-scale { + display: inline-block; + margin-right: 8px; +} +.spremenljivka.tip_1 .custom_radio_picture label, +.spremenljivka.tip_1 .visual-radio-scale label, +.spremenljivka.tip_2 .custom_radio_picture label, +.spremenljivka.tip_2 .visual-radio-scale label { + display: inline-block !important; +} -.variabla.floatLeft { - margin-right: 16px; +.spremenljivka.tip_7 input.width_100:not(:first-of-type) { + margin-top: 16px; } .variabla.missing:first-of-type { @@ -238,20 +263,6 @@ h1.evalvacija { padding: 0; } -div.variabla { - display: flex; - align-items: center; -} - -input[type=text].input_other, -textarea.input_other { - margin: 0 0 0 8px; -} - -.variabla label.limit { - padding: 0 16px 0 8px !important; -} - div.variabla, td.variabla, td.question, @@ -294,10 +305,6 @@ table.grid_table td { padding: 12px 16px; } -span.reminder { - left: 3px; -} - /* Textboxi, textarea, select */ input, textarea, select { font-family: Source Sans Pro, sans-serif !important; @@ -531,10 +538,10 @@ textarea:focus { } .frame_dropping_titles { - width: 240px; + width: 244px; padding: 5px; margin: 0px auto 0px auto; - height: 15px; + height: 20px; text-align: center; background-color: #FFFFFF; border-top: 2px solid #b9c5d9; @@ -568,16 +575,17 @@ textarea:focus { } .frame_dropping_titles_box { - width: 240px; + width: 244px; padding: 5px; margin: 0px auto 0px auto; - height: 15px; + height: 20px; text-align: center; background-color: #FFFFFF; font-size: 16px; } .frame_dropping { + width: 234px; padding: 7px 10px 9px; } diff --git a/main/survey/skins/Cdi.css b/main/survey/skins/Cdi.css index 668dbb26a..a3b07cb8a 100644 --- a/main/survey/skins/Cdi.css +++ b/main/survey/skins/Cdi.css @@ -122,7 +122,8 @@ h1.evalvacija { /* ie6,7 doesnt support inline-block */ display: block; width: 20px; - font-size: 11px; + font-size: 14px; + line-height: 16px; color: #6D87AF; } .header_settings_holder .progress_bar div { @@ -166,7 +167,7 @@ h1.evalvacija { /* Spremenljivke */ .spremenljivka { margin: 0; - padding: 48px 0 !important; + padding: 48px 16px !important; border-bottom: 1px #E5E5E5 solid; } .spremenljivka .naslov { @@ -203,6 +204,10 @@ h1.evalvacija { .spremenljivka .arrow:hover { color: #8c8c8c; } +.spremenljivka span.reminder { + left: 3px; + text-indent: 0; +} .spremenljivka.limited { outline: 1px #F15A24 solid; @@ -212,22 +217,42 @@ h1.evalvacija { outline: 1px #F15A24 solid; } -.spremenljivka.tip_1 .custom_radio_picture { - display: inline-block; - margin-right: 8px; +.spremenljivka.tip_1 .variabla, +.spremenljivka.tip_2 .variabla { + display: flex; + align-items: center; } -.spremenljivka.tip_1 .custom_radio_picture label { - display: inline-block !important; +.spremenljivka.tip_1 .variabla.floatLeft, +.spremenljivka.tip_2 .variabla.floatLeft { + margin-right: 16px; } - .spremenljivka.tip_1 .variabla label, .spremenljivka.tip_2 .variabla label { display: flex; line-height: 23px; } +.spremenljivka.tip_1 .variabla input[type=text].input_other, +.spremenljivka.tip_1 .variabla textarea.input_other, +.spremenljivka.tip_2 .variabla input[type=text].input_other, +.spremenljivka.tip_2 .variabla textarea.input_other { + margin: 0 0 0 8px; +} +.spremenljivka.tip_1 .custom_radio_picture, +.spremenljivka.tip_1 .visual-radio-scale, +.spremenljivka.tip_2 .custom_radio_picture, +.spremenljivka.tip_2 .visual-radio-scale { + display: inline-block; + margin-right: 8px; +} +.spremenljivka.tip_1 .custom_radio_picture label, +.spremenljivka.tip_1 .visual-radio-scale label, +.spremenljivka.tip_2 .custom_radio_picture label, +.spremenljivka.tip_2 .visual-radio-scale label { + display: inline-block !important; +} -.variabla.floatLeft { - margin-right: 16px; +.spremenljivka.tip_7 input.width_100:not(:first-of-type) { + margin-top: 16px; } .variabla.missing:first-of-type { @@ -238,20 +263,6 @@ h1.evalvacija { padding: 0; } -div.variabla { - display: flex; - align-items: center; -} - -input[type=text].input_other, -textarea.input_other { - margin: 0 0 0 8px; -} - -.variabla label.limit { - padding: 0 16px 0 8px !important; -} - div.variabla, td.variabla, td.question, @@ -294,10 +305,6 @@ table.grid_table td { padding: 12px 16px; } -span.reminder { - left: 3px; -} - /* Textboxi, textarea, select */ input, textarea, select { font-family: Source Sans Pro, sans-serif !important; @@ -531,10 +538,10 @@ textarea:focus { } .frame_dropping_titles { - width: 240px; + width: 244px; padding: 5px; margin: 0px auto 0px auto; - height: 15px; + height: 20px; text-align: center; background-color: #FFFFFF; border-top: 2px solid #b9c5d9; @@ -568,16 +575,17 @@ textarea:focus { } .frame_dropping_titles_box { - width: 240px; + width: 244px; padding: 5px; margin: 0px auto 0px auto; - height: 15px; + height: 20px; text-align: center; background-color: #FFFFFF; font-size: 16px; } .frame_dropping { + width: 234px; padding: 7px 10px 9px; } diff --git a/main/survey/skins/Fdv.css b/main/survey/skins/Fdv.css index 9e5d3ca1b..6b84bafb7 100644 --- a/main/survey/skins/Fdv.css +++ b/main/survey/skins/Fdv.css @@ -122,7 +122,8 @@ h1.evalvacija { /* ie6,7 doesnt support inline-block */ display: block; width: 20px; - font-size: 11px; + font-size: 14px; + line-height: 16px; color: #6D87AF; } .header_settings_holder .progress_bar div { @@ -166,7 +167,7 @@ h1.evalvacija { /* Spremenljivke */ .spremenljivka { margin: 0; - padding: 48px 0 !important; + padding: 48px 16px !important; border-bottom: 1px #E5E5E5 solid; } .spremenljivka .naslov { @@ -203,6 +204,10 @@ h1.evalvacija { .spremenljivka .arrow:hover { color: #8c8c8c; } +.spremenljivka span.reminder { + left: 3px; + text-indent: 0; +} .spremenljivka.limited { outline: 1px #F15A24 solid; @@ -212,22 +217,42 @@ h1.evalvacija { outline: 1px #F15A24 solid; } -.spremenljivka.tip_1 .custom_radio_picture { - display: inline-block; - margin-right: 8px; +.spremenljivka.tip_1 .variabla, +.spremenljivka.tip_2 .variabla { + display: flex; + align-items: center; } -.spremenljivka.tip_1 .custom_radio_picture label { - display: inline-block !important; +.spremenljivka.tip_1 .variabla.floatLeft, +.spremenljivka.tip_2 .variabla.floatLeft { + margin-right: 16px; } - .spremenljivka.tip_1 .variabla label, .spremenljivka.tip_2 .variabla label { display: flex; line-height: 23px; } +.spremenljivka.tip_1 .variabla input[type=text].input_other, +.spremenljivka.tip_1 .variabla textarea.input_other, +.spremenljivka.tip_2 .variabla input[type=text].input_other, +.spremenljivka.tip_2 .variabla textarea.input_other { + margin: 0 0 0 8px; +} +.spremenljivka.tip_1 .custom_radio_picture, +.spremenljivka.tip_1 .visual-radio-scale, +.spremenljivka.tip_2 .custom_radio_picture, +.spremenljivka.tip_2 .visual-radio-scale { + display: inline-block; + margin-right: 8px; +} +.spremenljivka.tip_1 .custom_radio_picture label, +.spremenljivka.tip_1 .visual-radio-scale label, +.spremenljivka.tip_2 .custom_radio_picture label, +.spremenljivka.tip_2 .visual-radio-scale label { + display: inline-block !important; +} -.variabla.floatLeft { - margin-right: 16px; +.spremenljivka.tip_7 input.width_100:not(:first-of-type) { + margin-top: 16px; } .variabla.missing:first-of-type { @@ -238,20 +263,6 @@ h1.evalvacija { padding: 0; } -div.variabla { - display: flex; - align-items: center; -} - -input[type=text].input_other, -textarea.input_other { - margin: 0 0 0 8px; -} - -.variabla label.limit { - padding: 0 16px 0 8px !important; -} - div.variabla, td.variabla, td.question, @@ -294,10 +305,6 @@ table.grid_table td { padding: 12px 16px; } -span.reminder { - left: 3px; -} - /* Textboxi, textarea, select */ input, textarea, select { font-family: Source Sans Pro, sans-serif !important; @@ -531,10 +538,10 @@ textarea:focus { } .frame_dropping_titles { - width: 240px; + width: 244px; padding: 5px; margin: 0px auto 0px auto; - height: 15px; + height: 20px; text-align: center; background-color: #FFFFFF; border-top: 2px solid #b9c5d9; @@ -568,16 +575,17 @@ textarea:focus { } .frame_dropping_titles_box { - width: 240px; + width: 244px; padding: 5px; margin: 0px auto 0px auto; - height: 15px; + height: 20px; text-align: center; background-color: #FFFFFF; font-size: 16px; } .frame_dropping { + width: 234px; padding: 7px 10px 9px; } diff --git a/main/survey/skins/Uni.css b/main/survey/skins/Uni.css index 36cabf48f..1d3360582 100644 --- a/main/survey/skins/Uni.css +++ b/main/survey/skins/Uni.css @@ -122,7 +122,8 @@ h1.evalvacija { /* ie6,7 doesnt support inline-block */ display: block; width: 20px; - font-size: 11px; + font-size: 14px; + line-height: 16px; color: #6D87AF; } .header_settings_holder .progress_bar div { @@ -166,7 +167,7 @@ h1.evalvacija { /* Spremenljivke */ .spremenljivka { margin: 0; - padding: 48px 0 !important; + padding: 48px 16px !important; border-bottom: 1px #E5E5E5 solid; } .spremenljivka .naslov { @@ -203,6 +204,10 @@ h1.evalvacija { .spremenljivka .arrow:hover { color: #8c8c8c; } +.spremenljivka span.reminder { + left: 3px; + text-indent: 0; +} .spremenljivka.limited { outline: 1px #F15A24 solid; @@ -212,22 +217,42 @@ h1.evalvacija { outline: 1px #F15A24 solid; } -.spremenljivka.tip_1 .custom_radio_picture { - display: inline-block; - margin-right: 8px; +.spremenljivka.tip_1 .variabla, +.spremenljivka.tip_2 .variabla { + display: flex; + align-items: center; } -.spremenljivka.tip_1 .custom_radio_picture label { - display: inline-block !important; +.spremenljivka.tip_1 .variabla.floatLeft, +.spremenljivka.tip_2 .variabla.floatLeft { + margin-right: 16px; } - .spremenljivka.tip_1 .variabla label, .spremenljivka.tip_2 .variabla label { display: flex; line-height: 23px; } +.spremenljivka.tip_1 .variabla input[type=text].input_other, +.spremenljivka.tip_1 .variabla textarea.input_other, +.spremenljivka.tip_2 .variabla input[type=text].input_other, +.spremenljivka.tip_2 .variabla textarea.input_other { + margin: 0 0 0 8px; +} +.spremenljivka.tip_1 .custom_radio_picture, +.spremenljivka.tip_1 .visual-radio-scale, +.spremenljivka.tip_2 .custom_radio_picture, +.spremenljivka.tip_2 .visual-radio-scale { + display: inline-block; + margin-right: 8px; +} +.spremenljivka.tip_1 .custom_radio_picture label, +.spremenljivka.tip_1 .visual-radio-scale label, +.spremenljivka.tip_2 .custom_radio_picture label, +.spremenljivka.tip_2 .visual-radio-scale label { + display: inline-block !important; +} -.variabla.floatLeft { - margin-right: 16px; +.spremenljivka.tip_7 input.width_100:not(:first-of-type) { + margin-top: 16px; } .variabla.missing:first-of-type { @@ -238,20 +263,6 @@ h1.evalvacija { padding: 0; } -div.variabla { - display: flex; - align-items: center; -} - -input[type=text].input_other, -textarea.input_other { - margin: 0 0 0 8px; -} - -.variabla label.limit { - padding: 0 16px 0 8px !important; -} - div.variabla, td.variabla, td.question, @@ -294,10 +305,6 @@ table.grid_table td { padding: 12px 16px; } -span.reminder { - left: 3px; -} - /* Textboxi, textarea, select */ input, textarea, select { font-family: Source Sans Pro, sans-serif !important; @@ -531,10 +538,10 @@ textarea:focus { } .frame_dropping_titles { - width: 240px; + width: 244px; padding: 5px; margin: 0px auto 0px auto; - height: 15px; + height: 20px; text-align: center; background-color: #FFFFFF; border-top: 2px solid #b9c5d9; @@ -568,16 +575,17 @@ textarea:focus { } .frame_dropping_titles_box { - width: 240px; + width: 244px; padding: 5px; margin: 0px auto 0px auto; - height: 15px; + height: 20px; text-align: center; background-color: #FFFFFF; font-size: 16px; } .frame_dropping { + width: 234px; padding: 7px 10px 9px; } diff --git a/public/css/main.css b/public/css/main.css index 61381512b..61f7135e5 100644 --- a/public/css/main.css +++ b/public/css/main.css @@ -7310,6 +7310,7 @@ button.ui-datepicker-trigger::before { #preview-window.closed { border: 0; box-shadow: none; + background-color: transparent; } #preview-window.closed #preview_switch { padding-bottom: 0; diff --git a/resources/sass/main/main/admin.scss b/resources/sass/main/main/admin.scss index 231e9fca7..dbe262f30 100644 --- a/resources/sass/main/main/admin.scss +++ b/resources/sass/main/main/admin.scss @@ -140,6 +140,8 @@ border: 0; box-shadow: none; + background-color: transparent; + #preview_switch{ padding-bottom: 0; border-bottom: 0; diff --git a/resources/sass/main/skins/1ka/1ka.scss b/resources/sass/main/skins/1ka/1ka.scss index 5703b957f..6c5e2883b 100644 --- a/resources/sass/main/skins/1ka/1ka.scss +++ b/resources/sass/main/skins/1ka/1ka.scss @@ -143,7 +143,8 @@ h1.evalvacija{ display: block; width: 20px; - font-size: 11px; + font-size: 14px; + line-height: 16px; color: #6D87AF; } @@ -207,7 +208,7 @@ h1.evalvacija{ /* Spremenljivke */ .spremenljivka { margin: 0; - padding: 48px 0 !important; + padding: 48px 16px !important; border-bottom: 1px $color_gray solid; @@ -254,6 +255,11 @@ h1.evalvacija{ color: $color_link_hover; } } + + span.reminder { + left: 3px; + text-indent: 0; + } } .spremenljivka.limited{ outline: 1px #F15A24 solid; @@ -263,23 +269,46 @@ h1.evalvacija{ } -.spremenljivka.tip_1 .custom_radio_picture{ - display: inline-block; - margin-right: 8px; - label{ - display: inline-block !important; +.spremenljivka.tip_1, +.spremenljivka.tip_2{ + + .variabla{ + display: flex; + align-items: center; + + &.floatLeft{ + margin-right: 16px; + } + + label{ + display: flex; + line-height: 23px; + } + + input[type="text"].input_other, + textarea.input_other{ + margin: 0 0 0 8px; + } + } + + .custom_radio_picture, + .visual-radio-scale{ + display: inline-block; + margin-right: 8px; + + label{ + display: inline-block !important; + } } } +.spremenljivka.tip_7{ + + input.width_100:not(:first-of-type){ + margin-top: 16px; + } -.spremenljivka.tip_1 .variabla label, -.spremenljivka.tip_2 .variabla label{ - display: flex; - line-height: 23px; -} -.variabla.floatLeft{ - margin-right: 16px; } .variabla.missing:first-of-type{ @@ -289,19 +318,6 @@ h1.evalvacija{ padding: 0; } -div.variabla{ - display: flex; - align-items: center; -} - -input[type="text"].input_other, -textarea.input_other{ - margin: 0 0 0 8px; -} - -.variabla label.limit{ - padding: 0 16px 0 8px !important; -} div.variabla, @@ -353,10 +369,6 @@ table.grid_table{ } } -span.reminder { - left: 3px; -} - /* Textboxi, textarea, select */ input, textarea, select{ font-family: $font_family !important; @@ -627,10 +639,10 @@ textarea:focus{ } .frame_dropping_titles { - width: 240px; + width: 244px; padding: 5px; margin: 0px auto 0px auto; - height: 15px; + height: 20px; text-align: center; background-color: #FFFFFF; border-top: 2px solid #b9c5d9; @@ -665,17 +677,18 @@ textarea:focus{ } .frame_dropping_titles_box { - width: 240px; + width: 244px; padding: 5px; margin: 0px auto 0px auto; - height: 15px; + height: 20px; text-align: center; background-color: #FFFFFF; font-size: 16px; } .frame_dropping { - padding: 7px 10px 9px; + width: 234px; + padding: 7px 10px 9px; } .frame_dropping_box { padding: 7px 10px 9px;