diff --git a/admin/survey/SurveyAdminSettings.php b/admin/survey/SurveyAdminSettings.php index 1840f3833..16dca9bff 100644 --- a/admin/survey/SurveyAdminSettings.php +++ b/admin/survey/SurveyAdminSettings.php @@ -8849,7 +8849,9 @@ class SurveyAdminSettings { echo ''; } - echo '
'.$row['pagename'].''; + echo '
'; + echo ''.$row['pagename'].''; + // echo ' - '; echo ''; $prevpage = $row['gru_id']; @@ -8925,7 +8927,7 @@ class SurveyAdminSettings { echo ''; diff --git a/public/css/admin_new.css b/public/css/admin_new.css index 5b7cb96bf..579ada81f 100644 --- a/public/css/admin_new.css +++ b/public/css/admin_new.css @@ -10164,6 +10164,11 @@ div .table-horizontal-scroll-wrapper2 table { margin-bottom: 0; } +#anketa_edit .page_num_fieldset { + border: unset; + border-top: 1px dashed #E5E5E5; +} + .page_num_fieldset { padding-top: 0px; padding-bottom: 0px; @@ -10173,6 +10178,7 @@ div .table-horizontal-scroll-wrapper2 table { .page_num { margin-left: 39%; color: #333333; + position: relative; } .table_header { diff --git a/resources/sass/admin_new/components/table/table.scss b/resources/sass/admin_new/components/table/table.scss index 0744bc565..139a84854 100644 --- a/resources/sass/admin_new/components/table/table.scss +++ b/resources/sass/admin_new/components/table/table.scss @@ -39,13 +39,13 @@ table { } tr { - + height: 40px; &:last-of-type, &.show_as_last_row{ - td, th { + td, th { border-bottom: 1px solid $gray; } } @@ -107,6 +107,11 @@ div { //testiranje --> avtomatski vnosi +#anketa_edit .page_num_fieldset{ + border: unset; + border-top: 1px dashed #E5E5E5; +} + .page_num_fieldset{ padding-top: 0px; padding-bottom: 0px; @@ -117,6 +122,7 @@ div { .page_num{ margin-left: 39%; color: #333333; + position: relative; }
'; echo '
'; - echo '
'; + echo '
'; echo ' '.$p.'% ('.($total_rows-$rowc['count']).')'; echo '
'; echo '