diff --git a/admin/survey/classes/surveyAnalysis/class.SurveyMultiCrosstabs.php b/admin/survey/classes/surveyAnalysis/class.SurveyMultiCrosstabs.php index 0ec9f4aba..4af44f382 100644 --- a/admin/survey/classes/surveyAnalysis/class.SurveyMultiCrosstabs.php +++ b/admin/survey/classes/surveyAnalysis/class.SurveyMultiCrosstabs.php @@ -1413,8 +1413,7 @@ class SurveyMultiCrosstabs { echo ''; - echo '
'; - echo ''.$lang['srv_multicrosstabs_settings_val'].''; + echo '

'.$lang['srv_multicrosstabs_settings_val'].'

'; echo '
'; @@ -1433,11 +1432,7 @@ class SurveyMultiCrosstabs { echo '
'; - echo '
'; - - - echo '
'; - echo ''.$lang['srv_multicrosstabs_settings_avg'].''; + echo '

'.$lang['srv_multicrosstabs_settings_avg'].'

'; // Variabla za racunanje povprecja - numeric in ordinal (radio, dropdown, mg) $checked = $this->table_settings[$this->table_id]['avgVar'] == '' ? false : true; @@ -1459,11 +1454,9 @@ class SurveyMultiCrosstabs { echo ''; echo ''; - echo '
'; - echo '
'; - echo ''.$lang['srv_multicrosstabs_settings_del'].''; + echo '

'.$lang['srv_multicrosstabs_settings_del'].'

'; // Variabla za racunanje deleza - ordinal in nominal (radio, dropdown, mg, po novem tudi checkbox, multicheckbox) $checked = $this->table_settings[$this->table_id]['delezVar'] == '' ? false : true; @@ -1490,8 +1483,6 @@ class SurveyMultiCrosstabs { $this->displayDelez($this->table_settings[$this->table_id]['delezVar']); echo ''; - echo '
'; - echo ''; diff --git a/public/css/admin_new.css b/public/css/admin_new.css index bac61db5f..751027d38 100644 --- a/public/css/admin_new.css +++ b/public/css/admin_new.css @@ -8501,6 +8501,28 @@ div#newMCTable .setting_holder input.text { width: 100% !important; } +div#mc_table_settings h3 { + font-weight: 700; + color: #1E88E5; + text-transform: uppercase; + font-size: 14px; + overflow: hidden; + margin: 0 0 8px 0; +} +div#mc_table_settings h3:after { + content: ""; + display: inline-block; + height: 0.5em; + vertical-align: bottom; + width: 100%; + margin-right: -100%; + margin-left: 12px; + border-top: 1px solid #E5E5E5; +} +div#mc_table_settings form { + padding: 0; +} + /* Header scss - top line, menu... */ diff --git a/resources/sass/admin_new/components/popup/page_specific.scss b/resources/sass/admin_new/components/popup/page_specific.scss index a5efd3f9b..892ba3936 100644 --- a/resources/sass/admin_new/components/popup/page_specific.scss +++ b/resources/sass/admin_new/components/popup/page_specific.scss @@ -462,6 +462,9 @@ div.popupShadow { box-shadow: 0 0 10px 0 rgb(0 0 0 / 34%); } +//Grafi - barve + + //Multitabele div#newMCTable { .setting_holder { @@ -471,3 +474,30 @@ div#newMCTable { } } } + +div#mc_table_settings { + + h3 { + font-weight: 700; + color: $blue; + text-transform: uppercase; + font-size: 14px; + overflow: hidden; + margin: 0 0 8px 0; + + &:after { + content: ""; + display: inline-block; + height: 0.5em; + vertical-align: bottom; + width: 100%; + margin-right: -100%; + margin-left: 12px; + border-top: 1px solid $gray; + } + } + + form { + padding: 0; + } +}