From 7b9d10184da51478b75fccf714cd8eb901c8dd6f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nejc=20Kova=C4=8D?= Date: Mon, 22 Aug 2022 09:37:56 +0200 Subject: [PATCH 1/3] avtomatski vnosi --> styling test --- admin/survey/SurveyAdminSettings.php | 6 ++++-- public/css/admin_new.css | 8 ++++++++ .../sass/admin_new/components/table/table.scss | 14 ++++++++++++-- 3 files changed, 24 insertions(+), 4 deletions(-) diff --git a/admin/survey/SurveyAdminSettings.php b/admin/survey/SurveyAdminSettings.php index 1840f3833..bb513912a 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 e4d943c55..e8f245ee6 100644 --- a/public/css/admin_new.css +++ b/public/css/admin_new.css @@ -10164,6 +10164,13 @@ div .table-horizontal-scroll-wrapper2 table { margin-bottom: 0; } +.dotted_line { + position: absolute; + bottom: -26px; + width: 928px; + border-top: dotted 1px red; +} + .page_num_fieldset { padding-top: 0px; padding-bottom: 0px; @@ -10173,6 +10180,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..e923679fa 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,15 @@ div { //testiranje --> avtomatski vnosi +.dotted_line{ + position: absolute; + bottom: -26px; + width: 928px; + + border-top: dotted 1px red; + // #E5E5E5 +} + .page_num_fieldset{ padding-top: 0px; padding-bottom: 0px; @@ -117,6 +126,7 @@ div { .page_num{ margin-left: 39%; color: #333333; + position: relative; } From 917df3d615c55df9fce68fb2071d57b536d13d4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nejc=20Kova=C4=8D?= Date: Mon, 22 Aug 2022 09:48:56 +0200 Subject: [PATCH 2/3] avtomatski vnosi --> tabela styling --- admin/survey/SurveyAdminSettings.php | 2 +- public/css/admin_new.css | 8 +++----- resources/sass/admin_new/components/table/table.scss | 10 +++------- 3 files changed, 7 insertions(+), 13 deletions(-) diff --git a/admin/survey/SurveyAdminSettings.php b/admin/survey/SurveyAdminSettings.php index bb513912a..16dca9bff 100644 --- a/admin/survey/SurveyAdminSettings.php +++ b/admin/survey/SurveyAdminSettings.php @@ -8851,7 +8851,7 @@ class SurveyAdminSettings { echo '
'; echo ''.$row['pagename'].''; - echo ' - '; + // echo ' - '; echo '
'; echo '
'; - echo '
'; + echo '
'; echo ' '.$p.'% ('.($total_rows-$rowc['count']).')'; echo '
'; echo '
'; $prevpage = $row['gru_id']; diff --git a/public/css/admin_new.css b/public/css/admin_new.css index e8f245ee6..b1ccc666e 100644 --- a/public/css/admin_new.css +++ b/public/css/admin_new.css @@ -10164,11 +10164,9 @@ div .table-horizontal-scroll-wrapper2 table { margin-bottom: 0; } -.dotted_line { - position: absolute; - bottom: -26px; - width: 928px; - border-top: dotted 1px red; +#anketa_edit .page_num_fieldset { + border: unset; + border-top: 1px dotted #E5E5E5; } .page_num_fieldset { diff --git a/resources/sass/admin_new/components/table/table.scss b/resources/sass/admin_new/components/table/table.scss index e923679fa..2e9282b9c 100644 --- a/resources/sass/admin_new/components/table/table.scss +++ b/resources/sass/admin_new/components/table/table.scss @@ -107,13 +107,9 @@ div { //testiranje --> avtomatski vnosi -.dotted_line{ - position: absolute; - bottom: -26px; - width: 928px; - - border-top: dotted 1px red; - // #E5E5E5 +#anketa_edit .page_num_fieldset{ + border: unset; + border-top: 1px dotted #E5E5E5; } .page_num_fieldset{ From 512fe35ac2bc2a664e19acee60e7425a855abaf6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nejc=20Kova=C4=8D?= Date: Mon, 22 Aug 2022 09:55:52 +0200 Subject: [PATCH 3/3] avtomatski vnosi: dashed border --- public/css/admin_new.css | 2 +- resources/sass/admin_new/components/table/table.scss | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/public/css/admin_new.css b/public/css/admin_new.css index b1ccc666e..52e5c690c 100644 --- a/public/css/admin_new.css +++ b/public/css/admin_new.css @@ -10166,7 +10166,7 @@ div .table-horizontal-scroll-wrapper2 table { #anketa_edit .page_num_fieldset { border: unset; - border-top: 1px dotted #E5E5E5; + border-top: 1px dashed #E5E5E5; } .page_num_fieldset { diff --git a/resources/sass/admin_new/components/table/table.scss b/resources/sass/admin_new/components/table/table.scss index 2e9282b9c..139a84854 100644 --- a/resources/sass/admin_new/components/table/table.scss +++ b/resources/sass/admin_new/components/table/table.scss @@ -109,7 +109,7 @@ div { #anketa_edit .page_num_fieldset{ border: unset; - border-top: 1px dotted #E5E5E5; + border-top: 1px dashed #E5E5E5; } .page_num_fieldset{