From d5d24d3337ff45febd9fcbede712c41f7901efc3 Mon Sep 17 00:00:00 2001 From: tejagerjovic Date: Fri, 9 Sep 2022 09:19:47 +0200 Subject: [PATCH] Redizajn - dodan breadcrumbs --- admin/survey/SurveyAdmin.php | 4 +- public/css/admin_new.css | 111 +++++++++++++++++- .../components/header/navigation.scss | 11 +- 3 files changed, 117 insertions(+), 9 deletions(-) diff --git a/admin/survey/SurveyAdmin.php b/admin/survey/SurveyAdmin.php index 9eeea2f70..67a217d87 100644 --- a/admin/survey/SurveyAdmin.php +++ b/admin/survey/SurveyAdmin.php @@ -332,13 +332,13 @@ class SurveyAdmin echo '
'; // breadcrumbs - echo '
'; //Začasno skriti breadcrumbs, dokler se ne uredi css @TGx + echo '
'; if ((isset($_GET['a']) && $this->first_action == 'NAVI_STATUS')? $breadcrumbs_a = '_' . $_GET['a'] : $breadcrumbs_a = ''); if ((isset($_GET['m']) && $this->first_action == 'NAVI_ANALYSIS' && $_GET['m'] == 'charts')? $breadcrumbs_m = '_' . $_GET['m'] : $breadcrumbs_m = ''); echo $lang['navigation_'.$this->first_action] . ' > ' . $lang['navigation_'.$this->second_action.$breadcrumbs_a.$breadcrumbs_m]; - if (isset($this->third_action)) { + if (isset($this->third_action) && $this->third_action != '') { echo ' > '.$lang['navigation_'.$this->third_action]; } //echo '
'.$this->first_action .' > '.$this->second_action. ' > '.$this->third_action; diff --git a/public/css/admin_new.css b/public/css/admin_new.css index bebb73d73..101c43489 100644 --- a/public/css/admin_new.css +++ b/public/css/admin_new.css @@ -9264,7 +9264,8 @@ header #topSettingsHolder .right_options_holder#analiza_right_options_holder #di header #topSettingsHolder .right_options_holder#analiza_right_options_holder #div_analiza_filtri_right2.analiza ul li.space { display: none; } -header div.breadcrumbs { + +div.breadcrumbs { display: none; } @@ -25787,6 +25788,114 @@ div.page_komentarji_anketa ul div.question_comment_holder div.question_comment . font-size: 16px !important; } +span#test_comments { + position: relative; +} +span#test_comments #comment_dropdown { + position: absolute; + background-color: #FFFFFF; + top: 35px; + right: 0; + width: 305px; + z-index: 9999; + box-shadow: 0px 0px 7px rgba(0, 0, 0, 0.12); + border-radius: 2px; + font-family: Source Sans Pro, sans-serif; + padding: 12px; + cursor: auto !important; +} +span#test_comments #comment_dropdown .title { + width: 100%; + margin-bottom: 16px; + padding-bottom: 12px; + font-weight: 600; + font-size: 16px; + text-transform: uppercase; + border-bottom: 1px #E5E5E5 solid; + font-size: 14px !important; + color: #333333; + display: flex; + flex-direction: row; + align-content: center; +} +span#test_comments #comment_dropdown .title span.faicon.comment_dropdown { + margin-right: 6px; + line-height: 17px !important; +} +span#test_comments #comment_dropdown .title span.faicon.comment_dropdown::before { + color: #1E88E5 !important; + font-weight: 400; + font-size: 14px !important; + content: "\f27a"; +} +span#test_comments #comment_dropdown .links { + margin-bottom: 16px; + color: #1E88E5; + font-weight: 400; + font-size: 14px !important; + display: flex; + flex-direction: row; + align-content: center; + cursor: pointer; + width: fit-content; +} +span#test_comments #comment_dropdown .links span.faicon { + margin-left: 8px; + line-height: 17px !important; +} +span#test_comments #comment_dropdown .links span.faicon::before { + color: #1E88E5 !important; + font-size: 14px !important; +} +span#test_comments #comment_dropdown #comment_field { + padding-top: 16px; + border-top: 1px solid #E5E5E5; + margin-bottom: 10px; +} +span#test_comments #comment_dropdown #comment_field textarea { + height: 130px; + width: 100%; + margin: 0; +} +span#test_comments #comment_dropdown .button_holder { + display: flex; + flex-direction: row; + justify-content: space-between; + padding-top: 8px; + border-top: 1px solid #E5E5E5; + margin-bottom: 0; +} +span#test_comments #comment_dropdown .button_holder button { + min-width: 128px; +} +span#test_comments #comment_dropdown .button_holder .options { + display: flex; + flex-direction: row; +} +span#test_comments #comment_dropdown .button_holder .options .square { + box-sizing: border-box; + border: 1px solid #1E88E5; + width: 28px; + height: 28px; + margin-left: 8px; + display: flex; + justify-content: center; + align-content: center; + color: #1E88E5; + font-size: 14px !important; + cursor: pointer; +} +span#test_comments #comment_dropdown .button_holder .options .square.blue { + background-color: #1E88E5; +} +span#test_comments #comment_dropdown .button_holder .options .square.blue span.faicon::before { + font-size: 14px !important; + color: #FFFFFF; +} +span#test_comments #comment_dropdown .button_holder .options .square span.faicon::before { + font-size: 16px !important; +} + #quick_comments_link.newCss { text-align: center; } diff --git a/resources/sass/admin_new/components/header/navigation.scss b/resources/sass/admin_new/components/header/navigation.scss index 0576efb83..868f79cce 100644 --- a/resources/sass/admin_new/components/header/navigation.scss +++ b/resources/sass/admin_new/components/header/navigation.scss @@ -549,11 +549,10 @@ header{ - } - - - // skrijemo breadcrumbs na desktopu - div.breadcrumbs { - display: none; } } + +// skrijemo breadcrumbs na desktopu +div.breadcrumbs { + display: none; +}