diff --git a/admin/survey/SurveyAdminAjax.php b/admin/survey/SurveyAdminAjax.php
index 4b5f74ccc..608e2cb12 100644
--- a/admin/survey/SurveyAdminAjax.php
+++ b/admin/survey/SurveyAdminAjax.php
@@ -6808,6 +6808,7 @@ class SurveyAdminAjax {
break;
case 'settings': // še v delu
+ $d = new Dostop();
echo '
'.$lang['srv_publication_survey_settings'].' ';
@@ -7173,7 +7174,7 @@ class SurveyAdminAjax {
}
else {
echo ''.$lang['srv_zapri'].' ';
- echo ''.$lang['srv_diagnostika_testiranje_copy'].' ';
+ echo ''.$lang['srv_diagnostika_testiranje_copy'].' ';
}
echo '';
}
diff --git a/admin/survey/classes/class.SurveyAktivnost.php b/admin/survey/classes/class.SurveyAktivnost.php
index 483648ba9..209b35e3a 100644
--- a/admin/survey/classes/class.SurveyAktivnost.php
+++ b/admin/survey/classes/class.SurveyAktivnost.php
@@ -166,7 +166,6 @@ class SurveyAktivnost{
echo ' ';
echo ''; //div#dataSettingsCheckboxes
-
// Datum
echo '';
echo '
';
@@ -231,6 +230,21 @@ class SurveyAktivnost{
echo '
';
echo '
'; //div#dataSettingsCheckboxes_Date
+ // Klik izven razprith nastavitev - zapremo okno
+ echo '';
+
echo ''; // div.data_table_top_holder
diff --git a/resources/fonts/FontAwesome5/scss/solid.scss b/resources/fonts/FontAwesome5/scss/solid.scss
index 72b0755e9..02f2290c6 100644
--- a/resources/fonts/FontAwesome5/scss/solid.scss
+++ b/resources/fonts/FontAwesome5/scss/solid.scss
@@ -16,25 +16,8 @@
url('#{$fa-font-path}/fa-solid-900.svg#fontawesome') format('svg');
}
-@font-face {
- font-family: 'Font Awesome 5 Brands';
- font-style: normal;
- font-weight: 400;
- src: url('#{$fa-font-path}/fa-brands-400.eot');
- src: url('#{$fa-font-path}/fa-brands-400.eot?#iefix') format('embedded-opentype'),
- url('#{$fa-font-path}/fa-brands-400.woff2') format('woff2'),
- url('#{$fa-font-path}/fa-brands-400.woff') format('woff'),
- url('#{$fa-font-path}/fa-brands-400.ttf') format('truetype'),
- url('#{$fa-font-path}/fa-brands-400.svg#fontawesome') format('svg');
-}
-
.fa,
.fas {
font-family: 'Font Awesome 5 Free';
font-weight: 900;
-}
-
-.fa-brands {
- font-family: 'Font Awesome 5 Brands';
- font-weight: 400;
-}
+}
\ No newline at end of file
diff --git a/resources/sass/admin_new/basic/font.scss b/resources/sass/admin_new/basic/font.scss
index ec06bf94f..fa4e524fe 100644
--- a/resources/sass/admin_new/basic/font.scss
+++ b/resources/sass/admin_new/basic/font.scss
@@ -13,6 +13,11 @@ body {
font-family: $font_family;
}
+.fa-brands {
+ font-family: 'Font Awesome 5 Brands';
+ font-weight: 400;
+}
+
//font-weight
$light: 300;
$regular: 400;
diff --git a/resources/sass/admin_new/pages/aktivnost/weekyearmonth.scss b/resources/sass/admin_new/pages/aktivnost/weekyearmonth.scss
index 1618e70f7..87f50d70f 100644
--- a/resources/sass/admin_new/pages/aktivnost/weekyearmonth.scss
+++ b/resources/sass/admin_new/pages/aktivnost/weekyearmonth.scss
@@ -30,9 +30,13 @@ div.page_diagnostics {
$background_color_130: #8064a2;
$background_color_131: #4f81bd;
+ .time_span.year_2023 {
+ background-color: $background_color_127;
+ }
.time_span.year_2022 {
background-color: $background_color_128;
- }.time_span.year_2021 {
+ }
+ .time_span.year_2021 {
background-color: $background_color_129;
}
.time_span.year_2020 {