From cd70890f260a6d0bffc22f4a138d5e254d725a1d Mon Sep 17 00:00:00 2001 From: tejagerjovic Date: Tue, 7 Jun 2022 04:28:35 +0200 Subject: [PATCH] [Redizajn 1KA] Popupi: Analize > Multitabele - Edit - v2 --- .../class.SurveyMultiCrosstabs.php | 4 +- public/css/admin_new.css | 45 +++++++++++-------- .../sass/admin/analysis/multi_crosstabs.scss | 16 ++++--- .../components/popup/page_specific.scss | 5 +++ .../survey_analysis/popups/multicrosstab.scss | 17 ++++--- .../admin_new/pages/survey_data/no_data.scss | 4 -- 6 files changed, 53 insertions(+), 38 deletions(-) diff --git a/admin/survey/classes/surveyAnalysis/class.SurveyMultiCrosstabs.php b/admin/survey/classes/surveyAnalysis/class.SurveyMultiCrosstabs.php index 6e09e315d..9699372ab 100644 --- a/admin/survey/classes/surveyAnalysis/class.SurveyMultiCrosstabs.php +++ b/admin/survey/classes/surveyAnalysis/class.SurveyMultiCrosstabs.php @@ -2182,9 +2182,9 @@ class SurveyMultiCrosstabs { echo ''; // Cas kreiranja tabele - echo '
'; + echo '
'; $time_created = strtotime($current_table['time_created']); - echo $lang['srv_multicrosstabs_tables_time'].': '.date("d.m.Y H:i", $time_created).'
'; + echo $lang['srv_multicrosstabs_tables_time'].': '.date("d.m.Y H:i", $time_created).''; echo '
'; diff --git a/public/css/admin_new.css b/public/css/admin_new.css index 8be8938b4..a09b4bb89 100644 --- a/public/css/admin_new.css +++ b/public/css/admin_new.css @@ -8586,6 +8586,11 @@ div#mc_table_settings form { padding: 0; } +#table_create_time { + margin: 16px 0 32px 0; + text-align: right; +} + div#div_analiza_archive_name { width: 900px !important; } @@ -26849,10 +26854,6 @@ div.no_data_alert div#buttons button::first-letter { text-transform: uppercase; } -.printHide { - display: none !important; -} - #div_analiza_data:not(.anal_arch) .div_analiza_holder, #div_means_data .div_analiza_holder, #div_break_data .div_analiza_holder, @@ -30685,13 +30686,15 @@ input#endDate { line-height: 20px; background-color: white; display: none; - position: fixed; - left: calc(50% - 275px); - top: 40vh; + position: absolute; z-index: 999; - height: auto; - margin: 10px; + left: calc(50% - 300px); + top: 40%; + padding: 20px; width: 550px; + background-color: #FFFFFF; + border-left: 6px #1E88E5 solid !important; + box-shadow: 0 0 10px 0 rgba(0, 0, 0, 0.34); } #newMCTable .popup_close { position: absolute !important; @@ -30872,13 +30875,15 @@ input#endDate { line-height: 20px; background-color: white; display: none; - position: fixed; - left: calc(50% - 275px); - top: 40vh; + position: absolute; z-index: 999; - height: auto; - margin: 10px; + left: calc(50% - 300px); + top: 40%; + padding: 20px; width: 550px; + background-color: #FFFFFF; + border-left: 6px #1E88E5 solid !important; + box-shadow: 0 0 10px 0 rgba(0, 0, 0, 0.34); } #renameMCTable .popup_close { position: absolute !important; @@ -31059,13 +31064,15 @@ input#endDate { line-height: 20px; background-color: white; display: none; - position: fixed; - left: calc(50% - 275px); - top: 40vh; + position: absolute; z-index: 999; - height: auto; - margin: 10px; + left: calc(50% - 300px); + top: 40%; + padding: 20px; width: 550px; + background-color: #FFFFFF; + border-left: 6px #1E88E5 solid !important; + box-shadow: 0 0 10px 0 rgba(0, 0, 0, 0.34); } #deleteMCTable .popup_close { position: absolute !important; diff --git a/resources/sass/admin/analysis/multi_crosstabs.scss b/resources/sass/admin/analysis/multi_crosstabs.scss index 3e37e9d69..3ed188b5b 100644 --- a/resources/sass/admin/analysis/multi_crosstabs.scss +++ b/resources/sass/admin/analysis/multi_crosstabs.scss @@ -294,13 +294,17 @@ and open the template in the editor. @include popup_general(); display: none; - position: fixed; - left: calc(50% - 275px); - top: 40vh; - z-index: 999; + position: absolute; + z-index: 20; + + left: calc(50% - 300px); + top: 40%; + padding: 20px; + width: 550px; - margin: 10px; - width: 550px; + background-color: white; + border-left: 6px $blue solid !important; + box-shadow: 0 0 10px 0 rgba(0, 0, 0, 0.34); } /*new table popup*/ diff --git a/resources/sass/admin_new/components/popup/page_specific.scss b/resources/sass/admin_new/components/popup/page_specific.scss index 4bdefabce..cd2b28df2 100644 --- a/resources/sass/admin_new/components/popup/page_specific.scss +++ b/resources/sass/admin_new/components/popup/page_specific.scss @@ -583,6 +583,11 @@ div#mc_table_settings { } } +#table_create_time { + margin: 16px 0 32px 0; + text-align: right; +} + //PoĊĦilji arhiv div#div_analiza_archive_name { width: 900px !important; diff --git a/resources/sass/admin_new/pages/survey_analysis/popups/multicrosstab.scss b/resources/sass/admin_new/pages/survey_analysis/popups/multicrosstab.scss index e6b275428..7d9cedeb7 100644 --- a/resources/sass/admin_new/pages/survey_analysis/popups/multicrosstab.scss +++ b/resources/sass/admin_new/pages/survey_analysis/popups/multicrosstab.scss @@ -40,14 +40,17 @@ @include popup_general(); display: none; - position: fixed; - left: calc(50% - 275px); - top: 40vh; - z-index: 999; - height: auto; + position: absolute; + z-index: 999; + + left: calc(50% - 300px); + top: 40%; + padding: 20px; + width: 550px; - margin: 10px; - width: 550px; + background-color: $white; + border-left: 6px $blue solid !important; + box-shadow: 0 0 10px 0 rgba(0, 0, 0, 0.34); } diff --git a/resources/sass/admin_new/pages/survey_data/no_data.scss b/resources/sass/admin_new/pages/survey_data/no_data.scss index c38a9009a..7ce4b35fe 100644 --- a/resources/sass/admin_new/pages/survey_data/no_data.scss +++ b/resources/sass/admin_new/pages/survey_data/no_data.scss @@ -34,8 +34,4 @@ div.no_data_alert { text-transform: uppercase; } } -} - -.printHide{ - display: none !important; } \ No newline at end of file