From 6bac98ed54535d58fc61de534fba5e48f560e7ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nejc=20Kova=C4=8D?= <nejc.kouko@gmail.com>
Date: Tue, 21 Jun 2022 08:58:43 +0200
Subject: [PATCH 001/110] Landing page --> landing page window  popravki

---
 frontend/simple/classes/DisplayController.php | 33 ++++++++----
 frontend/simple/css/style.css                 | 52 +++++++++++++++++++
 2 files changed, 74 insertions(+), 11 deletions(-)

diff --git a/frontend/simple/classes/DisplayController.php b/frontend/simple/classes/DisplayController.php
index 36aba06ce..3340a1585 100644
--- a/frontend/simple/classes/DisplayController.php
+++ b/frontend/simple/classes/DisplayController.php
@@ -391,11 +391,21 @@ class DisplayController{
 
 
         echo '<div class="app_title">'.AppSettings::getInstance()->getSetting('app_settings-app_name').'</div>';
-
-
+        echo '<div class="landing_page_content"> ';
+        echo '<div class="landing_page_title"> TEST 1KA </div>';    
+        
+        // APP SUBTITLE
+        echo '<div class="app_subtitle">';
+        if(isVirtual())
+            echo $lang['app_virtual_domain'];
+        else
+            echo $lang['app_installation'];
+        echo '</div>';   
         // WHITE BOX FOR LOGIN / REGISTRATION
-		echo '<div class="landing_page_window">';      
 
+
+		echo '<div class="landing_page_window">';
+        
         // Tabs - samo pri lastni instalaciji, pri virtualkah nimamo registracije
         if(isVirtual()){
             echo '	<div class="tabs">';
@@ -429,17 +439,18 @@ class DisplayController{
             $this->displayFrontPageRegistration();
             echo '  </div>';
         }
-	
+        
+        echo '</div>';
         echo '</div>';
         
 
-        // APP SUBTITLE
-        echo '<div class="app_subtitle">';
-        if(isVirtual())
-            echo $lang['app_virtual_domain'];
-        else
-            echo $lang['app_installation'];
-        echo '</div>';
+        // // APP SUBTITLE
+        // echo '<div class="app_subtitle">';
+        // if(isVirtual())
+        //     echo $lang['app_virtual_domain'];
+        // else
+        //     echo $lang['app_installation'];
+        // echo '</div>';
     }
 
     // Izris okna na prvi strani - AAI
diff --git a/frontend/simple/css/style.css b/frontend/simple/css/style.css
index 016600ca3..f5bda1d33 100644
--- a/frontend/simple/css/style.css
+++ b/frontend/simple/css/style.css
@@ -892,3 +892,55 @@ body.login_noEmail #content.aai #main .main_content .app_subtitle {
 }
 
 /*# sourceMappingURL=style.css.map */
+
+
+/* 
+    Author     : Nejc Kovač
+    Urejanje landing page
+*/
+
+@import url("https://fonts.googleapis.com/css2?family=Source+Sans+Pro:wght@300;400;600;700&display=swap");
+
+body.landing_page #main {
+  background-image: none;
+}
+
+.landing_page_content {
+  font-family: "Source Sans Pro", "sans-serif";
+  text-align: center;
+  color: #333333;
+  
+}
+
+.landing_page_content .landing_page_title {
+  font-weight: 300;
+  font-size: 50px;
+  line-height: 63px;
+}
+
+
+
+body.landing_page #main .app_subtitle {
+  text-shadow: unset;
+  color: #333333;
+}
+
+body.landing_page #main .landing_page_window {
+  border: 1px solid #C4C4C4;
+  max-width: 400px;
+  width: unset;
+  min-height: 327px;
+}
+
+body.landing_page #main .landing_page_window .tabs .tab {
+  font-size: 16px;
+  font-weight: 600;
+
+  background-color: unset;
+  color: #777777;
+}
+
+body.landing_page #main .landing_page_window .tabs .tab.active {
+  color: #1E88E5;
+}
+

From 92413516338d4d3b08ab94eb88ec355e7c0325a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nejc=20Kova=C4=8D?= <nejc.kouko@gmail.com>
Date: Tue, 21 Jun 2022 09:36:40 +0200
Subject: [PATCH 002/110] Landing page --> landing page window  popravki

---
 frontend/simple/classes/DisplayController.php | 11 ++--
 frontend/simple/css/style.css                 | 54 ++++++++++++++++++-
 2 files changed, 60 insertions(+), 5 deletions(-)

diff --git a/frontend/simple/classes/DisplayController.php b/frontend/simple/classes/DisplayController.php
index 3340a1585..02a4082d4 100644
--- a/frontend/simple/classes/DisplayController.php
+++ b/frontend/simple/classes/DisplayController.php
@@ -554,11 +554,11 @@ class DisplayController{
         
         // Email
         echo '  <label for="email" '.($error == 'email' ? 'class="red"': '').'>'.$lang['email'].'</label>';
-        echo '  <input id="em" '.($error == 'email' ? 'class="red"': '').' name="email" value="'.$email.'" size="30" placeholder="E-mail" onblur="CheckEmailFP();" type="text">';
+        echo '  <input id="em" '.($error == 'email' ? 'class="red"': '').' name="email" value="'.$email.'" size="30" placeholder="" onblur="CheckEmailFP();" type="text">';
 
         // Password
         echo '  <label for="pass" '.($error == 'password' ? 'class="red"': '').'>'.$lang['password'].'</label>';
-        echo '  <input '.($error == 'password' ? 'class="red"': '').' name="pass" placeholder="'.$lang['login_password'].'" type="password">';
+        echo '  <input '.($error == 'password' ? 'class="red"': '').' name="pass" placeholder="" type="password">';
 
         // Error text
         if($error != ''){
@@ -574,11 +574,14 @@ class DisplayController{
             echo '  </div>';
         }
 
+        // Submit
+		echo '  <input name="submit" title="'.$lang['login'].'" value="'.$lang['next1'].'" type="submit">';	
+
         // Lost pass
         echo '  <div class="lostpass"><a class="RegLastPage" href="#" onclick="LostPassword(\''.$lang['please_insert_email'].'\');">'.$lang['forgot_password'].'</a></div>';
         
-        // Submit
-		echo '  <input name="submit" title="'.$lang['login'].'" value="'.$lang['next1'].'" type="submit">';	
+        // // Submit
+		// echo '  <input name="submit" title="'.$lang['login'].'" value="'.$lang['next1'].'" type="submit">';	
         
         echo '</form>';	
     }
diff --git a/frontend/simple/css/style.css b/frontend/simple/css/style.css
index f5bda1d33..42f9ce3c5 100644
--- a/frontend/simple/css/style.css
+++ b/frontend/simple/css/style.css
@@ -906,7 +906,7 @@ body.landing_page #main {
 }
 
 .landing_page_content {
-  font-family: "Source Sans Pro", "sans-serif";
+  font-family: "Source Sans Pro";
   text-align: center;
   color: #333333;
   
@@ -923,6 +923,12 @@ body.landing_page #main {
 body.landing_page #main .app_subtitle {
   text-shadow: unset;
   color: #333333;
+
+  font-weight: 400px;
+  line-height: 26px;
+
+  margin-top: 25px;
+  margin-bottom: 24px;
 }
 
 body.landing_page #main .landing_page_window {
@@ -932,6 +938,10 @@ body.landing_page #main .landing_page_window {
   min-height: 327px;
 }
 
+body.landing_page #main .landing_page_window #login_holder .login_form {
+  padding: 25px 23px;
+}
+
 body.landing_page #main .landing_page_window .tabs .tab {
   font-size: 16px;
   font-weight: 600;
@@ -944,3 +954,45 @@ body.landing_page #main .landing_page_window .tabs .tab.active {
   color: #1E88E5;
 }
 
+body.landing_page #main .landing_page_window label {
+  text-align: left;
+
+  margin: 15px 0px 4px 0px;
+}
+
+.landing_page_window input[type="text"] {
+  padding: 0px;
+  height: 38px;
+  max-width: 354px;
+}
+.landing_page_window input[type="password"] {
+  padding: 0px;
+  height: 38px;
+  max-width: 354px;
+}
+
+
+body.landing_page #main .landing_page_window input[type="submit"] {
+  align-self: unset;
+  width: unset;
+  max-width: 354px;
+
+  margin: 16px 0px;
+
+  font-weight: 700;
+  padding: 12.5px 0px;
+  line-height: 20px;
+}
+
+
+
+body.landing_page #main .landing_page_window #login_holder .login_form .lostpass {
+  position: unset;
+  text-align: left;
+  text-decoration-line: underline;
+  text-decoration-color: #1e88e5;
+  font-weight: 400;
+  font-size: 16px;
+  line-height: 20px;
+  
+}
\ No newline at end of file

From 24b5e2410f97eb2698a74839fb28e63da255b275 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nejc=20Kova=C4=8D?= <nejc.kouko@gmail.com>
Date: Tue, 21 Jun 2022 09:40:26 +0200
Subject: [PATCH 003/110] Landing page window - spremenjen tekst gumba

---
 lang/1.php | 2 +-
 lang/2.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lang/1.php b/lang/1.php
index 267b29ad2..115721a89 100644
--- a/lang/1.php
+++ b/lang/1.php
@@ -557,7 +557,7 @@ $lang = array (
 	"base_displayinsert"		=>	"Vnos",
 	"base_displaylabel"		=>	"Pregled",
 	"base_alternative"		=>	"Alternativni napisi",
-	"next1"				=>	"Naprej",
+	"next1"				=>	"Prijava",
 	"vpisal"			=>	"Vpisal",
 	"spremenil"			=>	"Spremenil",
 	"show_menu"			=>	"Prika&#382;i menu",
diff --git a/lang/2.php b/lang/2.php
index 48bbc1188..53cc338fa 100644
--- a/lang/2.php
+++ b/lang/2.php
@@ -544,7 +544,7 @@ $lang = array (
 	"base_displayinsert"	=>	"Insert",
 	"base_displaylabel"	=>	"View",
 	"base_alternative"	=>	"Alternative labels",
-	"next1"			=>	"Next",
+	"next1"			=>	"Login",
 	"vpisal"		=>	"Posted by",
 	"spremenil"		=>	"Changed by",
 	"show_menu"		=>	"Show menu",

From a268fe710f06c0d9b1ff676642977c268b21f8e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nejc=20Kova=C4=8D?= <nejc.kouko@gmail.com>
Date: Tue, 21 Jun 2022 10:34:24 +0200
Subject: [PATCH 004/110] Register from - popravljena napaka pri E-mailu

---
 frontend/simple/classes/DisplayController.php |  8 ++++----
 frontend/simple/css/style.css                 | 20 +++++++++++++++++--
 2 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/frontend/simple/classes/DisplayController.php b/frontend/simple/classes/DisplayController.php
index 02a4082d4..d6a245c4c 100644
--- a/frontend/simple/classes/DisplayController.php
+++ b/frontend/simple/classes/DisplayController.php
@@ -621,17 +621,17 @@ class DisplayController{
         }
         
 
-        echo '<form name="register" id="register_form" class="register_form" action="'.$site_url.'frontend/api/api.php?action=register" method="post">';
+        echo '<form name="register" id="register_form" class="register_form register_window" action="'.$site_url.'frontend/api/api.php?action=register" method="post">';
         
-        echo '  <span class="subtitle">'.$lang['cms_register_user_text'].'</span>';
+        // echo '  <span class="subtitle">'.$lang['cms_register_user_text'].'</span>';
 
 		// Email
-		echo '  <label for="email" '.(isset($error['email']) ? 'class="red"' : '').''.$lang['email'].':</label>'; 
+		echo '  <label for="email" '.(isset($error['email']) ? 'class="red"' : '').'>'.$lang['email'].':</label>'; 
 		echo '  <input class="regfield '.(isset($error['email']) ? 'red' : '').'" id="email" name="email" value="'.$email.'" placeholder="'.$lang['email'].'" type="text">';
 		
 		// Ime
 		echo '  <label for="ime" '.(isset($error['ime']) ? 'class="red"' : '').'>'.$lang['cms_register_user_nickname'].':</label>';
-		echo '  <input class="regfield '.(isset($error['ime']) ? 'red' : '').'" id="ime" name="ime" value="'.$ime.'" placeholder="'.$lang['cms_register_user_nickname'].'" type="text">';
+        echo '  <input class="regfield '.(isset($error['ime']) ? 'red' : '').'" id="ime" name="ime" value="'.$ime.'" placeholder="'.$lang['cms_register_user_nickname'].'" type="text">';
 				
 		// RECAPTCHA
 		if(AppSettings::getInstance()->getSetting('google-secret_captcha') !== false && AppSettings::getInstance()->getSetting('google-recaptcha_sitekey') !== false)
diff --git a/frontend/simple/css/style.css b/frontend/simple/css/style.css
index 42f9ce3c5..389cdaeff 100644
--- a/frontend/simple/css/style.css
+++ b/frontend/simple/css/style.css
@@ -906,7 +906,7 @@ body.landing_page #main {
 }
 
 .landing_page_content {
-  font-family: "Source Sans Pro";
+  font-family: "Source Sans Pro", "sans-serif";
   text-align: center;
   color: #333333;
   
@@ -924,8 +924,9 @@ body.landing_page #main .app_subtitle {
   text-shadow: unset;
   color: #333333;
 
-  font-weight: 400px;
+  font-weight: 400;
   line-height: 26px;
+  font-size: 18px;
 
   margin-top: 25px;
   margin-bottom: 24px;
@@ -948,6 +949,12 @@ body.landing_page #main .landing_page_window .tabs .tab {
 
   background-color: unset;
   color: #777777;
+
+  height: 39px;
+  
+  display: flex;
+  justify-content: center;
+  align-items: center;
 }
 
 body.landing_page #main .landing_page_window .tabs .tab.active {
@@ -956,10 +963,12 @@ body.landing_page #main .landing_page_window .tabs .tab.active {
 
 body.landing_page #main .landing_page_window label {
   text-align: left;
+  font-size: 16px;
 
   margin: 15px 0px 4px 0px;
 }
 
+
 .landing_page_window input[type="text"] {
   padding: 0px;
   height: 38px;
@@ -995,4 +1004,11 @@ body.landing_page #main .landing_page_window #login_holder .login_form .lostpass
   font-size: 16px;
   line-height: 20px;
   
+}
+
+
+/* REGISTRACIJA */
+
+body.landing_page #main .landing_page_window .register_window label{
+
 }
\ No newline at end of file

From 8b75c96f894b31b8bcab57905ea754eb0b387650 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nejc=20Kova=C4=8D?= <nejc.kouko@gmail.com>
Date: Tue, 21 Jun 2022 10:59:34 +0200
Subject: [PATCH 005/110] Registration - strinjam se s pogoji uporabe

---
 frontend/simple/classes/DisplayController.php | 5 +++--
 lang/1.php                                    | 2 +-
 lang/2.php                                    | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/frontend/simple/classes/DisplayController.php b/frontend/simple/classes/DisplayController.php
index d6a245c4c..77ee7c883 100644
--- a/frontend/simple/classes/DisplayController.php
+++ b/frontend/simple/classes/DisplayController.php
@@ -651,7 +651,8 @@ class DisplayController{
 		echo '  <div class="form_row agreement '.(isset($_GET['missing_agree']) ? ' red' : '').'">';
 		echo '      <input id="IAgree" type="checkbox" name="agree" value="1"><label for="IAgree">';
 		echo        '<div class="checkbox_text_holder"> '.str_replace('TERMS_URL', $terms_url, $lang['cms_register_user_terms_of_use']).'</label>';
-		echo '      <br /><span class="red italic">*'.$lang['cms_register_mandatory_field'].'</span></div>';
+		// echo '      <br /><span class="red italic">*'.$lang['cms_register_mandatory_field'].'</span>';
+        echo '</div>';
         echo '  </div>';
         
         // Error text
@@ -854,7 +855,7 @@ class DisplayController{
 		echo '			<div class="form_row agreement '.(isset($_GET['missing_agree']) ? ' red' : '').'">';
 		echo '				<input id="IAgree" type="checkbox" name="agree" value="1"><label for="IAgree">';
 		echo 				'<div class="checkbox_text_holder"> '.str_replace('TERMS_URL', $terms_url, $lang['cms_register_user_terms_of_use']).'</label>';
-		echo '				<br /><span class="red italic">*'.$lang['cms_register_mandatory_field'].'</span></div>';
+
 		echo '			</div>';
 		
 		// Strinjam se s posiljanjem mailov (gdpr)
diff --git a/lang/1.php b/lang/1.php
index 115721a89..9ef10e169 100644
--- a/lang/1.php
+++ b/lang/1.php
@@ -1640,7 +1640,7 @@ $lang = array (
   "cms_login_registration_link" => "Še nimate računa na 1KA? <a href='#URL#' id=\"odpri-registracijo\">Registrirajte se</a>",
 	"cms_register_mandatory_field" => "Odgovor je obvezen",
 	"cms_search" => "Iskanje",
-	"cms_register_user_terms_of_use" => "Strinjam se s pogoji uporabe! <strong><a href='https://www.1ka.si/d/sl/o-1ka/pogoji-uporabe-storitve-1ka' target='_blank'>Splošni pogoji uporabe.</a></strong>",
+	"cms_register_user_terms_of_use" => "Strinjam se s <a href='#'>pogoji uporabe! </a> ",
 	"cms_register_gdpr_agree" => "Strinjam se, da mi na zgoraj navedeni elektronski naslov enkrat letno pošljete pomembna obvestila (pomembne informacije o novostih 1KA, vabilo na dogodek).",
   "cms_register_gdpr_agree_explain" => "Vaš email bomo uporabljali in hranili zgolj za potrebe uporabe uporabniškega imena v orodju 1KA in ga bom skrbno varovali v skladu s predpisi. 
 																				Vašega emaila ne bomo pod nobenimi pogoji posredovali tretjim osebam ali ga uporabljali v druge namene. 
diff --git a/lang/2.php b/lang/2.php
index 53cc338fa..bdaf60a74 100644
--- a/lang/2.php
+++ b/lang/2.php
@@ -1626,7 +1626,7 @@ $lang = array (
   "cms_login_registration_link" => "Do not have an account at 1KA? <a href='#URL#' id=\"odpri-registracijo\">Register</a>",
   "cms_register_mandatory_field" => "Mandatory field",
 	"cms_search" => "Search",
-	"cms_register_user_terms_of_use" => "I agree to user agreement! <strong><a href='https://www.1ka.si/d/en/about/terms-of-use' target='_blank'>General terms of use.</a></strong>",
+	"cms_register_user_terms_of_use" => "I agree to <a href='#'>user agreement! </a> ",
   "cms_register_gdpr_agree" => "I agree that you send me notifications to the above-mentioned email address (important information about 1KA, 1KA evaluation, event invitation - once a year).",
   "cms_register_gdpr_agree_explain" => "We will use and store your email only for the purposes of using the 1KA username and will carefully protect it in accordance with the regulations. 
                                         We will not pass on your email to third parties under any circumstances or use it for other purposes. We will keep your email as long as your account on 1KA is active. 

From 9a7f763eedcc0843dd833f82ac3b159eec7bd02c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nejc=20Kova=C4=8D?= <nejc.kouko@gmail.com>
Date: Tue, 21 Jun 2022 11:20:18 +0200
Subject: [PATCH 006/110] Registracija - odstranjeni placeholderji , dodan
 LostPass

---
 frontend/simple/classes/DisplayController.php | 14 ++++++++---
 frontend/simple/css/style.css                 | 25 ++++++++++++++++++-
 2 files changed, 34 insertions(+), 5 deletions(-)

diff --git a/frontend/simple/classes/DisplayController.php b/frontend/simple/classes/DisplayController.php
index 77ee7c883..4ab8b3bc9 100644
--- a/frontend/simple/classes/DisplayController.php
+++ b/frontend/simple/classes/DisplayController.php
@@ -627,11 +627,11 @@ class DisplayController{
 
 		// Email
 		echo '  <label for="email" '.(isset($error['email']) ? 'class="red"' : '').'>'.$lang['email'].':</label>'; 
-		echo '  <input class="regfield '.(isset($error['email']) ? 'red' : '').'" id="email" name="email" value="'.$email.'" placeholder="'.$lang['email'].'" type="text">';
+		echo '  <input class="regfield '.(isset($error['email']) ? 'red' : '').'" id="email" name="email" value="'.$email.'" placeholder="" type="text">';
 		
 		// Ime
 		echo '  <label for="ime" '.(isset($error['ime']) ? 'class="red"' : '').'>'.$lang['cms_register_user_nickname'].':</label>';
-        echo '  <input class="regfield '.(isset($error['ime']) ? 'red' : '').'" id="ime" name="ime" value="'.$ime.'" placeholder="'.$lang['cms_register_user_nickname'].'" type="text">';
+        echo '  <input class="regfield '.(isset($error['ime']) ? 'red' : '').'" id="ime" name="ime" value="'.$ime.'" placeholder="" type="text">';
 				
 		// RECAPTCHA
 		if(AppSettings::getInstance()->getSetting('google-secret_captcha') !== false && AppSettings::getInstance()->getSetting('google-recaptcha_sitekey') !== false)
@@ -639,11 +639,11 @@ class DisplayController{
 		
 		// Geslo
         echo '  <label for="p1" '.(isset($error['password']) ? 'class="red"' : '').'>'.$lang['login_password'].':</label>';
-        echo '  <input id="p1" class="text '.(isset($error['password']) ? 'red' : '').'" value="" name="geslo" placeholder="'.$lang['password'].'" type="password">';
+        echo '  <input id="p1" class="text '.(isset($error['password']) ? 'red' : '').'" value="" name="geslo" placeholder="" type="password">';
         
         // Geslo2
         echo '  <label for="p2" '.(isset($error['password']) ? 'class="red"' : '').'>'.$lang['cms_register_user_repeat_password'].':</label>';
-        echo '  <input id="p2" class="text '.(isset($error['password']) ? 'red' : '').'" value="" name="geslo2" placeholder="'.$lang['cms_register_user_repeat_password'].'" type="password">';
+        echo '  <input id="p2" class="text '.(isset($error['password']) ? 'red' : '').'" value="" name="geslo2" placeholder="" type="password">';
 
 		// Strinjam se s pogoji
         //echo '				<input id="IAgree" type="hidden" name="agree" value="1">';
@@ -687,6 +687,10 @@ class DisplayController{
         // Submit
 		echo '  <input name="submit" value="'.$lang['next1'].'" class="regfield" type="submit">';
 		
+        // Lost pass
+        echo '  <div class="lostpass"><a class="RegLastPage" href="#" onclick="LostPassword(\''.$lang['please_insert_email'].'\');">'.$lang['forgot_password'].'</a></div>';
+
+
 		echo '</form>';
     }
 	
@@ -736,6 +740,8 @@ class DisplayController{
 
         echo '			<input name="submit" value="'.$lang['login'].'" class="regfield" type="submit">';
         echo '			<span class="spaceLeft">'.str_replace('#URL#', $site_url.$this->root.'index.php?a=register', $lang['cms_login_registration_link']).'</span>';
+
+
         
 		echo '		</form>';
 		
diff --git a/frontend/simple/css/style.css b/frontend/simple/css/style.css
index 389cdaeff..a954af9c4 100644
--- a/frontend/simple/css/style.css
+++ b/frontend/simple/css/style.css
@@ -1005,10 +1005,33 @@ body.landing_page #main .landing_page_window #login_holder .login_form .lostpass
   line-height: 20px;
   
 }
+body.landing_page #main .landing_page_window #login_holder .login_form .lostpass a {
+  font-weight: 400;
+}
 
 
 /* REGISTRACIJA */
 
-body.landing_page #main .landing_page_window .register_window label{
+body.landing_page #main .landing_page_window .register_window {
+  padding: 24px 23px 25px 23px;
+}
 
+body.landing_page #main .landing_page_window .register_window a {
+  position: unset;
+  text-align: left;
+  text-decoration-line: underline;
+  text-decoration-color: #1e88e5;
+  font-weight: 400;
+  font-size: 16px;
+  line-height: 20px;
+}
+
+body.landing_page #main .landing_page_window .register_window .lostpass {
+  position: unset;
+  text-align: left;
+  text-decoration-line: underline;
+  text-decoration-color: #1e88e5;
+  font-weight: 400;
+  font-size: 16px;
+  line-height: 20px;
 }
\ No newline at end of file

From 55224149ad527077ce65efacaba62997bd75dade Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nejc=20Kova=C4=8D?= <nejc.kouko@gmail.com>
Date: Tue, 21 Jun 2022 11:29:08 +0200
Subject: [PATCH 007/110] Registracija -  RECAPTCHA prestavljen spodaj

---
 frontend/simple/classes/DisplayController.php | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/frontend/simple/classes/DisplayController.php b/frontend/simple/classes/DisplayController.php
index 4ab8b3bc9..6233deb37 100644
--- a/frontend/simple/classes/DisplayController.php
+++ b/frontend/simple/classes/DisplayController.php
@@ -633,9 +633,9 @@ class DisplayController{
 		echo '  <label for="ime" '.(isset($error['ime']) ? 'class="red"' : '').'>'.$lang['cms_register_user_nickname'].':</label>';
         echo '  <input class="regfield '.(isset($error['ime']) ? 'red' : '').'" id="ime" name="ime" value="'.$ime.'" placeholder="" type="text">';
 				
-		// RECAPTCHA
-		if(AppSettings::getInstance()->getSetting('google-secret_captcha') !== false && AppSettings::getInstance()->getSetting('google-recaptcha_sitekey') !== false)
-			echo '  <div class="g-recaptcha" data-sitekey="'.AppSettings::getInstance()->getSetting('google-recaptcha_sitekey').'" '.(isset($_GET['invalid_recaptcha']) ? ' style="border:1px red solid"' : '').'></div>';	
+		// // RECAPTCHA
+		// if(AppSettings::getInstance()->getSetting('google-secret_captcha') !== false && AppSettings::getInstance()->getSetting('google-recaptcha_sitekey') !== false)
+		// 	echo '  <div class="g-recaptcha" data-sitekey="'.AppSettings::getInstance()->getSetting('google-recaptcha_sitekey').'" '.(isset($_GET['invalid_recaptcha']) ? ' style="border:1px red solid"' : '').'></div>';	
 		
 		// Geslo
         echo '  <label for="p1" '.(isset($error['password']) ? 'class="red"' : '').'>'.$lang['login_password'].':</label>';
@@ -653,6 +653,12 @@ class DisplayController{
 		echo        '<div class="checkbox_text_holder"> '.str_replace('TERMS_URL', $terms_url, $lang['cms_register_user_terms_of_use']).'</label>';
 		// echo '      <br /><span class="red italic">*'.$lang['cms_register_mandatory_field'].'</span>';
         echo '</div>';
+
+        // RECAPTCHA
+		if(AppSettings::getInstance()->getSetting('google-secret_captcha') !== false && AppSettings::getInstance()->getSetting('google-recaptcha_sitekey') !== false)
+        echo '  <div class="g-recaptcha" data-sitekey="'.AppSettings::getInstance()->getSetting('google-recaptcha_sitekey').'" '.(isset($_GET['invalid_recaptcha']) ? ' style="border:1px red solid"' : '').'></div>';	
+
+
         echo '  </div>';
         
         // Error text

From 1adcbc9eb6696f3a07e464c8890d34e4e5c923d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nejc=20Kova=C4=8D?= <nejc.kouko@gmail.com>
Date: Tue, 21 Jun 2022 13:39:04 +0200
Subject: [PATCH 008/110] =?UTF-8?q?Register=20form=20-=20odpravljena=20te?=
 =?UTF-8?q?=C5=BEava=20z=20uvo=C5=BEenim=20fontom,=20footer=20col1=20flex-?=
 =?UTF-8?q?column?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/simple/css/style.css | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/frontend/simple/css/style.css b/frontend/simple/css/style.css
index a954af9c4..37a6ecdd0 100644
--- a/frontend/simple/css/style.css
+++ b/frontend/simple/css/style.css
@@ -4,6 +4,7 @@
 */
 /* BARVE */
 /* FONTI */
+@import url("https://fonts.googleapis.com/css2?family=Source+Sans+Pro:wght@300;400;600;700&display=swap");
 @import url("https://fonts.googleapis.com/css?family=Montserrat:300,400,400i,600,700&amp;subset=latin-ext");
 .thin {
   font-weight: 300;
@@ -893,13 +894,14 @@ body.login_noEmail #content.aai #main .main_content .app_subtitle {
 
 /*# sourceMappingURL=style.css.map */
 
+/* -------------------------------------------------------------------------------------- */
 
 /* 
     Author     : Nejc Kovač
     Urejanje landing page
 */
 
-@import url("https://fonts.googleapis.com/css2?family=Source+Sans+Pro:wght@300;400;600;700&display=swap");
+/* @import url("https://fonts.googleapis.com/css2?family=Source+Sans+Pro:wght@300;400;600;700&display=swap"); */
 
 body.landing_page #main {
   background-image: none;
@@ -1034,4 +1036,10 @@ body.landing_page #main .landing_page_window .register_window .lostpass {
   font-weight: 400;
   font-size: 16px;
   line-height: 20px;
-}
\ No newline at end of file
+}
+
+footer .footer_content .col1-flex{
+  display: flex;
+  flex-direction: column;
+}
+

From 23aebe3ae894eed13c21282d2ddd5366c1ab91ea Mon Sep 17 00:00:00 2001
From: pero1203 <peter.hrvatin@gmail.com>
Date: Wed, 22 Jun 2022 09:16:54 +0200
Subject: [PATCH 009/110] Redesign - zamenjan gumb za aktivacijo/deaktivacijo
 ankete (svg)

---
 admin/survey/SurveyAdmin.php                  |  11 +-
 admin/survey/SurveyAdminSettings.php          |  11 +-
 admin/survey/classes/class.SurveyList.php     |   4 +-
 .../mobile/class.MobileSurveyAdmin.php        |   4 +-
 public/css/admin_new.css                      | 172 ++----------------
 public/img/icons/toggle_active.svg            |   5 +
 public/img/icons/toggle_inactive.svg          |   5 +
 .../admin_new/components/header/top_line.scss |  65 +------
 .../pages/my_surveys/top_filters.scss         |  66 +------
 .../pages/survey_objava/pregled.scss          |  68 -------
 10 files changed, 56 insertions(+), 355 deletions(-)
 create mode 100644 public/img/icons/toggle_active.svg
 create mode 100644 public/img/icons/toggle_inactive.svg

diff --git a/admin/survey/SurveyAdmin.php b/admin/survey/SurveyAdmin.php
index 0d2658644..ca5b5ce43 100644
--- a/admin/survey/SurveyAdmin.php
+++ b/admin/survey/SurveyAdmin.php
@@ -5956,7 +5956,7 @@ class SurveyAdmin
                     echo '<a href="#" class="srv_ico" onclick="anketa_active(\'' . $this->anketa . '\',\'' . $row['active'] . '\'); return false;">';
                 }
 
-                echo '<div id="srv_active" class="switch_anketa anketa_on"><span class="switch_anketa_content">ON</span></div>';
+                echo '<div id="srv_active" class="switch_anketa anketa_on"></div>';
                 
                 echo '</a>';
             } 
@@ -5975,14 +5975,7 @@ class SurveyAdmin
                     echo '<a href="#" class="srv_ico" onclick="' . $anketa_active . ' return false;">';
                 }
 
-                if ((int)$_last_active > 0) {
-                    # anketa je zaključena
-					echo '<div id="srv_inactive" class="switch_anketa anketa_off"><span class="switch_anketa_content">OFF</span></div>';
-                } 
-                else {
-                    # anketa je neaktivna
-					echo '<div id="srv_inactive" class="switch_anketa anketa_off"><span class="switch_anketa_content">OFF</span></div>';
-                }
+				echo '<div id="srv_inactive" class="switch_anketa anketa_off"></div>';
 
                 echo '</a>';
             }
diff --git a/admin/survey/SurveyAdminSettings.php b/admin/survey/SurveyAdminSettings.php
index 02f72386b..ff93c4b11 100644
--- a/admin/survey/SurveyAdminSettings.php
+++ b/admin/survey/SurveyAdminSettings.php
@@ -2673,7 +2673,7 @@ class SurveyAdminSettings {
                     echo '<a href="#" class="srv_ico" onclick="anketa_active(\'' . $this->anketa . '\',\'' . $row['active'] . '\'); return false;" title="' . $lang['srv_anketa_active'] . '">';
                 }
 
-                echo '<div id="srv_active" class="switch_anketa anketa_on"><span class="switch_anketa_content">ON</span></div>';
+                echo '<div id="srv_active" class="switch_anketa anketa_on"></div>';
                 
                 echo '</a>';
             } 
@@ -2692,14 +2692,7 @@ class SurveyAdminSettings {
                     echo '<a href="#" class="srv_ico" onclick="' . $anketa_active . ' return false;" title="' . $lang['srv_anketa_noactive'] . '">';
                 }
 
-                if ((int)$_last_active > 0) {
-                    # anketa je zaključena
-					echo '<div id="srv_inactive" class="switch_anketa anketa_off"><span class="switch_anketa_content">OFF</span></div>';
-                } 
-                else {
-                    # anketa je neaktivna
-					echo '<div id="srv_inactive" class="switch_anketa anketa_off"><span class="switch_anketa_content">OFF</span></div>';
-                }
+				echo '<div id="srv_inactive" class="switch_anketa anketa_off"></div>';
 
                 echo '</a>';
             }
diff --git a/admin/survey/classes/class.SurveyList.php b/admin/survey/classes/class.SurveyList.php
index df0584851..0c33bdb59 100644
--- a/admin/survey/classes/class.SurveyList.php
+++ b/admin/survey/classes/class.SurveyList.php
@@ -1557,9 +1557,9 @@ class SurveyList {
 
             // Stikalo za folderje
             if($this->show_folders == 1)
-                echo '  <div class="switch_folders on"><span class="switch_folders_content">ON</span></div>';
+                echo '  <div class="switch_folders on"></div>';
             else
-                echo '  <div class="switch_folders off"><span class="switch_folders_content">OFF</span></div>';
+                echo '  <div class="switch_folders off"></div>';
 
 		    echo '</div>';
         }	
diff --git a/admin/survey/classes/mobile/class.MobileSurveyAdmin.php b/admin/survey/classes/mobile/class.MobileSurveyAdmin.php
index 706dfe138..b1655d3fb 100644
--- a/admin/survey/classes/mobile/class.MobileSurveyAdmin.php
+++ b/admin/survey/classes/mobile/class.MobileSurveyAdmin.php
@@ -166,7 +166,7 @@ class MobileSurveyAdmin{
                     echo '<a href="#" class="srv_ico" onclick="anketa_active(\'' . $this->surveyAdminClass->anketa . '\',\'' . $row['active'] . '\'); return false;" title="' . $lang['srv_anketa_active'] . '">';
                 }
 
-                echo '  <div class="setting_icon"><div id="srv_active" class="switch_anketa anketa_on"><span class="switch_anketa_content">ON</span></div></div>';
+                echo '  <div class="setting_icon"><div id="srv_active" class="switch_anketa anketa_on"></div></div>';
                 echo '  <div class="setting_text">'.$lang['srv_anketa_active'].'</div>';
                 
                 echo '</a>';
@@ -187,7 +187,7 @@ class MobileSurveyAdmin{
                     echo '<a href="#" class="srv_ico" onclick="' . $anketa_active . ' return false;" title="' . $lang['srv_anketa_noactive'] . '">';
                 }
  
-                echo '  <div class="setting_icon"><div id="srv_inactive" class="switch_anketa anketa_off"><span class="switch_anketa_content">OFF</span></div></div>';
+                echo '  <div class="setting_icon"><div id="srv_inactive" class="switch_anketa anketa_off"></div></div>';
                 echo '  <div class="setting_text">'.$lang['srv_anketa_noactive'].'</div>';
 
                 echo '</a>';
diff --git a/public/css/admin_new.css b/public/css/admin_new.css
index 63f6649eb..a93f3a36d 100644
--- a/public/css/admin_new.css
+++ b/public/css/admin_new.css
@@ -8883,51 +8883,15 @@ header #top_line #xtradiv #xtradivSettings a .faicon:before {
   width: 46px;
   height: 16px;
 }
-.switch_anketa .switch_anketa_content {
-  position: absolute;
-  cursor: pointer;
-  top: 0;
-  left: 0;
-  right: 0;
-  bottom: 0;
-  padding-top: 1px;
-  color: white;
-  font-size: 12px;
-  font-weight: 400;
-  line-height: 12px;
-  background-color: #1E88E5;
-  border-radius: 16px;
+.switch_anketa.anketa_on {
+  background-image: url("../../public/img/icons/toggle_active.svg");
+  background-size: 100% 100%;
+  background-repeat: no-repeat;
 }
-.switch_anketa .switch_anketa_content:before {
-  position: absolute;
-  content: "";
-  height: 14px;
-  width: 14px;
-  bottom: 1px;
-  background-color: white;
-  border-radius: 50%;
-}
-
-.switch_anketa.anketa_on .switch_anketa_content {
-  padding-left: 20px;
-  background-color: #1E88E5;
-}
-.switch_anketa.anketa_on .switch_anketa_content:before {
-  left: 1px;
-}
-.switch_anketa.anketa_on:hover .switch_anketa_content {
-  background-color: #0059ab;
-}
-
-.switch_anketa.anketa_off .switch_anketa_content {
-  padding-left: 6px;
-  background-color: #C4C4C4;
-}
-.switch_anketa.anketa_off .switch_anketa_content:before {
-  right: 1px;
-}
-.switch_anketa.anketa_off:hover .switch_anketa_content {
-  background-color: #b7b7b7;
+.switch_anketa.anketa_off {
+  background-image: url("../../public/img/icons/toggle_inactive.svg");
+  background-size: 100% 100%;
+  background-repeat: no-repeat;
 }
 
 header #surveyNavigation {
@@ -10639,65 +10603,19 @@ header #top_line #enka_nav .anketa_header_upgrade_package button {
   width: 41px;
   height: 16px;
 }
-#survey_list .second_line .filters #filterButton#folderSwitch .switch_folders .switch_folders_content,
-#survey_list .second_line .filters #sortButton#folderSwitch .switch_folders .switch_folders_content,
-#survey_list .second_line .filters #folderSwitch#folderSwitch .switch_folders .switch_folders_content {
-  position: absolute;
-  cursor: pointer;
-  top: 0;
-  left: 0;
-  right: 0;
-  bottom: 0;
-  padding-top: 1px;
-  color: white;
-  font-size: 10px;
-  font-weight: 400;
-  line-height: 13px;
-  background-color: #1E88E5;
-  border-radius: 16px;
+#survey_list .second_line .filters #filterButton#folderSwitch .switch_folders.on,
+#survey_list .second_line .filters #sortButton#folderSwitch .switch_folders.on,
+#survey_list .second_line .filters #folderSwitch#folderSwitch .switch_folders.on {
+  background-image: url("../../public/img/icons/toggle_active.svg");
+  background-size: 100% 100%;
+  background-repeat: no-repeat;
 }
-#survey_list .second_line .filters #filterButton#folderSwitch .switch_folders .switch_folders_content:before,
-#survey_list .second_line .filters #sortButton#folderSwitch .switch_folders .switch_folders_content:before,
-#survey_list .second_line .filters #folderSwitch#folderSwitch .switch_folders .switch_folders_content:before {
-  position: absolute;
-  content: "";
-  height: 14px;
-  width: 14px;
-  bottom: 1px;
-  background-color: white;
-  border-radius: 50%;
-}
-#survey_list .second_line .filters #filterButton#folderSwitch .switch_folders.on .switch_folders_content,
-#survey_list .second_line .filters #sortButton#folderSwitch .switch_folders.on .switch_folders_content,
-#survey_list .second_line .filters #folderSwitch#folderSwitch .switch_folders.on .switch_folders_content {
-  padding-left: 20px;
-  background-color: #1E88E5;
-}
-#survey_list .second_line .filters #filterButton#folderSwitch .switch_folders.on .switch_folders_content:before,
-#survey_list .second_line .filters #sortButton#folderSwitch .switch_folders.on .switch_folders_content:before,
-#survey_list .second_line .filters #folderSwitch#folderSwitch .switch_folders.on .switch_folders_content:before {
-  left: 1px;
-}
-#survey_list .second_line .filters #filterButton#folderSwitch .switch_folders.on:hover .switch_folders_content,
-#survey_list .second_line .filters #sortButton#folderSwitch .switch_folders.on:hover .switch_folders_content,
-#survey_list .second_line .filters #folderSwitch#folderSwitch .switch_folders.on:hover .switch_folders_content {
-  background-color: #0059ab;
-}
-#survey_list .second_line .filters #filterButton#folderSwitch .switch_folders.off .switch_folders_content,
-#survey_list .second_line .filters #sortButton#folderSwitch .switch_folders.off .switch_folders_content,
-#survey_list .second_line .filters #folderSwitch#folderSwitch .switch_folders.off .switch_folders_content {
-  padding-left: 6px;
-  background-color: #808080;
-}
-#survey_list .second_line .filters #filterButton#folderSwitch .switch_folders.off .switch_folders_content:before,
-#survey_list .second_line .filters #sortButton#folderSwitch .switch_folders.off .switch_folders_content:before,
-#survey_list .second_line .filters #folderSwitch#folderSwitch .switch_folders.off .switch_folders_content:before {
-  right: 1px;
-}
-#survey_list .second_line .filters #filterButton#folderSwitch .switch_folders.off:hover .switch_folders_content,
-#survey_list .second_line .filters #sortButton#folderSwitch .switch_folders.off:hover .switch_folders_content,
-#survey_list .second_line .filters #folderSwitch#folderSwitch .switch_folders.off:hover .switch_folders_content {
-  background-color: #777777;
+#survey_list .second_line .filters #filterButton#folderSwitch .switch_folders.off,
+#survey_list .second_line .filters #sortButton#folderSwitch .switch_folders.off,
+#survey_list .second_line .filters #folderSwitch#folderSwitch .switch_folders.off {
+  background-image: url("../../public/img/icons/toggle_inactive.svg");
+  background-size: 100% 100%;
+  background-repeat: no-repeat;
 }
 #survey_list .second_line .filters #filterButton#filterButton:after, #survey_list .second_line .filters #filterButton#sortButton:after,
 #survey_list .second_line .filters #sortButton#filterButton:after,
@@ -24395,56 +24313,6 @@ div#vabila div.top_note div.top_note_activate {
 div#vabila div.top_note div.top_note_activate p {
   margin-right: 12px;
 }
-div#vabila div.top_note div.top_note_activate .switch_anketa {
-  position: relative;
-  display: block;
-  width: 46px;
-  height: 16px;
-}
-div#vabila div.top_note div.top_note_activate .switch_anketa .switch_anketa_content {
-  position: absolute;
-  cursor: pointer;
-  top: 0;
-  left: 0;
-  right: 0;
-  bottom: 0;
-  padding-top: 1px;
-  color: white;
-  font-size: 12px;
-  font-weight: 400;
-  line-height: 12px;
-  background-color: #1E88E5;
-  border-radius: 16px;
-}
-div#vabila div.top_note div.top_note_activate .switch_anketa .switch_anketa_content:before {
-  position: absolute;
-  content: "";
-  height: 14px;
-  width: 14px;
-  bottom: 1px;
-  background-color: white;
-  border-radius: 50%;
-}
-div#vabila div.top_note div.top_note_activate .switch_anketa.anketa_on .switch_anketa_content {
-  padding-left: 20px;
-  background-color: #1E88E5;
-}
-div#vabila div.top_note div.top_note_activate .switch_anketa.anketa_on .switch_anketa_content:before {
-  left: 1px;
-}
-div#vabila div.top_note div.top_note_activate .switch_anketa.anketa_on:hover .switch_anketa_content {
-  background-color: #0059ab;
-}
-div#vabila div.top_note div.top_note_activate .switch_anketa.anketa_off .switch_anketa_content {
-  padding-left: 6px;
-  background-color: #808080;
-}
-div#vabila div.top_note div.top_note_activate .switch_anketa.anketa_off .switch_anketa_content:before {
-  right: 1px;
-}
-div#vabila div.top_note div.top_note_activate .switch_anketa.anketa_off:hover .switch_anketa_content {
-  background-color: #777777;
-}
 div#vabila div.title {
   display: flex;
   flex-direction: row;
diff --git a/public/img/icons/toggle_active.svg b/public/img/icons/toggle_active.svg
new file mode 100644
index 000000000..26faa6f23
--- /dev/null
+++ b/public/img/icons/toggle_active.svg
@@ -0,0 +1,5 @@
+<svg width="95" height="35" viewBox="0 0 95 35" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect width="94.0625" height="35" rx="17.5" fill="#1E88E5"/>
+<rect x="2.1875" y="2.1875" width="30.625" height="30.625" rx="15.3125" fill="white"/>
+<path d="M52.7513 27.315C51.3163 27.315 50.0388 26.9475 48.9188 26.2125C47.8163 25.4775 46.95 24.4362 46.32 23.0887C45.7075 21.7412 45.4013 20.1487 45.4013 18.3112C45.4013 16.4737 45.7075 14.8987 46.32 13.5862C46.95 12.2562 47.8163 11.2412 48.9188 10.5412C50.0388 9.82375 51.3163 9.465 52.7513 9.465C54.2038 9.465 55.4813 9.82375 56.5838 10.5412C57.6863 11.2412 58.5525 12.2562 59.1825 13.5862C59.8125 14.8987 60.1275 16.4737 60.1275 18.3112C60.1275 20.1487 59.8125 21.7412 59.1825 23.0887C58.5525 24.4362 57.6863 25.4775 56.5838 26.2125C55.4813 26.9475 54.2038 27.315 52.7513 27.315ZM52.7513 25.3987C53.7838 25.3987 54.6763 25.11 55.4288 24.5325C56.1988 23.9375 56.7938 23.115 57.2138 22.065C57.6338 20.9975 57.8438 19.7462 57.8438 18.3112C57.8438 16.1762 57.38 14.4875 56.4525 13.245C55.525 12.0025 54.2913 11.3812 52.7513 11.3812C51.2113 11.3812 49.9775 12.0025 49.05 13.245C48.1225 14.4875 47.6588 16.1762 47.6588 18.3112C47.6588 19.7462 47.8688 20.9975 48.2888 22.065C48.7088 23.115 49.3038 23.9375 50.0738 24.5325C50.8438 25.11 51.7363 25.3987 52.7513 25.3987ZM63.8304 27V9.78H66.0879L72.3091 20.595L74.1729 24.165H74.2779C74.2254 23.29 74.1641 22.3887 74.0941 21.4612C74.0416 20.5162 74.0154 19.5887 74.0154 18.6787V9.78H76.0891V27H73.8316L67.5841 16.1587L65.7204 12.615H65.6154C65.6854 13.4725 65.7466 14.3562 65.7991 15.2662C65.8691 16.1762 65.9041 17.0862 65.9041 17.9962V27H63.8304Z" fill="white"/>
+</svg>
diff --git a/public/img/icons/toggle_inactive.svg b/public/img/icons/toggle_inactive.svg
new file mode 100644
index 000000000..10d2eaf5b
--- /dev/null
+++ b/public/img/icons/toggle_inactive.svg
@@ -0,0 +1,5 @@
+<svg width="95" height="35" viewBox="0 0 95 35" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect width="94.0628" height="35.0001" rx="17.5001" fill="#CCCCCC"/>
+<rect x="61.2502" y="2.1875" width="30.6251" height="30.6251" rx="15.3125" fill="white"/>
+<path d="M21.2341 26.4763C19.9187 26.4763 18.7476 26.1394 17.7209 25.4656C16.7103 24.7919 15.9162 23.8374 15.3387 22.6022C14.7773 21.367 14.4966 19.9072 14.4966 18.2228C14.4966 16.5384 14.7773 15.0947 15.3387 13.8915C15.9162 12.6724 16.7103 11.7419 17.7209 11.1003C18.7476 10.4426 19.9187 10.1137 21.2341 10.1137C22.5655 10.1137 23.7366 10.4426 24.7472 11.1003C25.7578 11.7419 26.5519 12.6724 27.1294 13.8915C27.7069 15.0947 27.9957 16.5384 27.9957 18.2228C27.9957 19.9072 27.7069 21.367 27.1294 22.6022C26.5519 23.8374 25.7578 24.7919 24.7472 25.4656C23.7366 26.1394 22.5655 26.4763 21.2341 26.4763ZM21.2341 24.7197C22.1805 24.7197 22.9987 24.455 23.6885 23.9256C24.3943 23.3802 24.9397 22.6262 25.3247 21.6637C25.7097 20.6852 25.9022 19.5382 25.9022 18.2228C25.9022 16.2657 25.4771 14.7177 24.6269 13.5787C23.7767 12.4397 22.6457 11.8703 21.2341 11.8703C19.8224 11.8703 18.6915 12.4397 17.8413 13.5787C16.991 14.7177 16.5659 16.2657 16.5659 18.2228C16.5659 19.5382 16.7584 20.6852 17.1434 21.6637C17.5284 22.6262 18.0739 23.3802 18.7797 23.9256C19.4855 24.455 20.3037 24.7197 21.2341 24.7197ZM31.39 26.1875V10.4025H40.4856V12.0868H33.3872V17.4287H39.4028V19.1131H33.3872V26.1875H31.39ZM43.2803 26.1875V10.4025H52.3759V12.0868H45.2775V17.4287H51.2931V19.1131H45.2775V26.1875H43.2803Z" fill="white"/>
+</svg>
diff --git a/resources/sass/admin_new/components/header/top_line.scss b/resources/sass/admin_new/components/header/top_line.scss
index 88ebee76a..22e9934c7 100644
--- a/resources/sass/admin_new/components/header/top_line.scss
+++ b/resources/sass/admin_new/components/header/top_line.scss
@@ -327,63 +327,16 @@ header #top_line{
     
     width: 46px;
     height: 16px;
-    
-    .switch_anketa_content {
-        position: absolute;
-        cursor: pointer;
-        top: 0;
-        left: 0;
-        right: 0;
-        bottom: 0;
-        padding-top: 1px;
 
-        color: white;
-        font-size: 12px;
-        font-weight: 400;
-        line-height: 12px;
-        
-        background-color: $blue;
-        border-radius: 16px;
+    &.anketa_on{
+        background-image: url("../../public/img/icons/toggle_active.svg");
+        background-size: 100% 100%;
+        background-repeat: no-repeat;
     }
-    .switch_anketa_content:before {
-        position: absolute;
-        content: "";
-        
-        height: 14px;
-        width: 14px;
-        bottom: 1px;
-        
-        background-color: white;
-        border-radius: 50%;
-    }
-}
-
-.switch_anketa.anketa_on{
-    .switch_anketa_content{
-        padding-left: 20px;
-        background-color: $blue;
-    }
-    .switch_anketa_content:before{
-        left: 1px;
-    }
-    &:hover{
-        .switch_anketa_content{
-            background-color: $dark-blue;
-        }
-    }
-}
-
-.switch_anketa.anketa_off{
-    .switch_anketa_content{
-        padding-left: 6px;
-        background-color: $dark-gray;
-    }
-    .switch_anketa_content:before{
-        right: 1px;
-    }
-    &:hover{
-        .switch_anketa_content{
-            background-color: darken($dark-gray, 5%);
-        }
+
+    &.anketa_off{
+        background-image: url("../../public/img/icons/toggle_inactive.svg");
+        background-size: 100% 100%;
+        background-repeat: no-repeat;
     }
 }
diff --git a/resources/sass/admin_new/pages/my_surveys/top_filters.scss b/resources/sass/admin_new/pages/my_surveys/top_filters.scss
index fe26191ee..3a26fafd1 100644
--- a/resources/sass/admin_new/pages/my_surveys/top_filters.scss
+++ b/resources/sass/admin_new/pages/my_surveys/top_filters.scss
@@ -245,64 +245,16 @@
                         width: 41px;
                         height: 16px;
                         
-                        .switch_folders_content {
-                            position: absolute;
-                            cursor: pointer;
-                            top: 0;
-                            left: 0;
-                            right: 0;
-                            bottom: 0;
-                            padding-top: 1px;
-    
-                            color: white;
-                            font-size: 10px;
-                            font-weight: 400;
-                            line-height: 13px;
-                            
-                            background-color: $blue;
-                            border-radius: 16px;
+                        &.on{
+                            background-image: url("../../public/img/icons/toggle_active.svg");
+                            background-size: 100% 100%;
+                            background-repeat: no-repeat;
                         }
-                        
-                        .switch_folders_content:before {
-                            position: absolute;
-                            content: "";
-                            
-                            height: 14px;
-                            width: 14px;
-                            bottom: 1px;
-                            
-                            background-color: white;
-                            border-radius: 50%;
-                        }
-                    }
-    
-                    .switch_folders.on{
-                        .switch_folders_content{
-                            padding-left: 20px;
-                            background-color: $blue;
-                        }
-                        .switch_folders_content:before{
-                            left: 1px;
-                        }
-                        &:hover{
-                            .switch_folders_content{
-                                background-color: $dark-blue;
-                            }
-                        }
-                    }
-    
-                    .switch_folders.off{
-                        .switch_folders_content{
-                            padding-left: 6px;
-                            background-color: $very-dark-gray2;
-                        }
-                        .switch_folders_content:before{
-                            right: 1px;
-                        }
-                        &:hover{
-                            .switch_folders_content{
-                                background-color: $very-dark-gray;
-                            }
+        
+                        &.off{
+                            background-image: url("../../public/img/icons/toggle_inactive.svg");
+                            background-size: 100% 100%;
+                            background-repeat: no-repeat;
                         }
                     }
                 }
diff --git a/resources/sass/admin_new/pages/survey_objava/pregled.scss b/resources/sass/admin_new/pages/survey_objava/pregled.scss
index efc83965c..222d989fc 100644
--- a/resources/sass/admin_new/pages/survey_objava/pregled.scss
+++ b/resources/sass/admin_new/pages/survey_objava/pregled.scss
@@ -36,74 +36,6 @@ div#vabila {
             p {
                 margin-right: 12px;
             }
-
-            // Gumb za aktivacijo ankete - kopirano iz headerja
-            .switch_anketa {
-                position: relative;
-                display: block;
-                
-                width: 46px;
-                height: 16px;
-                
-                .switch_anketa_content {
-                    position: absolute;
-                    cursor: pointer;
-                    top: 0;
-                    left: 0;
-                    right: 0;
-                    bottom: 0;
-                    padding-top: 1px;
-
-                    color: white;
-                    font-size: 12px;
-                    font-weight: 400;
-                    line-height: 12px;
-                    
-                    background-color: $blue;
-                    border-radius: 16px;
-                }
-                .switch_anketa_content:before {
-                    position: absolute;
-                    content: "";
-                    
-                    height: 14px;
-                    width: 14px;
-                    bottom: 1px;
-                    
-                    background-color: white;
-                    border-radius: 50%;
-                }
-            }
-
-            .switch_anketa.anketa_on{
-                .switch_anketa_content{
-                    padding-left: 20px;
-                    background-color: $blue;
-                }
-                .switch_anketa_content:before{
-                    left: 1px;
-                }
-                &:hover{
-                    .switch_anketa_content{
-                        background-color: $dark-blue;
-                    }
-                }
-            }
-
-            .switch_anketa.anketa_off{
-                .switch_anketa_content{
-                    padding-left: 6px;
-                    background-color: $very-dark-gray2;
-                }
-                .switch_anketa_content:before{
-                    right: 1px;
-                }
-                &:hover{
-                    .switch_anketa_content{
-                        background-color: $very-dark-gray;
-                    }
-                }
-            }
         }
     }
     

From c1c9dd592f4a302a42d2fc59ce41c5bed73de920 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nejc=20Kova=C4=8D?= <nejc.kouko@gmail.com>
Date: Thu, 23 Jun 2022 11:25:06 +0200
Subject: [PATCH 010/110] FOOTER - dodana organizacija, spremljajte nas lang-->
 organizacija:  1KA enklik anketa

---
 frontend/simple/classes/DisplayController.php | 22 +++++++++++++++++++
 lang/1.php                                    |  1 +
 lang/2.php                                    |  1 +
 3 files changed, 24 insertions(+)

diff --git a/frontend/simple/classes/DisplayController.php b/frontend/simple/classes/DisplayController.php
index 6233deb37..c0566127a 100644
--- a/frontend/simple/classes/DisplayController.php
+++ b/frontend/simple/classes/DisplayController.php
@@ -328,7 +328,29 @@ class DisplayController{
             // echo '  </div>';
         echo '</div>';
         echo '</div>';
+
+
         
+        if(!isAAI()) {
+            // Stolpec 2
+            echo '<div class="col col2">';
+            echo '  <h2>'.$lang['simple_footer_company'].'</h2>';   
+            echo ' <a href="https://www.1ka.si/">'.$lang['simple_footer_company_1ka'].' </a>';        
+            echo '</div>';
+
+            // stolpec 3 - spremljajte nas
+            echo '<div class="col col3">';
+            echo '  <h2>'.$lang['simple_footer_about_follow'].'</h2>';
+                echo ' <div class= "social_logo_flex">';
+                    echo ' <a href="https://www.facebook.com/1KAenklikanketa/"> <img src="public/img/social/fb_orange.svg" alt="Facebook logo"> </a>';
+                    echo ' <a href="https://twitter.com/enklikanketa"> <img src="public/img/social/twitter_orange.svg" alt="Twitter logo"> </a>';
+                echo ' </div>';
+            echo '</div>';
+
+
+        }
+
+        // samo za AAI
         if(isAAI()){
         // Stolpec 2
             echo '<div class="col col2">';
diff --git a/lang/1.php b/lang/1.php
index 9ef10e169..9d37da3d9 100644
--- a/lang/1.php
+++ b/lang/1.php
@@ -8040,6 +8040,7 @@ $lang = array (
 	'simple_footer_namestitev'    => "Namestitev omogočajo",
 
     'simple_footer_company'         => "Organizacija",
+	'simple_footer_company_1ka' 	=> "1KA ENKLIK ANKETA",
     'simple_footer_company_contact' => "Kontakt",
     'simple_footer_company_web'     => "Spletna stran",
 
diff --git a/lang/2.php b/lang/2.php
index bdaf60a74..214a09fbf 100644
--- a/lang/2.php
+++ b/lang/2.php
@@ -7924,6 +7924,7 @@ $lang = array (
 	'simple_footer_namestitev'    => "Installation enabled by",
 
     'simple_footer_company'         => "Organization",
+	'simple_footer_company_1ka' 	=> "1KA ONECLICK SURVEY",
     'simple_footer_company_contact' => "Contact",
     'simple_footer_company_web'     => "Website",
 

From a93db58fed6364d80afd6deea08dd5ae25c7c710 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nejc=20Kova=C4=8D?= <nejc.kouko@gmail.com>
Date: Thu, 23 Jun 2022 11:31:36 +0200
Subject: [PATCH 011/110] FOOTER: spremljajte nas novi modri logotipi

---
 public/img/social/FB_blue_new.svg      | 11 +++++++++++
 public/img/social/twitter_blue_new.svg | 11 +++++++++++
 2 files changed, 22 insertions(+)
 create mode 100644 public/img/social/FB_blue_new.svg
 create mode 100644 public/img/social/twitter_blue_new.svg

diff --git a/public/img/social/FB_blue_new.svg b/public/img/social/FB_blue_new.svg
new file mode 100644
index 000000000..dc1ee4104
--- /dev/null
+++ b/public/img/social/FB_blue_new.svg
@@ -0,0 +1,11 @@
+<svg width="40" height="40" viewBox="0 0 40 40" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_2_149)">
+<path d="M20 40C31.0457 40 40 31.0457 40 20C40 8.95431 31.0457 0 20 0C8.95431 0 0 8.95431 0 20C0 31.0457 8.95431 40 20 40Z" fill="#0059AB"/>
+<path d="M12.897 10.6743C12.3088 10.6761 11.7453 10.9105 11.3294 11.3264C10.9135 11.7423 10.6791 12.3058 10.6773 12.894V27.0999C10.6791 27.6881 10.9135 28.2516 11.3294 28.6675C11.7453 29.0834 12.3088 29.3178 12.897 29.3196H20.3694C20.4173 29.3276 20.4662 29.3276 20.5142 29.3196H23.033C23.0809 29.3276 23.1298 29.3276 23.1778 29.3196H27.103C27.6911 29.3178 28.2547 29.0834 28.6706 28.6675C29.0864 28.2516 29.3209 27.6881 29.3227 27.0999V12.894C29.3209 12.3058 29.0864 11.7423 28.6706 11.3264C28.2547 10.9105 27.6911 10.6761 27.103 10.6743H12.897ZM12.897 11.5622H27.103C27.2781 11.5613 27.4517 11.5951 27.6137 11.6618C27.7757 11.7284 27.9228 11.8265 28.0467 11.9503C28.1705 12.0741 28.2686 12.2213 28.3352 12.3833C28.4018 12.5453 28.4357 12.7188 28.4348 12.894V27.0999C28.4357 27.2751 28.4018 27.4487 28.3352 27.6106C28.2686 27.7726 28.1705 27.9198 28.0467 28.0436C27.9228 28.1675 27.7757 28.2655 27.6137 28.3321C27.4517 28.3988 27.2781 28.4326 27.103 28.4318H23.5515V22.2167H25.2475L25.8692 19.1091H23.5515V18.2212C23.5515 17.9737 23.575 17.9544 23.6581 17.9004C23.9056 17.7997 24.1729 17.7575 24.4394 17.7773H25.7712V15.2775L25.518 15.157C24.7557 14.8333 23.9358 14.6675 23.1076 14.6697C22.6623 14.655 22.2195 14.7424 21.8131 14.9251C21.4067 15.1079 21.0476 15.3812 20.7631 15.7241C20.2328 16.4458 19.9637 17.3264 20 18.2212V19.1091H18.6682V22.2167H20V28.4318H12.897C12.7218 28.4326 12.5483 28.3988 12.3863 28.3322C12.2243 28.2655 12.0772 28.1675 11.9533 28.0436C11.8295 27.9198 11.7314 27.7726 11.6648 27.6106C11.5982 27.4487 11.5643 27.2751 11.5652 27.0999V12.894C11.5643 12.7188 11.5982 12.5453 11.6648 12.3833C11.7314 12.2213 11.8295 12.0741 11.9533 11.9503C12.0772 11.8265 12.2243 11.7284 12.3863 11.6618C12.5483 11.5951 12.7218 11.5613 12.897 11.5622ZM23.1075 15.5576C23.7141 15.5451 24.3172 15.6508 24.8833 15.8689V16.8894H24.4394C24.0007 16.8517 23.5606 16.9443 23.1743 17.1556C23.0082 17.2776 22.8747 17.4386 22.7856 17.6245C22.6966 17.8104 22.6547 18.0153 22.6636 18.2212V19.997H24.7853L24.5191 21.3288H22.6636V28.4318H20.8879V21.3288H19.5561V19.997H20.8879V18.2212C20.8547 17.5284 21.055 16.8445 21.4567 16.279C21.654 16.0354 21.907 15.8428 22.1942 15.7172C22.4815 15.5917 22.7947 15.537 23.1075 15.5576Z" fill="white"/>
+</g>
+<defs>
+<clipPath id="clip0_2_149">
+<rect width="40" height="40" fill="white"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/public/img/social/twitter_blue_new.svg b/public/img/social/twitter_blue_new.svg
new file mode 100644
index 000000000..ab0b88f6e
--- /dev/null
+++ b/public/img/social/twitter_blue_new.svg
@@ -0,0 +1,11 @@
+<svg width="40" height="40" viewBox="0 0 40 40" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_2_152)">
+<path d="M20 40C31.0457 40 40 31.0457 40 20C40 8.95431 31.0457 0 20 0C8.95431 0 0 8.95431 0 20C0 31.0457 8.95431 40 20 40Z" fill="#0059AB"/>
+<path d="M24.9941 11.462C23.6854 11.4633 22.4307 11.9837 21.5054 12.909C20.5801 13.8344 20.0596 15.0891 20.0583 16.3977C20.0692 16.5597 20.0882 16.7212 20.1152 16.8813C18.4973 16.736 16.9245 16.2699 15.4886 15.5105C14.0526 14.751 12.7823 13.7132 11.7515 12.4576C11.7051 12.399 11.645 12.3526 11.5765 12.3225C11.508 12.2924 11.4332 12.2796 11.3586 12.2852C11.2842 12.2907 11.2123 12.3146 11.1494 12.3546C11.0864 12.3946 11.0343 12.4495 10.9977 12.5145C10.5094 13.3436 10.2797 14.2995 10.338 15.2599C10.3963 16.2203 10.7399 17.1415 11.3248 17.9054C11.2075 17.8539 11.0795 17.8254 10.9692 17.7632C10.9002 17.7264 10.8228 17.7081 10.7446 17.71C10.6664 17.7119 10.59 17.7339 10.5227 17.774C10.4555 17.814 10.3998 17.8707 10.3609 17.9386C10.322 18.0065 10.3013 18.0832 10.3007 18.1615V18.2184C10.3063 19.013 10.5046 19.7945 10.8787 20.4956C11.2528 21.1968 11.7915 21.7966 12.4485 22.2437C12.4343 22.2446 12.42 22.2446 12.4058 22.2437C12.3291 22.2303 12.2501 22.2368 12.1766 22.2627C12.1031 22.2886 12.0374 22.3329 11.986 22.3915C11.9346 22.4501 11.8991 22.5209 11.8829 22.5972C11.8668 22.6734 11.8705 22.7525 11.8938 22.8269C12.1504 23.606 12.5968 24.309 13.1927 24.8726C13.7887 25.4363 14.5154 25.8428 15.3075 26.0557C13.6904 27.0196 11.801 27.4245 9.93087 27.2079C9.82749 27.1942 9.72254 27.2164 9.63355 27.2707C9.54456 27.3251 9.47693 27.4084 9.44196 27.5066C9.40699 27.6049 9.4068 27.7121 9.44142 27.8105C9.47604 27.9089 9.54337 27.9924 9.63217 28.0471C11.7527 29.4129 14.2219 30.1388 16.7442 30.138C18.5946 30.1729 20.4304 29.8055 22.125 29.0614C23.8195 28.3173 25.3323 27.2141 26.5587 25.8281C28.7212 23.3627 29.9275 20.2033 29.9582 16.924C29.9582 16.7942 29.9475 16.668 29.944 16.5399C30.7843 15.9102 31.5148 15.1461 32.106 14.2783C32.162 14.1959 32.1894 14.0973 32.184 13.9978C32.1786 13.8983 32.1407 13.8033 32.0761 13.7274C32.0115 13.6515 31.9238 13.5989 31.8264 13.5777C31.7291 13.5564 31.6274 13.5677 31.5371 13.6098C31.3024 13.7147 31.0286 13.7253 30.7832 13.8089C31.1173 13.3813 31.377 12.9004 31.5513 12.3865C31.579 12.2984 31.5793 12.204 31.552 12.1157C31.5248 12.0275 31.4713 11.9497 31.3988 11.8925C31.3262 11.8354 31.238 11.8017 31.1458 11.7959C31.0536 11.7902 30.9619 11.8126 30.8828 11.8602C30.0922 12.3219 29.2325 12.6533 28.3367 12.8417C27.4392 11.9724 26.2434 11.4788 24.9941 11.462ZM24.9941 12.3723C25.5464 12.3725 26.0927 12.4863 26.5992 12.7065C27.1057 12.9267 27.5616 13.2487 27.9384 13.6525C27.9928 13.7083 28.0605 13.7494 28.1352 13.7718C28.2098 13.7942 28.289 13.7972 28.3651 13.7805C28.9491 13.6644 29.5206 13.4929 30.072 13.2684C29.757 13.6971 29.3607 14.0596 28.9056 14.3352C28.8055 14.3842 28.7269 14.4682 28.6845 14.5713C28.6422 14.6744 28.6392 14.7894 28.676 14.8946C28.7128 14.9997 28.7869 15.0878 28.8843 15.142C28.9816 15.1962 29.0955 15.2128 29.2043 15.1886C29.6437 15.1011 30.0763 14.9823 30.4987 14.833C30.1107 15.2538 29.6819 15.635 29.2185 15.971C29.1565 16.0163 29.107 16.0766 29.0747 16.1462C29.0423 16.2159 29.0282 16.2926 29.0336 16.3692C29.0407 16.5542 29.0478 16.7372 29.0478 16.924C29.0133 19.978 27.8883 22.9191 25.8759 25.2165C24.7379 26.51 23.331 27.5391 21.7536 28.232C20.1763 28.9248 18.4666 29.2647 16.7442 29.2277C14.9914 29.2278 13.2592 28.8493 11.6662 28.1182C13.5284 27.9902 15.3107 27.312 16.7868 26.1696C16.8596 26.1114 16.9127 26.0323 16.9391 25.9429C16.9655 25.8536 16.9639 25.7583 16.9344 25.6699C16.9049 25.5816 16.8491 25.5044 16.7744 25.4487C16.6997 25.3931 16.6097 25.3617 16.5166 25.3588C15.807 25.3405 15.1151 25.1332 14.5125 24.7581C13.9098 24.383 13.4183 23.8538 13.0886 23.2252H13.1597C13.6015 23.2268 14.0416 23.1694 14.4683 23.0545C14.5656 23.0265 14.6507 22.9668 14.7103 22.885C14.7699 22.8031 14.8005 22.7037 14.7972 22.6025C14.7939 22.5013 14.757 22.4041 14.6923 22.3262C14.6276 22.2484 14.5387 22.1943 14.4398 22.1726C13.6493 22.0042 12.9283 21.6 12.3722 21.0134C11.8161 20.4268 11.4509 19.6853 11.3248 18.8869C11.7857 19.059 12.2701 19.1597 12.7614 19.1856C12.8622 19.1916 12.9622 19.164 13.0456 19.107C13.1289 19.05 13.191 18.9669 13.2219 18.8708C13.2529 18.7747 13.251 18.671 13.2165 18.576C13.1821 18.4811 13.1171 18.4003 13.0317 18.3464C12.4796 17.9777 12.0271 17.4784 11.7145 16.8928C11.4018 16.3072 11.2386 15.6534 11.2395 14.9896C11.2513 14.4905 11.3575 13.9982 11.5524 13.5387C13.8787 16.1279 17.1374 17.6882 20.6131 17.877C20.6834 17.8807 20.7536 17.8681 20.8183 17.8404C20.8831 17.8127 20.9406 17.7704 20.9865 17.717C21.0319 17.6632 21.0643 17.5995 21.081 17.531C21.0976 17.4625 21.0981 17.391 21.0824 17.3223C21.0092 17.0195 20.971 16.7093 20.9687 16.3977C20.9676 15.8688 21.0709 15.3449 21.2728 14.856C21.4748 14.3671 21.7712 13.9229 22.1452 13.5489C22.5192 13.1749 22.9634 12.8784 23.4523 12.6765C23.9412 12.4746 24.4651 12.3712 24.9941 12.3723Z" fill="white"/>
+</g>
+<defs>
+<clipPath id="clip0_2_152">
+<rect width="40" height="40" fill="white"/>
+</clipPath>
+</defs>
+</svg>

From b3965f1c2af2c62a88168fc5a5e1f4b42b1bc9d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nejc=20Kova=C4=8D?= <nejc.kouko@gmail.com>
Date: Thu, 23 Jun 2022 13:33:20 +0200
Subject: [PATCH 012/110] FOOTER; modri social logotipi

---
 frontend/simple/classes/DisplayController.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/simple/classes/DisplayController.php b/frontend/simple/classes/DisplayController.php
index c0566127a..6fce868e9 100644
--- a/frontend/simple/classes/DisplayController.php
+++ b/frontend/simple/classes/DisplayController.php
@@ -342,8 +342,8 @@ class DisplayController{
             echo '<div class="col col3">';
             echo '  <h2>'.$lang['simple_footer_about_follow'].'</h2>';
                 echo ' <div class= "social_logo_flex">';
-                    echo ' <a href="https://www.facebook.com/1KAenklikanketa/"> <img src="public/img/social/fb_orange.svg" alt="Facebook logo"> </a>';
-                    echo ' <a href="https://twitter.com/enklikanketa"> <img src="public/img/social/twitter_orange.svg" alt="Twitter logo"> </a>';
+                    echo ' <a href="https://www.facebook.com/1KAenklikanketa/"> <img src="public/img/social/fb_blue_new.svg" alt="Facebook logo"> </a>';
+                    echo ' <a href="https://twitter.com/enklikanketa"> <img src="public/img/social/twitter_blue_new.svg" alt="Twitter logo"> </a>';
                 echo ' </div>';
             echo '</div>';
 

From d74bbab397a37a8d2ec1f8f163d3e17161753241 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nejc=20Kova=C4=8D?= <nejc.kouko@gmail.com>
Date: Thu, 23 Jun 2022 15:10:57 +0200
Subject: [PATCH 013/110] PRIJAVA/REGISTRACIJA   popravki ,      header/footer
 popravki

---
 frontend/simple/css/style.css                 | 104 +++++----
 .../sass/frontend_simple/basic/popravki.scss  | 208 ++++++++++++++++++
 resources/sass/frontend_simple/style.scss     |   4 +
 3 files changed, 277 insertions(+), 39 deletions(-)
 create mode 100644 resources/sass/frontend_simple/basic/popravki.scss

diff --git a/frontend/simple/css/style.css b/frontend/simple/css/style.css
index 37a6ecdd0..cdef4203c 100644
--- a/frontend/simple/css/style.css
+++ b/frontend/simple/css/style.css
@@ -1,11 +1,11 @@
+@charset "UTF-8";
 /* 
     Created on : 28.3.2020
     Author     : Peter Hrvatin
 */
-/* BARVE */
-/* FONTI */
-@import url("https://fonts.googleapis.com/css2?family=Source+Sans+Pro:wght@300;400;600;700&display=swap");
+/* BARVE */ /* FONTI */
 @import url("https://fonts.googleapis.com/css?family=Montserrat:300,400,400i,600,700&amp;subset=latin-ext");
+@import url("https://fonts.googleapis.com/css2?family=Source+Sans+Pro:wght@300;400;600;700&display=swap");
 .thin {
   font-weight: 300;
 }
@@ -736,7 +736,6 @@ body.reset_password_activate div.label {
   header nav span.menu_item a {
     line-height: 18px;
   }
-
   body #main .main_content {
     padding: 10px 20px 40px 20px;
   }
@@ -778,7 +777,6 @@ body #main .main_content input[type=button] {
     margin: 0;
     width: 100%;
   }
-
   body.landing_page,
 body.login,
 body.register,
@@ -864,7 +862,6 @@ body.login_noEmail #content.aai #main .main_content .app_subtitle {
     width: 100%;
     box-sizing: border-box;
   }
-
   footer {
     padding: 0 20px;
   }
@@ -882,7 +879,6 @@ body.login_noEmail #content.aai #main .main_content .app_subtitle {
   footer .footer_content .logo_holder img {
     margin: 20px auto 30px auto;
   }
-
   .cookie_notice {
     flex-direction: column;
   }
@@ -891,27 +887,38 @@ body.login_noEmail #content.aai #main .main_content .app_subtitle {
     text-align: center;
   }
 }
-
-/*# sourceMappingURL=style.css.map */
-
-/* -------------------------------------------------------------------------------------- */
-
 /* 
     Author     : Nejc Kovač
     Urejanje landing page
 */
-
 /* @import url("https://fonts.googleapis.com/css2?family=Source+Sans+Pro:wght@300;400;600;700&display=swap"); */
-
 body.landing_page #main {
   background-image: none;
 }
 
+header {
+  height: unset;
+  padding-top: 13px;
+  padding-left: 0px;
+  padding-right: 0px;
+  max-width: 1160px;
+  width: 95%;
+  margin: auto;
+}
+
+header .logo a img {
+  height: 45px;
+}
+
+.nav-desktop {
+  align-items: center;
+  padding-bottom: 13px;
+}
+
 .landing_page_content {
   font-family: "Source Sans Pro", "sans-serif";
   text-align: center;
   color: #333333;
-  
 }
 
 .landing_page_content .landing_page_title {
@@ -920,16 +927,12 @@ body.landing_page #main {
   line-height: 63px;
 }
 
-
-
 body.landing_page #main .app_subtitle {
   text-shadow: unset;
   color: #333333;
-
   font-weight: 400;
   line-height: 26px;
   font-size: 18px;
-
   margin-top: 25px;
   margin-bottom: 24px;
 }
@@ -948,12 +951,9 @@ body.landing_page #main .landing_page_window #login_holder .login_form {
 body.landing_page #main .landing_page_window .tabs .tab {
   font-size: 16px;
   font-weight: 600;
-
   background-color: unset;
   color: #777777;
-
   height: 39px;
-  
   display: flex;
   justify-content: center;
   align-items: center;
@@ -966,37 +966,31 @@ body.landing_page #main .landing_page_window .tabs .tab.active {
 body.landing_page #main .landing_page_window label {
   text-align: left;
   font-size: 16px;
-
   margin: 15px 0px 4px 0px;
 }
 
-
-.landing_page_window input[type="text"] {
-  padding: 0px;
-  height: 38px;
-  max-width: 354px;
-}
-.landing_page_window input[type="password"] {
+.landing_page_window input[type=text] {
   padding: 0px;
   height: 38px;
   max-width: 354px;
 }
 
+.landing_page_window input[type=password] {
+  padding: 0px;
+  height: 38px;
+  max-width: 354px;
+}
 
-body.landing_page #main .landing_page_window input[type="submit"] {
+body.landing_page #main .landing_page_window input[type=submit] {
   align-self: unset;
   width: unset;
   max-width: 354px;
-
   margin: 16px 0px;
-
   font-weight: 700;
   padding: 12.5px 0px;
   line-height: 20px;
 }
 
-
-
 body.landing_page #main .landing_page_window #login_holder .login_form .lostpass {
   position: unset;
   text-align: left;
@@ -1005,15 +999,13 @@ body.landing_page #main .landing_page_window #login_holder .login_form .lostpass
   font-weight: 400;
   font-size: 16px;
   line-height: 20px;
-  
 }
+
 body.landing_page #main .landing_page_window #login_holder .login_form .lostpass a {
   font-weight: 400;
 }
 
-
 /* REGISTRACIJA */
-
 body.landing_page #main .landing_page_window .register_window {
   padding: 24px 23px 25px 23px;
 }
@@ -1038,8 +1030,42 @@ body.landing_page #main .landing_page_window .register_window .lostpass {
   line-height: 20px;
 }
 
-footer .footer_content .col1-flex{
+footer .footer_content {
+  max-width: 1160px;
+  width: 95%;
+  margin: auto;
+  padding: 0px;
+}
+
+footer .footer_content h2 {
+  font-family: "Source Sans Pro";
+  text-transform: uppercase;
+  font-size: 18px;
+  line-height: 26px;
+  font-weight: 700;
+  margin: 0px;
+  padding-bottom: 12px;
+}
+
+footer .footer_content .col a:hover {
+  color: #4ca0ea;
+}
+
+footer .footer_content .col1-flex {
   display: flex;
   flex-direction: column;
 }
 
+footer .footer_content .col span {
+  padding: 0px 0px 12px 0px;
+}
+
+footer .footer_content .col a {
+  color: #333333;
+}
+
+footer .footer_content .col3 .social_logo_flex a:first-of-type {
+  margin-right: 20px;
+}
+
+/*# sourceMappingURL=style.css.map */
diff --git a/resources/sass/frontend_simple/basic/popravki.scss b/resources/sass/frontend_simple/basic/popravki.scss
new file mode 100644
index 000000000..605eaa933
--- /dev/null
+++ b/resources/sass/frontend_simple/basic/popravki.scss
@@ -0,0 +1,208 @@
+$SansPro_font: "Source Sans Pro";
+$max_sirina: (1160px);
+$black: #333333;
+$light_blue: #4ca0ea;
+$blue: #1e88e5;
+
+@import url("https://fonts.googleapis.com/css2?family=Source+Sans+Pro:wght@300;400;600;700&display=swap");
+
+/* 
+    Author     : Nejc Kovač
+    Urejanje landing page
+*/
+
+/* @import url("https://fonts.googleapis.com/css2?family=Source+Sans+Pro:wght@300;400;600;700&display=swap"); */
+
+
+body.landing_page #main {
+    background-image: none;
+}
+
+header {
+    height: unset;
+    padding-top: 13px;
+    padding-left: 0px;
+    padding-right: 0px;
+    max-width: 1160px;
+    width: 95%;
+    margin: auto;
+}
+
+header .logo a img {
+    height: 45px;
+}
+.nav-desktop {
+    align-items: center;
+    padding-bottom: 13px;
+}
+
+  
+.landing_page_content {
+    font-family: "Source Sans Pro", "sans-serif";
+    text-align: center;
+    color: #333333;    
+}
+
+.landing_page_content .landing_page_title {
+    font-weight: 300;
+    font-size: 50px;
+    line-height: 63px;
+}
+   
+body.landing_page #main .app_subtitle {
+text-shadow: unset;
+color: #333333;
+  
+font-weight: 400;
+line-height: 26px;
+font-size: 18px;
+  
+margin-top: 25px;
+margin-bottom: 24px;
+}
+  
+body.landing_page #main .landing_page_window {
+    border: 1px solid #C4C4C4;
+    max-width: 400px;
+    width: unset;
+    min-height: 327px;
+}
+  
+body.landing_page #main .landing_page_window #login_holder .login_form {
+    padding: 25px 23px;
+}
+
+body.landing_page #main .landing_page_window .tabs .tab {
+    font-size: 16px;
+    font-weight: 600;
+    
+    background-color: unset;
+    color: #777777;
+    
+    height: 39px;
+        
+    display: flex;
+    justify-content: center;
+    align-items: center;
+}
+  
+body.landing_page #main .landing_page_window .tabs .tab.active {
+    color: #1E88E5;
+}
+
+body.landing_page #main .landing_page_window label {
+    text-align: left;
+    font-size: 16px;
+    
+    margin: 15px 0px 4px 0px;
+}
+
+.landing_page_window input[type="text"] {
+    padding: 0px;
+    height: 38px;
+    max-width: 354px;
+}
+.landing_page_window input[type="password"] {
+    padding: 0px;
+    height: 38px;
+    max-width: 354px;
+}
+
+body.landing_page #main .landing_page_window input[type="submit"] {
+    align-self: unset;
+    width: unset;
+    max-width: 354px;
+  
+    margin: 16px 0px;
+  
+    font-weight: 700;
+    padding: 12.5px 0px;
+    line-height: 20px;
+}
+
+
+body.landing_page #main .landing_page_window #login_holder .login_form .lostpass {
+    position: unset;
+    text-align: left;
+    text-decoration-line: underline;
+    text-decoration-color: $blue;
+    font-weight: 400;
+    font-size: 16px;
+    line-height: 20px;
+    
+}
+body.landing_page #main .landing_page_window #login_holder .login_form .lostpass a {
+    font-weight: 400;
+}
+
+
+/* REGISTRACIJA */
+
+body.landing_page #main .landing_page_window .register_window {
+    padding: 24px 23px 25px 23px;
+}
+  
+body.landing_page #main .landing_page_window .register_window a {
+    position: unset;
+    text-align: left;
+    text-decoration-line: underline;
+    text-decoration-color: $blue;
+    font-weight: 400;
+    font-size: 16px;
+    line-height: 20px;
+}
+  
+body.landing_page #main .landing_page_window .register_window .lostpass {
+    position: unset;
+    text-align: left;
+    text-decoration-line: underline;
+    text-decoration-color: $blue;
+    font-weight: 400;
+    font-size: 16px;
+    line-height: 20px;
+}
+
+
+footer .footer_content {
+    max-width: $max_sirina;
+    width: 95%;
+    margin: auto;
+    padding: 0px;
+}
+
+
+footer .footer_content h2 {
+    font-family: $SansPro_font;
+    text-transform: uppercase;
+    font-size: 18px;
+    line-height: 26px;
+    font-weight: 700;
+
+    margin: 0px;
+    padding-bottom: 12px;
+}
+
+footer .footer_content .col a:hover{
+    color: $light_blue;
+}
+
+// footer .footer_content .col {
+//     max-width: 290px;
+// }
+
+  
+footer .footer_content .col1-flex{
+    display: flex;
+    flex-direction: column;
+}
+footer .footer_content .col span{
+    padding: 0px 0px 12px 0px;
+}
+footer .footer_content .col a {
+    color: $black;
+}
+
+footer .footer_content .col3 .social_logo_flex a:first-of-type{
+    margin-right: 20px;
+}
+  
\ No newline at end of file
diff --git a/resources/sass/frontend_simple/style.scss b/resources/sass/frontend_simple/style.scss
index 7a312df58..31e41e975 100644
--- a/resources/sass/frontend_simple/style.scss
+++ b/resources/sass/frontend_simple/style.scss
@@ -26,3 +26,7 @@
 
 // Mobile popravki
 @import "./basic/mobile.scss";
+
+// popravki - Nejc Kovac
+@import "./basic/popravki.scss";
+

From 681d6735e3822105c1d97a3e30ce990ae6f24964 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nejc=20Kova=C4=8D?= <nejc.kouko@gmail.com>
Date: Thu, 23 Jun 2022 15:23:52 +0200
Subject: [PATCH 014/110] header poravnava jezika

---
 resources/sass/frontend_simple/basic/popravki.scss | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/resources/sass/frontend_simple/basic/popravki.scss b/resources/sass/frontend_simple/basic/popravki.scss
index 605eaa933..ac779bcd3 100644
--- a/resources/sass/frontend_simple/basic/popravki.scss
+++ b/resources/sass/frontend_simple/basic/popravki.scss
@@ -35,6 +35,14 @@ header .logo a img {
     align-items: center;
     padding-bottom: 13px;
 }
+.flag {
+    display: flex;
+    align-items: unset;
+}
+header nav span.menu_item{
+    border-bottom: unset;
+}
+
 
   
 .landing_page_content {

From 90672506e5dcfb53d1024aa2325c02fd64c125c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nejc=20Kova=C4=8D?= <nejc.kouko@gmail.com>
Date: Thu, 23 Jun 2022 15:24:26 +0200
Subject: [PATCH 015/110] header poravnava jezika

---
 frontend/simple/css/style.css | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/frontend/simple/css/style.css b/frontend/simple/css/style.css
index cdef4203c..b702c48f5 100644
--- a/frontend/simple/css/style.css
+++ b/frontend/simple/css/style.css
@@ -915,6 +915,15 @@ header .logo a img {
   padding-bottom: 13px;
 }
 
+.flag {
+  display: flex;
+  align-items: unset;
+}
+
+header nav span.menu_item {
+  border-bottom: unset;
+}
+
 .landing_page_content {
   font-family: "Source Sans Pro", "sans-serif";
   text-align: center;

From 02982e4f315d1f6e1ea6bda691fb07ff92c1027b Mon Sep 17 00:00:00 2001
From: patrik2020 <patrik.pucer@gmail.com>
Date: Fri, 24 Jun 2022 10:04:20 +0200
Subject: [PATCH 016/110] Latex za izvoze: sprememba pisave - Source Sans Pro

---
 .../textemp/latexTemplatePdfAnalysisAndOtherLandscape.cls    | 5 +++--
 .../textemp/latexTemplatePdfAnalysisPortrait.cls             | 5 +++--
 .../export/latexclasses/textemp/latexTemplatePdfSurvey.cls   | 5 +++--
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/admin/survey/export/latexclasses/textemp/latexTemplatePdfAnalysisAndOtherLandscape.cls b/admin/survey/export/latexclasses/textemp/latexTemplatePdfAnalysisAndOtherLandscape.cls
index fa222fbaa..ab2be47e3 100644
--- a/admin/survey/export/latexclasses/textemp/latexTemplatePdfAnalysisAndOtherLandscape.cls
+++ b/admin/survey/export/latexclasses/textemp/latexTemplatePdfAnalysisAndOtherLandscape.cls
@@ -16,7 +16,8 @@
 %\usepackage[allfiguresdraft]{draftfigure}
 \usepackage{colortbl}		%The pack­age al­lows rows and columns to be coloured, and even in­di­vid­ual cells
 \usepackage{fancyhdr}	% za ureditev glav in nog
-\usepackage{montserrat}	% za uporabo Montserrat pisave v dokumentu
+%\usepackage{montserrat}	% za uporabo Montserrat pisave v dokumentu
+\usepackage[default]{sourcesanspro} % za uporabo Source Sans Pro pisave v dokumentu
 \usepackage{multirow}	% za spajanje vrstic v tabeli
 \usepackage{hyperref}
 \usepackage{tikz} % za risanje crt, ki oznacujejo stevilo klikov v Status
@@ -51,7 +52,7 @@
 %definiranje novih ukazov, funkcij, nastavitev potrebnih za izris dolocenih delov besedila
 \linespread{1}	% za razmik med vrsticami
 \fontencoding{T1}\selectfont % za encode besedila
-\renewcommand{\familydefault}{\sfdefault}	% za izbiro novega fonta Montserrat
+\renewcommand{\familydefault}{\sfdefault}	%  za izbiro izbranega fonta, trenutno Source Sans Pro
 \color{besedilo} % za izbiro barve besedila
 \newenvironment{analysis} % za ureditev prostora za izpis analize
  {\parindent0pt \fontsize{10}{12} \selectfont }
diff --git a/admin/survey/export/latexclasses/textemp/latexTemplatePdfAnalysisPortrait.cls b/admin/survey/export/latexclasses/textemp/latexTemplatePdfAnalysisPortrait.cls
index 952ddf599..3d5a39e6a 100644
--- a/admin/survey/export/latexclasses/textemp/latexTemplatePdfAnalysisPortrait.cls
+++ b/admin/survey/export/latexclasses/textemp/latexTemplatePdfAnalysisPortrait.cls
@@ -17,7 +17,8 @@
 \usepackage{graphicx}	% za prikazovanje slik in ostalih grafik
 \usepackage{colortbl}		%The pack­age al­lows rows and columns to be coloured, and even in­di­vid­ual cells
 \usepackage{fancyhdr}	% za ureditev glav in nog
-\usepackage{montserrat}	% za uporabo Montserrat pisave v dokumentu
+%\usepackage{montserrat}	% za uporabo Montserrat pisave v dokumentu
+\usepackage[default]{sourcesanspro} % za uporabo Source Sans Pro pisave v dokumentu
 \usepackage{multirow}	% za spajanje vrstic v tabeli
 \usepackage{hyperref}
 \usepackage{tikz} % za risanje
@@ -52,7 +53,7 @@
 %\linespread{1.5}	% za razmik med vrsticami
 \linespread{1.2}	% za razmik med vrsticami
 \fontencoding{T1}\selectfont % za encode besedila
-\renewcommand{\familydefault}{\sfdefault}	% za izbiro novega fonta Montserrat
+\renewcommand{\familydefault}{\sfdefault}	% za izbiro izbranega fonta, trenutno Source Sans Pro
 \renewcommand{\arraystretch}{1.5}
 \color{besedilo} % za izbiro barve besedila
 \newenvironment{analysis} % za ureditev prostora za izpis analize
diff --git a/admin/survey/export/latexclasses/textemp/latexTemplatePdfSurvey.cls b/admin/survey/export/latexclasses/textemp/latexTemplatePdfSurvey.cls
index f7957dc4b..78dda414a 100644
--- a/admin/survey/export/latexclasses/textemp/latexTemplatePdfSurvey.cls
+++ b/admin/survey/export/latexclasses/textemp/latexTemplatePdfSurvey.cls
@@ -125,7 +125,8 @@
 \usepackage{seqsplit} % za samodejno razbijanje dolgih besed v tabelah
 \usepackage{url} %za razbijanje url-jev v tabelah
 \urlstyle{same} %nastavitev, da je font URL isti kot je font ostalega besedila (http://ctan.ijs.si/tex-archive/macros/latex/contrib/url/url.pdf)
-\usepackage{montserrat}	% za uporabo Montserrat pisave v dokumentu
+%\usepackage{montserrat}	% za uporabo Montserrat pisave v dokumentu
+\usepackage[default]{sourcesanspro} % za uporabo Source Sans Pro pisave v dokumentu
 \usepackage{multirow}	% za spajanje vrstic v tabeli
 \usepackage[hidelinks]{hyperref}
 \usepackage{tikz} % za risanje drsnikov
@@ -158,7 +159,7 @@
 \linespread{1.5}	% za razmik med vrsticami
 %\fontencoding{T1}\selectfont % za encode besedila
 %\fontencoding{T2A,T1}\selectfont % za encode besedila
-\renewcommand{\familydefault}{\sfdefault}	% za izbiro novega fonta Montserrat
+\renewcommand{\familydefault}{\sfdefault}	%  za izbiro izbranega fonta, trenutno Source Sans Pro
 \color{besedilo} % za izbiro barve besedila
 \newenvironment{absolutelynopagebreak}	% za ureditev dela besedila, kjer ne sme biti odsek strani; za prepreciti prelome strani, kjer ni potrebno
   {\par\nobreak\vfil\penalty0\vfilneg

From fafac959ff86556b9beb9837dc053171987dc024 Mon Sep 17 00:00:00 2001
From: patrik2020 <patrik.pucer@gmail.com>
Date: Sun, 26 Jun 2022 10:27:45 +0200
Subject: [PATCH 017/110] Latex za izvoze: Multitabele: ureditev delovanja
 izvoza v rtf

---
 .../Analize/AnalizaMultiCrosstab.php             |  8 ++++----
 .../latexclasses/class.LatexAnalysisElement.php  | 16 +++++++++++++---
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/admin/survey/export/latexclasses/Analize/AnalizaMultiCrosstab.php b/admin/survey/export/latexclasses/Analize/AnalizaMultiCrosstab.php
index 156a3c2c0..e3f1a8889 100644
--- a/admin/survey/export/latexclasses/Analize/AnalizaMultiCrosstab.php
+++ b/admin/survey/export/latexclasses/Analize/AnalizaMultiCrosstab.php
@@ -512,7 +512,7 @@ class AnalizaMultiCrosstab extends LatexAnalysisElement {
 			$tabela .= "\\cline{".($colspan+1)."-".$steviloStolpcevParameterTabular."}";	//prekinjena horizontalna vrstica na vrhu tabele
 		}
 
-		$tabela .= $this->MultiColCellLatex($colspan, '', 1); //prazne celice v prvi vrstici		
+		$tabela .= $this->MultiColCellLatex($colspan, '', 1, $export_format); //prazne celice v prvi vrstici		
 		//$tabela .= $this->tableRow($prvaVrsticaVert, 1, 0, 0, $steviloPodstolpcevV1);	//izpis prve vrstice tabele
 		$tabela .= $this->tableRow($prvaVrsticaVert, 1, 0, 0, '', $export_format, $steviloPodstolpcevV1);	//izpis prve vrstice tabele
 		
@@ -523,7 +523,7 @@ class AnalizaMultiCrosstab extends LatexAnalysisElement {
 		//prekinjena horizontalna vrstica po prvi vrstici - konec
 		
 		if(count($drugaVrsticaVert)){
-			$tabela .= $this->MultiColCellLatex($colspan, '', 1); //prazne celice v drugi vrstici
+			$tabela .= $this->MultiColCellLatex($colspan, '', 1, $export_format); //prazne celice v drugi vrstici
 			if(count($steviloPodstolpcevV2)){
 				//$tabela .= $this->tableRow($drugaVrsticaVert, 1, 0, 0, $steviloPodstolpcevV2);
 				$tabela .= $this->tableRow($drugaVrsticaVert, 1, 0, 0, '', $export_format, $steviloPodstolpcevV2);
@@ -539,7 +539,7 @@ class AnalizaMultiCrosstab extends LatexAnalysisElement {
 		}
 		
 		if(count($tretjaVrsticaVert)){
-			$tabela .= $this->MultiColCellLatex($colspan, '', 1); //prazne celice v drugi vrstici
+			$tabela .= $this->MultiColCellLatex($colspan, '', 1, $export_format); //prazne celice v drugi vrstici
 			if(count($steviloPodstolpcevV3)){
 				//$tabela .= $this->tableRow($tretjaVrsticaVert, 1, 0, 0, $steviloPodstolpcevV3);
 				$tabela .= $this->tableRow($tretjaVrsticaVert, 1, 0, 0, '', $export_format, $steviloPodstolpcevV3);
@@ -552,7 +552,7 @@ class AnalizaMultiCrosstab extends LatexAnalysisElement {
 		}
 		
 		if(count($cetrtaVrsticaVert)){
-			$tabela .= $this->MultiColCellLatex($colspan, '', 1); //prazne celice v drugi vrstici
+			$tabela .= $this->MultiColCellLatex($colspan, '', 1, $export_format); //prazne celice v drugi vrstici
 			$tabela .= $this->tableRow($cetrtaVrsticaVert, 1);	
 		}
 		
diff --git a/admin/survey/export/latexclasses/class.LatexAnalysisElement.php b/admin/survey/export/latexclasses/class.LatexAnalysisElement.php
index d30024d1a..a5b57be12 100644
--- a/admin/survey/export/latexclasses/class.LatexAnalysisElement.php
+++ b/admin/survey/export/latexclasses/class.LatexAnalysisElement.php
@@ -1516,9 +1516,10 @@ class LatexAnalysisElement{
 	}
 	
 	//funkcija skrbi za izpis multicol celice
-	function MultiColCellLatex($steviloVmesnihStolpcevPodvrstic=null, $text='', $odZacetka=0){			
+	function MultiColCellLatex($steviloVmesnihStolpcevPodvrstic=null, $text='', $odZacetka=0, $export_format=null){			
 			$tabela = '';
 			//echo "steviloVmesnihStolpcevPodvrstic: $steviloVmesnihStolpcevPodvrstic</br>";
+			//echo "format: $export_format</br>";
 			if($steviloVmesnihStolpcevPodvrstic==1){	//ce je 1, ne sme biti multicolumn{1}, saj so drugace tezave z izpisom
 				$tabela .= " & ".$text." ";
 			}else{
@@ -1526,10 +1527,19 @@ class LatexAnalysisElement{
 				$steviloArrayrulewidth = ($steviloVmesnihStolpcevPodvrstic-1);
 				if($odZacetka==0){					
 					//$tabela .= " & \multicolumn{".$steviloVmesnihStolpcevPodvrstic."}{X|}{";//zacetek multicol
-					$tabela .= " & \multicolumn{".$steviloVmesnihStolpcevPodvrstic."}{>{\hsize=\dimexpr".$steviloVmesnihStolpcevPodvrstic."\hsize+".$steviloTabColSep."\\tabcolsep+".$steviloArrayrulewidth."\arrayrulewidth\\relax}C|}{";//zacetek multicol
+					if($export_format=='pdf'){
+						$tabela .= " & \multicolumn{".$steviloVmesnihStolpcevPodvrstic."}{>{\hsize=\dimexpr".$steviloVmesnihStolpcevPodvrstic."\hsize+".$steviloTabColSep."\\tabcolsep+".$steviloArrayrulewidth."\arrayrulewidth\\relax}C|}{";//zacetek multicol
+					}elseif($export_format=='rtf'){
+						$tabela .= " & \multicolumn{".$steviloVmesnihStolpcevPodvrstic."}{C|}{";//zacetek multicol
+					}
+						
 				}else{					
 					//$tabela .= " \multicolumn{".$steviloVmesnihStolpcevPodvrstic."}{X|}{";//zacetek multicol
-					$tabela .= " \multicolumn{".$steviloVmesnihStolpcevPodvrstic."}{>{\hsize=\dimexpr".$steviloVmesnihStolpcevPodvrstic."\hsize+".$steviloTabColSep."\\tabcolsep+".$steviloArrayrulewidth."\arrayrulewidth\\relax}C|}{";//zacetek multicol
+					if($export_format=='pdf'){
+						$tabela .= " \multicolumn{".$steviloVmesnihStolpcevPodvrstic."}{>{\hsize=\dimexpr".$steviloVmesnihStolpcevPodvrstic."\hsize+".$steviloTabColSep."\\tabcolsep+".$steviloArrayrulewidth."\arrayrulewidth\\relax}C|}{";//zacetek multicol
+					}elseif($export_format=='rtf'){
+						$tabela .= " \multicolumn{".$steviloVmesnihStolpcevPodvrstic."}{C|}{";//zacetek multicol
+					}
 				}				
 				$tabela .= $text;
 				if($odZacetka==0){

From 64c84a404411e959859262a77f7b5f9cdf3178e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nejc=20Kova=C4=8D?= <nejc.kouko@gmail.com>
Date: Sun, 26 Jun 2022 16:40:30 +0200
Subject: [PATCH 018/110] login/register padding, FOOTER popravki

---
 frontend/simple/css/aai.css                   | 35 +++----------------
 frontend/simple/css/style.css                 | 27 ++++++++++++--
 resources/sass/frontend_simple/aai.scss       |  3 ++
 .../sass/frontend_simple/basic/mobile.scss    | 10 +++++-
 .../sass/frontend_simple/basic/popravki.scss  | 17 ++++++---
 .../sass/frontend_simple/modules/footer.scss  |  5 ++-
 resources/sass/frontend_simple/style.scss     |  1 +
 7 files changed, 58 insertions(+), 40 deletions(-)

diff --git a/frontend/simple/css/aai.css b/frontend/simple/css/aai.css
index 9871b7fba..859de0df6 100644
--- a/frontend/simple/css/aai.css
+++ b/frontend/simple/css/aai.css
@@ -277,6 +277,7 @@ footer {
   padding-top: 105px;
 }
 footer h2 {
+  color: #343434 !important;
   text-transform: uppercase;
   font-weight: 700;
   font-size: 18px;
@@ -289,9 +290,11 @@ footer .footer_content {
   width: 95%;
   margin: auto;
   padding: 0px;
+  justify-content: space-between;
 }
 footer .footer_content .col {
   max-width: 254px;
+  margin-right: unset;
 }
 footer .footer_content .col span {
   font-weight: 400;
@@ -491,7 +494,6 @@ input[type=button]:hover,
   header .logo {
     width: auto;
   }
-
   .hero-container {
     display: flex;
     flex-direction: column-reverse;
@@ -518,17 +520,14 @@ input[type=button]:hover,
     max-width: 280px;
     margin: auto;
   }
-
   .register_holder {
     margin-top: 70px;
     margin-bottom: 70px;
   }
-
   .pomembne_povezave {
     padding-top: 68px;
     padding-bottom: 70px;
   }
-
   .povezave {
     display: grid;
     grid-template-columns: 1fr 1fr;
@@ -547,15 +546,12 @@ input[type=button]:hover,
   .povezave .col:last-child {
     margin-right: 25px;
   }
-
   .title {
     margin-bottom: 0px;
   }
-
   #povezave-btn {
     margin: 0px auto;
   }
-
   footer {
     padding: 70px 0px 0px 0px;
   }
@@ -597,20 +593,16 @@ input[type=button]:hover,
   body.landing_page #main .main_content {
     padding: 0px;
   }
-
   body #main .main_content h1 {
     font-size: 50px;
   }
-
   header .logo a img {
     max-height: 29px;
     max-width: 95px;
   }
-
   header .logo a img:last-of-type {
     margin-left: 12px;
   }
-
   .hero-container {
     padding-top: 50px;
   }
@@ -629,27 +621,22 @@ input[type=button]:hover,
   .hero-container img {
     max-width: 80%;
   }
-
   .register_holder {
     margin-top: 50px;
     margin-bottom: 46px;
   }
-
   body #main .main_content .register_holder h1 {
     text-align: unset;
     padding: 0px;
   }
-
   .pomembne_povezave {
     padding-top: 46px;
     padding-bottom: 46px;
   }
-
   .title {
     margin-bottom: 49px;
     margin-top: 0px;
   }
-
   .povezave {
     display: flex;
     flex-direction: column;
@@ -661,7 +648,6 @@ input[type=button]:hover,
   .povezave .col p {
     min-height: unset;
   }
-
   .povezave .col:nth-of-type(1),
 .povezave .col:nth-of-type(3),
 .povezave .col:nth-of-type(2),
@@ -669,20 +655,16 @@ input[type=button]:hover,
     margin: auto;
     margin-bottom: 30px;
   }
-
   .povezave .col:nth-of-type(4) {
     margin-bottom: 0px;
   }
-
   /* --------------HAMBURGER---------------------------------- */
   .nav-desktop {
     display: none;
   }
-
   .mobile {
     display: block;
   }
-
   #nav-icon3 {
     width: 38px;
     height: 20px;
@@ -726,42 +708,35 @@ input[type=button]:hover,
   #nav-icon3 span:nth-child(4) {
     top: 18px;
   }
-
   #nav-icon3.open span:nth-child(1) {
     top: 9px;
     width: 0%;
     left: 50%;
   }
-
   #nav-icon3.open span:nth-child(2) {
     -webkit-transform: rotate(45deg);
     -moz-transform: rotate(45deg);
     -o-transform: rotate(45deg);
     transform: rotate(45deg);
   }
-
   #nav-icon3.open span:nth-child(3) {
     -webkit-transform: rotate(-45deg);
     -moz-transform: rotate(-45deg);
     -o-transform: rotate(-45deg);
     transform: rotate(-45deg);
   }
-
   #nav-icon3.open span:nth-child(4) {
     top: 9px;
     width: 0%;
     left: 50%;
   }
-
   #links {
     display: none;
   }
-
   /*  */
   .aai a {
     color: #333333;
   }
-
   #links.open {
     position: absolute;
     top: 100px;
@@ -771,9 +746,8 @@ input[type=button]:hover,
     align-items: center;
     width: 100%;
     height: 700px;
-    background-color: white;
+    background-color: rgb(255, 255, 255);
   }
-
   #links .menu_item {
     font-size: 30px;
     margin-top: 30px;
@@ -781,7 +755,6 @@ input[type=button]:hover,
   #links .menu_item a {
     font-size: 16px;
   }
-
   footer {
     margin: 0px;
     padding: 0px;
diff --git a/frontend/simple/css/style.css b/frontend/simple/css/style.css
index b702c48f5..156734a8d 100644
--- a/frontend/simple/css/style.css
+++ b/frontend/simple/css/style.css
@@ -174,7 +174,6 @@ header nav span.menu_item.active {
 
 footer .footer_content {
   display: flex;
-  justify-content: space-between;
   max-width: 1400px;
   margin: 0 auto;
   padding: 70px 20px;
@@ -184,6 +183,8 @@ footer .footer_content .col {
   flex-direction: column;
   box-sizing: border-box;
   width: 33%;
+  max-width: 290px;
+  margin-right: 25px;
 }
 footer .footer_content .col span, footer .footer_content .col div.follow {
   padding: 8px 0;
@@ -867,12 +868,19 @@ body.login_noEmail #content.aai #main .main_content .app_subtitle {
   }
   footer .footer_content {
     flex-direction: column;
-    padding: 20px 0;
+    padding: 50px 0;
     text-align: center;
   }
   footer .footer_content .col {
+    max-width: unset;
     width: 100%;
   }
+  footer .footer_content .col h2 {
+    padding-top: 12px;
+  }
+  footer .footer_content .col a {
+    padding-bottom: 12px;
+  }
   footer .footer_content .col .follow {
     justify-content: center;
   }
@@ -896,6 +904,10 @@ body.landing_page #main {
   background-image: none;
 }
 
+#main .main_content {
+  padding: 70px 0px 305px 0px;
+}
+
 header {
   height: unset;
   padding-top: 13px;
@@ -1043,11 +1055,12 @@ footer .footer_content {
   max-width: 1160px;
   width: 95%;
   margin: auto;
-  padding: 0px;
+  padding: 67px 0px 0px 0px;
 }
 
 footer .footer_content h2 {
   font-family: "Source Sans Pro";
+  color: #1e88e5;
   text-transform: uppercase;
   font-size: 18px;
   line-height: 26px;
@@ -1060,6 +1073,10 @@ footer .footer_content .col a:hover {
   color: #4ca0ea;
 }
 
+#main footer .footer_content col {
+  max-width: 290px;
+}
+
 footer .footer_content .col1-flex {
   display: flex;
   flex-direction: column;
@@ -1071,6 +1088,10 @@ footer .footer_content .col span {
 
 footer .footer_content .col a {
   color: #333333;
+  font-weight: 400;
+  font-size: 18px;
+  line-height: 26px;
+  font-family: "Source Sans Pro";
 }
 
 footer .footer_content .col3 .social_logo_flex a:first-of-type {
diff --git a/resources/sass/frontend_simple/aai.scss b/resources/sass/frontend_simple/aai.scss
index aa54d1da5..8d24cfc3b 100644
--- a/resources/sass/frontend_simple/aai.scss
+++ b/resources/sass/frontend_simple/aai.scss
@@ -339,6 +339,7 @@ footer {
     padding-top: 105px;
 
     h2 {
+        color: #343434 !important;
         text-transform: uppercase;
         font-weight: 700;
         font-size: 18px;
@@ -353,9 +354,11 @@ footer {
         width: 95%;
         margin: auto;
         padding: 0px;
+        justify-content: space-between;
 
         .col {
             max-width: 254px;
+            margin-right: unset;
 
             span {
                 font-weight: 400;
diff --git a/resources/sass/frontend_simple/basic/mobile.scss b/resources/sass/frontend_simple/basic/mobile.scss
index 330c18572..6ef69c03e 100644
--- a/resources/sass/frontend_simple/basic/mobile.scss
+++ b/resources/sass/frontend_simple/basic/mobile.scss
@@ -154,13 +154,21 @@
 
         .footer_content{
             flex-direction: column;
-            padding: 20px 0;
+            padding: 50px 0;
 
             text-align: center;
 
             .col{
+                max-width: unset;
                 width: 100%;
 
+                h2{
+                    padding-top: 12px;
+                }
+                a{
+                    padding-bottom: 12px;
+                }
+
                 .follow{
                     justify-content: center;
                 }
diff --git a/resources/sass/frontend_simple/basic/popravki.scss b/resources/sass/frontend_simple/basic/popravki.scss
index ac779bcd3..378989f7d 100644
--- a/resources/sass/frontend_simple/basic/popravki.scss
+++ b/resources/sass/frontend_simple/basic/popravki.scss
@@ -17,6 +17,9 @@ $blue: #1e88e5;
 body.landing_page #main {
     background-image: none;
 }
+#main .main_content {
+    padding: 70px 0px 305px 0px;
+}
 
 header {
     height: unset;
@@ -175,12 +178,13 @@ footer .footer_content {
     max-width: $max_sirina;
     width: 95%;
     margin: auto;
-    padding: 0px;
+    padding: 67px 0px 0px 0px;
 }
 
 
 footer .footer_content h2 {
     font-family: $SansPro_font;
+    color: $blue;
     text-transform: uppercase;
     font-size: 18px;
     line-height: 26px;
@@ -194,9 +198,9 @@ footer .footer_content .col a:hover{
     color: $light_blue;
 }
 
-// footer .footer_content .col {
-//     max-width: 290px;
-// }
+#main footer .footer_content col {
+    max-width: 290px;
+}
 
   
 footer .footer_content .col1-flex{
@@ -208,6 +212,11 @@ footer .footer_content .col span{
 }
 footer .footer_content .col a {
     color: $black;
+    font-weight: 400;
+    font-size: 18px;
+    line-height: 26px;
+
+    font-family: $SansPro_font;
 }
 
 footer .footer_content .col3 .social_logo_flex a:first-of-type{
diff --git a/resources/sass/frontend_simple/modules/footer.scss b/resources/sass/frontend_simple/modules/footer.scss
index 151808653..e8d965993 100644
--- a/resources/sass/frontend_simple/modules/footer.scss
+++ b/resources/sass/frontend_simple/modules/footer.scss
@@ -2,7 +2,7 @@ footer{
     
     .footer_content{
         display: flex;
-        justify-content: space-between;
+        // justify-content: space-between;
 
         max-width: 1400px;
         margin: 0 auto;
@@ -14,6 +14,9 @@ footer{
 
             box-sizing: border-box;
             width: 33%;
+            max-width: 290px;
+
+            margin-right: 25px;
 
             span, div.follow{
                 padding: 8px 0;
diff --git a/resources/sass/frontend_simple/style.scss b/resources/sass/frontend_simple/style.scss
index 31e41e975..3c30ddd78 100644
--- a/resources/sass/frontend_simple/style.scss
+++ b/resources/sass/frontend_simple/style.scss
@@ -30,3 +30,4 @@
 // popravki - Nejc Kovac
 @import "./basic/popravki.scss";
 
+

From 24431c997e10ec88c0f3a31afcac96820fb2942e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nejc=20Kova=C4=8D?= <nejc.kouko@gmail.com>
Date: Sun, 26 Jun 2022 17:53:41 +0200
Subject: [PATCH 019/110] mobile nav menu,  login/register form css popravki

---
 frontend/simple/classes/DisplayController.php |  15 +-
 frontend/simple/css/style.css                 | 122 ++++++++++++--
 .../sass/frontend_simple/basic/mobile.scss    | 154 ++++++++++++++++--
 .../sass/frontend_simple/basic/popravki.scss  |  14 +-
 4 files changed, 268 insertions(+), 37 deletions(-)

diff --git a/frontend/simple/classes/DisplayController.php b/frontend/simple/classes/DisplayController.php
index 6fce868e9..87e69f987 100644
--- a/frontend/simple/classes/DisplayController.php
+++ b/frontend/simple/classes/DisplayController.php
@@ -138,7 +138,7 @@ class DisplayController{
 
         echo '</div>';
         
-        if(isAAI()){
+        // moblie nav ----------------------
 
         
             echo '<div class="mobile">';
@@ -179,17 +179,20 @@ class DisplayController{
                     }
                     echo '</span>';
 
-                    // AAI PRIJAVA 
-                    echo '<span class="menu_item ">';
+                    if(isAAI()){
+                        // AAI PRIJAVA 
+                        echo '<span class="menu_item ">';
                         echo    '<a id="header-btn"  href="'.$site_url.'/aai">'.$lang['AAI_prijava'].' </a> ';
-                    echo '</span>';
-
+                        echo '</span>';
+                    }
 
                 echo '</div>';
             echo '</div>';
 
             echo '<script type="text/javascript" src="frontend/simple/script/nav-mobile.js"></script> ';
-        }
+        
+        //---------------------------------------------------
+
         // Navigacija
         echo '<nav class=nav-desktop>';
 
diff --git a/frontend/simple/css/style.css b/frontend/simple/css/style.css
index 156734a8d..bf9abc4bb 100644
--- a/frontend/simple/css/style.css
+++ b/frontend/simple/css/style.css
@@ -719,23 +719,107 @@ body.reset_password_activate div.label {
 
 /******************************/
 /* Mobile prilagoditve */
+.mobile {
+  display: none;
+}
+
 @media screen and (max-width: 700px) {
-  header nav {
-    flex-direction: column-reverse;
-    align-self: auto;
-    justify-content: space-evenly;
-    height: 100%;
-    text-align: right;
-    font-size: 14px;
+  /* --------------HAMBURGER---------------------------------- */
+  .nav-desktop {
+    display: none;
   }
-  header nav span.menu_item {
-    line-height: 18px;
+  .mobile {
+    display: block;
   }
-  header nav span.menu_item.active {
-    border-bottom: 2px #1e88e5 solid;
+  #nav-icon3 {
+    width: 38px;
+    height: 20px;
+    position: relative;
+    bottom: 15px;
+    -webkit-transform: rotate(0deg);
+    -moz-transform: rotate(0deg);
+    -o-transform: rotate(0deg);
+    transform: rotate(0deg);
+    -webkit-transition: 0.5s ease-in-out;
+    -moz-transition: 0.5s ease-in-out;
+    -o-transition: 0.5s ease-in-out;
+    transition: 0.5s ease-in-out;
+    cursor: pointer;
   }
-  header nav span.menu_item a {
-    line-height: 18px;
+  #nav-icon3 span {
+    display: block;
+    position: absolute;
+    height: 5px;
+    width: 100%;
+    background: #1E88E5;
+    border-radius: 9px;
+    opacity: 1;
+    left: 0;
+    -webkit-transform: rotate(0deg);
+    -moz-transform: rotate(0deg);
+    -o-transform: rotate(0deg);
+    transform: rotate(0deg);
+    -webkit-transition: 0.25s ease-in-out;
+    -moz-transition: 0.25s ease-in-out;
+    -o-transition: 0.25s ease-in-out;
+    transition: 0.25s ease-in-out;
+  }
+  #nav-icon3 span:nth-child(1) {
+    top: 0px;
+  }
+  #nav-icon3 span:nth-child(2),
+#nav-icon3 span:nth-child(3) {
+    top: 9px;
+  }
+  #nav-icon3 span:nth-child(4) {
+    top: 18px;
+  }
+  #nav-icon3.open span:nth-child(1) {
+    top: 9px;
+    width: 0%;
+    left: 50%;
+  }
+  #nav-icon3.open span:nth-child(2) {
+    -webkit-transform: rotate(45deg);
+    -moz-transform: rotate(45deg);
+    -o-transform: rotate(45deg);
+    transform: rotate(45deg);
+  }
+  #nav-icon3.open span:nth-child(3) {
+    -webkit-transform: rotate(-45deg);
+    -moz-transform: rotate(-45deg);
+    -o-transform: rotate(-45deg);
+    transform: rotate(-45deg);
+  }
+  #nav-icon3.open span:nth-child(4) {
+    top: 9px;
+    width: 0%;
+    left: 50%;
+  }
+  #links {
+    display: none;
+  }
+  /*  */
+  .aai a {
+    color: #333333;
+  }
+  #links.open {
+    position: absolute;
+    top: 100px;
+    left: 0px;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    width: 100%;
+    height: 100vh;
+    background-color: rgb(255, 255, 255);
+  }
+  #links .menu_item {
+    font-size: 30px;
+    margin-top: 30px;
+  }
+  #links .menu_item a {
+    font-size: 16px;
   }
   body #main .main_content {
     padding: 10px 20px 40px 20px;
@@ -833,6 +917,7 @@ body.register #main .main_content .landing_page_window input[type=button],
 body.login_noEmail #main .main_content .landing_page_window input[type=submit],
 body.login_noEmail #main .main_content .landing_page_window input[type=button] {
     margin: 30px auto !important;
+    width: 100%;
   }
   body.landing_page #main .main_content .app_subtitle,
 body.login #main .main_content .app_subtitle,
@@ -916,6 +1001,11 @@ header {
   max-width: 1160px;
   width: 95%;
   margin: auto;
+  font-family: "Source Sans Pro";
+}
+
+header nav {
+  font-weight: 400;
 }
 
 header .logo a img {
@@ -992,12 +1082,14 @@ body.landing_page #main .landing_page_window label {
 
 .landing_page_window input[type=text] {
   padding: 0px;
+  padding-left: 8px;
   height: 38px;
   max-width: 354px;
 }
 
 .landing_page_window input[type=password] {
   padding: 0px;
+  padding-left: 8px;
   height: 38px;
   max-width: 354px;
 }
@@ -1041,6 +1133,10 @@ body.landing_page #main .landing_page_window .register_window a {
   line-height: 20px;
 }
 
+body.landing_page #main .landing_page_window .register_window .checkbox_text_holder {
+  font-weight: 400;
+}
+
 body.landing_page #main .landing_page_window .register_window .lostpass {
   position: unset;
   text-align: left;
diff --git a/resources/sass/frontend_simple/basic/mobile.scss b/resources/sass/frontend_simple/basic/mobile.scss
index 6ef69c03e..72560cc13 100644
--- a/resources/sass/frontend_simple/basic/mobile.scss
+++ b/resources/sass/frontend_simple/basic/mobile.scss
@@ -1,31 +1,150 @@
 /* Mobile prilagoditve */
 
+.mobile{
+    display: none;
+}
 @media screen and (max-width: 700px) {
     
-    header{
-        nav{
-            flex-direction: column-reverse;
-            align-self: auto;
-            justify-content: space-evenly;
+    // header{
+    //     nav{
+    //         flex-direction: column-reverse;
+    //         align-self: auto;
+    //         justify-content: space-evenly;
 
-            height: 100%;
+    //         height: 100%;
 
-            text-align: right;
-            font-size: 14px;
+    //         text-align: right;
+    //         font-size: 14px;
 
-            span.menu_item{
-                line-height: 18px;
+    //         span.menu_item{
+    //             line-height: 18px;
 
-                &.active{
-                    border-bottom: 2px $color_blue solid;
-                }
+    //             &.active{
+    //                 border-bottom: 2px $color_blue solid;
+    //             }
 
-                a{
-                    line-height: 18px;
-                }
+    //             a{
+    //                 line-height: 18px;
+    //             }
+    //         }
+    //     }
+    // }
+
+        /* --------------HAMBURGER---------------------------------- */
+        .nav-desktop {
+            display: none;  
+        }
+    
+        .mobile {
+            display: block;
+        }
+    
+        #nav-icon3 {
+            width: 38px;
+            height: 20px;
+            position: relative;
+    
+            bottom: 15px;
+            
+            -webkit-transform: rotate(0deg);
+            -moz-transform: rotate(0deg);
+            -o-transform: rotate(0deg);
+            transform: rotate(0deg);
+            -webkit-transition: .5s ease-in-out;
+            -moz-transition: .5s ease-in-out;
+            -o-transition: .5s ease-in-out;
+            transition: .5s ease-in-out;
+            cursor: pointer;
+    
+            span {
+                display: block;
+                position: absolute;
+                height: 5px;
+                width: 100%;
+                background: #1E88E5;
+                border-radius: 9px;
+                opacity: 1;
+                left: 0;
+                -webkit-transform: rotate(0deg);
+                -moz-transform: rotate(0deg);
+                -o-transform: rotate(0deg);
+                transform: rotate(0deg);
+                -webkit-transition: .25s ease-in-out;
+                -moz-transition: .25s ease-in-out;
+                -o-transition: .25s ease-in-out;
+                transition: .25s ease-in-out;
+            }
+            span:nth-child(1) {
+                top: 0px;
+            }
+            span:nth-child(2),
+            span:nth-child(3) {
+                top: 9px;
+            }
+            span:nth-child(4) {
+                top: 18px;
             }
         }
-    }
+          
+        #nav-icon3.open span:nth-child(1) {
+            top: 9px;
+            width: 0%;
+            left: 50%;
+        }
+          
+        #nav-icon3.open span:nth-child(2) {
+            -webkit-transform: rotate(45deg);
+            -moz-transform: rotate(45deg);
+            -o-transform: rotate(45deg);
+            transform: rotate(45deg);
+        }
+          
+        #nav-icon3.open span:nth-child(3) {
+            -webkit-transform: rotate(-45deg);
+            -moz-transform: rotate(-45deg);
+            -o-transform: rotate(-45deg);
+            transform: rotate(-45deg);
+        }
+          
+        #nav-icon3.open span:nth-child(4) {
+            top: 9px;
+            width: 0%;
+            left: 50%;
+        }
+    
+        #links {
+            display: none;
+        }
+    
+        /*  */
+        .aai a  {
+            color: #333333;
+        }
+          
+        #links.open {
+            position: absolute;
+            top: 100px;
+            left: 0px;
+    
+            display: flex;
+            flex-direction: column;
+            align-items: center;
+
+    
+            width: 100%;
+            height: 100vh;
+            background-color: rgb(255, 255, 255);
+        }
+    
+        #links .menu_item {
+            font-size: 30px;
+            margin-top: 30px;
+            a {
+                font-size: 16px;
+            }
+        }
+
+        //-------------------------------------------------------------------
 
     body{
         #main{
@@ -116,6 +235,7 @@
                     input[type="submit"],
                     input[type="button"]{
                         margin: 30px auto !important;
+                        width: 100%;
                     }
                 }
 
diff --git a/resources/sass/frontend_simple/basic/popravki.scss b/resources/sass/frontend_simple/basic/popravki.scss
index 378989f7d..002f3ce3a 100644
--- a/resources/sass/frontend_simple/basic/popravki.scss
+++ b/resources/sass/frontend_simple/basic/popravki.scss
@@ -29,6 +29,11 @@ header {
     max-width: 1160px;
     width: 95%;
     margin: auto;
+
+    font-family: $SansPro_font;
+}
+header nav{
+    font-weight: 400;
 }
 
 header .logo a img {
@@ -110,11 +115,13 @@ body.landing_page #main .landing_page_window label {
 
 .landing_page_window input[type="text"] {
     padding: 0px;
+    padding-left: 8px;
     height: 38px;
     max-width: 354px;
 }
 .landing_page_window input[type="password"] {
     padding: 0px;
+    padding-left: 8px;
     height: 38px;
     max-width: 354px;
 }
@@ -162,6 +169,11 @@ body.landing_page #main .landing_page_window .register_window a {
     font-size: 16px;
     line-height: 20px;
 }
+
+body.landing_page #main .landing_page_window .register_window .checkbox_text_holder{
+    font-weight: 400;
+}
+
   
 body.landing_page #main .landing_page_window .register_window .lostpass {
     position: unset;
@@ -222,4 +234,4 @@ footer .footer_content .col a {
 footer .footer_content .col3 .social_logo_flex a:first-of-type{
     margin-right: 20px;
 }
-  
\ No newline at end of file
+  

From 459a3a29852a16a8c65de8bfd20db951a0baa15b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nejc=20Kova=C4=8D?= <nejc.kouko@gmail.com>
Date: Sun, 26 Jun 2022 18:03:54 +0200
Subject: [PATCH 020/110] login/register form border sprememba barve

---
 frontend/simple/css/style.css                      | 2 ++
 resources/sass/frontend_simple/basic/popravki.scss | 7 +++++++
 2 files changed, 9 insertions(+)

diff --git a/frontend/simple/css/style.css b/frontend/simple/css/style.css
index bf9abc4bb..cf0d0b590 100644
--- a/frontend/simple/css/style.css
+++ b/frontend/simple/css/style.css
@@ -1085,6 +1085,7 @@ body.landing_page #main .landing_page_window label {
   padding-left: 8px;
   height: 38px;
   max-width: 354px;
+  border: 1px solid #C4C4C4;
 }
 
 .landing_page_window input[type=password] {
@@ -1092,6 +1093,7 @@ body.landing_page #main .landing_page_window label {
   padding-left: 8px;
   height: 38px;
   max-width: 354px;
+  border: 1px solid #C4C4C4;
 }
 
 body.landing_page #main .landing_page_window input[type=submit] {
diff --git a/resources/sass/frontend_simple/basic/popravki.scss b/resources/sass/frontend_simple/basic/popravki.scss
index 002f3ce3a..df1146e86 100644
--- a/resources/sass/frontend_simple/basic/popravki.scss
+++ b/resources/sass/frontend_simple/basic/popravki.scss
@@ -4,6 +4,8 @@ $black: #333333;
 $light_blue: #4ca0ea;
 $blue: #1e88e5;
 
+$input_border: 1px solid #C4C4C4;
+
 @import url("https://fonts.googleapis.com/css2?family=Source+Sans+Pro:wght@300;400;600;700&display=swap");
 
 /* 
@@ -113,17 +115,22 @@ body.landing_page #main .landing_page_window label {
     margin: 15px 0px 4px 0px;
 }
 
+
 .landing_page_window input[type="text"] {
     padding: 0px;
     padding-left: 8px;
     height: 38px;
     max-width: 354px;
+
+    border: $input_border;
 }
 .landing_page_window input[type="password"] {
     padding: 0px;
     padding-left: 8px;
     height: 38px;
     max-width: 354px;
+
+    border: $input_border;
 }
 
 body.landing_page #main .landing_page_window input[type="submit"] {

From 479ad457d19526118c4a2dc73d50acb65592f36c Mon Sep 17 00:00:00 2001
From: pero1203 <peter.hrvatin@gmail.com>
Date: Tue, 28 Jun 2022 08:32:47 +0200
Subject: [PATCH 021/110] Redesign - vrnjena ikona za if v urejanju posameznega
 vprasanja

---
 public/css/admin_new.css                             | 12 ++++++++----
 .../sass/admin_new/basic/icons/question_edit.scss    |  1 -
 .../pages/survey_edit/questions/question_box.scss    | 11 +++++++++--
 3 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/public/css/admin_new.css b/public/css/admin_new.css
index a93f3a36d..7745acffe 100644
--- a/public/css/admin_new.css
+++ b/public/css/admin_new.css
@@ -6376,7 +6376,6 @@ a.faicon.edit::before {
 
 a.faicon.addif::before {
   font-family: Source Sans Pro, sans-serif;
-  font-size: 18px;
   font-weight: 900;
   content: "IF";
 }
@@ -14895,9 +14894,14 @@ div.spr .spr_edit .scale_ordnom button.active,
 .jezik_row .spr_edit .scale_ordnom button.active {
   cursor: default;
 }
-li.spr .spr_edit .faicon.addif,
-div.spr .spr_edit .faicon.addif,
-.jezik_row .spr_edit .faicon.addif {
+li.spr .spr_edit a.faicon.addif:before,
+div.spr .spr_edit a.faicon.addif:before,
+.jezik_row .spr_edit a.faicon.addif:before {
+  font-size: 18px;
+}
+li.spr .spr_edit a.faicon.addif.user_access_locked,
+div.spr .spr_edit a.faicon.addif.user_access_locked,
+.jezik_row .spr_edit a.faicon.addif.user_access_locked {
   display: none;
 }
 li.spr .spremenljivka_content,
diff --git a/resources/sass/admin_new/basic/icons/question_edit.scss b/resources/sass/admin_new/basic/icons/question_edit.scss
index efd6622d6..ace95b202 100644
--- a/resources/sass/admin_new/basic/icons/question_edit.scss
+++ b/resources/sass/admin_new/basic/icons/question_edit.scss
@@ -32,7 +32,6 @@ a.faicon.edit::before{
 }
 a.faicon.addif::before{
     font-family: $font_family;
-    font-size: 18px;
     font-weight: 900;
     content: "IF";
 }
diff --git a/resources/sass/admin_new/pages/survey_edit/questions/question_box.scss b/resources/sass/admin_new/pages/survey_edit/questions/question_box.scss
index c7327e24c..e0a206704 100644
--- a/resources/sass/admin_new/pages/survey_edit/questions/question_box.scss
+++ b/resources/sass/admin_new/pages/survey_edit/questions/question_box.scss
@@ -112,8 +112,15 @@ div.spr,
 		}
 
         // IF na vprasanje zaenkrat skrijemo
-        .faicon.addif{
-            display: none;
+        a.faicon.addif{
+
+            &:before{   
+                font-size: 18px;
+            }
+
+            &.user_access_locked{
+                display: none;
+            }
         }
     }
 

From 932ce9c78640c3662299cd054474e1dfa23d34da Mon Sep 17 00:00:00 2001
From: pero1203 <peter.hrvatin@gmail.com>
Date: Tue, 28 Jun 2022 08:35:09 +0200
Subject: [PATCH 022/110] Redesign - popravek shranjevanja posameznega odgovora
 v urejanju vprasanja

---
 admin/survey/classes/class.Vprasanje.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/admin/survey/classes/class.Vprasanje.php b/admin/survey/classes/class.Vprasanje.php
index f1a8a2a08..06eea9e3c 100644
--- a/admin/survey/classes/class.Vprasanje.php
+++ b/admin/survey/classes/class.Vprasanje.php
@@ -2898,8 +2898,8 @@ class Vprasanje {
 			echo '</p>';
 
 			echo '<div class="button_holder">';
-			echo '<button class="medium white-blue" onClick="vrednost_save(\''.$vrednost.'\'); return false;">'.$lang['srv_close_profile'].'</button>';              
-			echo '<button class="medium blue" onclick="vrednost_cancel(); return false;">'.$lang['srv_potrdi'].'</button>';
+			echo '  <button class="medium white-blue" onClick="vrednost_cancel(); return false;">'.$lang['srv_close_profile'].'</button>';              
+			echo '  <button class="medium blue" onclick="vrednost_save(\''.$vrednost.'\'); return false;">'.$lang['srv_potrdi'].'</button>';
 			echo '</div>';
 		}
 

From c911f2ec03f9818b20e3dc20f87c455ed684324c Mon Sep 17 00:00:00 2001
From: pero1203 <peter.hrvatin@gmail.com>
Date: Tue, 28 Jun 2022 08:53:34 +0200
Subject: [PATCH 023/110] Popravek nadaljuj kasneje - pri vecjezicni anketi je
 bil pri prevodu text vedno v slovenscini

---
 admin/survey/SurveyAdminSettings.php          | 24 +++----
 .../survey/app/Controllers/AjaxController.php | 70 +++++++++++++------
 2 files changed, 60 insertions(+), 34 deletions(-)

diff --git a/admin/survey/SurveyAdminSettings.php b/admin/survey/SurveyAdminSettings.php
index ff93c4b11..aff2d3ef7 100644
--- a/admin/survey/SurveyAdminSettings.php
+++ b/admin/survey/SurveyAdminSettings.php
@@ -300,19 +300,19 @@ class SurveyAdminSettings {
 			
 			// Nadaljuj kasneje
 			if($this->survey_type > 1){
-			echo '<div class="setting_holder">';
-			echo '<span class="setting_title">'. $lang['srv_show_continue_later'].' '.Help::display('srv_continue_later_setting').':</span>';
-			
-			echo '<div class="setting_item">';
-			echo '<input type="radio" name="continue_later" value="1" id="continue_later_1"' . ($row['continue_later'] == 1 ? ' checked="checked"' : '') . '>';
-			echo '<label for="continue_later_1">'.$lang['yes'].'</label>';
-			echo '</div>';
-			echo '<div class="setting_item">';
-			echo '<input type="radio" name="continue_later" value="0" id="continue_later_0"' . ($row['continue_later'] == 0 ? ' checked="checked"' : '') . '>';
-			echo '<label for="continue_later_0">'.$lang['no1'].'</label>';
-			echo '</div>';
+                echo '<div class="setting_holder">';
+                echo '<span class="setting_title">'. $lang['srv_show_continue_later'].' '.Help::display('srv_continue_later_setting').':</span>';
+                
+                echo '<div class="setting_item">';
+                echo '<input type="radio" name="continue_later" value="1" id="continue_later_1"' . ($row['continue_later'] == 1 ? ' checked="checked"' : '') . '>';
+                echo '<label for="continue_later_1">'.$lang['yes'].'</label>';
+                echo '</div>';
+                echo '<div class="setting_item">';
+                echo '<input type="radio" name="continue_later" value="0" id="continue_later_0"' . ($row['continue_later'] == 0 ? ' checked="checked"' : '') . '>';
+                echo '<label for="continue_later_0">'.$lang['no1'].'</label>';
+                echo '</div>';
 
-			echo '</div>';
+                echo '</div>';
 			}
 			
 			// Gumb nazaj
diff --git a/main/survey/app/Controllers/AjaxController.php b/main/survey/app/Controllers/AjaxController.php
index 8eb8d7fc4..e76192a1f 100644
--- a/main/survey/app/Controllers/AjaxController.php
+++ b/main/survey/app/Controllers/AjaxController.php
@@ -10,6 +10,7 @@ namespace App\Controllers;
 // Osnovni razredi
 use App\Controllers\StatisticController as Statistic;
 use App\Controllers\Vprasanja\VprasanjaController as Vprasanja;
+use App\Controllers\LanguageController as Language;
 use App\Models\Model;
 use Common;
 use Branching;
@@ -23,52 +24,77 @@ use AppSettings;
 class AjaxController extends Controller
 {
     //ajax zahteve
-    public function __construct()
-    {
+    public function __construct(){       
+
         if(empty($_GET['a'])){
 			return '';
 		}
+
+        // inicializiramo jezik za multilang anketo
+        Language::getInstance()->multilang_init();
+
+
         if ($_GET['a'] == 'accept_droppable') {
             $this->ajax_accept_droppable();
-        } elseif ($_GET['a'] == 'accept_ranking') {
+        } 
+        elseif ($_GET['a'] == 'accept_ranking') {
             $this->ajax_accept_ranking();
-        } elseif ($_GET['a'] == 'accept_dragdrop1') {
+        } 
+        elseif ($_GET['a'] == 'accept_dragdrop1') {
             $this->ajax_accept_dragdrop1();
-        } elseif ($_GET['a'] == 'get_dragdrop1_data') {
+        } 
+        elseif ($_GET['a'] == 'get_dragdrop1_data') {
             $this->ajax_get_dragdrop1_data();
-        } elseif ($_GET['a'] == 'delete_dragdrop1_data') {
+        } 
+        elseif ($_GET['a'] == 'delete_dragdrop1_data') {
             $this->ajax_delete_dragdrop1_data();
-        } elseif ($_GET['a'] == 'delete_dragdrop2_data') {
+        } 
+        elseif ($_GET['a'] == 'delete_dragdrop2_data') {
             $this->ajax_delete_dragdrop2_data();
-        } elseif ($_GET['a'] == 'accept_dragdrop_grid') {
+        } 
+        elseif ($_GET['a'] == 'accept_dragdrop_grid') {
             $this->ajax_accept_dragdrop_grid();
-        } elseif ($_GET['a'] == 'accept_sortable_ranking') {
+        } 
+        elseif ($_GET['a'] == 'accept_sortable_ranking') {
             $this->ajax_accept_sortable_ranking();
-        } elseif ($_GET['a'] == 'edit_size') {
+        } 
+        elseif ($_GET['a'] == 'edit_size') {
             $this->ajax_edit_size();
-        } elseif ($_GET['a'] == 'dodaj_ime') {
+        } 
+        elseif ($_GET['a'] == 'dodaj_ime') {
             $this->ajax_dodaj_ime();
-        } elseif ($_GET['a'] == 'spol') {
+        } 
+        elseif ($_GET['a'] == 'spol') {
             $this->ajax_glasovanje_spol();
-        } elseif ($_GET['a'] == 'vote_spol') {
+        } 
+        elseif ($_GET['a'] == 'vote_spol') {
             $this->ajax_glasovanje_vote_spol();
-        } elseif ($_GET['a'] == 'captcha') {
+        } 
+        elseif ($_GET['a'] == 'captcha') {
             $this->ajax_captcha();
-        } elseif ($_GET['a'] == 'skin') {
+        } 
+        elseif ($_GET['a'] == 'skin') {
             $this->ajax_skin();
-        } elseif ($_GET['a'] == 'grupa_for_if') {
+        } 
+        elseif ($_GET['a'] == 'grupa_for_if') {
             $this->ajax_grupa_for_if();
-        } elseif ($_GET['a'] == 'enable_comments') {
+        } 
+        elseif ($_GET['a'] == 'enable_comments') {
             $this->ajax_enable_comments();
-        } elseif ($_GET['a'] == 'continue_later') {
+        } 
+        elseif ($_GET['a'] == 'continue_later') {
             $this->ajax_continue_later();
-        } elseif ($_GET['a'] == 'continue_later_send') {
+        } 
+        elseif ($_GET['a'] == 'continue_later_send') {
             $this->ajax_continue_later_send();
-        } elseif ($_GET['a'] == 'usr_id_data') {
+        } 
+        elseif ($_GET['a'] == 'usr_id_data') {
             $this->ajax_delete_signature_data();
-		}elseif ($_GET['a'] == 'get_tip_opozorila') {
+		}
+        elseif ($_GET['a'] == 'get_tip_opozorila') {
             $this->ajax_get_tip_opozorila();
-        } // genericna resitev za vse nadaljne
+        } 
+        // genericna resitev za vse nadaljne
         else {
             $ajax = 'ajax_' . $_GET['a'];
             if (method_exists($this, $ajax))

From 40475b25184c73bf6d927478a79588a929316419 Mon Sep 17 00:00:00 2001
From: pero1203 <peter.hrvatin@gmail.com>
Date: Tue, 28 Jun 2022 08:54:24 +0200
Subject: [PATCH 024/110] Razbitje je zaenkrat vidno samo adminom

---
 admin/survey/classes/class.SurveyStaticHtml.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/admin/survey/classes/class.SurveyStaticHtml.php b/admin/survey/classes/class.SurveyStaticHtml.php
index b30b21e3a..cae651e66 100644
--- a/admin/survey/classes/class.SurveyStaticHtml.php
+++ b/admin/survey/classes/class.SurveyStaticHtml.php
@@ -657,9 +657,11 @@ class SurveyStaticHtml
                     }
 
                     # break
-                    echo '<li' . ($_GET['m'] == M_ANALYSIS_BREAK ? ' class="highlightLineTab"' : ' class="nonhighlight displayNone"') . $_js_links[7] . '>';
-                    echo '<a href="index.php?anketa=' . $this->sid . '&a=' . A_ANALYSIS . '&m=' . M_ANALYSIS_BREAK . '" title="' . $lang['srv_break'] . '"><span>' . $lang['srv_break'] . '</span></a>';
-                    echo '</li>';
+                    if ($admin_type == 0) {
+                        echo '<li' . ($_GET['m'] == M_ANALYSIS_BREAK ? ' class="highlightLineTab"' : ' class="nonhighlight displayNone"') . $_js_links[7] . '>';
+                        echo '<a href="index.php?anketa=' . $this->sid . '&a=' . A_ANALYSIS . '&m=' . M_ANALYSIS_BREAK . '" title="' . $lang['srv_break'] . '"><span>' . $lang['srv_break'] . '</span></a>';
+                        echo '</li>';
+                    }
                 }
 
                 echo '</ul>';

From bc4dd88663e37cccb2c1a28088b026720cbf26b5 Mon Sep 17 00:00:00 2001
From: pero1203 <peter.hrvatin@gmail.com>
Date: Tue, 28 Jun 2022 09:07:49 +0200
Subject: [PATCH 025/110] Redesign - popravek borderja pri 2. navigaciji

---
 public/css/admin_new.css                                   | 2 +-
 resources/sass/admin_new/components/header/navigation.scss | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/public/css/admin_new.css b/public/css/admin_new.css
index 7745acffe..7cf6f9953 100644
--- a/public/css/admin_new.css
+++ b/public/css/admin_new.css
@@ -9020,7 +9020,7 @@ header #secondNavigation ul.secondNavigationArchive li {
   list-style-type: none;
   height: 41px;
   margin-left: 16px;
-  border-bottom: 1px #E5E5E5 solid;
+  border-bottom: 1px transparent solid;
 }
 header #secondNavigation ul.secondNavigation li a,
 header #secondNavigation ul.secondNavigationArchive li a {
diff --git a/resources/sass/admin_new/components/header/navigation.scss b/resources/sass/admin_new/components/header/navigation.scss
index fb725b852..0576efb83 100644
--- a/resources/sass/admin_new/components/header/navigation.scss
+++ b/resources/sass/admin_new/components/header/navigation.scss
@@ -182,7 +182,7 @@ header{
                 height: 41px;
                 margin-left: 16px;
 
-                border-bottom: 1px $gray solid;
+                border-bottom: 1px transparent solid;
 
                 a {
                     padding: 12px 16px;     

From 033da50e8dbb5e28966c2dd0fdd1557ea8d52d75 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nejc=20Kova=C4=8D?= <nejc.kouko@gmail.com>
Date: Wed, 29 Jun 2022 09:18:13 +0200
Subject: [PATCH 026/110] login/register popravki,

---
 frontend/simple/css/style.css                 | 53 ++++++++++++++-----
 .../sass/frontend_simple/basic/mobile.scss    |  2 +-
 .../sass/frontend_simple/basic/popravki.scss  | 48 ++++++++++++++---
 .../sass/frontend_simple/modules/footer.scss  |  1 +
 .../sass/frontend_simple/modules/header.scss  |  2 +-
 .../frontend_simple/modules/landing_page.scss |  4 +-
 .../sass/frontend_simple/modules/main.scss    |  3 +-
 7 files changed, 88 insertions(+), 25 deletions(-)

diff --git a/frontend/simple/css/style.css b/frontend/simple/css/style.css
index cf0d0b590..fef3fbbc3 100644
--- a/frontend/simple/css/style.css
+++ b/frontend/simple/css/style.css
@@ -147,7 +147,7 @@ header nav {
   font-weight: 600;
 }
 header nav span.menu_item {
-  margin-left: 40px;
+  margin-left: 32px;
   border-bottom: 3px transparent solid;
 }
 header nav span.menu_item a {
@@ -168,8 +168,9 @@ header nav span.menu_item.active {
 }
 #main .main_content {
   max-width: 1400px;
+  min-height: 839px;
   margin: 0 auto;
-  padding: 30px 20px 60px 20px;
+  padding: 70px 20px 0px 20px;
 }
 
 footer .footer_content {
@@ -280,7 +281,6 @@ body.register #main,
 body.login #main,
 body.login_noEmail #main {
   height: auto;
-  min-height: 940px;
   background-image: url("../img/landing_page_image.jpg");
   background-position: top;
 }
@@ -462,7 +462,7 @@ body.login_noEmail #main .landing_page_window .agreement {
   cursor: pointer;
   display: flex;
   align-items: baseline;
-  margin: 15px 0 5px 0;
+  margin: 17px 0 5px 0;
 }
 body.landing_page #main .landing_page_window .agreement input,
 body.register #main .landing_page_window .agreement input,
@@ -735,7 +735,7 @@ body.reset_password_activate div.label {
     width: 38px;
     height: 20px;
     position: relative;
-    bottom: 15px;
+    bottom: 0px;
     -webkit-transform: rotate(0deg);
     -moz-transform: rotate(0deg);
     -o-transform: rotate(0deg);
@@ -989,13 +989,9 @@ body.landing_page #main {
   background-image: none;
 }
 
-#main .main_content {
-  padding: 70px 0px 305px 0px;
-}
-
 header {
   height: unset;
-  padding-top: 13px;
+  padding-top: 12px;
   padding-left: 0px;
   padding-right: 0px;
   max-width: 1160px;
@@ -1014,7 +1010,11 @@ header .logo a img {
 
 .nav-desktop {
   align-items: center;
-  padding-bottom: 13px;
+  padding-bottom: 12px;
+}
+
+header nav span.lang_switch .flag img {
+  padding-right: 8px;
 }
 
 .flag {
@@ -1026,6 +1026,10 @@ header nav span.menu_item {
   border-bottom: unset;
 }
 
+.app_title {
+  display: none;
+}
+
 .landing_page_content {
   font-family: "Source Sans Pro", "sans-serif";
   text-align: center;
@@ -1053,10 +1057,12 @@ body.landing_page #main .landing_page_window {
   max-width: 400px;
   width: unset;
   min-height: 327px;
+  margin-bottom: 70px;
 }
 
 body.landing_page #main .landing_page_window #login_holder .login_form {
   padding: 25px 23px;
+  position: unset;
 }
 
 body.landing_page #main .landing_page_window .tabs .tab {
@@ -1070,8 +1076,13 @@ body.landing_page #main .landing_page_window .tabs .tab {
   align-items: center;
 }
 
+body.landing_page #main .landing_page_window .tabs .tab {
+  background-color: #F8F8F8;
+}
+
 body.landing_page #main .landing_page_window .tabs .tab.active {
   color: #1E88E5;
+  background-color: #FFFFFF;
 }
 
 body.landing_page #main .landing_page_window label {
@@ -1080,6 +1091,10 @@ body.landing_page #main .landing_page_window label {
   margin: 15px 0px 4px 0px;
 }
 
+body.landing_page #main .landing_page_window label:first-of-type {
+  margin-top: 0px;
+}
+
 .landing_page_window input[type=text] {
   padding: 0px;
   padding-left: 8px;
@@ -1104,6 +1119,7 @@ body.landing_page #main .landing_page_window input[type=submit] {
   font-weight: 700;
   padding: 12.5px 0px;
   line-height: 20px;
+  font-family: "Source Sans Pro";
 }
 
 body.landing_page #main .landing_page_window #login_holder .login_form .lostpass {
@@ -1135,8 +1151,21 @@ body.landing_page #main .landing_page_window .register_window a {
   line-height: 20px;
 }
 
+body.landing_page #main .landing_page_window .agreement {
+  align-items: center;
+}
+
+body.landing_page #main .landing_page_window .agreement input {
+  height: 18px;
+  width: 18px;
+  margin: 0px 9px 4px 0px;
+  margin-top: 0px;
+  margin-bottom: 4px;
+}
+
 body.landing_page #main .landing_page_window .register_window .checkbox_text_holder {
   font-weight: 400;
+  margin-bottom: 0px;
 }
 
 body.landing_page #main .landing_page_window .register_window .lostpass {
@@ -1153,7 +1182,7 @@ footer .footer_content {
   max-width: 1160px;
   width: 95%;
   margin: auto;
-  padding: 67px 0px 0px 0px;
+  padding: 67px 0px 66px 0px;
 }
 
 footer .footer_content h2 {
diff --git a/resources/sass/frontend_simple/basic/mobile.scss b/resources/sass/frontend_simple/basic/mobile.scss
index 72560cc13..2e715a953 100644
--- a/resources/sass/frontend_simple/basic/mobile.scss
+++ b/resources/sass/frontend_simple/basic/mobile.scss
@@ -44,7 +44,7 @@
             height: 20px;
             position: relative;
     
-            bottom: 15px;
+            bottom: 0px;
             
             -webkit-transform: rotate(0deg);
             -moz-transform: rotate(0deg);
diff --git a/resources/sass/frontend_simple/basic/popravki.scss b/resources/sass/frontend_simple/basic/popravki.scss
index df1146e86..bc88f5884 100644
--- a/resources/sass/frontend_simple/basic/popravki.scss
+++ b/resources/sass/frontend_simple/basic/popravki.scss
@@ -19,13 +19,11 @@ $input_border: 1px solid #C4C4C4;
 body.landing_page #main {
     background-image: none;
 }
-#main .main_content {
-    padding: 70px 0px 305px 0px;
-}
+
 
 header {
     height: unset;
-    padding-top: 13px;
+    padding-top: 12px;
     padding-left: 0px;
     padding-right: 0px;
     max-width: 1160px;
@@ -38,22 +36,29 @@ header nav{
     font-weight: 400;
 }
 
+
 header .logo a img {
     height: 45px;
 }
 .nav-desktop {
     align-items: center;
-    padding-bottom: 13px;
+    padding-bottom: 12px;
+}
+header nav span.lang_switch .flag img {
+    padding-right: 8px;
 }
 .flag {
     display: flex;
     align-items: unset;
 }
+
 header nav span.menu_item{
     border-bottom: unset;
 }
 
-
+.app_title{
+    display: none;
+}
   
 .landing_page_content {
     font-family: "Source Sans Pro", "sans-serif";
@@ -84,10 +89,13 @@ body.landing_page #main .landing_page_window {
     max-width: 400px;
     width: unset;
     min-height: 327px;
+
+    margin-bottom: 70px;
 }
-  
+ 
 body.landing_page #main .landing_page_window #login_holder .login_form {
     padding: 25px 23px;
+    position: unset;
 }
 
 body.landing_page #main .landing_page_window .tabs .tab {
@@ -103,9 +111,13 @@ body.landing_page #main .landing_page_window .tabs .tab {
     justify-content: center;
     align-items: center;
 }
+body.landing_page #main .landing_page_window .tabs .tab{
+    background-color: #F8F8F8;
+}
   
 body.landing_page #main .landing_page_window .tabs .tab.active {
     color: #1E88E5;
+    background-color: #FFFFFF;
 }
 
 body.landing_page #main .landing_page_window label {
@@ -114,6 +126,9 @@ body.landing_page #main .landing_page_window label {
     
     margin: 15px 0px 4px 0px;
 }
+body.landing_page #main .landing_page_window label:first-of-type{
+    margin-top: 0px;
+}
 
 
 .landing_page_window input[type="text"] {
@@ -143,6 +158,8 @@ body.landing_page #main .landing_page_window input[type="submit"] {
     font-weight: 700;
     padding: 12.5px 0px;
     line-height: 20px;
+
+    font-family: $SansPro_font;
 }
 
 
@@ -177,8 +194,23 @@ body.landing_page #main .landing_page_window .register_window a {
     line-height: 20px;
 }
 
+body.landing_page #main .landing_page_window .agreement{
+    align-items: center;
+}
+
+
+body.landing_page #main .landing_page_window .agreement input{
+    height: 18px;
+    width: 18px;
+
+    margin: 0px 9px 4px 0px;
+    margin-top: 0px;
+    margin-bottom: 4px;
+}
+
 body.landing_page #main .landing_page_window .register_window .checkbox_text_holder{
     font-weight: 400;
+    margin-bottom: 0px;
 }
 
   
@@ -197,7 +229,7 @@ footer .footer_content {
     max-width: $max_sirina;
     width: 95%;
     margin: auto;
-    padding: 67px 0px 0px 0px;
+    padding: 67px 0px 66px 0px;
 }
 
 
diff --git a/resources/sass/frontend_simple/modules/footer.scss b/resources/sass/frontend_simple/modules/footer.scss
index e8d965993..5bcb06b58 100644
--- a/resources/sass/frontend_simple/modules/footer.scss
+++ b/resources/sass/frontend_simple/modules/footer.scss
@@ -1,4 +1,5 @@
 footer{
+
     
     .footer_content{
         display: flex;
diff --git a/resources/sass/frontend_simple/modules/header.scss b/resources/sass/frontend_simple/modules/header.scss
index 4c9abe9b7..0df146c57 100644
--- a/resources/sass/frontend_simple/modules/header.scss
+++ b/resources/sass/frontend_simple/modules/header.scss
@@ -29,7 +29,7 @@ header{
         font-weight: 600;
 
         span.menu_item{
-            margin-left: 40px;
+            margin-left:32px;
 
             border-bottom: 3px transparent solid;
             
diff --git a/resources/sass/frontend_simple/modules/landing_page.scss b/resources/sass/frontend_simple/modules/landing_page.scss
index 1773d19bd..4ebe330f0 100644
--- a/resources/sass/frontend_simple/modules/landing_page.scss
+++ b/resources/sass/frontend_simple/modules/landing_page.scss
@@ -5,7 +5,7 @@ body.login_noEmail{
 
     #main{
         height: auto;
-        min-height: 940px;
+        // min-height: 940px;
         
         background-image: url("../img/landing_page_image.jpg");     
         background-position: top;
@@ -155,7 +155,7 @@ body.login_noEmail{
                 display: flex;
                 align-items: baseline;
 
-                margin: 15px 0 5px 0;
+                margin: 17px 0 5px 0;
 
                 input{
                     margin-right: 10px;
diff --git a/resources/sass/frontend_simple/modules/main.scss b/resources/sass/frontend_simple/modules/main.scss
index 8fde8302c..9acc669d7 100644
--- a/resources/sass/frontend_simple/modules/main.scss
+++ b/resources/sass/frontend_simple/modules/main.scss
@@ -3,7 +3,8 @@
 
     .main_content{
         max-width: 1400px;
+        min-height: 839px;
         margin: 0 auto;
-        padding: 30px 20px 60px 20px;
+        padding: 70px 20px 0px 20px;
     }
 }
\ No newline at end of file

From 7fb37a973f412be0025d09d94e0c0addafe1685e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nejc=20Kova=C4=8D?= <nejc.kouko@gmail.com>
Date: Wed, 29 Jun 2022 09:20:44 +0200
Subject: [PATCH 027/110] Register forma - gumb spremenjen tekst

---
 lang/1.php | 2 +-
 lang/2.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lang/1.php b/lang/1.php
index 9d37da3d9..a7bb43126 100644
--- a/lang/1.php
+++ b/lang/1.php
@@ -557,7 +557,7 @@ $lang = array (
 	"base_displayinsert"		=>	"Vnos",
 	"base_displaylabel"		=>	"Pregled",
 	"base_alternative"		=>	"Alternativni napisi",
-	"next1"				=>	"Prijava",
+	"next1"				=>	"Registracija",
 	"vpisal"			=>	"Vpisal",
 	"spremenil"			=>	"Spremenil",
 	"show_menu"			=>	"Prika&#382;i menu",
diff --git a/lang/2.php b/lang/2.php
index 214a09fbf..88dc6f738 100644
--- a/lang/2.php
+++ b/lang/2.php
@@ -544,7 +544,7 @@ $lang = array (
 	"base_displayinsert"	=>	"Insert",
 	"base_displaylabel"	=>	"View",
 	"base_alternative"	=>	"Alternative labels",
-	"next1"			=>	"Login",
+	"next1"			=>	"Register",
 	"vpisal"		=>	"Posted by",
 	"spremenil"		=>	"Changed by",
 	"show_menu"		=>	"Show menu",

From bc331353db1c18f9d1ce23c09f7a29d453b25782 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nejc=20Kova=C4=8D?= <nejc.kouko@gmail.com>
Date: Wed, 29 Jun 2022 09:26:43 +0200
Subject: [PATCH 028/110] login/register form  - footer odstranjen min-height
 za mobile

---
 frontend/simple/css/style.css                    | 3 +++
 resources/sass/frontend_simple/basic/mobile.scss | 5 +++++
 2 files changed, 8 insertions(+)

diff --git a/frontend/simple/css/style.css b/frontend/simple/css/style.css
index fef3fbbc3..33bda094c 100644
--- a/frontend/simple/css/style.css
+++ b/frontend/simple/css/style.css
@@ -724,6 +724,9 @@ body.reset_password_activate div.label {
 }
 
 @media screen and (max-width: 700px) {
+  #main .main_content {
+    min-height: unset;
+  }
   /* --------------HAMBURGER---------------------------------- */
   .nav-desktop {
     display: none;
diff --git a/resources/sass/frontend_simple/basic/mobile.scss b/resources/sass/frontend_simple/basic/mobile.scss
index 2e715a953..c6114f9a5 100644
--- a/resources/sass/frontend_simple/basic/mobile.scss
+++ b/resources/sass/frontend_simple/basic/mobile.scss
@@ -4,6 +4,11 @@
     display: none;
 }
 @media screen and (max-width: 700px) {
+
+    #main .main_content {
+        min-height: unset;
+
+    }
     
     // header{
     //     nav{

From f08aa5a6b198be479512db05bdcd9f62e70a9081 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nejc=20Kova=C4=8D?= <nejc.kouko@gmail.com>
Date: Wed, 29 Jun 2022 12:31:52 +0200
Subject: [PATCH 029/110] Poprava teksta za gumbe

---
 frontend/simple/classes/DisplayController.php | 2 +-
 lang/1.php                                    | 3 ++-
 lang/2.php                                    | 3 ++-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/frontend/simple/classes/DisplayController.php b/frontend/simple/classes/DisplayController.php
index 87e69f987..c723f873f 100644
--- a/frontend/simple/classes/DisplayController.php
+++ b/frontend/simple/classes/DisplayController.php
@@ -716,7 +716,7 @@ class DisplayController{
         }
         
         // Submit
-		echo '  <input name="submit" value="'.$lang['next1'].'" class="regfield" type="submit">';
+		echo '  <input name="submit" value="'.$lang['register'].'" class="regfield" type="submit">';
 		
         // Lost pass
         echo '  <div class="lostpass"><a class="RegLastPage" href="#" onclick="LostPassword(\''.$lang['please_insert_email'].'\');">'.$lang['forgot_password'].'</a></div>';
diff --git a/lang/1.php b/lang/1.php
index a7bb43126..6e2a74829 100644
--- a/lang/1.php
+++ b/lang/1.php
@@ -557,7 +557,8 @@ $lang = array (
 	"base_displayinsert"		=>	"Vnos",
 	"base_displaylabel"		=>	"Pregled",
 	"base_alternative"		=>	"Alternativni napisi",
-	"next1"				=>	"Registracija",
+	"next1"				=>	"Prijava",
+	"register"				=>	"Registracija",
 	"vpisal"			=>	"Vpisal",
 	"spremenil"			=>	"Spremenil",
 	"show_menu"			=>	"Prika&#382;i menu",
diff --git a/lang/2.php b/lang/2.php
index 88dc6f738..e86b6ffe1 100644
--- a/lang/2.php
+++ b/lang/2.php
@@ -544,7 +544,8 @@ $lang = array (
 	"base_displayinsert"	=>	"Insert",
 	"base_displaylabel"	=>	"View",
 	"base_alternative"	=>	"Alternative labels",
-	"next1"			=>	"Register",
+	"next1"			=>	"Login",
+	"register"				=>	"Register",
 	"vpisal"		=>	"Posted by",
 	"spremenil"		=>	"Changed by",
 	"show_menu"		=>	"Show menu",

From 763a668c74a0eddf45d6d61a0b4dad809d9fe813 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nejc=20Kova=C4=8D?= <nejc.kouko@gmail.com>
Date: Wed, 29 Jun 2022 12:47:46 +0200
Subject: [PATCH 030/110] login/register form - height

---
 frontend/simple/css/style.css                    | 2 +-
 resources/sass/frontend_simple/modules/main.scss | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/simple/css/style.css b/frontend/simple/css/style.css
index 33bda094c..03921e489 100644
--- a/frontend/simple/css/style.css
+++ b/frontend/simple/css/style.css
@@ -168,7 +168,7 @@ header nav span.menu_item.active {
 }
 #main .main_content {
   max-width: 1400px;
-  min-height: 839px;
+  min-height: 769px;
   margin: 0 auto;
   padding: 70px 20px 0px 20px;
 }
diff --git a/resources/sass/frontend_simple/modules/main.scss b/resources/sass/frontend_simple/modules/main.scss
index 9acc669d7..02ce7223d 100644
--- a/resources/sass/frontend_simple/modules/main.scss
+++ b/resources/sass/frontend_simple/modules/main.scss
@@ -3,7 +3,7 @@
 
     .main_content{
         max-width: 1400px;
-        min-height: 839px;
+        min-height: 769px;
         margin: 0 auto;
         padding: 70px 20px 0px 20px;
     }

From 66526c3fc64b41b482a1cb984fab377f8f6fd643 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nejc=20Kova=C4=8D?= <nejc.kouko@gmail.com>
Date: Wed, 29 Jun 2022 14:28:04 +0200
Subject: [PATCH 031/110] login/register form popravki

---
 frontend/simple/css/aai.css                       |  4 ++++
 frontend/simple/css/style.css                     | 15 +++++++++++----
 resources/sass/frontend_simple/aai.scss           |  4 ++++
 resources/sass/frontend_simple/basic/mobile.scss  |  4 ++++
 .../sass/frontend_simple/basic/popravki.scss      |  9 ++++++---
 .../sass/frontend_simple/modules/header.scss      |  2 +-
 6 files changed, 30 insertions(+), 8 deletions(-)

diff --git a/frontend/simple/css/aai.css b/frontend/simple/css/aai.css
index 859de0df6..e841f9f1c 100644
--- a/frontend/simple/css/aai.css
+++ b/frontend/simple/css/aai.css
@@ -327,6 +327,10 @@ footer .col a {
   line-height: 26px;
 }
 
+footer .footer_content .col3 .social_logo_flex a:first-of-type {
+  margin-right: 0px;
+}
+
 .social_logo_flex img {
   margin-right: 20px;
 }
diff --git a/frontend/simple/css/style.css b/frontend/simple/css/style.css
index 03921e489..f9c17772c 100644
--- a/frontend/simple/css/style.css
+++ b/frontend/simple/css/style.css
@@ -143,7 +143,6 @@ header nav {
   display: flex;
   align-self: flex-end;
   font-size: 17px;
-  text-transform: uppercase;
   font-weight: 600;
 }
 header nav span.menu_item {
@@ -823,6 +822,10 @@ body.reset_password_activate div.label {
   }
   #links .menu_item a {
     font-size: 16px;
+    color: #333333;
+  }
+  #links .menu_item a:hover {
+    color: #1E88E5;
   }
   body #main .main_content {
     padding: 10px 20px 40px 20px;
@@ -1013,13 +1016,17 @@ header .logo a img {
 
 .nav-desktop {
   align-items: center;
-  padding-bottom: 12px;
+  padding-bottom: 19px;
 }
 
 header nav span.lang_switch .flag img {
   padding-right: 8px;
 }
 
+.flag img {
+  padding-right: 8px;
+}
+
 .flag {
   display: flex;
   align-items: unset;
@@ -1064,7 +1071,7 @@ body.landing_page #main .landing_page_window {
 }
 
 body.landing_page #main .landing_page_window #login_holder .login_form {
-  padding: 25px 23px;
+  padding: 25px 25px;
   position: unset;
 }
 
@@ -1185,7 +1192,7 @@ footer .footer_content {
   max-width: 1160px;
   width: 95%;
   margin: auto;
-  padding: 67px 0px 66px 0px;
+  padding: 70px 0px 70px 0px;
 }
 
 footer .footer_content h2 {
diff --git a/resources/sass/frontend_simple/aai.scss b/resources/sass/frontend_simple/aai.scss
index 8d24cfc3b..1bd29b7a5 100644
--- a/resources/sass/frontend_simple/aai.scss
+++ b/resources/sass/frontend_simple/aai.scss
@@ -401,6 +401,10 @@ footer {
     }
 }
 
+footer .footer_content .col3 .social_logo_flex a:first-of-type{
+    margin-right: 0px;
+}
+
 .social_logo_flex img {
     margin-right: 20px;
     
diff --git a/resources/sass/frontend_simple/basic/mobile.scss b/resources/sass/frontend_simple/basic/mobile.scss
index c6114f9a5..163a14ba0 100644
--- a/resources/sass/frontend_simple/basic/mobile.scss
+++ b/resources/sass/frontend_simple/basic/mobile.scss
@@ -146,6 +146,10 @@
             margin-top: 30px;
             a {
                 font-size: 16px;
+                color: #333333 ;
+            }
+            a:hover{
+                color: #1E88E5;
             }
         }
 
diff --git a/resources/sass/frontend_simple/basic/popravki.scss b/resources/sass/frontend_simple/basic/popravki.scss
index bc88f5884..e947d0c40 100644
--- a/resources/sass/frontend_simple/basic/popravki.scss
+++ b/resources/sass/frontend_simple/basic/popravki.scss
@@ -42,11 +42,14 @@ header .logo a img {
 }
 .nav-desktop {
     align-items: center;
-    padding-bottom: 12px;
+    padding-bottom: 19px;
 }
 header nav span.lang_switch .flag img {
     padding-right: 8px;
 }
+.flag img{
+    padding-right: 8px;
+}
 .flag {
     display: flex;
     align-items: unset;
@@ -94,7 +97,7 @@ body.landing_page #main .landing_page_window {
 }
  
 body.landing_page #main .landing_page_window #login_holder .login_form {
-    padding: 25px 23px;
+    padding: 25px 25px;
     position: unset;
 }
 
@@ -229,7 +232,7 @@ footer .footer_content {
     max-width: $max_sirina;
     width: 95%;
     margin: auto;
-    padding: 67px 0px 66px 0px;
+    padding: 70px 0px 70px 0px;
 }
 
 
diff --git a/resources/sass/frontend_simple/modules/header.scss b/resources/sass/frontend_simple/modules/header.scss
index 0df146c57..8cae6386d 100644
--- a/resources/sass/frontend_simple/modules/header.scss
+++ b/resources/sass/frontend_simple/modules/header.scss
@@ -25,7 +25,7 @@ header{
         align-self: flex-end;
 
         font-size: 17px;
-        text-transform: uppercase;
+        // text-transform: uppercase;
         font-weight: 600;
 
         span.menu_item{

From 68c9e83687d34fb8200ece17599558c523e31162 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nejc=20Kova=C4=8D?= <nejc.kouko@gmail.com>
Date: Thu, 30 Jun 2022 09:46:57 +0200
Subject: [PATCH 032/110] login/register form popravki

---
 frontend/simple/css/style.css                     | 15 +++++++++++----
 resources/sass/frontend_simple/basic/mobile.scss  |  8 ++++++--
 .../sass/frontend_simple/basic/popravki.scss      |  6 +++++-
 .../frontend_simple/modules/landing_page.scss     |  2 +-
 4 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/frontend/simple/css/style.css b/frontend/simple/css/style.css
index f9c17772c..b9bab306d 100644
--- a/frontend/simple/css/style.css
+++ b/frontend/simple/css/style.css
@@ -313,7 +313,7 @@ body.login #main .landing_page_window,
 body.login_noEmail #main .landing_page_window {
   z-index: 999;
   width: 600px;
-  margin: 20px auto;
+  margin: 25px auto;
   background-color: white;
 }
 body.landing_page #main .landing_page_window .tabs,
@@ -737,7 +737,7 @@ body.reset_password_activate div.label {
     width: 38px;
     height: 20px;
     position: relative;
-    bottom: 0px;
+    bottom: 8px;
     -webkit-transform: rotate(0deg);
     -moz-transform: rotate(0deg);
     -o-transform: rotate(0deg);
@@ -807,7 +807,7 @@ body.reset_password_activate div.label {
   }
   #links.open {
     position: absolute;
-    top: 100px;
+    top: 72px;
     left: 0px;
     display: flex;
     flex-direction: column;
@@ -966,6 +966,9 @@ body.login_noEmail #content.aai #main .main_content .app_subtitle {
     max-width: unset;
     width: 100%;
   }
+  footer .footer_content .col span {
+    padding: 0px 0px 12px 0px;
+  }
   footer .footer_content .col h2 {
     padding-top: 12px;
   }
@@ -1044,6 +1047,7 @@ header nav span.menu_item {
   font-family: "Source Sans Pro", "sans-serif";
   text-align: center;
   color: #333333;
+  padding-bottom: 70px;
 }
 
 .landing_page_content .landing_page_title {
@@ -1067,7 +1071,6 @@ body.landing_page #main .landing_page_window {
   max-width: 400px;
   width: unset;
   min-height: 327px;
-  margin-bottom: 70px;
 }
 
 body.landing_page #main .landing_page_window #login_holder .login_form {
@@ -1223,6 +1226,10 @@ footer .footer_content .col span {
   padding: 0px 0px 12px 0px;
 }
 
+footer .footer_content .col span:last-of-type {
+  padding: 0px;
+}
+
 footer .footer_content .col a {
   color: #333333;
   font-weight: 400;
diff --git a/resources/sass/frontend_simple/basic/mobile.scss b/resources/sass/frontend_simple/basic/mobile.scss
index 163a14ba0..249ae2f49 100644
--- a/resources/sass/frontend_simple/basic/mobile.scss
+++ b/resources/sass/frontend_simple/basic/mobile.scss
@@ -49,7 +49,7 @@
             height: 20px;
             position: relative;
     
-            bottom: 0px;
+            bottom: 8px;
             
             -webkit-transform: rotate(0deg);
             -moz-transform: rotate(0deg);
@@ -128,7 +128,7 @@
           
         #links.open {
             position: absolute;
-            top: 100px;
+            top: 72px;
             left: 0px;
     
             display: flex;
@@ -291,6 +291,10 @@
                 max-width: unset;
                 width: 100%;
 
+                span{
+                    padding: 0px 0px 12px 0px;
+                }
+
                 h2{
                     padding-top: 12px;
                 }
diff --git a/resources/sass/frontend_simple/basic/popravki.scss b/resources/sass/frontend_simple/basic/popravki.scss
index e947d0c40..599cde792 100644
--- a/resources/sass/frontend_simple/basic/popravki.scss
+++ b/resources/sass/frontend_simple/basic/popravki.scss
@@ -67,6 +67,8 @@ header nav span.menu_item{
     font-family: "Source Sans Pro", "sans-serif";
     text-align: center;
     color: #333333;    
+
+    padding-bottom: 70px;
 }
 
 .landing_page_content .landing_page_title {
@@ -93,7 +95,6 @@ body.landing_page #main .landing_page_window {
     width: unset;
     min-height: 327px;
 
-    margin-bottom: 70px;
 }
  
 body.landing_page #main .landing_page_window #login_holder .login_form {
@@ -264,6 +265,9 @@ footer .footer_content .col1-flex{
 footer .footer_content .col span{
     padding: 0px 0px 12px 0px;
 }
+footer .footer_content .col span:last-of-type{
+    padding: 0px;
+}
 footer .footer_content .col a {
     color: $black;
     font-weight: 400;
diff --git a/resources/sass/frontend_simple/modules/landing_page.scss b/resources/sass/frontend_simple/modules/landing_page.scss
index 4ebe330f0..bae3b092b 100644
--- a/resources/sass/frontend_simple/modules/landing_page.scss
+++ b/resources/sass/frontend_simple/modules/landing_page.scss
@@ -36,7 +36,7 @@ body.login_noEmail{
             z-index: 999;
 
             width: 600px;
-            margin: 20px auto;
+            margin: 25px auto;
 
             background-color: white;
 

From 1b2f6a3bbc7c589cbd4413547aa88bad91b0733f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nejc=20Kova=C4=8D?= <nejc.kouko@gmail.com>
Date: Thu, 30 Jun 2022 10:44:23 +0200
Subject: [PATCH 033/110] GDPR popravki

---
 frontend/simple/css/style.css                 | 159 +++++++++++++++-
 .../sass/frontend_simple/basic/mobile.scss    |  10 ++
 .../sass/frontend_simple/modules/GDPR.scss    | 170 ++++++++++++++++++
 .../sass/frontend_simple/modules/header.scss  |   2 +-
 resources/sass/frontend_simple/style.scss     |   3 +
 5 files changed, 339 insertions(+), 5 deletions(-)
 create mode 100644 resources/sass/frontend_simple/modules/GDPR.scss

diff --git a/frontend/simple/css/style.css b/frontend/simple/css/style.css
index b9bab306d..b17f26160 100644
--- a/frontend/simple/css/style.css
+++ b/frontend/simple/css/style.css
@@ -158,10 +158,6 @@ header nav span.menu_item a {
 header nav span.menu_item a:hover {
   color: #1e88e5;
 }
-header nav span.menu_item.active {
-  border-bottom: 3px #1e88e5 solid;
-}
-
 #main {
   background-color: #f7f7f7;
 }
@@ -988,6 +984,13 @@ body.login_noEmail #content.aai #main .main_content .app_subtitle {
     margin: 0 0 20px 0;
     text-align: center;
   }
+  body #main .main_content .register_holder h1 {
+    font-size: 50px;
+    font-weight: 300;
+    line-height: 62px;
+    margin: 20px 0px;
+    text-align: left;
+  }
 }
 /* 
     Author     : Nejc Kovač
@@ -1242,4 +1245,152 @@ footer .footer_content .col3 .social_logo_flex a:first-of-type {
   margin-right: 20px;
 }
 
+/* GDPR ZAHTEVEK -------------------------------------- */
+body.gdpr {
+  line-height: 20px;
+}
+
+.gdpr #main .main_content {
+  padding: 0px;
+}
+
+.register_holder {
+  max-width: 810px;
+  width: 95%;
+  margin: 70px auto 70px auto;
+}
+.register_holder h1 {
+  font-size: 50px;
+  font-weight: 300;
+  line-height: 62px;
+  margin: 20px 0px;
+}
+.register_holder p {
+  font-weight: 400;
+  line-height: 26px;
+  margin: 20px 0px;
+}
+.register_holder p a {
+  color: #1e88e5;
+}
+
+body.gdpr div.label {
+  display: block;
+  line-height: unset;
+  font-weight: 600;
+  width: 200px;
+  line-height: unset;
+}
+
+body #main .main_content .register_holder .label {
+  line-height: 20px;
+  padding-bottom: 4px;
+}
+
+body.gdpr .input_field div.label label {
+  line-height: unset;
+  padding-bottom: 4px;
+}
+
+.regfield {
+  height: 38px;
+  max-width: 245px;
+  width: 95%;
+  border: 1px solid #C4C4C4;
+  border-radius: 0px;
+  padding: 0px;
+  padding-left: 8px;
+  margin: 0px;
+}
+
+body .gdpr form p:first-of-type {
+  font-weight: 600;
+}
+
+body.gdpr div.input_field {
+  padding: 10px 0px;
+}
+
+/* Elektronski naslov:  */
+body.gdpr div.input_field:first-of-type {
+  padding-top: 0px;
+}
+
+/* URL ankete:  */
+body.gdpr div.input_field:nth-of-type(3) {
+  padding-bottom: 0px;
+}
+
+/* Želim podati zahtevo za:  */
+form p:first-of-type {
+  margin: 20px 0px 6px 0px;
+}
+
+body.gdpr div.zahtevek {
+  padding: 6px 0px;
+}
+
+body.gdpr div.zahtevek:last-of-type {
+  padding-bottom: 0px;
+}
+
+body.gdpr div.zahtevek label input {
+  margin-right: 2px;
+  margin-left: 0px;
+  height: 18px;
+  width: 18px;
+  vertical-align: -3px;
+  border-radius: 0px;
+}
+
+/* tekst nad poljem za opis */
+form p:nth-of-type(2) {
+  margin: 20px 0px;
+}
+
+form .opis {
+  font-weight: 600;
+  margin: 0px 0px 4px 0px;
+}
+
+#gdpr-note {
+  padding: 0px;
+  padding-left: 8px;
+  margin: 0px;
+  width: 100%;
+  border-radius: 0px;
+}
+
+.register_holder p:last-of-type {
+  margin: 18px 0px 20px 0px;
+  line-height: 26px;
+}
+
+input[type=submit],
+button,
+input[type=button],
+.button {
+  font-weight: 600;
+  font-size: 16px;
+  line-height: 26px;
+  height: 50px;
+  max-width: 320px;
+  width: 95%;
+  padding: 0px;
+  color: #FFFFFF;
+  background-color: #1e88e5;
+  border: 1px solid #1e88e5;
+  transition: 0.3s ease-out;
+}
+input[type=submit]:hover,
+button:hover,
+input[type=button]:hover,
+.button:hover {
+  color: #1e88e5;
+  background-color: white;
+  border: 1px solid #1e88e5;
+}
+
+/* -------------------------------------- */
+
 /*# sourceMappingURL=style.css.map */
diff --git a/resources/sass/frontend_simple/basic/mobile.scss b/resources/sass/frontend_simple/basic/mobile.scss
index 249ae2f49..1a92ad2e4 100644
--- a/resources/sass/frontend_simple/basic/mobile.scss
+++ b/resources/sass/frontend_simple/basic/mobile.scss
@@ -323,4 +323,14 @@
             text-align: center;
         }
     }
+
+    // GDPR ------------------------------
+
+    body #main .main_content .register_holder h1{
+        font-size: 50px;
+        font-weight: 300;
+        line-height: 62px;
+        margin: 20px 0px;
+        text-align: left;
+    }
 }
\ No newline at end of file
diff --git a/resources/sass/frontend_simple/modules/GDPR.scss b/resources/sass/frontend_simple/modules/GDPR.scss
new file mode 100644
index 000000000..f3753cd3d
--- /dev/null
+++ b/resources/sass/frontend_simple/modules/GDPR.scss
@@ -0,0 +1,170 @@
+/* GDPR ZAHTEVEK -------------------------------------- */
+
+body.gdpr {
+    line-height: 20px;
+}
+
+.gdpr #main .main_content {
+    padding: 0px;
+}
+
+ .register_holder{
+    max-width: 810px;
+    width: 95%;
+    margin: 70px auto 70px auto;
+
+    h1 {
+        font-size: 50px;
+        font-weight: 300;
+        line-height: 62px;
+    
+        margin: 20px 0px;
+    }
+
+    p {
+        font-weight: 400;
+        line-height: 26px;
+    
+        margin: 20px 0px;
+
+        a {
+            color: #1e88e5;
+        }
+    }
+}
+
+
+body.gdpr div.label {
+    display: block;
+    line-height: unset;
+    font-weight: 600;
+    width: 200px;
+
+    line-height: unset;
+
+}
+body #main .main_content .register_holder .label {
+    line-height: 20px;
+    padding-bottom: 4px;
+}
+
+body.gdpr .input_field div.label label {
+    line-height: unset;
+    padding-bottom: 4px;
+}
+
+
+.regfield {
+    height: 38px;
+    max-width: 245px;
+    width: 95%;
+    border: 1px solid #C4C4C4;
+    border-radius: 0px;
+
+    padding: 0px;
+    padding-left: 8px;
+    margin: 0px;
+}
+
+body .gdpr form p:first-of-type{
+    font-weight: 600;
+}
+
+body.gdpr div.input_field{
+    padding: 10px 0px;
+}
+/* Elektronski naslov:  */
+body.gdpr div.input_field:first-of-type {
+    padding-top: 0px;
+}
+/* URL ankete:  */
+body.gdpr div.input_field:nth-of-type(3){
+    padding-bottom: 0px;
+}
+
+/* Želim podati zahtevo za:  */
+form p:first-of-type {
+    margin: 20px 0px 6px 0px;
+}
+
+
+body.gdpr div.zahtevek {
+    padding: 6px 0px;
+}
+body.gdpr div.zahtevek:last-of-type {
+    padding-bottom: 0px;
+}
+
+body.gdpr div.zahtevek label{
+
+    
+}
+
+body.gdpr div.zahtevek label input {
+    margin-right: 2px;
+    margin-left: 0px;
+    height: 18px;
+    width: 18px;
+
+    vertical-align: -3px;
+
+    border-radius: 0px;
+}
+
+
+/* tekst nad poljem za opis */
+form p:nth-of-type(2){
+    margin: 20px 0px;
+}
+form .opis {
+    font-weight: 600;
+
+    margin: 0px 0px 4px 0px;
+}
+
+#gdpr-note {
+    padding: 0px;
+    padding-left: 8px;
+    margin: 0px;
+    width: 100%;
+
+    border-radius: 0px;
+
+}
+
+.register_holder p:last-of-type {
+    margin: 18px 0px 20px 0px;
+    line-height: 26px;
+}
+
+
+input[type=submit],
+button,
+input[type=button],
+.button {
+    font-weight: 600;
+    font-size: 16px;
+    line-height: 26px;
+    height: 50px;
+    max-width: 320px;
+    width: 95%;
+    padding: 0px;
+
+    color: #FFFFFF;
+    background-color: #1e88e5;
+    border: 1px solid #1e88e5;
+
+    transition: .3s ease-out;
+
+    &:hover {
+        color: #1e88e5;
+        background-color: white;
+
+        border: 1px solid #1e88e5;
+    }
+}
+
+
+
+
+/* -------------------------------------- */
\ No newline at end of file
diff --git a/resources/sass/frontend_simple/modules/header.scss b/resources/sass/frontend_simple/modules/header.scss
index 8cae6386d..1ea7956e1 100644
--- a/resources/sass/frontend_simple/modules/header.scss
+++ b/resources/sass/frontend_simple/modules/header.scss
@@ -46,7 +46,7 @@ header{
             }
 
             &.active{
-                border-bottom: 3px $color_blue solid;
+                // border-bottom: 3px $color_blue solid;
             }
         } 
     }
diff --git a/resources/sass/frontend_simple/style.scss b/resources/sass/frontend_simple/style.scss
index 3c30ddd78..4700e8d98 100644
--- a/resources/sass/frontend_simple/style.scss
+++ b/resources/sass/frontend_simple/style.scss
@@ -30,4 +30,7 @@
 // popravki - Nejc Kovac
 @import "./basic/popravki.scss";
 
+// GDPR
+@import "./modules/GDPR.scss";
+
 

From 772470ccaf3d4f6b3acba7f67e4f3ab080fd922f Mon Sep 17 00:00:00 2001
From: pero1203 <peter.hrvatin@gmail.com>
Date: Thu, 30 Jun 2022 12:03:53 +0200
Subject: [PATCH 034/110] Redesign - popravki postavitve desnih nastavitev
 vprasanja (missing toggle, omejitve stevila)

---
 admin/survey/classes/class.Vprasanje.php      | 227 +++++++-----------
 lang/1.php                                    |   1 +
 lang/2.php                                    |   3 +-
 public/css/admin_new.css                      |   1 +
 .../survey_edit/question_right_settings.scss  |   1 +
 5 files changed, 96 insertions(+), 137 deletions(-)

diff --git a/admin/survey/classes/class.Vprasanje.php b/admin/survey/classes/class.Vprasanje.php
index 06eea9e3c..6a31d5833 100644
--- a/admin/survey/classes/class.Vprasanje.php
+++ b/admin/survey/classes/class.Vprasanje.php
@@ -396,21 +396,16 @@ class Vprasanje {
 				}
 				// manjkajoce vrednosti
 				if ($row['tip'] <= 3) {
-						echo '<fieldset><legend>'.$lang['srv_manjkajoce_vrednosti2'].' '.Help::display('srv_missing_values').'</legend>';
-						$this->edit_missing();
-						echo '</fieldset>';
+                    echo '<fieldset><legend>'.$lang['srv_manjkajoce_vrednosti2'].' '.Help::display('srv_missing_values').'</legend>';
+                    $this->edit_missing();
+                    echo '</fieldset>';
 				}
 				
 				// editiranje vrednosti pri datumu
 				if ( in_array($row['tip'], array(8)) ) {
 
-					echo '<fieldset><legend>'.$lang['srv_manjkajoce_vrednosti2'].' '.Help::display('srv_missing_values').'</legend>';					
-                    
-                    $this->edit_vrednost_datum();
-					
-					// naknaden prikaz missinga ne vem ob opozorilu (samo ce imamo vklopljeno opozorilo in missing ne vem)
-					$this->edit_alert_show_missing();
-					                    
+					echo '<fieldset><legend>'.$lang['srv_manjkajoce_vrednosti2'].' '.Help::display('srv_missing_values').'</legend>';					           
+                    $this->edit_vrednost_missing();					                    
 					echo '</fieldset>';
 				}
 											
@@ -463,11 +458,9 @@ class Vprasanje {
     
 				// manjkajoce vrednosti - besedilo
 				if ( in_array($row['tip'], array(21)) ) {
+
 					echo '<fieldset><legend>'.$lang['srv_manjkajoce_vrednosti2'].' '.Help::display('srv_missing_values').'</legend>';
-					$this->edit_vrednost_besedilo();
-					
-					// naknaden prikaz missinga ne vem ob opozorilu (samo ce imamo vklopljeno opozorilo in missing ne vem)
-					$this->edit_alert_show_missing();
+					$this->edit_vrednost_missing();
 					echo '</fieldset>';
 				}
 				
@@ -475,28 +468,27 @@ class Vprasanje {
 				if (in_array($row['tip'], array(1,2,3,6,16,19,20,24)))
 					$this->edit_other_field();
 				
-				if ( in_array($row['tip'], array(7, 18, 20)) ) {
+				if ( in_array($row['tip'], array(7, 18, 20, 21)) ) {
 				
-                    // ce je izbrano stevilo in ne drsnik
+                    // ce je izbrano stevilo in ne drsnik - omejitve vnosa
 					if ($row['ranking_k'] == 0){	
 
                         echo '<fieldset><legend>'.$lang['srv_num_limits'].'</legend>';
-						$this->edit_number();
+
+                        if ($row['tip'] != 21)
+						    $this->edit_number();
+
+                        $this->edit_limit();
+
                         echo '</fieldset>';
 					}
-					
-					if ($row['tip'] == 7) {
-
-						echo '<fieldset><legend>'.$lang['srv_manjkajoce_vrednosti2'].' '.Help::display('srv_missing_values').'</legend>';
-
-						$this->edit_vrednost_number();
-						
-						// naknaden prikaz missinga ne vem ob opozorilu (samo ce imamo vklopljeno opozorilo in missing ne vem)
-                        $this->edit_alert_show_missing();
-
-						echo '</fieldset>';
-					}	
 				}
+
+                if ($row['tip'] == 7) {
+                    echo '<fieldset><legend>'.$lang['srv_manjkajoce_vrednosti2'].' '.Help::display('srv_missing_values').'</legend>';
+                    $this->edit_vrednost_missing();
+                    echo '</fieldset>';
+                }
 					
 				if ( in_array($row['tip'], array(22)) ) {
 					$this->edit_compute();
@@ -506,11 +498,7 @@ class Vprasanje {
 					$this->edit_name_generator();
 				}
 				
-				if ( in_array($row['tip'], array(7,18,20, 21)) ) {
-					if ($row['ranking_k'] == 0){	//ce je izbrano stevilo in ne drsnik
-						$this->edit_limit();
-					}	
-				}
+				
 			}
 		}	
 	}
@@ -2728,24 +2716,39 @@ class Vprasanje {
 				$already_set_mv[$row_grid_mv['other']] = $row_grid_mv['naslov'];
 			}
 
-			if (count($missing_values) > 0) {
-				
-				foreach ($missing_values AS $mv_key => $mv_text) {
-								
-                    echo '<div class="vprasanje_setting_holder">';
 
-                    echo '  <div class="vprasanje_setting_line">';
+			if (count($missing_values) > 0) {
+
+                // Checkbox za prikaz vseh missing nastavitev
+                echo '<div class="vprasanje_setting_holder">';
+
+                echo '  <div class="vprasanje_setting_line">';
+                echo '      <input type="checkbox" '.(!empty($already_set_mv) ? ' checked="checked"' : '').' id="show_missing_settings" onChange="$(\'#missing_settings_holder\').slideToggle();">';
+                echo '      <label for="show_missing_settings">'.$lang['srv_manjkajoce_vrednosti_toggle'].'</label>';
+                echo '  </div>';
+
+                echo '</div>';
+				
+
+                echo '<div id="missing_settings_holder" '.(empty($already_set_mv) ? 'style="display:none;"' : '').'">';
+
+                echo '<div class="vprasanje_setting_holder">';
+
+                echo '  <div class="vprasanje_setting_line inline">';
+				foreach ($missing_values AS $mv_key => $mv_text) {
 					echo '      <input type="checkbox" '.(isset($already_set_mv[$mv_key]) ? ' checked="checked"' : '').' onChange="vrednost_new_dodatne(\'' . $row['id'] . '\', \''.$mv_key.'\', \''.$row['tip'].'\', this.checked); show_alert_missing();" id="missing_value_'.$mv_key.'">';
 					echo '      <label for="missing_value_'.$mv_key.'" class="pointer">'. $mv_text . '</label> ';
-                    echo '  </div>';
-
-		            echo '</div>';
 				}
+                echo '  </div>';
+
+                echo '</div>';
+                
+                // naknaden prikaz missinga ne vem ob opozorilu (samo ce imamo vklopljeno opozorilo in missing ne vem)
+			    if ($row['tip'] <= 2)
+                    $this->edit_alert_show_missing();
+                
+                echo '</div>';
 			}
-		
-			// naknaden prikaz missinga ne vem ob opozorilu (samo ce imamo vklopljeno opozorilo in missing ne vem)
-			if ($row['tip'] <= 2)
-				$this->edit_alert_show_missing();
 		}
 	}
 	
@@ -3158,64 +3161,70 @@ class Vprasanje {
 		?><script> $('textarea[name=fastadd]').focus(); </script><?php
 	}
 	
-	//editiranje vrednosti pri besedilu
-	function edit_vrednost_besedilo(){
+	// editiranje missing vrednosti pri besedilu, stevilu in datumu
+	function edit_vrednost_missing(){
 		global $lang;
 		
 		$row = Cache::srv_spremenljivka($this->spremenljivka);
 		$spremenljivkaParams = new enkaParameters($row['params']);
-		
-		$taSize = ($spremenljivkaParams->get('taSize') ? $spremenljivkaParams->get('taSize') : 1);
-		$taWidth = ($spremenljivkaParams->get('taWidth') ? $spremenljivkaParams->get('taWidth') : -1);
-                
-		//default sirina
-		if($taWidth == -1)
-			$taWidth = 30;
-	
-		# manjkajoče vrednosti 
-		//dodatne missing vrednosti (ne vem, zavrnil...)
-		# preberemo iz class.SurveyMissingValues
+			
+		# preberemo missing vrednosti iz class.SurveyMissingValues - kateri so na voljo v anketi
 		$smv = new SurveyMissingValues($this->anketa);
-		# katere missinge imamo na voljo
 		$missing_values = $smv->GetUnsetValuesForSurvey();
 		
-		#kateri missingi so nastavljeni
+		# kateri missingi so nastavljeni
 		$already_set_mv = array();
 		$sql_grid_mv = sisplet_query("SELECT naslov, other FROM srv_vrednost WHERE spr_id='".$this->spremenljivka."' AND other != 0");
 		while ($row_grid_mv = mysqli_fetch_array($sql_grid_mv)) {
 			$already_set_mv[$row_grid_mv['other']] = $row_grid_mv['naslov'];
 		}
-		
 	
-        echo '<input type="hidden" name="edit_vrednost_besedilo" value="1" />';
 
-		if (count($missing_values) > 0) {
+        if($row['tip'] == '7')
+	        echo '<input type="hidden" name="edit_vrednost_number" value="1" />';
+        elseif($row['tip'] == '21')
+	        echo '<input type="hidden" name="edit_vrednost_besedilo" value="1" />';
 
+    
+        if (count($missing_values) > 0) { 
+
+            // Checkbox za prikaz vseh missing nastavitev
+            echo '<div class="vprasanje_setting_holder">';
+
+            echo '  <div class="vprasanje_setting_line">';
+            echo '      <input type="checkbox" '.(!empty($already_set_mv) ? ' checked="checked"' : '').' id="show_missing_settings" onChange="$(\'#missing_settings_holder\').slideToggle();">';
+            echo '      <label for="show_missing_settings">'.$lang['srv_manjkajoce_vrednosti_toggle'].'</label>';
+            echo '  </div>';
+
+            echo '</div>';
+
+
+            echo '<div id="missing_settings_holder" '.(empty($already_set_mv) ? 'style="display:none;"' : '').'">';
+            
+            echo '<div class="vprasanje_setting_holder">';
+            
+            echo '  <div class="vprasanje_setting_line inline">';
 			foreach ($missing_values AS $mv_key => $mv_text) {
-
-                echo '<div class="vprasanje_setting_holder">';
-
-                echo '  <div class="vprasanje_setting_line">';
-				echo '      <input type="checkbox" '.(isset($already_set_mv[$mv_key]) ? ' checked="checked"' : '').' onChange="vrednost_new_dodatne(\'' . $row['id'] . '\', \''.$mv_key.'\', \''.$row['tip'].'\', this.checked); show_alert_missing();" id="missing_value_'.$mv_key.'">';
+                echo '      <input type="checkbox" '.(isset($already_set_mv[$mv_key]) ? ' checked="checked"' : '').' onChange="vrednost_new_dodatne(\'' . $row['id'] . '\', \''.$mv_key.'\', \''.$row['tip'].'\', this.checked); show_alert_missing();" id="missing_value_'.$mv_key.'">';
 				echo '      <label for="missing_value_'.$mv_key.'" class="pointer">'.$mv_text.'</label>';
-                echo '  </div>';
-                
-                echo '</div>';
 			}
+            echo '  </div>';    
+            
+            echo '</div>';
+            
+            // naknaden prikaz missinga ne vem ob opozorilu (samo ce imamo vklopljeno opozorilo in missing ne vem)
+            $this->edit_alert_show_missing();            
+
+            echo '</div>';
 		}
 	}
 	
-	//editiranje vrednosti pri number
+	// editiranje missing vrednosti pri number
 	function edit_vrednost_number(){
 		global $lang;
 		
 		$row = Cache::srv_spremenljivka($this->spremenljivka);		
 		$spremenljivkaParams = new enkaParameters($row['params']);	
-		
-		$taWidth = ($spremenljivkaParams->get('taWidth') ? $spremenljivkaParams->get('taWidth') : -1);
-		//default sirina
-		if($taWidth == -1)
-			$taWidth = 10;
 				
 		//dodatne missing vrednosti (ne vem, zavrnil...)
 		# preberemo iz class.SurveyMissingValues
@@ -3249,15 +3258,13 @@ class Vprasanje {
 		}
 	}
 	
-	//editiranje vrednosti pri datumu
+	// editiranje missing vrednosti pri datumu
 	function edit_vrednost_datum(){
 		global $lang;
 				
 		$row = Cache::srv_spremenljivka($this->spremenljivka);		
 		$spremenljivkaParams = new enkaParameters($row['params']);	
-		
-		# manjkajoče vrednosti 
-		
+				
 		//dodatne missing vrednosti (ne vem, zavrnil...)
 		# preberemo iz class.SurveyMissingValues
 		$smv = new SurveyMissingValues($this->anketa);
@@ -4034,8 +4041,6 @@ class Vprasanje {
 		if($row['tip'] == 7 || $row['tip'] == 21){
 
             $onkeyup = $row['tip'] == 21 ? ' onkeyup="checkNumber(this, 4, 0, true);"' : '';
-                    
-			echo '<fieldset><legend>'.$lang['srv_num_reminder'].'</legend>';
 
 			echo '<input type="hidden" name="edit_number_limit" value="1" />';
 			
@@ -4122,17 +4127,12 @@ class Vprasanje {
             echo '  </div>';
 
             echo '</div>';
-
-
-			echo '</fieldset>';
 		}
 		
 		// grid number
 		if ($row['tip'] == 20 && $row['ranking_k'] != 1) {
 			
 			// zaenkrat sam za slider			
-			echo '<fieldset><legend>'.$lang['srv_num_reminder'].'</legend>';
-
 			echo '<input type="hidden" name="edit_number_limit" value="1" />';
 			
 
@@ -4165,38 +4165,6 @@ class Vprasanje {
             echo '  </div>';
 
 			echo '</div>';
-
-			
-			// Omejitve za 2. polje (ce ga imamo)
-			echo '<div class="vprasanje_setting_holder">';
-
-            echo '  <div id="num_limit2" class="vprasanje_setting_line" '.($row['size'] == 2 ? '' : ' style="display:none;"').'>';
-			echo '      <span>'.$lang['srv_num_field2'].':</span>';
-            echo '  </div>';
-
-			// spodnji limit
-            echo '  <div class="vprasanje_setting_line half-half">';
-            echo '      <span class="content" onClick="num_limit(\'num_min2\', \'num_useMin2\')">';
-			echo '          <input type="checkbox" value="1" id="num_useMin2" name="num_useMin2" '.($row['num_useMin2']==1 ? ' checked="checked"' : '').' >';
-			echo '          <label for="num_min2">'.$lang['srv_num_min'].'</label>';
-            echo '      </span>';
-            echo '      <span class="content">';
-            echo '          <input type="text" name="num_min2" id="num_min2" value="' . $row['num_min2'] . '" size="8" '.($row['num_useMin2'] == 0 ? ' disabled' : '').'></input>';
-            echo '      </span>';
-            echo '  </div>';
-			
-            // zgornji limit
-            echo '  <div class="vprasanje_setting_line half-half">';
-            echo '      <span class="content" onClick="num_limit(\'num_max2\', \'num_useMax2\')">';
-			echo '          <input type="checkbox" value="1" id="num_useMax2" name="num_useMax2" '.($row['num_useMax2']==1 ? ' checked="checked"' : '').'>';
-			echo '          <label for="num_max2">'.$lang['srv_num_limit'].'</label>';
-            echo '      </span>';
-            echo '      <span class="content">';
-            echo '          <input type="text" name="num_max2" id="num_max2" value="' . $row['num_max2'] . '" size="8" '.($row['num_useMax2'] == 0 ? ' disabled' : '').'></input>';			
-            echo '      </span>';
-            echo '  </div>';
-
-			echo '</div>';
 			
 
 			// prikaz omejitve
@@ -4223,16 +4191,11 @@ class Vprasanje {
             echo '  </div>';
 
             echo '</div>';
-
-
-			echo '</fieldset>';
 		}
 		
 		// grid slider
 		if ($row['tip'] == 20 && $row['ranking_k'] == 1) {
 			
-			echo '<fieldset><legend>'.$lang['srv_num_reminder'].'</legend>';
-
 			echo '<input type="hidden" name="edit_number_limit" value="1" />';
 			
 			echo '<div class="vprasanje_setting_holder">';
@@ -4250,16 +4213,11 @@ class Vprasanje {
 			echo '  </div>';
 
             echo '</div>';
-			
-			echo '</fieldset>';
-			
 		}
 		
 		//omejitev za vsoto
 		if($row['tip'] == 18){
-
-			echo '<fieldset><legend>'.$lang['srv_vsota_reminder'].'</legend>';
-
+            
 			echo '<input type="hidden" name="edit_vsota_limit" value="1" />';
 
 			//nastavitev tocne vsote
@@ -4328,9 +4286,6 @@ class Vprasanje {
 			echo '  </div>';
 
 			echo '</div>';
-
-
-			echo '</fieldset>';
 		}
 	}
 	
diff --git a/lang/1.php b/lang/1.php
index 6e2a74829..1be1e2666 100644
--- a/lang/1.php
+++ b/lang/1.php
@@ -5461,6 +5461,7 @@ $lang = array (
 	"srv_podvprasanja"							=> 'Podvprašanja',
 	"srv_manjkajoce_vrednosti"					=> 'Manjkajoče vrednosti',
 	"srv_manjkajoce_vrednosti2"					=> 'Nevsebinski in manjkajoči odgovori',
+	"srv_manjkajoce_vrednosti_toggle"			=> 'Dodaj nevsebinske in manjkajoče odgovore',
 	"srv_nastavitve_stevila"					=> 'Nastavitve števila',
 	"srv_ostale_nastavitve"						=> 'Ostale nastavitve',
 	"srv_prikaz_nastavitve"						=> 'Prikaz podatkov',
diff --git a/lang/2.php b/lang/2.php
index e86b6ffe1..e8b30277d 100644
--- a/lang/2.php
+++ b/lang/2.php
@@ -2069,7 +2069,7 @@ $lang = array (
 	"srv_remind_checkbox_min_violated_soft"	=>	"The minimal number of answers have not been chosen. Do you want to proceed?",
 	"srv_remind_num_soft"	=>	"You have exceeded the number limit. Do you want to proceed?",
 	"srv_remind_preview"	=>	"You can turn off alert and condition checking in settings in the top right corner (+).",
-	"srv_alert_show_missing"		=>	"Show option \"Don\'t know\" on alert",
+	"srv_alert_show_missing"		=>	"Show option \"Don't know\" on alert",
 	"srv_alert_show_missing_98"		=>	"Show option \"Refused\" on alert",
     "srv_alert_show_missing_97"		=>	"Show option \"Invalid\" on alert",
     "srv_alert_upload_size"		    =>	"Uploaded file is too large! Maximum file size is 16 MB.",
@@ -5437,6 +5437,7 @@ $lang = array (
 	"srv_podvprasanja"							=> 'Subquestions',
 	"srv_manjkajoce_vrednosti"					=> 'Missing values',
 	"srv_manjkajoce_vrednosti2"						=> 'Nonsubstantive and missing responses',
+    "srv_manjkajoce_vrednosti_toggle"			=> 'Add nonsubstantive and missing responses',
 	"srv_nastavitve_stevila"					=> 'Number settings',
 	"srv_ostale_nastavitve"						=> 'Other settings',
 	"srv_vprasanje_tracking"					=> 'Question archiving',
diff --git a/public/css/admin_new.css b/public/css/admin_new.css
index 7cf6f9953..30be5b29b 100644
--- a/public/css/admin_new.css
+++ b/public/css/admin_new.css
@@ -14714,6 +14714,7 @@ div#variabla_new span.correct {
 }
 #vprasanje_float_editing .vprasanje_edit_holder .vprasanje_setting_holder .vprasanje_setting_line.inline {
   justify-content: space-between;
+  flex-wrap: wrap;
 }
 #vprasanje_float_editing .vprasanje_edit_holder .vprasanje_setting_holder .vprasanje_setting_line.inline .content label:last-child {
   margin-right: 0;
diff --git a/resources/sass/admin_new/pages/survey_edit/question_right_settings.scss b/resources/sass/admin_new/pages/survey_edit/question_right_settings.scss
index 0e9546cfb..5774f5d89 100644
--- a/resources/sass/admin_new/pages/survey_edit/question_right_settings.scss
+++ b/resources/sass/admin_new/pages/survey_edit/question_right_settings.scss
@@ -221,6 +221,7 @@
 
                 &.inline{
                     justify-content: space-between;
+                    flex-wrap: wrap;
 
                     .content{
 

From 4230bf67e20c31b4c4b7f7a1dccefdc38b90ba30 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nejc=20Kova=C4=8D?= <nejc.kouko@gmail.com>
Date: Thu, 30 Jun 2022 13:35:04 +0200
Subject: [PATCH 035/110] FOOTER facebook logo

---
 frontend/simple/classes/DisplayController.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/frontend/simple/classes/DisplayController.php b/frontend/simple/classes/DisplayController.php
index c723f873f..47159b996 100644
--- a/frontend/simple/classes/DisplayController.php
+++ b/frontend/simple/classes/DisplayController.php
@@ -345,7 +345,9 @@ class DisplayController{
             echo '<div class="col col3">';
             echo '  <h2>'.$lang['simple_footer_about_follow'].'</h2>';
                 echo ' <div class= "social_logo_flex">';
-                    echo ' <a href="https://www.facebook.com/1KAenklikanketa/"> <img src="public/img/social/fb_blue_new.svg" alt="Facebook logo"> </a>';
+                    // echo ' <a href="https://www.facebook.com/1KAenklikanketa/"> <img src="public/img/social/fb_blue_new.svg" alt="Facebook logo"> </a>';
+                    
+                    echo ' <a href="https://www.facebook.com/1KAenklikanketa/"> <img src="public/img/social/fb_blue_new.svg " alt="Facebook logo"> </a>';
                     echo ' <a href="https://twitter.com/enklikanketa"> <img src="public/img/social/twitter_blue_new.svg" alt="Twitter logo"> </a>';
                 echo ' </div>';
             echo '</div>';
@@ -1183,4 +1185,5 @@ class DisplayController{
         // Set cookie for 90 days
         setcookie("simple_frontend_cookie", "1", time() + (60*60*24*90), "/"); 
     }
-}
\ No newline at end of file
+}
+

From e24e2ce1b6528174aaa0c7f27a7fc311665cb8a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nejc=20Kova=C4=8D?= <nejc.kouko@gmail.com>
Date: Thu, 30 Jun 2022 13:43:18 +0200
Subject: [PATCH 036/110] FOOTER facebook logo

---
 frontend/simple/classes/DisplayController.php | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/frontend/simple/classes/DisplayController.php b/frontend/simple/classes/DisplayController.php
index 47159b996..5ebe428e7 100644
--- a/frontend/simple/classes/DisplayController.php
+++ b/frontend/simple/classes/DisplayController.php
@@ -344,10 +344,8 @@ class DisplayController{
             // stolpec 3 - spremljajte nas
             echo '<div class="col col3">';
             echo '  <h2>'.$lang['simple_footer_about_follow'].'</h2>';
-                echo ' <div class= "social_logo_flex">';
-                    // echo ' <a href="https://www.facebook.com/1KAenklikanketa/"> <img src="public/img/social/fb_blue_new.svg" alt="Facebook logo"> </a>';
-                    
-                    echo ' <a href="https://www.facebook.com/1KAenklikanketa/"> <img src="public/img/social/fb_blue_new.svg " alt="Facebook logo"> </a>';
+                echo ' <div class= "social_logo_flex">';                    
+                    echo ' <a href="https://www.facebook.com/1KAenklikanketa/"> <img src="public/img/social/FB_blue_new.svg " alt="Facebook logo"> </a>';
                     echo ' <a href="https://twitter.com/enklikanketa"> <img src="public/img/social/twitter_blue_new.svg" alt="Twitter logo"> </a>';
                 echo ' </div>';
             echo '</div>';

From 6157de3bc413134b59a08800f8ce16ab56997574 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nejc=20Kova=C4=8D?= <nejc.kouko@gmail.com>
Date: Thu, 30 Jun 2022 13:49:16 +0200
Subject: [PATCH 037/110] login/register form gumb margin

---
 frontend/simple/css/style.css                    | 2 +-
 resources/sass/frontend_simple/basic/mobile.scss | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/simple/css/style.css b/frontend/simple/css/style.css
index b17f26160..09a6a92df 100644
--- a/frontend/simple/css/style.css
+++ b/frontend/simple/css/style.css
@@ -918,7 +918,7 @@ body.register #main .main_content .landing_page_window input[type=submit],
 body.register #main .main_content .landing_page_window input[type=button],
 body.login_noEmail #main .main_content .landing_page_window input[type=submit],
 body.login_noEmail #main .main_content .landing_page_window input[type=button] {
-    margin: 30px auto !important;
+    margin: 16px auto !important;
     width: 100%;
   }
   body.landing_page #main .main_content .app_subtitle,
diff --git a/resources/sass/frontend_simple/basic/mobile.scss b/resources/sass/frontend_simple/basic/mobile.scss
index 1a92ad2e4..2a92ad90a 100644
--- a/resources/sass/frontend_simple/basic/mobile.scss
+++ b/resources/sass/frontend_simple/basic/mobile.scss
@@ -243,7 +243,7 @@
 
                     input[type="submit"],
                     input[type="button"]{
-                        margin: 30px auto !important;
+                        margin: 16px auto !important;
                         width: 100%;
                     }
                 }

From ce7e246a7c2968e4ace6c971a68cca1f04a0825d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nejc=20Kova=C4=8D?= <nejc.kouko@gmail.com>
Date: Thu, 30 Jun 2022 14:05:01 +0200
Subject: [PATCH 038/110] register - captcha

---
 frontend/simple/css/style.css                      | 10 ++++++++++
 resources/sass/frontend_simple/basic/popravki.scss | 12 ++++++++++++
 2 files changed, 22 insertions(+)

diff --git a/frontend/simple/css/style.css b/frontend/simple/css/style.css
index 09a6a92df..e706b5d8b 100644
--- a/frontend/simple/css/style.css
+++ b/frontend/simple/css/style.css
@@ -1245,6 +1245,16 @@ footer .footer_content .col3 .social_logo_flex a:first-of-type {
   margin-right: 20px;
 }
 
+iframe {
+  max-width: 304px;
+  width: unset;
+}
+
+.rc-anchor-normal .rc-anchor-checkbox-label {
+  max-width: 152px;
+  width: unset;
+}
+
 /* GDPR ZAHTEVEK -------------------------------------- */
 body.gdpr {
   line-height: 20px;
diff --git a/resources/sass/frontend_simple/basic/popravki.scss b/resources/sass/frontend_simple/basic/popravki.scss
index 599cde792..8b8017c17 100644
--- a/resources/sass/frontend_simple/basic/popravki.scss
+++ b/resources/sass/frontend_simple/basic/popravki.scss
@@ -281,3 +281,15 @@ footer .footer_content .col3 .social_logo_flex a:first-of-type{
     margin-right: 20px;
 }
   
+
+
+//CAPTCHA
+iframe {
+    max-width: 304px;
+    width: unset;
+}
+
+.rc-anchor-normal .rc-anchor-checkbox-label{
+    max-width: 152px;
+    width: unset;
+}
\ No newline at end of file

From a1453e3d4638da9886d2366a38b15345ff0ca8bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nejc=20Kova=C4=8D?= <nejc.kouko@gmail.com>
Date: Thu, 30 Jun 2022 15:05:07 +0200
Subject: [PATCH 039/110] login/register popravki

---
 frontend/simple/css/style.css                      | 9 ++++-----
 resources/sass/frontend_simple/basic/mobile.scss   | 4 ++++
 resources/sass/frontend_simple/basic/popravki.scss | 6 ++----
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/frontend/simple/css/style.css b/frontend/simple/css/style.css
index e706b5d8b..32a1e663c 100644
--- a/frontend/simple/css/style.css
+++ b/frontend/simple/css/style.css
@@ -965,6 +965,9 @@ body.login_noEmail #content.aai #main .main_content .app_subtitle {
   footer .footer_content .col span {
     padding: 0px 0px 12px 0px;
   }
+  footer .footer_content .col span:last-of-type {
+    padding: 0px 0px 12px 0px !important;
+  }
   footer .footer_content .col h2 {
     padding-top: 12px;
   }
@@ -1154,7 +1157,7 @@ body.landing_page #main .landing_page_window #login_holder .login_form .lostpass
 
 /* REGISTRACIJA */
 body.landing_page #main .landing_page_window .register_window {
-  padding: 24px 23px 25px 23px;
+  padding: 25px 23px !important;
 }
 
 body.landing_page #main .landing_page_window .register_window a {
@@ -1167,10 +1170,6 @@ body.landing_page #main .landing_page_window .register_window a {
   line-height: 20px;
 }
 
-body.landing_page #main .landing_page_window .agreement {
-  align-items: center;
-}
-
 body.landing_page #main .landing_page_window .agreement input {
   height: 18px;
   width: 18px;
diff --git a/resources/sass/frontend_simple/basic/mobile.scss b/resources/sass/frontend_simple/basic/mobile.scss
index 2a92ad90a..09d922d01 100644
--- a/resources/sass/frontend_simple/basic/mobile.scss
+++ b/resources/sass/frontend_simple/basic/mobile.scss
@@ -294,6 +294,10 @@
                 span{
                     padding: 0px 0px 12px 0px;
                 }
+                span:last-of-type{
+                    padding: 0px 0px 12px 0px !important;
+                }
+                
 
                 h2{
                     padding-top: 12px;
diff --git a/resources/sass/frontend_simple/basic/popravki.scss b/resources/sass/frontend_simple/basic/popravki.scss
index 8b8017c17..73892f185 100644
--- a/resources/sass/frontend_simple/basic/popravki.scss
+++ b/resources/sass/frontend_simple/basic/popravki.scss
@@ -185,7 +185,7 @@ body.landing_page #main .landing_page_window #login_holder .login_form .lostpass
 /* REGISTRACIJA */
 
 body.landing_page #main .landing_page_window .register_window {
-    padding: 24px 23px 25px 23px;
+    padding: 25px 23px !important;
 }
   
 body.landing_page #main .landing_page_window .register_window a {
@@ -198,9 +198,7 @@ body.landing_page #main .landing_page_window .register_window a {
     line-height: 20px;
 }
 
-body.landing_page #main .landing_page_window .agreement{
-    align-items: center;
-}
+
 
 
 body.landing_page #main .landing_page_window .agreement input{

From 2041cb2740456a9953aeb221a572260d6fbe1a30 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nejc=20Kova=C4=8D?= <nejc.kouko@gmail.com>
Date: Thu, 30 Jun 2022 15:22:42 +0200
Subject: [PATCH 040/110] Register form - poravnan checkbox

---
 frontend/simple/css/style.css                      | 3 +--
 resources/sass/frontend_simple/basic/popravki.scss | 4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/frontend/simple/css/style.css b/frontend/simple/css/style.css
index 32a1e663c..430947a2b 100644
--- a/frontend/simple/css/style.css
+++ b/frontend/simple/css/style.css
@@ -1174,8 +1174,7 @@ body.landing_page #main .landing_page_window .agreement input {
   height: 18px;
   width: 18px;
   margin: 0px 9px 4px 0px;
-  margin-top: 0px;
-  margin-bottom: 4px;
+  align-self: normal;
 }
 
 body.landing_page #main .landing_page_window .register_window .checkbox_text_holder {
diff --git a/resources/sass/frontend_simple/basic/popravki.scss b/resources/sass/frontend_simple/basic/popravki.scss
index 73892f185..126f6df1e 100644
--- a/resources/sass/frontend_simple/basic/popravki.scss
+++ b/resources/sass/frontend_simple/basic/popravki.scss
@@ -206,8 +206,8 @@ body.landing_page #main .landing_page_window .agreement input{
     width: 18px;
 
     margin: 0px 9px 4px 0px;
-    margin-top: 0px;
-    margin-bottom: 4px;
+
+    align-self: normal;
 }
 
 body.landing_page #main .landing_page_window .register_window .checkbox_text_holder{

From 65a305dfbd9178088ece551451d89448dd6fe274 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nejc=20Kova=C4=8D?= <nejc.kouko@gmail.com>
Date: Thu, 30 Jun 2022 15:50:20 +0200
Subject: [PATCH 041/110] =?UTF-8?q?register=20form=20-=20text=20fields=20o?=
 =?UTF-8?q?dpravljen=20bug=20pri=20=C5=A1irini?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/simple/css/style.css                      | 2 ++
 resources/sass/frontend_simple/basic/popravki.scss | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/frontend/simple/css/style.css b/frontend/simple/css/style.css
index 430947a2b..0bea9ee4d 100644
--- a/frontend/simple/css/style.css
+++ b/frontend/simple/css/style.css
@@ -1119,6 +1119,7 @@ body.landing_page #main .landing_page_window label:first-of-type {
   padding-left: 8px;
   height: 38px;
   max-width: 354px;
+  width: 100%;
   border: 1px solid #C4C4C4;
 }
 
@@ -1127,6 +1128,7 @@ body.landing_page #main .landing_page_window label:first-of-type {
   padding-left: 8px;
   height: 38px;
   max-width: 354px;
+  width: 100%;
   border: 1px solid #C4C4C4;
 }
 
diff --git a/resources/sass/frontend_simple/basic/popravki.scss b/resources/sass/frontend_simple/basic/popravki.scss
index 126f6df1e..589ec6633 100644
--- a/resources/sass/frontend_simple/basic/popravki.scss
+++ b/resources/sass/frontend_simple/basic/popravki.scss
@@ -140,6 +140,7 @@ body.landing_page #main .landing_page_window label:first-of-type{
     padding-left: 8px;
     height: 38px;
     max-width: 354px;
+    width: 100%;
 
     border: $input_border;
 }
@@ -148,6 +149,7 @@ body.landing_page #main .landing_page_window label:first-of-type{
     padding-left: 8px;
     height: 38px;
     max-width: 354px;
+    width: 100%;
 
     border: $input_border;
 }

From ebf7db34a12f885463a7df5412062f30c1567411 Mon Sep 17 00:00:00 2001
From: pero1203 <peter.hrvatin@gmail.com>
Date: Fri, 1 Jul 2022 11:18:33 +0200
Subject: [PATCH 042/110] Pri izpolnjevanju ankete omogocen upload tudi za ppt
 in pptx datoteke

---
 lang/1.php                            | 2 +-
 lang/2.php                            | 2 +-
 main/survey/app/Models/SaveSurvey.php | 2 +-
 main/survey/js/script.js              | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lang/1.php b/lang/1.php
index 1be1e2666..a2be420d8 100644
--- a/lang/1.php
+++ b/lang/1.php
@@ -6641,7 +6641,7 @@ $lang = array (
 	'srv_vprasanje_upload_fotografija'			=>	'Fotografiranje',
 	'srv_vprasanje_upload_limit_title'          =>	'Omejitve uploada datoteke',
 	'srv_vprasanje_upload_limit'			    =>	'Omejitev velikosti datoteke je <b>16 MB</b>',
-	'srv_vprasanje_upload_limit_type'			=>	'Uporabnik lahko naloži datoteke tipa:<br />"jpeg", "jpg", "png", "gif", "pdf", "doc", "docx", "xls", "xlsx"',
+	'srv_vprasanje_upload_limit_type'			=>	'Uporabnik lahko naloži datoteke tipa:<br />"jpeg", "jpg", "png", "gif", "pdf", "doc", "docx", "xls", "xlsx", "ppt", "pptx"',
 	'srv_vprasanje_delete_line_map'				=>	'Izbriši linijo',
 	'srv_vprasanje_delete_point_map'			=>	'Izbriši',
 	'srv_vprasanje_delete_line_confirm_map'		=>	'Ste prepričani, da želite izbrisati to linijo?',
diff --git a/lang/2.php b/lang/2.php
index e8b30277d..79b669ccd 100644
--- a/lang/2.php
+++ b/lang/2.php
@@ -6524,7 +6524,7 @@ $lang = array (
     'srv_vprasanje_upload_fotografija'			=>	'Take a picture',
     'srv_vprasanje_upload_limit_title'          =>	'File upload limits',
     'srv_vprasanje_upload_limit'			    =>	'Filesize limit is 16 MB',
-	'srv_vprasanje_upload_limit_type'			=>	'Respondent can upload file types: "jpeg", "jpg", "png", "gif", "pdf", "doc", "docx", "xls", "xlsx"',
+	'srv_vprasanje_upload_limit_type'			=>	'Respondent can upload file types: "jpeg", "jpg", "png", "gif", "pdf", "doc", "docx", "xls", "xlsx", "ppt", "pptx"',
 	'srv_vprasanje_delete_line_map'				=>	'Delete line',
 	'srv_vprasanje_delete_point_map'			=>	'Delete',
 	'srv_vprasanje_delete_line_confirm_map'		=>	'Are you sure you want to delete this line?',
diff --git a/main/survey/app/Models/SaveSurvey.php b/main/survey/app/Models/SaveSurvey.php
index 83ab68e6c..203fa7b3f 100644
--- a/main/survey/app/Models/SaveSurvey.php
+++ b/main/survey/app/Models/SaveSurvey.php
@@ -799,7 +799,7 @@ class SaveSurvey extends Model
                                 $file_allowed = true;
 
                                 // Preverimo ce je file type dovoljen (prava koncnica)
-                                if( !in_array(strtolower($ext), array("jpeg", "jpg", "png", "gif", "pdf", "doc", "docx", "xls", "xlsx")) ){
+                                if( !in_array(strtolower($ext), array("jpeg", "jpg", "png", "gif", "pdf", "doc", "docx", "xls", "xlsx", "ppt", "pptx")) ){
                                     $file_allowed = false;
                                 }
 
diff --git a/main/survey/js/script.js b/main/survey/js/script.js
index 7099e78f2..c392f1fb3 100644
--- a/main/survey/js/script.js
+++ b/main/survey/js/script.js
@@ -1916,7 +1916,7 @@ function checkUpload(upload, id){
 
 
     // File extensions allowed
-    let extAllowed = ["jpeg", "jpg", "png", "gif", "pdf", "doc", "docx", "xls", "xlsx"];
+    let extAllowed = ["jpeg", "jpg", "png", "gif", "pdf", "doc", "docx", "xls", "xlsx", "ppt", "pptx"];
 
     // Get file ext
     let fileNameFull = upload.files[0].name;

From de76fbbe5122033daa3aa5a8cdd6b3d930d4ad7a Mon Sep 17 00:00:00 2001
From: tejagerjovic <teja.gerjovic@fdv.uni-lj.si>
Date: Mon, 4 Jul 2022 10:00:11 +0200
Subject: [PATCH 043/110] Popup: Izbris kategorije v anketi s podatki -
 popravljen styling za gumbe

---
 admin/survey/classes/class.Vprasanje.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/admin/survey/classes/class.Vprasanje.php b/admin/survey/classes/class.Vprasanje.php
index 6a31d5833..14a301671 100644
--- a/admin/survey/classes/class.Vprasanje.php
+++ b/admin/survey/classes/class.Vprasanje.php
@@ -7185,11 +7185,13 @@ class Vprasanje {
                 $return['output'] .= '<div class="popup_close"><a href="#" onClick="$(\'#dropped_alert\').hide(); $(\'#fade\').fadeOut(); return false;">✕</a></div>';
 
 				$return['output'] .= '<p>'.$lang['spremenljivka_delete_data_vre'].'</p>';
-                $return['output'] .= '<p>'.$lang['srv_brisivrednostconfirm_data'].'</p><br />';
+                $return['output'] .= '<p class="top16">'.$lang['srv_brisivrednostconfirm_data'].'</p>';
                 
                 //ce se spremeni onclick, se prosim spremeni v datoteki vprasanjeInline.js v funkciji inline_vrednost_delete v else if (data.error == 2)
-                $return['output'] .= '<span class="buttonwrapper floatRight"><a class="ovalbutton ovalbutton_orange" href="#" onclick="inline_vrednost_delete(\''.$spremenljivka.'\', \''.$vrednost.'\', \'1\'); $(\'#dropped_alert\').html(\'\').hide(); $(\'#fade\').fadeOut(); return false;"><span>'.$lang['srv_brisivrednost'].'</span></a></span>';
-                $return['output'] .= '<span class="buttonwrapper floatRight spaceRight"><a class="ovalbutton ovalbutton_gray" href="#" onclick="$(\'#dropped_alert\').hide(); $(\'#fade\').fadeOut(); return false;"><span>'.$lang['srv_analiza_arhiviraj_cancle'].'</span></a></span>';
+                $return['output'] .= '<div class="button_holder">';
+                $return['output'] .= '<button class="medium white-blue" onclick="$(\'#dropped_alert\').hide(); $(\'#fade\').fadeOut(); return false;">'.$lang['srv_analiza_arhiviraj_cancle'].'</button>';
+                $return['output'] .= '<button class="medium blue" onclick="inline_vrednost_delete(\''.$spremenljivka.'\', \''.$vrednost.'\', \'1\'); $(\'#dropped_alert\').html(\'\').hide(); $(\'#fade\').fadeOut(); return false;">'.$lang['srv_brisivrednost'].'</button>';
+                $return['output'] .= '</div>';
 				//$return['output'] .= '<p><a href="#" id="brisivrednostchecked" onclick="inline_vrednost_delete(\''.$spremenljivka.'\', \''.$vrednost.'\', \'1\'); $(\'#dropped_alert\').html(\'\').hide(); $(\'#fade\').fadeOut(); return false;">'.$lang['srv_brisivrednost'].'</a> <a href="#" onclick="$(\'#dropped_alert\').html(\'\').hide(); $(\'#fade\').fadeOut(); return false;">'.$lang['srv_analiza_arhiviraj_cancle'].'</a></p>';
                 
                 echo json_encode($return);

From ed0cc0356b44faf6dd188b8c74a5bb734562627c Mon Sep 17 00:00:00 2001
From: pero1203 <peter.hrvatin@gmail.com>
Date: Tue, 5 Jul 2022 08:17:43 +0200
Subject: [PATCH 044/110] Popravek lang - Nejc popravki simple frontenda
 ("naprej")

---
 frontend/simple/classes/DisplayController.php |  8 ++++----
 lang/1.php                                    | 10 ++++++----
 lang/2.php                                    | 16 +++++++++-------
 3 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/frontend/simple/classes/DisplayController.php b/frontend/simple/classes/DisplayController.php
index 5ebe428e7..d015e05fa 100644
--- a/frontend/simple/classes/DisplayController.php
+++ b/frontend/simple/classes/DisplayController.php
@@ -600,7 +600,7 @@ class DisplayController{
         }
 
         // Submit
-		echo '  <input name="submit" title="'.$lang['login'].'" value="'.$lang['next1'].'" type="submit">';	
+		echo '  <input name="submit" title="'.$lang['login'].'" value="'.$lang['next2'].'" type="submit">';	
 
         // Lost pass
         echo '  <div class="lostpass"><a class="RegLastPage" href="#" onclick="LostPassword(\''.$lang['please_insert_email'].'\');">'.$lang['forgot_password'].'</a></div>';
@@ -675,7 +675,7 @@ class DisplayController{
         $terms_url = ($lang['id'] == '1') ? 'https://www.1ka.si/d/sl/o-1ka/pogoji-uporabe-storitve-1ka' : 'https://www.1ka.si/d/en/about/terms-of-use';
 		echo '  <div class="form_row agreement '.(isset($_GET['missing_agree']) ? ' red' : '').'">';
 		echo '      <input id="IAgree" type="checkbox" name="agree" value="1"><label for="IAgree">';
-		echo        '<div class="checkbox_text_holder"> '.str_replace('TERMS_URL', $terms_url, $lang['cms_register_user_terms_of_use']).'</label>';
+		echo        '<div class="checkbox_text_holder"> '.str_replace('TERMS_URL', $terms_url, $lang['cms_register_user_terms_of_use2']).'</label>';
 		// echo '      <br /><span class="red italic">*'.$lang['cms_register_mandatory_field'].'</span>';
         echo '</div>';
 
@@ -891,7 +891,7 @@ class DisplayController{
 		$terms_url = ($lang['id'] == '1') ? 'https://www.1ka.si/d/sl/o-1ka/pogoji-uporabe-storitve-1ka' : 'https://www.1ka.si/d/en/about/terms-of-use';
 		echo '			<div class="form_row agreement '.(isset($_GET['missing_agree']) ? ' red' : '').'">';
 		echo '				<input id="IAgree" type="checkbox" name="agree" value="1"><label for="IAgree">';
-		echo 				'<div class="checkbox_text_holder"> '.str_replace('TERMS_URL', $terms_url, $lang['cms_register_user_terms_of_use']).'</label>';
+		echo 				'<div class="checkbox_text_holder"> '.str_replace('TERMS_URL', $terms_url, $lang['cms_register_user_terms_of_use2']).'</label>';
 
 		echo '			</div>';
 		
@@ -902,7 +902,7 @@ class DisplayController{
 		echo '				<div id="checkbox_explain_text_holder" class="checkbox_explain_text_holder"> '.$lang['cms_register_gdpr_agree_explain'].'</div>';
 		echo '			</div>';*/
 		
-		echo '			<input name="submit" value="'.$lang['next1'].'" class="regfield" type="submit">';
+		echo '			<input name="submit" value="'.$lang['next2'].'" class="regfield" type="submit">';
 		echo '			<span class="have_account spaceLeft">'.str_replace('#URL#', $site_url.$this->root.'index.php?a=login', $lang['cms_register_login_link']).'</span>';
 		
 		echo '		</form>';
diff --git a/lang/1.php b/lang/1.php
index a2be420d8..96bae3f80 100644
--- a/lang/1.php
+++ b/lang/1.php
@@ -557,7 +557,8 @@ $lang = array (
 	"base_displayinsert"		=>	"Vnos",
 	"base_displaylabel"		=>	"Pregled",
 	"base_alternative"		=>	"Alternativni napisi",
-	"next1"				=>	"Prijava",
+    "next1"				    =>	"Naprej",
+	"next2"				    =>	"Prijava",
 	"register"				=>	"Registracija",
 	"vpisal"			=>	"Vpisal",
 	"spremenil"			=>	"Spremenil",
@@ -1638,12 +1639,13 @@ $lang = array (
 	"cms_register_other_email" => "Z uporabniškim računom",
 	"cms_login_title_block" => "Prijava uporabnika",
 	"cms_register_login_link" => "Že imate račun? <a href='#URL#' id=\"odpri-prijavo\">Prijavite se</a>",
-  "cms_login_registration_link" => "Še nimate računa na 1KA? <a href='#URL#' id=\"odpri-registracijo\">Registrirajte se</a>",
+    "cms_login_registration_link" => "Še nimate računa na 1KA? <a href='#URL#' id=\"odpri-registracijo\">Registrirajte se</a>",
 	"cms_register_mandatory_field" => "Odgovor je obvezen",
 	"cms_search" => "Iskanje",
-	"cms_register_user_terms_of_use" => "Strinjam se s <a href='#'>pogoji uporabe! </a> ",
+    "cms_register_user_terms_of_use"    => "Strinjam se s pogoji uporabe! <strong><a href='https://www.1ka.si/d/sl/o-1ka/pogoji-uporabe-storitve-1ka' target='_blank'>Splošni pogoji uporabe.</a></strong>",
+	"cms_register_user_terms_of_use2"   => "Strinjam se s <a href='#'>pogoji uporabe! </a> ",
 	"cms_register_gdpr_agree" => "Strinjam se, da mi na zgoraj navedeni elektronski naslov enkrat letno pošljete pomembna obvestila (pomembne informacije o novostih 1KA, vabilo na dogodek).",
-  "cms_register_gdpr_agree_explain" => "Vaš email bomo uporabljali in hranili zgolj za potrebe uporabe uporabniškega imena v orodju 1KA in ga bom skrbno varovali v skladu s predpisi. 
+    "cms_register_gdpr_agree_explain" => "Vaš email bomo uporabljali in hranili zgolj za potrebe uporabe uporabniškega imena v orodju 1KA in ga bom skrbno varovali v skladu s predpisi. 
 																				Vašega emaila ne bomo pod nobenimi pogoji posredovali tretjim osebam ali ga uporabljali v druge namene. 
 																				Vaš email bomo hranili toliko časa, kolikor bo aktiven vaš uporabniški račun v orodju 1KA. 
 																				Za vsakega uporabnika beležimo naslednje informacije: elektronski naslov, ime (vzdevek), tip uporabnika, jezik vmesnika, 
diff --git a/lang/2.php b/lang/2.php
index 79b669ccd..d9959a2b6 100644
--- a/lang/2.php
+++ b/lang/2.php
@@ -544,7 +544,8 @@ $lang = array (
 	"base_displayinsert"	=>	"Insert",
 	"base_displaylabel"	=>	"View",
 	"base_alternative"	=>	"Alternative labels",
-	"next1"			=>	"Login",
+    "next1"			=>	"Next",
+	"next2"			=>	"Login",
 	"register"				=>	"Register",
 	"vpisal"		=>	"Posted by",
 	"spremenil"		=>	"Changed by",
@@ -1623,13 +1624,14 @@ $lang = array (
     "cms_register_new_user_email" => "With email",
     "cms_register_other_email" => "With account",
     "cms_login_title_block" => "Login user",
-  "cms_register_login_link" => "Do you have an account? <a href='#URL#' id=\"odpri-prijavo\">Sign in</a>",
-  "cms_login_registration_link" => "Do not have an account at 1KA? <a href='#URL#' id=\"odpri-registracijo\">Register</a>",
-  "cms_register_mandatory_field" => "Mandatory field",
+    "cms_register_login_link" => "Do you have an account? <a href='#URL#' id=\"odpri-prijavo\">Sign in</a>",
+    "cms_login_registration_link" => "Do not have an account at 1KA? <a href='#URL#' id=\"odpri-registracijo\">Register</a>",
+    "cms_register_mandatory_field" => "Mandatory field",
 	"cms_search" => "Search",
-	"cms_register_user_terms_of_use" => "I agree to <a href='#'>user agreement! </a> ",
-  "cms_register_gdpr_agree" => "I agree that you send me notifications to the above-mentioned email address (important information about 1KA, 1KA evaluation, event invitation - once a year).",
-  "cms_register_gdpr_agree_explain" => "We will use and store your email only for the purposes of using the 1KA username and will carefully protect it in accordance with the regulations. 
+    "cms_register_user_terms_of_use"    => "I agree to user agreement! <strong><a href='https://www.1ka.si/d/en/about/terms-of-use' target='_blank'>General terms of use.</a></strong>",
+	"cms_register_user_terms_of_use2"   => "I agree to <a href='#'>user agreement! </a> ",
+    "cms_register_gdpr_agree" => "I agree that you send me notifications to the above-mentioned email address (important information about 1KA, 1KA evaluation, event invitation - once a year).",
+    "cms_register_gdpr_agree_explain" => "We will use and store your email only for the purposes of using the 1KA username and will carefully protect it in accordance with the regulations. 
                                         We will not pass on your email to third parties under any circumstances or use it for other purposes. We will keep your email as long as your account on 1KA is active. 
                                         For each user, we store the following information: email address, name(nickname), user type, interface language, registration date, last login date, order(subscription) to receiving news.<br /><br />
   										In the event that you agree to receive notifications, we will send you important information about 1KA news, an invitation to an event, etc. on your email once a year. 

From bfba1710665c5bee1122f63bcfb86910dd15026c Mon Sep 17 00:00:00 2001
From: Peter Hrvatin <peter.hrvatin@gmail.com>
Date: Wed, 6 Jul 2022 12:37:25 +0200
Subject: [PATCH 045/110] Kolektor - postavitev baze, osnovna struktura modula

---
 .../modules/mod_KOLEKTOR/class.Kolektor.php   | 93 +++++++++++++++++++
 .../class.KolektorNotifications.php           | 51 ++++++++++
 .../mod_KOLEKTOR/class.KolektorResponse.php   | 60 ++++++++++++
 .../survey/modules/mod_KOLEKTOR/css/style.css |  0
 .../modules/mod_KOLEKTOR/script/script.js     |  0
 sql/update2.sql                               | 59 ++++++++++++
 6 files changed, 263 insertions(+)
 create mode 100644 admin/survey/modules/mod_KOLEKTOR/class.Kolektor.php
 create mode 100644 admin/survey/modules/mod_KOLEKTOR/class.KolektorNotifications.php
 create mode 100644 admin/survey/modules/mod_KOLEKTOR/class.KolektorResponse.php
 create mode 100644 admin/survey/modules/mod_KOLEKTOR/css/style.css
 create mode 100644 admin/survey/modules/mod_KOLEKTOR/script/script.js

diff --git a/admin/survey/modules/mod_KOLEKTOR/class.Kolektor.php b/admin/survey/modules/mod_KOLEKTOR/class.Kolektor.php
new file mode 100644
index 000000000..07b8a65f5
--- /dev/null
+++ b/admin/survey/modules/mod_KOLEKTOR/class.Kolektor.php
@@ -0,0 +1,93 @@
+<?php
+
+	
+/*
+    VPRASANJA
+    - lahko razlicni userji aktivirajo razlicne faze iste stranke? Potem vidjo vse ankete te stranke?
+    - kaj povezuje ankete stranke - porjekt id? potem se ga vnese samo pri prvi anketi
+    - je lahko vec faz istocasno aktivnih (npr. anketa 1 in anketa 2)?
+    - kdaj se poslje sporocilo? ob 8h zjutraj?
+    - se lahko zacne sekvenca na npr. 2. anketi (oz. se preskoci anketo 2...?)
+
+
+
+*/
+
+
+class Kolektor {
+	
+
+    var $sequence = array();
+    var $clients = array();
+
+	
+	function __construct(){
+		global $site_url;
+		global $lang;
+
+        $this->prepareSequence();
+        $this->prepareClients();
+	}
+	
+
+    private function prepareSequence(){
+
+        // Dobimo sekvenco anket
+        $sql = sisplet_query("SELECT * FROM kolektor_sequence");
+        $row = mysqli_fetch_array($sql);
+
+        $this->sequence = $row;
+    }
+
+    private function prepareClients(){
+        global $global_user_id;
+        global $admin_type;
+
+        // Admini vidijo vse kliente
+        if($admin_type == '0'){
+            $sql = sisplet_query("SELECT * FROM kolektor_client");
+
+            while($row = mysqli_fetch_array($sql)){
+                $this->clients[$row['id']] = $row;
+            }
+        }
+        else{
+            // Uporabnik vidi samo svoje kliente
+            $sql = sisplet_query("SELECT * FROM kolektor_client WHERE usr_id='".$global_user_id."'");
+
+            while($row = mysqli_fetch_array($sql)){
+                $this->clients[$row['id']] = $row;
+            }
+        }
+    }
+
+
+
+    // Osnovni pogled
+    public function display(){
+
+
+
+    }
+	
+
+    public function displayClientList(){
+
+
+    }
+
+    // Prikaze formo za dodajanje novega respondenta
+	public function displayAddRespondent(){
+
+
+
+    }
+    
+    public function displayRespondentDetails(){
+
+
+
+    }
+}
+	
+?>
\ No newline at end of file
diff --git a/admin/survey/modules/mod_KOLEKTOR/class.KolektorNotifications.php b/admin/survey/modules/mod_KOLEKTOR/class.KolektorNotifications.php
new file mode 100644
index 000000000..10ab4e3a0
--- /dev/null
+++ b/admin/survey/modules/mod_KOLEKTOR/class.KolektorNotifications.php
@@ -0,0 +1,51 @@
+<?php
+
+	
+class KolektorNotifications {
+
+	
+	function __construct(){
+		global $site_url;
+		global $lang;
+
+
+
+	}
+
+
+    // Loop cez vse response in posljemo notificatione glede na statuse
+    public function executeCronJob(){
+        
+        
+
+    }
+	
+
+    private function sendNotification($response_id){
+
+        $response = new KolektorResponse($response_id);
+
+        // Status 0 - "prozeno" - preklopimo na status 1 "opozorilo 1"
+        if($response->getStatus() == 0){
+
+        }
+        // Status 1 - "opozorilo 1" - preklopimo na status 2 "opozorilo 3"
+        elseif($response->getStatus() == 1){
+            
+        }
+        // Status 2 "opozorilo 3" - preklopimo na status 3 "neodgovorjeno"
+        elseif($response->getStatus() == 2){
+            
+            
+            
+        }
+
+
+        // Posljemo mail
+
+
+        // Spremenimo status
+    }
+}
+	
+?>
\ No newline at end of file
diff --git a/admin/survey/modules/mod_KOLEKTOR/class.KolektorResponse.php b/admin/survey/modules/mod_KOLEKTOR/class.KolektorResponse.php
new file mode 100644
index 000000000..403ce5b54
--- /dev/null
+++ b/admin/survey/modules/mod_KOLEKTOR/class.KolektorResponse.php
@@ -0,0 +1,60 @@
+<?php
+
+	
+class KolektorResponse {
+
+
+    private $response = array();
+
+	
+	function __construct($response_id){
+		global $site_url;
+		global $lang;
+
+        // Dobimo podatke responsa
+        $sql = sisplet_query("SELECT * FROM kolektor_survey_response WHERE id='".$response_id."'");
+
+        if(mysqli_num_rows($sql) == 0){
+            echo 'Napaka! Odgovor ne obstaja.';
+            return false;
+        }
+
+        $row = mysqli_fetch_array($sql);
+        $this->response = $row;
+	}
+
+    public function getStatus(){ 
+        return $this->response['status']; 
+    }
+	
+
+    // Dodajanje responsa
+    public static function addResponse($response_data){
+
+
+        // Dodaj respondenta v srv_user
+
+
+        // Poslji email z vabilom na anketo
+
+
+        // Dodaj respondenta v kolektor bazo
+        $sql = sisplet_query("INSERT INTO kolektor_survey_response 
+                                (ank_id, usr_id, inser_time, status, kolektor_client_id, respondent_id)
+                                VALUES
+                                ('".$response_data['ank_id']."', '".$response_data['usr_id']."', NOW(), '0', '".$response_data['kolektor_client_id']."', '".$response_data['respondent_id']."')
+                            ");
+
+        $response_id = mysqli_insert_id($GLOBALS['connect_db']);
+
+        /*if($response = new KolektorResponse($response_id)){
+            return $response;
+        }
+        else{
+            echo 'Napaka pri dodajanju odgovora!';
+            return false;
+        }*/
+    }
+}
+	
+?>
\ No newline at end of file
diff --git a/admin/survey/modules/mod_KOLEKTOR/css/style.css b/admin/survey/modules/mod_KOLEKTOR/css/style.css
new file mode 100644
index 000000000..e69de29bb
diff --git a/admin/survey/modules/mod_KOLEKTOR/script/script.js b/admin/survey/modules/mod_KOLEKTOR/script/script.js
new file mode 100644
index 000000000..e69de29bb
diff --git a/sql/update2.sql b/sql/update2.sql
index aafa80d26..d5e7d8694 100644
--- a/sql/update2.sql
+++ b/sql/update2.sql
@@ -9592,3 +9592,62 @@ UPDATE misc SET value='22.03.31' WHERE what="version";
 ALTER TABLE srv_data_upload CHANGE filename filename VARCHAR(50) character set utf8 NOT NULL;
 
 UPDATE misc SET value='22.06.14' WHERE what="version";
+
+## MODUL ZA KOLEKTOR
+INSERT INTO srv_module (module_name, active) VALUES ('kolektor', '0');
+#UPDATE srv_module SET active='1' WHERE module_name = 'kolektor';
+
+CREATE TABLE kolektor_sequence(
+    id INT(11) NOT NULL auto_increment,
+    ank1_id INT(11) NOT NULL DEFAULT '0',
+    ank2_id INT(11) NOT NULL DEFAULT '0',
+    ank3_id INT(11) NOT NULL DEFAULT '0',
+    ank4_id INT(11) NOT NULL DEFAULT '0',
+    ank5_id INT(11) NOT NULL DEFAULT '0',
+    ank6_id INT(11) NOT NULL DEFAULT '0',
+    PRIMARY KEY (id)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+CREATE TABLE kolektor_client(
+    id INT(11) NOT NULL auto_increment,
+    usr_id INT(11) NOT NULL DEFAULT 0,
+    insert_time DATETIME(3) NOT NULL,
+    CONSTRAINT fk_kolektor_client_usr_id FOREIGN KEY (usr_id) REFERENCES users (id) ON DELETE CASCADE ON UPDATE CASCADE,
+    PRIMARY KEY (id)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+CREATE TABLE kolektor_survey_response(
+    id INT(11) NOT NULL auto_increment,
+    ank_id INT(11) NOT NULL DEFAULT 0,
+    usr_id INT(11) NOT NULL DEFAULT 0,
+    insert_time DATETIME(3) NOT NULL,
+    status ENUM('0','1','2','3','4') NOT NULL DEFAULT '0',
+    kolektor_client_id INT(11) NOT NULL DEFAULT 0,
+    respondent_id INT(11) NOT NULL DEFAULT 0,
+    respondent_email VARCHAR(100) NOT NULL DEFAULT '',
+    respondent_funkcija VARCHAR(100) NOT NULL DEFAULT '',
+    respondent_projekt_id VARCHAR(100) NOT NULL DEFAULT '',
+    respondent_remote_activation ENUM('0','1') NOT NULL DEFAULT '0',
+    respondent_message TEXT NOT NULL DEFAULT '',
+    CONSTRAINT fk_kolektor_survey_response_ank_id FOREIGN KEY (ank_id) REFERENCES srv_anketa (id) ON DELETE CASCADE ON UPDATE CASCADE,
+    CONSTRAINT fk_kolektor_survey_response_usr_id FOREIGN KEY (usr_id) REFERENCES users (id) ON DELETE CASCADE ON UPDATE CASCADE,
+    CONSTRAINT fk_kolektor_survey_response_kolektor_client_id FOREIGN KEY (kolektor_client_id) REFERENCES kolektor_client (id) ON DELETE CASCADE ON UPDATE CASCADE,
+    CONSTRAINT fk_kolektor_survey_response_respondent_id FOREIGN KEY (respondent_id) REFERENCES srv_user (id) ON DELETE CASCADE ON UPDATE CASCADE,
+    PRIMARY KEY (id),
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+CREATE TABLE kolektor_survey_response_alert(
+    kolektor_survey_response_id INT(11) NOT NULL,
+    alert_time DATETIME(3) NOT NULL,
+    status ENUM('0','1','2','3','4') NOT NULL,
+    CONSTRAINT kolektor_survey_response_alert_kolektor_survey_response_id FOREIGN KEY (kolektor_survey_response_id) REFERENCES kolektor_survey_response (id) ON DELETE CASCADE ON UPDATE CASCADE,
+    PRIMARY KEY (id)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+CREATE TABLE kolektor_podjetje_funkcija(
+    id INT(11) NOT NULL auto_increment,
+    text VARCHAR(255) NOT NULL DEFAULT '',
+    order_number INT(11) NOT NULL DEFAULT 0,
+    PRIMARY KEY (id)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+

From 1ee204da90ce25e1685016cd818bcb44181f894c Mon Sep 17 00:00:00 2001
From: Peter Hrvatin <peter.hrvatin@gmail.com>
Date: Wed, 6 Jul 2022 13:37:06 +0200
Subject: [PATCH 046/110] Kolektor - popravek imena funkcije

---
 admin/survey/modules/mod_KOLEKTOR/class.Kolektor.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/admin/survey/modules/mod_KOLEKTOR/class.Kolektor.php b/admin/survey/modules/mod_KOLEKTOR/class.Kolektor.php
index 07b8a65f5..a4cb7441f 100644
--- a/admin/survey/modules/mod_KOLEKTOR/class.Kolektor.php
+++ b/admin/survey/modules/mod_KOLEKTOR/class.Kolektor.php
@@ -76,14 +76,14 @@ class Kolektor {
 
     }
 
-    // Prikaze formo za dodajanje novega respondenta
-	public function displayAddRespondent(){
+    // Prikaze formo za dodajanje novega responsa
+	public function displayAddResponse(){
 
 
 
     }
     
-    public function displayRespondentDetails(){
+    public function displayResponseDetails(){
 
 
 

From 6342498f6d4b04153f1bb09d42a8ac108534d527 Mon Sep 17 00:00:00 2001
From: Peter Hrvatin <peter.hrvatin@gmail.com>
Date: Wed, 6 Jul 2022 13:37:31 +0200
Subject: [PATCH 047/110] Urejanje vprasanja - razpiranje fieldseta na desni -
 testno pri limitih in missingih

---
 admin/survey/classes/class.Vprasanje.php      | 40 +++++++------------
 admin/survey/script/vprasanje.js              | 15 ++++++-
 public/css/admin_new.css                      |  3 ++
 .../survey_edit/question_right_settings.scss  |  4 ++
 4 files changed, 35 insertions(+), 27 deletions(-)

diff --git a/admin/survey/classes/class.Vprasanje.php b/admin/survey/classes/class.Vprasanje.php
index 14a301671..785ed3fc7 100644
--- a/admin/survey/classes/class.Vprasanje.php
+++ b/admin/survey/classes/class.Vprasanje.php
@@ -473,20 +473,30 @@ class Vprasanje {
                     // ce je izbrano stevilo in ne drsnik - omejitve vnosa
 					if ($row['ranking_k'] == 0){	
 
-                        echo '<fieldset><legend>'.$lang['srv_num_limits'].'</legend>';
+                        echo '<fieldset>';
+                        echo '  <legend class="pointer" onClick="fieldsetToggle(this);"><span class="faicon arrow2_d"></span>'.$lang['srv_num_limits'].'</legend>';
+
+                        echo '  <div class="fieldset_holder" style="display:none;">';
 
                         if ($row['tip'] != 21)
 						    $this->edit_number();
 
                         $this->edit_limit();
 
+                        echo '  </div>';
+
                         echo '</fieldset>';
 					}
 				}
 
                 if ($row['tip'] == 7) {
-                    echo '<fieldset><legend>'.$lang['srv_manjkajoce_vrednosti2'].' '.Help::display('srv_missing_values').'</legend>';
+                    echo '<fieldset>';
+                    echo '  <legend class="pointer" onClick="fieldsetToggle(this);"><span class="faicon arrow2_d"></span>'.$lang['srv_manjkajoce_vrednosti2'].' '.Help::display('srv_missing_values').'</legend>';
+                    
+                    echo '  <div class="fieldset_holder" style="display:none;">';
                     $this->edit_vrednost_missing();
+                    echo '  </div>';
+
                     echo '</fieldset>';
                 }
 					
@@ -2719,18 +2729,7 @@ class Vprasanje {
 
 			if (count($missing_values) > 0) {
 
-                // Checkbox za prikaz vseh missing nastavitev
-                echo '<div class="vprasanje_setting_holder">';
-
-                echo '  <div class="vprasanje_setting_line">';
-                echo '      <input type="checkbox" '.(!empty($already_set_mv) ? ' checked="checked"' : '').' id="show_missing_settings" onChange="$(\'#missing_settings_holder\').slideToggle();">';
-                echo '      <label for="show_missing_settings">'.$lang['srv_manjkajoce_vrednosti_toggle'].'</label>';
-                echo '  </div>';
-
-                echo '</div>';
-				
-
-                echo '<div id="missing_settings_holder" '.(empty($already_set_mv) ? 'style="display:none;"' : '').'">';
+                echo '<div id="missing_settings_holder">';
 
                 echo '<div class="vprasanje_setting_holder">';
 
@@ -3188,18 +3187,7 @@ class Vprasanje {
     
         if (count($missing_values) > 0) { 
 
-            // Checkbox za prikaz vseh missing nastavitev
-            echo '<div class="vprasanje_setting_holder">';
-
-            echo '  <div class="vprasanje_setting_line">';
-            echo '      <input type="checkbox" '.(!empty($already_set_mv) ? ' checked="checked"' : '').' id="show_missing_settings" onChange="$(\'#missing_settings_holder\').slideToggle();">';
-            echo '      <label for="show_missing_settings">'.$lang['srv_manjkajoce_vrednosti_toggle'].'</label>';
-            echo '  </div>';
-
-            echo '</div>';
-
-
-            echo '<div id="missing_settings_holder" '.(empty($already_set_mv) ? 'style="display:none;"' : '').'">';
+            echo '<div id="missing_settings_holder">';
             
             echo '<div class="vprasanje_setting_holder">';
             
diff --git a/admin/survey/script/vprasanje.js b/admin/survey/script/vprasanje.js
index 6ec783475..f3e48776b 100644
--- a/admin/survey/script/vprasanje.js
+++ b/admin/survey/script/vprasanje.js
@@ -1636,4 +1636,17 @@ function toggleCheckboxMinLimitReminder(spremenljivka, checkbox_min_limit){
 	}else{
 		$('#checkboxLimitReminder_' + spremenljivka).css('display', 'none');	//skrij nastavitve za opozorilo
 	}
-}
\ No newline at end of file
+}
+
+
+// Fieldset toggle
+function fieldsetToggle(element){
+
+    $(element).next('.fieldset_holder').slideToggle(function(){
+        //$('#vprasanje_edit').animate({scrollTop: $(this).offset().top}, 2000); 
+    });
+
+    $(element).find('.faicon').toggleClass('arrow2_d').toggleClass('arrow2_u');
+
+}
+
diff --git a/public/css/admin_new.css b/public/css/admin_new.css
index 30be5b29b..85941ffd2 100644
--- a/public/css/admin_new.css
+++ b/public/css/admin_new.css
@@ -14674,6 +14674,9 @@ div#variabla_new span.correct {
   text-transform: none;
   background-color: transparent;
 }
+#vprasanje_float_editing .vprasanje_edit_holder fieldset legend .faicon {
+  margin-right: 4px;
+}
 #vprasanje_float_editing .vprasanje_edit_holder .vprasanje_setting_holder {
   display: flex;
   flex-direction: column;
diff --git a/resources/sass/admin_new/pages/survey_edit/question_right_settings.scss b/resources/sass/admin_new/pages/survey_edit/question_right_settings.scss
index 5774f5d89..7283ce214 100644
--- a/resources/sass/admin_new/pages/survey_edit/question_right_settings.scss
+++ b/resources/sass/admin_new/pages/survey_edit/question_right_settings.scss
@@ -168,6 +168,10 @@
                 text-transform: none;
                 
                 background-color: transparent;
+
+                .faicon{
+                    margin-right: 4px;
+                }
             }
         }   
         

From 45da4eedab119aa6ee0484d14136d209ee96b185 Mon Sep 17 00:00:00 2001
From: tejagerjovic <teja.gerjovic@fdv.uni-lj.si>
Date: Fri, 8 Jul 2022 07:07:01 +0200
Subject: [PATCH 048/110] Redesign - dodaj komentar pri ifu oz. bloku (inline
 margin)

---
 admin/survey/Branching.php                    |    2 +-
 public/css/admin_new.css                      | 2894 +++++++++--------
 .../pages/survey_edit/conditions.scss         |    5 +
 3 files changed, 1455 insertions(+), 1446 deletions(-)

diff --git a/admin/survey/Branching.php b/admin/survey/Branching.php
index afbef747a..fe479ea9c 100644
--- a/admin/survey/Branching.php
+++ b/admin/survey/Branching.php
@@ -6215,7 +6215,7 @@ class Branching {
 		if ($admin_type <= $question_comment && $question_comment != '') {
 
 			// Dodaj komentar
-			echo '   <span class="floatRight spaceLeft"><a href="#" id="surveycomment_'.$if_id.'_0" class="surveycomment" type="'.($block==1 ? '6' : '5').'" subtype="'.($block==1 ? 'blok_admin_add' : 'if_admin_add').'" spremenljivka="'.$if_id.'" view="0" onclick="return false;" title="'.$lang['srv_question_comment'].'"> ';
+			echo '   <span class="comment_inline"><a href="#" id="surveycomment_'.$if_id.'_0" class="surveycomment" type="'.($block==1 ? '6' : '5').'" subtype="'.($block==1 ? 'blok_admin_add' : 'if_admin_add').'" spremenljivka="'.$if_id.'" view="0" onclick="return false;" title="'.$lang['srv_question_comment'].'"> ';
 			//echo '<img src="img_' . $this->skin . '/comment.png" alt="'.$lang['srv_question_comment'].'" title="'.$lang['srv_question_comment'].'" > ';
 			echo '<span class="faicon inline_comment"></span> ';
 			echo $lang['srv_add_comment'];
diff --git a/public/css/admin_new.css b/public/css/admin_new.css
index 85941ffd2..e57589f2c 100644
--- a/public/css/admin_new.css
+++ b/public/css/admin_new.css
@@ -214,4767 +214,4767 @@
 /* Font Awesome uses the Unicode Private Use Area (PUA) to ensure screen
 readers do not read off random characters that represent icons */
 .fa-500px:before {
-  content: "";
+  content: "\f26e";
 }
 
 .fa-accessible-icon:before {
-  content: "";
+  content: "\f368";
 }
 
 .fa-accusoft:before {
-  content: "";
+  content: "\f369";
 }
 
 .fa-ad:before {
-  content: "";
+  content: "\f641";
 }
 
 .fa-address-book:before {
-  content: "";
+  content: "\f2b9";
 }
 
 .fa-address-card:before {
-  content: "";
+  content: "\f2bb";
 }
 
 .fa-adjust:before {
-  content: "";
+  content: "\f042";
 }
 
 .fa-adn:before {
-  content: "";
+  content: "\f170";
 }
 
 .fa-adversal:before {
-  content: "";
+  content: "\f36a";
 }
 
 .fa-affiliatetheme:before {
-  content: "";
+  content: "\f36b";
 }
 
 .fa-air-freshener:before {
-  content: "";
+  content: "\f5d0";
 }
 
 .fa-algolia:before {
-  content: "";
+  content: "\f36c";
 }
 
 .fa-align-center:before {
-  content: "";
+  content: "\f037";
 }
 
 .fa-align-justify:before {
-  content: "";
+  content: "\f039";
 }
 
 .fa-align-left:before {
-  content: "";
+  content: "\f036";
 }
 
 .fa-align-right:before {
-  content: "";
+  content: "\f038";
 }
 
 .fa-alipay:before {
-  content: "";
+  content: "\f642";
 }
 
 .fa-allergies:before {
-  content: "";
+  content: "\f461";
 }
 
 .fa-amazon:before {
-  content: "";
+  content: "\f270";
 }
 
 .fa-amazon-pay:before {
-  content: "";
+  content: "\f42c";
 }
 
 .fa-ambulance:before {
-  content: "";
+  content: "\f0f9";
 }
 
 .fa-american-sign-language-interpreting:before {
-  content: "";
+  content: "\f2a3";
 }
 
 .fa-amilia:before {
-  content: "";
+  content: "\f36d";
 }
 
 .fa-anchor:before {
-  content: "";
+  content: "\f13d";
 }
 
 .fa-android:before {
-  content: "";
+  content: "\f17b";
 }
 
 .fa-angellist:before {
-  content: "";
+  content: "\f209";
 }
 
 .fa-angle-double-down:before {
-  content: "";
+  content: "\f103";
 }
 
 .fa-angle-double-left:before {
-  content: "";
+  content: "\f100";
 }
 
 .fa-angle-double-right:before {
-  content: "";
+  content: "\f101";
 }
 
 .fa-angle-double-up:before {
-  content: "";
+  content: "\f102";
 }
 
 .fa-angle-down:before {
-  content: "";
+  content: "\f107";
 }
 
 .fa-angle-left:before {
-  content: "";
+  content: "\f104";
 }
 
 .fa-angle-right:before {
-  content: "";
+  content: "\f105";
 }
 
 .fa-angle-up:before {
-  content: "";
+  content: "\f106";
 }
 
 .fa-angry:before {
-  content: "";
+  content: "\f556";
 }
 
 .fa-angrycreative:before {
-  content: "";
+  content: "\f36e";
 }
 
 .fa-angular:before {
-  content: "";
+  content: "\f420";
 }
 
 .fa-ankh:before {
-  content: "";
+  content: "\f644";
 }
 
 .fa-app-store:before {
-  content: "";
+  content: "\f36f";
 }
 
 .fa-app-store-ios:before {
-  content: "";
+  content: "\f370";
 }
 
 .fa-apper:before {
-  content: "";
+  content: "\f371";
 }
 
 .fa-apple:before {
-  content: "";
+  content: "\f179";
 }
 
 .fa-apple-alt:before {
-  content: "";
+  content: "\f5d1";
 }
 
 .fa-apple-pay:before {
-  content: "";
+  content: "\f415";
 }
 
 .fa-archive:before {
-  content: "";
+  content: "\f187";
 }
 
 .fa-archway:before {
-  content: "";
+  content: "\f557";
 }
 
 .fa-arrow-alt-circle-down:before {
-  content: "";
+  content: "\f358";
 }
 
 .fa-arrow-alt-circle-left:before {
-  content: "";
+  content: "\f359";
 }
 
 .fa-arrow-alt-circle-right:before {
-  content: "";
+  content: "\f35a";
 }
 
 .fa-arrow-alt-circle-up:before {
-  content: "";
+  content: "\f35b";
 }
 
 .fa-arrow-circle-down:before {
-  content: "";
+  content: "\f0ab";
 }
 
 .fa-arrow-circle-left:before {
-  content: "";
+  content: "\f0a8";
 }
 
 .fa-arrow-circle-right:before {
-  content: "";
+  content: "\f0a9";
 }
 
 .fa-arrow-circle-up:before {
-  content: "";
+  content: "\f0aa";
 }
 
 .fa-arrow-down:before {
-  content: "";
+  content: "\f063";
 }
 
 .fa-arrow-left:before {
-  content: "";
+  content: "\f060";
 }
 
 .fa-arrow-right:before {
-  content: "";
+  content: "\f061";
 }
 
 .fa-arrow-up:before {
-  content: "";
+  content: "\f062";
 }
 
 .fa-arrows-alt:before {
-  content: "";
+  content: "\f0b2";
 }
 
 .fa-arrows-alt-h:before {
-  content: "";
+  content: "\f337";
 }
 
 .fa-arrows-alt-v:before {
-  content: "";
+  content: "\f338";
 }
 
 .fa-assistive-listening-systems:before {
-  content: "";
+  content: "\f2a2";
 }
 
 .fa-asterisk:before {
-  content: "";
+  content: "\f069";
 }
 
 .fa-asymmetrik:before {
-  content: "";
+  content: "\f372";
 }
 
 .fa-at:before {
-  content: "";
+  content: "\f1fa";
 }
 
 .fa-atlas:before {
-  content: "";
+  content: "\f558";
 }
 
 .fa-atom:before {
-  content: "";
+  content: "\f5d2";
 }
 
 .fa-audible:before {
-  content: "";
+  content: "\f373";
 }
 
 .fa-audio-description:before {
-  content: "";
+  content: "\f29e";
 }
 
 .fa-autoprefixer:before {
-  content: "";
+  content: "\f41c";
 }
 
 .fa-avianex:before {
-  content: "";
+  content: "\f374";
 }
 
 .fa-aviato:before {
-  content: "";
+  content: "\f421";
 }
 
 .fa-award:before {
-  content: "";
+  content: "\f559";
 }
 
 .fa-aws:before {
-  content: "";
+  content: "\f375";
 }
 
 .fa-backspace:before {
-  content: "";
+  content: "\f55a";
 }
 
 .fa-backward:before {
-  content: "";
+  content: "\f04a";
 }
 
 .fa-balance-scale:before {
-  content: "";
+  content: "\f24e";
 }
 
 .fa-ban:before {
-  content: "";
+  content: "\f05e";
 }
 
 .fa-band-aid:before {
-  content: "";
+  content: "\f462";
 }
 
 .fa-bandcamp:before {
-  content: "";
+  content: "\f2d5";
 }
 
 .fa-barcode:before {
-  content: "";
+  content: "\f02a";
 }
 
 .fa-bars:before {
-  content: "";
+  content: "\f0c9";
 }
 
 .fa-baseball-ball:before {
-  content: "";
+  content: "\f433";
 }
 
 .fa-basketball-ball:before {
-  content: "";
+  content: "\f434";
 }
 
 .fa-bath:before {
-  content: "";
+  content: "\f2cd";
 }
 
 .fa-battery-empty:before {
-  content: "";
+  content: "\f244";
 }
 
 .fa-battery-full:before {
-  content: "";
+  content: "\f240";
 }
 
 .fa-battery-half:before {
-  content: "";
+  content: "\f242";
 }
 
 .fa-battery-quarter:before {
-  content: "";
+  content: "\f243";
 }
 
 .fa-battery-three-quarters:before {
-  content: "";
+  content: "\f241";
 }
 
 .fa-bed:before {
-  content: "";
+  content: "\f236";
 }
 
 .fa-beer:before {
-  content: "";
+  content: "\f0fc";
 }
 
 .fa-behance:before {
-  content: "";
+  content: "\f1b4";
 }
 
 .fa-behance-square:before {
-  content: "";
+  content: "\f1b5";
 }
 
 .fa-bell:before {
-  content: "";
+  content: "\f0f3";
 }
 
 .fa-bell-slash:before {
-  content: "";
+  content: "\f1f6";
 }
 
 .fa-bezier-curve:before {
-  content: "";
+  content: "\f55b";
 }
 
 .fa-bible:before {
-  content: "";
+  content: "\f647";
 }
 
 .fa-bicycle:before {
-  content: "";
+  content: "\f206";
 }
 
 .fa-bimobject:before {
-  content: "";
+  content: "\f378";
 }
 
 .fa-binoculars:before {
-  content: "";
+  content: "\f1e5";
 }
 
 .fa-birthday-cake:before {
-  content: "";
+  content: "\f1fd";
 }
 
 .fa-bitbucket:before {
-  content: "";
+  content: "\f171";
 }
 
 .fa-bitcoin:before {
-  content: "";
+  content: "\f379";
 }
 
 .fa-bity:before {
-  content: "";
+  content: "\f37a";
 }
 
 .fa-black-tie:before {
-  content: "";
+  content: "\f27e";
 }
 
 .fa-blackberry:before {
-  content: "";
+  content: "\f37b";
 }
 
 .fa-blender:before {
-  content: "";
+  content: "\f517";
 }
 
 .fa-blind:before {
-  content: "";
+  content: "\f29d";
 }
 
 .fa-blogger:before {
-  content: "";
+  content: "\f37c";
 }
 
 .fa-blogger-b:before {
-  content: "";
+  content: "\f37d";
 }
 
 .fa-bluetooth:before {
-  content: "";
+  content: "\f293";
 }
 
 .fa-bluetooth-b:before {
-  content: "";
+  content: "\f294";
 }
 
 .fa-bold:before {
-  content: "";
+  content: "\f032";
 }
 
 .fa-bolt:before {
-  content: "";
+  content: "\f0e7";
 }
 
 .fa-bomb:before {
-  content: "";
+  content: "\f1e2";
 }
 
 .fa-bone:before {
-  content: "";
+  content: "\f5d7";
 }
 
 .fa-bong:before {
-  content: "";
+  content: "\f55c";
 }
 
 .fa-book:before {
-  content: "";
+  content: "\f02d";
 }
 
 .fa-book-open:before {
-  content: "";
+  content: "\f518";
 }
 
 .fa-book-reader:before {
-  content: "";
+  content: "\f5da";
 }
 
 .fa-bookmark:before {
-  content: "";
+  content: "\f02e";
 }
 
 .fa-bowling-ball:before {
-  content: "";
+  content: "\f436";
 }
 
 .fa-box:before {
-  content: "";
+  content: "\f466";
 }
 
 .fa-box-open:before {
-  content: "";
+  content: "\f49e";
 }
 
 .fa-boxes:before {
-  content: "";
+  content: "\f468";
 }
 
 .fa-braille:before {
-  content: "";
+  content: "\f2a1";
 }
 
 .fa-brain:before {
-  content: "";
+  content: "\f5dc";
 }
 
 .fa-briefcase:before {
-  content: "";
+  content: "\f0b1";
 }
 
 .fa-briefcase-medical:before {
-  content: "";
+  content: "\f469";
 }
 
 .fa-broadcast-tower:before {
-  content: "";
+  content: "\f519";
 }
 
 .fa-broom:before {
-  content: "";
+  content: "\f51a";
 }
 
 .fa-brush:before {
-  content: "";
+  content: "\f55d";
 }
 
 .fa-btc:before {
-  content: "";
+  content: "\f15a";
 }
 
 .fa-bug:before {
-  content: "";
+  content: "\f188";
 }
 
 .fa-building:before {
-  content: "";
+  content: "\f1ad";
 }
 
 .fa-bullhorn:before {
-  content: "";
+  content: "\f0a1";
 }
 
 .fa-bullseye:before {
-  content: "";
+  content: "\f140";
 }
 
 .fa-burn:before {
-  content: "";
+  content: "\f46a";
 }
 
 .fa-buromobelexperte:before {
-  content: "";
+  content: "\f37f";
 }
 
 .fa-bus:before {
-  content: "";
+  content: "\f207";
 }
 
 .fa-bus-alt:before {
-  content: "";
+  content: "\f55e";
 }
 
 .fa-business-time:before {
-  content: "";
+  content: "\f64a";
 }
 
 .fa-buysellads:before {
-  content: "";
+  content: "\f20d";
 }
 
 .fa-calculator:before {
-  content: "";
+  content: "\f1ec";
 }
 
 .fa-calendar:before {
-  content: "";
+  content: "\f133";
 }
 
 .fa-calendar-alt:before {
-  content: "";
+  content: "\f073";
 }
 
 .fa-calendar-check:before {
-  content: "";
+  content: "\f274";
 }
 
 .fa-calendar-minus:before {
-  content: "";
+  content: "\f272";
 }
 
 .fa-calendar-plus:before {
-  content: "";
+  content: "\f271";
 }
 
 .fa-calendar-times:before {
-  content: "";
+  content: "\f273";
 }
 
 .fa-camera:before {
-  content: "";
+  content: "\f030";
 }
 
 .fa-camera-retro:before {
-  content: "";
+  content: "\f083";
 }
 
 .fa-cannabis:before {
-  content: "";
+  content: "\f55f";
 }
 
 .fa-capsules:before {
-  content: "";
+  content: "\f46b";
 }
 
 .fa-car:before {
-  content: "";
+  content: "\f1b9";
 }
 
 .fa-car-alt:before {
-  content: "";
+  content: "\f5de";
 }
 
 .fa-car-battery:before {
-  content: "";
+  content: "\f5df";
 }
 
 .fa-car-crash:before {
-  content: "";
+  content: "\f5e1";
 }
 
 .fa-car-side:before {
-  content: "";
+  content: "\f5e4";
 }
 
 .fa-caret-down:before {
-  content: "";
+  content: "\f0d7";
 }
 
 .fa-caret-left:before {
-  content: "";
+  content: "\f0d9";
 }
 
 .fa-caret-right:before {
-  content: "";
+  content: "\f0da";
 }
 
 .fa-caret-square-down:before {
-  content: "";
+  content: "\f150";
 }
 
 .fa-caret-square-left:before {
-  content: "";
+  content: "\f191";
 }
 
 .fa-caret-square-right:before {
-  content: "";
+  content: "\f152";
 }
 
 .fa-caret-square-up:before {
-  content: "";
+  content: "\f151";
 }
 
 .fa-caret-up:before {
-  content: "";
+  content: "\f0d8";
 }
 
 .fa-cart-arrow-down:before {
-  content: "";
+  content: "\f218";
 }
 
 .fa-cart-plus:before {
-  content: "";
+  content: "\f217";
 }
 
 .fa-cc-amazon-pay:before {
-  content: "";
+  content: "\f42d";
 }
 
 .fa-cc-amex:before {
-  content: "";
+  content: "\f1f3";
 }
 
 .fa-cc-apple-pay:before {
-  content: "";
+  content: "\f416";
 }
 
 .fa-cc-diners-club:before {
-  content: "";
+  content: "\f24c";
 }
 
 .fa-cc-discover:before {
-  content: "";
+  content: "\f1f2";
 }
 
 .fa-cc-jcb:before {
-  content: "";
+  content: "\f24b";
 }
 
 .fa-cc-mastercard:before {
-  content: "";
+  content: "\f1f1";
 }
 
 .fa-cc-paypal:before {
-  content: "";
+  content: "\f1f4";
 }
 
 .fa-cc-stripe:before {
-  content: "";
+  content: "\f1f5";
 }
 
 .fa-cc-visa:before {
-  content: "";
+  content: "\f1f0";
 }
 
 .fa-centercode:before {
-  content: "";
+  content: "\f380";
 }
 
 .fa-certificate:before {
-  content: "";
+  content: "\f0a3";
 }
 
 .fa-chalkboard:before {
-  content: "";
+  content: "\f51b";
 }
 
 .fa-chalkboard-teacher:before {
-  content: "";
+  content: "\f51c";
 }
 
 .fa-charging-station:before {
-  content: "";
+  content: "\f5e7";
 }
 
 .fa-chart-area:before {
-  content: "";
+  content: "\f1fe";
 }
 
 .fa-chart-bar:before {
-  content: "";
+  content: "\f080";
 }
 
 .fa-chart-line:before {
-  content: "";
+  content: "\f201";
 }
 
 .fa-chart-pie:before {
-  content: "";
+  content: "\f200";
 }
 
 .fa-check:before {
-  content: "";
+  content: "\f00c";
 }
 
 .fa-check-circle:before {
-  content: "";
+  content: "\f058";
 }
 
 .fa-check-double:before {
-  content: "";
+  content: "\f560";
 }
 
 .fa-check-square:before {
-  content: "";
+  content: "\f14a";
 }
 
 .fa-chess:before {
-  content: "";
+  content: "\f439";
 }
 
 .fa-chess-bishop:before {
-  content: "";
+  content: "\f43a";
 }
 
 .fa-chess-board:before {
-  content: "";
+  content: "\f43c";
 }
 
 .fa-chess-king:before {
-  content: "";
+  content: "\f43f";
 }
 
 .fa-chess-knight:before {
-  content: "";
+  content: "\f441";
 }
 
 .fa-chess-pawn:before {
-  content: "";
+  content: "\f443";
 }
 
 .fa-chess-queen:before {
-  content: "";
+  content: "\f445";
 }
 
 .fa-chess-rook:before {
-  content: "";
+  content: "\f447";
 }
 
 .fa-chevron-circle-down:before {
-  content: "";
+  content: "\f13a";
 }
 
 .fa-chevron-circle-left:before {
-  content: "";
+  content: "\f137";
 }
 
 .fa-chevron-circle-right:before {
-  content: "";
+  content: "\f138";
 }
 
 .fa-chevron-circle-up:before {
-  content: "";
+  content: "\f139";
 }
 
 .fa-chevron-down:before {
-  content: "";
+  content: "\f078";
 }
 
 .fa-chevron-left:before {
-  content: "";
+  content: "\f053";
 }
 
 .fa-chevron-right:before {
-  content: "";
+  content: "\f054";
 }
 
 .fa-chevron-up:before {
-  content: "";
+  content: "\f077";
 }
 
 .fa-child:before {
-  content: "";
+  content: "\f1ae";
 }
 
 .fa-chrome:before {
-  content: "";
+  content: "\f268";
 }
 
 .fa-church:before {
-  content: "";
+  content: "\f51d";
 }
 
 .fa-circle:before {
-  content: "";
+  content: "\f111";
 }
 
 .fa-circle-notch:before {
-  content: "";
+  content: "\f1ce";
 }
 
 .fa-city:before {
-  content: "";
+  content: "\f64f";
 }
 
 .fa-clipboard:before {
-  content: "";
+  content: "\f328";
 }
 
 .fa-clipboard-check:before {
-  content: "";
+  content: "\f46c";
 }
 
 .fa-clipboard-list:before {
-  content: "";
+  content: "\f46d";
 }
 
 .fa-clock:before {
-  content: "";
+  content: "\f017";
 }
 
 .fa-clone:before {
-  content: "";
+  content: "\f24d";
 }
 
 .fa-closed-captioning:before {
-  content: "";
+  content: "\f20a";
 }
 
 .fa-cloud:before {
-  content: "";
+  content: "\f0c2";
 }
 
 .fa-cloud-download-alt:before {
-  content: "";
+  content: "\f381";
 }
 
 .fa-cloud-upload-alt:before {
-  content: "";
+  content: "\f382";
 }
 
 .fa-cloudscale:before {
-  content: "";
+  content: "\f383";
 }
 
 .fa-cloudsmith:before {
-  content: "";
+  content: "\f384";
 }
 
 .fa-cloudversify:before {
-  content: "";
+  content: "\f385";
 }
 
 .fa-cocktail:before {
-  content: "";
+  content: "\f561";
 }
 
 .fa-code:before {
-  content: "";
+  content: "\f121";
 }
 
 .fa-code-branch:before {
-  content: "";
+  content: "\f126";
 }
 
 .fa-codepen:before {
-  content: "";
+  content: "\f1cb";
 }
 
 .fa-codiepie:before {
-  content: "";
+  content: "\f284";
 }
 
 .fa-coffee:before {
-  content: "";
+  content: "\f0f4";
 }
 
 .fa-cog:before {
-  content: "";
+  content: "\f013";
 }
 
 .fa-cogs:before {
-  content: "";
+  content: "\f085";
 }
 
 .fa-coins:before {
-  content: "";
+  content: "\f51e";
 }
 
 .fa-columns:before {
-  content: "";
+  content: "\f0db";
 }
 
 .fa-comment:before {
-  content: "";
+  content: "\f075";
 }
 
 .fa-comment-alt:before {
-  content: "";
+  content: "\f27a";
 }
 
 .fa-comment-dollar:before {
-  content: "";
+  content: "\f651";
 }
 
 .fa-comment-dots:before {
-  content: "";
+  content: "\f4ad";
 }
 
 .fa-comment-slash:before {
-  content: "";
+  content: "\f4b3";
 }
 
 .fa-comments:before {
-  content: "";
+  content: "\f086";
 }
 
 .fa-comments-dollar:before {
-  content: "";
+  content: "\f653";
 }
 
 .fa-compact-disc:before {
-  content: "";
+  content: "\f51f";
 }
 
 .fa-compass:before {
-  content: "";
+  content: "\f14e";
 }
 
 .fa-compress:before {
-  content: "";
+  content: "\f066";
 }
 
 .fa-concierge-bell:before {
-  content: "";
+  content: "\f562";
 }
 
 .fa-connectdevelop:before {
-  content: "";
+  content: "\f20e";
 }
 
 .fa-contao:before {
-  content: "";
+  content: "\f26d";
 }
 
 .fa-cookie:before {
-  content: "";
+  content: "\f563";
 }
 
 .fa-cookie-bite:before {
-  content: "";
+  content: "\f564";
 }
 
 .fa-copy:before {
-  content: "";
+  content: "\f0c5";
 }
 
 .fa-copyright:before {
-  content: "";
+  content: "\f1f9";
 }
 
 .fa-couch:before {
-  content: "";
+  content: "\f4b8";
 }
 
 .fa-cpanel:before {
-  content: "";
+  content: "\f388";
 }
 
 .fa-creative-commons:before {
-  content: "";
+  content: "\f25e";
 }
 
 .fa-creative-commons-by:before {
-  content: "";
+  content: "\f4e7";
 }
 
 .fa-creative-commons-nc:before {
-  content: "";
+  content: "\f4e8";
 }
 
 .fa-creative-commons-nc-eu:before {
-  content: "";
+  content: "\f4e9";
 }
 
 .fa-creative-commons-nc-jp:before {
-  content: "";
+  content: "\f4ea";
 }
 
 .fa-creative-commons-nd:before {
-  content: "";
+  content: "\f4eb";
 }
 
 .fa-creative-commons-pd:before {
-  content: "";
+  content: "\f4ec";
 }
 
 .fa-creative-commons-pd-alt:before {
-  content: "";
+  content: "\f4ed";
 }
 
 .fa-creative-commons-remix:before {
-  content: "";
+  content: "\f4ee";
 }
 
 .fa-creative-commons-sa:before {
-  content: "";
+  content: "\f4ef";
 }
 
 .fa-creative-commons-sampling:before {
-  content: "";
+  content: "\f4f0";
 }
 
 .fa-creative-commons-sampling-plus:before {
-  content: "";
+  content: "\f4f1";
 }
 
 .fa-creative-commons-share:before {
-  content: "";
+  content: "\f4f2";
 }
 
 .fa-credit-card:before {
-  content: "";
+  content: "\f09d";
 }
 
 .fa-crop:before {
-  content: "";
+  content: "\f125";
 }
 
 .fa-crop-alt:before {
-  content: "";
+  content: "\f565";
 }
 
 .fa-cross:before {
-  content: "";
+  content: "\f654";
 }
 
 .fa-crosshairs:before {
-  content: "";
+  content: "\f05b";
 }
 
 .fa-crow:before {
-  content: "";
+  content: "\f520";
 }
 
 .fa-crown:before {
-  content: "";
+  content: "\f521";
 }
 
 .fa-css3:before {
-  content: "";
+  content: "\f13c";
 }
 
 .fa-css3-alt:before {
-  content: "";
+  content: "\f38b";
 }
 
 .fa-cube:before {
-  content: "";
+  content: "\f1b2";
 }
 
 .fa-cubes:before {
-  content: "";
+  content: "\f1b3";
 }
 
 .fa-cut:before {
-  content: "";
+  content: "\f0c4";
 }
 
 .fa-cuttlefish:before {
-  content: "";
+  content: "\f38c";
 }
 
 .fa-d-and-d:before {
-  content: "";
+  content: "\f38d";
 }
 
 .fa-dashcube:before {
-  content: "";
+  content: "\f210";
 }
 
 .fa-database:before {
-  content: "";
+  content: "\f1c0";
 }
 
 .fa-deaf:before {
-  content: "";
+  content: "\f2a4";
 }
 
 .fa-delicious:before {
-  content: "";
+  content: "\f1a5";
 }
 
 .fa-deploydog:before {
-  content: "";
+  content: "\f38e";
 }
 
 .fa-deskpro:before {
-  content: "";
+  content: "\f38f";
 }
 
 .fa-desktop:before {
-  content: "";
+  content: "\f108";
 }
 
 .fa-deviantart:before {
-  content: "";
+  content: "\f1bd";
 }
 
 .fa-dharmachakra:before {
-  content: "";
+  content: "\f655";
 }
 
 .fa-diagnoses:before {
-  content: "";
+  content: "\f470";
 }
 
 .fa-dice:before {
-  content: "";
+  content: "\f522";
 }
 
 .fa-dice-five:before {
-  content: "";
+  content: "\f523";
 }
 
 .fa-dice-four:before {
-  content: "";
+  content: "\f524";
 }
 
 .fa-dice-one:before {
-  content: "";
+  content: "\f525";
 }
 
 .fa-dice-six:before {
-  content: "";
+  content: "\f526";
 }
 
 .fa-dice-three:before {
-  content: "";
+  content: "\f527";
 }
 
 .fa-dice-two:before {
-  content: "";
+  content: "\f528";
 }
 
 .fa-digg:before {
-  content: "";
+  content: "\f1a6";
 }
 
 .fa-digital-ocean:before {
-  content: "";
+  content: "\f391";
 }
 
 .fa-digital-tachograph:before {
-  content: "";
+  content: "\f566";
 }
 
 .fa-directions:before {
-  content: "";
+  content: "\f5eb";
 }
 
 .fa-discord:before {
-  content: "";
+  content: "\f392";
 }
 
 .fa-discourse:before {
-  content: "";
+  content: "\f393";
 }
 
 .fa-divide:before {
-  content: "";
+  content: "\f529";
 }
 
 .fa-dizzy:before {
-  content: "";
+  content: "\f567";
 }
 
 .fa-dna:before {
-  content: "";
+  content: "\f471";
 }
 
 .fa-dochub:before {
-  content: "";
+  content: "\f394";
 }
 
 .fa-docker:before {
-  content: "";
+  content: "\f395";
 }
 
 .fa-dollar-sign:before {
-  content: "";
+  content: "\f155";
 }
 
 .fa-dolly:before {
-  content: "";
+  content: "\f472";
 }
 
 .fa-dolly-flatbed:before {
-  content: "";
+  content: "\f474";
 }
 
 .fa-donate:before {
-  content: "";
+  content: "\f4b9";
 }
 
 .fa-door-closed:before {
-  content: "";
+  content: "\f52a";
 }
 
 .fa-door-open:before {
-  content: "";
+  content: "\f52b";
 }
 
 .fa-dot-circle:before {
-  content: "";
+  content: "\f192";
 }
 
 .fa-dove:before {
-  content: "";
+  content: "\f4ba";
 }
 
 .fa-download:before {
-  content: "";
+  content: "\f019";
 }
 
 .fa-draft2digital:before {
-  content: "";
+  content: "\f396";
 }
 
 .fa-drafting-compass:before {
-  content: "";
+  content: "\f568";
 }
 
 .fa-draw-polygon:before {
-  content: "";
+  content: "\f5ee";
 }
 
 .fa-dribbble:before {
-  content: "";
+  content: "\f17d";
 }
 
 .fa-dribbble-square:before {
-  content: "";
+  content: "\f397";
 }
 
 .fa-dropbox:before {
-  content: "";
+  content: "\f16b";
 }
 
 .fa-drum:before {
-  content: "";
+  content: "\f569";
 }
 
 .fa-drum-steelpan:before {
-  content: "";
+  content: "\f56a";
 }
 
 .fa-drupal:before {
-  content: "";
+  content: "\f1a9";
 }
 
 .fa-dumbbell:before {
-  content: "";
+  content: "\f44b";
 }
 
 .fa-dyalog:before {
-  content: "";
+  content: "\f399";
 }
 
 .fa-earlybirds:before {
-  content: "";
+  content: "\f39a";
 }
 
 .fa-ebay:before {
-  content: "";
+  content: "\f4f4";
 }
 
 .fa-edge:before {
-  content: "";
+  content: "\f282";
 }
 
 .fa-edit:before {
-  content: "";
+  content: "\f044";
 }
 
 .fa-eject:before {
-  content: "";
+  content: "\f052";
 }
 
 .fa-elementor:before {
-  content: "";
+  content: "\f430";
 }
 
 .fa-ellipsis-h:before {
-  content: "";
+  content: "\f141";
 }
 
 .fa-ellipsis-v:before {
-  content: "";
+  content: "\f142";
 }
 
 .fa-ello:before {
-  content: "";
+  content: "\f5f1";
 }
 
 .fa-ember:before {
-  content: "";
+  content: "\f423";
 }
 
 .fa-empire:before {
-  content: "";
+  content: "\f1d1";
 }
 
 .fa-envelope:before {
-  content: "";
+  content: "\f0e0";
 }
 
 .fa-envelope-open:before {
-  content: "";
+  content: "\f2b6";
 }
 
 .fa-envelope-open-text:before {
-  content: "";
+  content: "\f658";
 }
 
 .fa-envelope-square:before {
-  content: "";
+  content: "\f199";
 }
 
 .fa-envira:before {
-  content: "";
+  content: "\f299";
 }
 
 .fa-equals:before {
-  content: "";
+  content: "\f52c";
 }
 
 .fa-eraser:before {
-  content: "";
+  content: "\f12d";
 }
 
 .fa-erlang:before {
-  content: "";
+  content: "\f39d";
 }
 
 .fa-ethereum:before {
-  content: "";
+  content: "\f42e";
 }
 
 .fa-etsy:before {
-  content: "";
+  content: "\f2d7";
 }
 
 .fa-euro-sign:before {
-  content: "";
+  content: "\f153";
 }
 
 .fa-exchange-alt:before {
-  content: "";
+  content: "\f362";
 }
 
 .fa-exclamation:before {
-  content: "";
+  content: "\f12a";
 }
 
 .fa-exclamation-circle:before {
-  content: "";
+  content: "\f06a";
 }
 
 .fa-exclamation-triangle:before {
-  content: "";
+  content: "\f071";
 }
 
 .fa-expand:before {
-  content: "";
+  content: "\f065";
 }
 
 .fa-expand-arrows-alt:before {
-  content: "";
+  content: "\f31e";
 }
 
 .fa-expeditedssl:before {
-  content: "";
+  content: "\f23e";
 }
 
 .fa-external-link-alt:before {
-  content: "";
+  content: "\f35d";
 }
 
 .fa-external-link-square-alt:before {
-  content: "";
+  content: "\f360";
 }
 
 .fa-eye:before {
-  content: "";
+  content: "\f06e";
 }
 
 .fa-eye-dropper:before {
-  content: "";
+  content: "\f1fb";
 }
 
 .fa-eye-slash:before {
-  content: "";
+  content: "\f070";
 }
 
 .fa-facebook:before {
-  content: "";
+  content: "\f09a";
 }
 
 .fa-facebook-f:before {
-  content: "";
+  content: "\f39e";
 }
 
 .fa-facebook-messenger:before {
-  content: "";
+  content: "\f39f";
 }
 
 .fa-facebook-square:before {
-  content: "";
+  content: "\f082";
 }
 
 .fa-fast-backward:before {
-  content: "";
+  content: "\f049";
 }
 
 .fa-fast-forward:before {
-  content: "";
+  content: "\f050";
 }
 
 .fa-fax:before {
-  content: "";
+  content: "\f1ac";
 }
 
 .fa-feather:before {
-  content: "";
+  content: "\f52d";
 }
 
 .fa-feather-alt:before {
-  content: "";
+  content: "\f56b";
 }
 
 .fa-female:before {
-  content: "";
+  content: "\f182";
 }
 
 .fa-fighter-jet:before {
-  content: "";
+  content: "\f0fb";
 }
 
 .fa-file:before {
-  content: "";
+  content: "\f15b";
 }
 
 .fa-file-alt:before {
-  content: "";
+  content: "\f15c";
 }
 
 .fa-file-archive:before {
-  content: "";
+  content: "\f1c6";
 }
 
 .fa-file-audio:before {
-  content: "";
+  content: "\f1c7";
 }
 
 .fa-file-code:before {
-  content: "";
+  content: "\f1c9";
 }
 
 .fa-file-contract:before {
-  content: "";
+  content: "\f56c";
 }
 
 .fa-file-download:before {
-  content: "";
+  content: "\f56d";
 }
 
 .fa-file-excel:before {
-  content: "";
+  content: "\f1c3";
 }
 
 .fa-file-export:before {
-  content: "";
+  content: "\f56e";
 }
 
 .fa-file-image:before {
-  content: "";
+  content: "\f1c5";
 }
 
 .fa-file-import:before {
-  content: "";
+  content: "\f56f";
 }
 
 .fa-file-invoice:before {
-  content: "";
+  content: "\f570";
 }
 
 .fa-file-invoice-dollar:before {
-  content: "";
+  content: "\f571";
 }
 
 .fa-file-medical:before {
-  content: "";
+  content: "\f477";
 }
 
 .fa-file-medical-alt:before {
-  content: "";
+  content: "\f478";
 }
 
 .fa-file-pdf:before {
-  content: "";
+  content: "\f1c1";
 }
 
 .fa-file-powerpoint:before {
-  content: "";
+  content: "\f1c4";
 }
 
 .fa-file-prescription:before {
-  content: "";
+  content: "\f572";
 }
 
 .fa-file-signature:before {
-  content: "";
+  content: "\f573";
 }
 
 .fa-file-upload:before {
-  content: "";
+  content: "\f574";
 }
 
 .fa-file-video:before {
-  content: "";
+  content: "\f1c8";
 }
 
 .fa-file-word:before {
-  content: "";
+  content: "\f1c2";
 }
 
 .fa-fill:before {
-  content: "";
+  content: "\f575";
 }
 
 .fa-fill-drip:before {
-  content: "";
+  content: "\f576";
 }
 
 .fa-film:before {
-  content: "";
+  content: "\f008";
 }
 
 .fa-filter:before {
-  content: "";
+  content: "\f0b0";
 }
 
 .fa-fingerprint:before {
-  content: "";
+  content: "\f577";
 }
 
 .fa-fire:before {
-  content: "";
+  content: "\f06d";
 }
 
 .fa-fire-extinguisher:before {
-  content: "";
+  content: "\f134";
 }
 
 .fa-firefox:before {
-  content: "";
+  content: "\f269";
 }
 
 .fa-first-aid:before {
-  content: "";
+  content: "\f479";
 }
 
 .fa-first-order:before {
-  content: "";
+  content: "\f2b0";
 }
 
 .fa-first-order-alt:before {
-  content: "";
+  content: "\f50a";
 }
 
 .fa-firstdraft:before {
-  content: "";
+  content: "\f3a1";
 }
 
 .fa-fish:before {
-  content: "";
+  content: "\f578";
 }
 
 .fa-flag:before {
-  content: "";
+  content: "\f024";
 }
 
 .fa-flag-checkered:before {
-  content: "";
+  content: "\f11e";
 }
 
 .fa-flask:before {
-  content: "";
+  content: "\f0c3";
 }
 
 .fa-flickr:before {
-  content: "";
+  content: "\f16e";
 }
 
 .fa-flipboard:before {
-  content: "";
+  content: "\f44d";
 }
 
 .fa-flushed:before {
-  content: "";
+  content: "\f579";
 }
 
 .fa-fly:before {
-  content: "";
+  content: "\f417";
 }
 
 .fa-folder:before {
-  content: "";
+  content: "\f07b";
 }
 
 .fa-folder-minus:before {
-  content: "";
+  content: "\f65d";
 }
 
 .fa-folder-open:before {
-  content: "";
+  content: "\f07c";
 }
 
 .fa-folder-plus:before {
-  content: "";
+  content: "\f65e";
 }
 
 .fa-font:before {
-  content: "";
+  content: "\f031";
 }
 
 .fa-font-awesome:before {
-  content: "";
+  content: "\f2b4";
 }
 
 .fa-font-awesome-alt:before {
-  content: "";
+  content: "\f35c";
 }
 
 .fa-font-awesome-flag:before {
-  content: "";
+  content: "\f425";
 }
 
 .fa-font-awesome-logo-full:before {
-  content: "";
+  content: "\f4e6";
 }
 
 .fa-fonticons:before {
-  content: "";
+  content: "\f280";
 }
 
 .fa-fonticons-fi:before {
-  content: "";
+  content: "\f3a2";
 }
 
 .fa-football-ball:before {
-  content: "";
+  content: "\f44e";
 }
 
 .fa-fort-awesome:before {
-  content: "";
+  content: "\f286";
 }
 
 .fa-fort-awesome-alt:before {
-  content: "";
+  content: "\f3a3";
 }
 
 .fa-forumbee:before {
-  content: "";
+  content: "\f211";
 }
 
 .fa-forward:before {
-  content: "";
+  content: "\f04e";
 }
 
 .fa-foursquare:before {
-  content: "";
+  content: "\f180";
 }
 
 .fa-free-code-camp:before {
-  content: "";
+  content: "\f2c5";
 }
 
 .fa-freebsd:before {
-  content: "";
+  content: "\f3a4";
 }
 
 .fa-frog:before {
-  content: "";
+  content: "\f52e";
 }
 
 .fa-frown:before {
-  content: "";
+  content: "\f119";
 }
 
 .fa-frown-open:before {
-  content: "";
+  content: "\f57a";
 }
 
 .fa-fulcrum:before {
-  content: "";
+  content: "\f50b";
 }
 
 .fa-funnel-dollar:before {
-  content: "";
+  content: "\f662";
 }
 
 .fa-futbol:before {
-  content: "";
+  content: "\f1e3";
 }
 
 .fa-galactic-republic:before {
-  content: "";
+  content: "\f50c";
 }
 
 .fa-galactic-senate:before {
-  content: "";
+  content: "\f50d";
 }
 
 .fa-gamepad:before {
-  content: "";
+  content: "\f11b";
 }
 
 .fa-gas-pump:before {
-  content: "";
+  content: "\f52f";
 }
 
 .fa-gavel:before {
-  content: "";
+  content: "\f0e3";
 }
 
 .fa-gem:before {
-  content: "";
+  content: "\f3a5";
 }
 
 .fa-genderless:before {
-  content: "";
+  content: "\f22d";
 }
 
 .fa-get-pocket:before {
-  content: "";
+  content: "\f265";
 }
 
 .fa-gg:before {
-  content: "";
+  content: "\f260";
 }
 
 .fa-gg-circle:before {
-  content: "";
+  content: "\f261";
 }
 
 .fa-gift:before {
-  content: "";
+  content: "\f06b";
 }
 
 .fa-git:before {
-  content: "";
+  content: "\f1d3";
 }
 
 .fa-git-square:before {
-  content: "";
+  content: "\f1d2";
 }
 
 .fa-github:before {
-  content: "";
+  content: "\f09b";
 }
 
 .fa-github-alt:before {
-  content: "";
+  content: "\f113";
 }
 
 .fa-github-square:before {
-  content: "";
+  content: "\f092";
 }
 
 .fa-gitkraken:before {
-  content: "";
+  content: "\f3a6";
 }
 
 .fa-gitlab:before {
-  content: "";
+  content: "\f296";
 }
 
 .fa-gitter:before {
-  content: "";
+  content: "\f426";
 }
 
 .fa-glass-martini:before {
-  content: "";
+  content: "\f000";
 }
 
 .fa-glass-martini-alt:before {
-  content: "";
+  content: "\f57b";
 }
 
 .fa-glasses:before {
-  content: "";
+  content: "\f530";
 }
 
 .fa-glide:before {
-  content: "";
+  content: "\f2a5";
 }
 
 .fa-glide-g:before {
-  content: "";
+  content: "\f2a6";
 }
 
 .fa-globe:before {
-  content: "";
+  content: "\f0ac";
 }
 
 .fa-globe-africa:before {
-  content: "";
+  content: "\f57c";
 }
 
 .fa-globe-americas:before {
-  content: "";
+  content: "\f57d";
 }
 
 .fa-globe-asia:before {
-  content: "";
+  content: "\f57e";
 }
 
 .fa-gofore:before {
-  content: "";
+  content: "\f3a7";
 }
 
 .fa-golf-ball:before {
-  content: "";
+  content: "\f450";
 }
 
 .fa-goodreads:before {
-  content: "";
+  content: "\f3a8";
 }
 
 .fa-goodreads-g:before {
-  content: "";
+  content: "\f3a9";
 }
 
 .fa-google:before {
-  content: "";
+  content: "\f1a0";
 }
 
 .fa-google-drive:before {
-  content: "";
+  content: "\f3aa";
 }
 
 .fa-google-play:before {
-  content: "";
+  content: "\f3ab";
 }
 
 .fa-google-plus:before {
-  content: "";
+  content: "\f2b3";
 }
 
 .fa-google-plus-g:before {
-  content: "";
+  content: "\f0d5";
 }
 
 .fa-google-plus-square:before {
-  content: "";
+  content: "\f0d4";
 }
 
 .fa-google-wallet:before {
-  content: "";
+  content: "\f1ee";
 }
 
 .fa-gopuram:before {
-  content: "";
+  content: "\f664";
 }
 
 .fa-graduation-cap:before {
-  content: "";
+  content: "\f19d";
 }
 
 .fa-gratipay:before {
-  content: "";
+  content: "\f184";
 }
 
 .fa-grav:before {
-  content: "";
+  content: "\f2d6";
 }
 
 .fa-greater-than:before {
-  content: "";
+  content: "\f531";
 }
 
 .fa-greater-than-equal:before {
-  content: "";
+  content: "\f532";
 }
 
 .fa-grimace:before {
-  content: "";
+  content: "\f57f";
 }
 
 .fa-grin:before {
-  content: "";
+  content: "\f580";
 }
 
 .fa-grin-alt:before {
-  content: "";
+  content: "\f581";
 }
 
 .fa-grin-beam:before {
-  content: "";
+  content: "\f582";
 }
 
 .fa-grin-beam-sweat:before {
-  content: "";
+  content: "\f583";
 }
 
 .fa-grin-hearts:before {
-  content: "";
+  content: "\f584";
 }
 
 .fa-grin-squint:before {
-  content: "";
+  content: "\f585";
 }
 
 .fa-grin-squint-tears:before {
-  content: "";
+  content: "\f586";
 }
 
 .fa-grin-stars:before {
-  content: "";
+  content: "\f587";
 }
 
 .fa-grin-tears:before {
-  content: "";
+  content: "\f588";
 }
 
 .fa-grin-tongue:before {
-  content: "";
+  content: "\f589";
 }
 
 .fa-grin-tongue-squint:before {
-  content: "";
+  content: "\f58a";
 }
 
 .fa-grin-tongue-wink:before {
-  content: "";
+  content: "\f58b";
 }
 
 .fa-grin-wink:before {
-  content: "";
+  content: "\f58c";
 }
 
 .fa-grip-horizontal:before {
-  content: "";
+  content: "\f58d";
 }
 
 .fa-grip-vertical:before {
-  content: "";
+  content: "\f58e";
 }
 
 .fa-gripfire:before {
-  content: "";
+  content: "\f3ac";
 }
 
 .fa-grunt:before {
-  content: "";
+  content: "\f3ad";
 }
 
 .fa-gulp:before {
-  content: "";
+  content: "\f3ae";
 }
 
 .fa-h-square:before {
-  content: "";
+  content: "\f0fd";
 }
 
 .fa-hacker-news:before {
-  content: "";
+  content: "\f1d4";
 }
 
 .fa-hacker-news-square:before {
-  content: "";
+  content: "\f3af";
 }
 
 .fa-hackerrank:before {
-  content: "";
+  content: "\f5f7";
 }
 
 .fa-hamsa:before {
-  content: "";
+  content: "\f665";
 }
 
 .fa-hand-holding:before {
-  content: "";
+  content: "\f4bd";
 }
 
 .fa-hand-holding-heart:before {
-  content: "";
+  content: "\f4be";
 }
 
 .fa-hand-holding-usd:before {
-  content: "";
+  content: "\f4c0";
 }
 
 .fa-hand-lizard:before {
-  content: "";
+  content: "\f258";
 }
 
 .fa-hand-paper:before {
-  content: "";
+  content: "\f256";
 }
 
 .fa-hand-peace:before {
-  content: "";
+  content: "\f25b";
 }
 
 .fa-hand-point-down:before {
-  content: "";
+  content: "\f0a7";
 }
 
 .fa-hand-point-left:before {
-  content: "";
+  content: "\f0a5";
 }
 
 .fa-hand-point-right:before {
-  content: "";
+  content: "\f0a4";
 }
 
 .fa-hand-point-up:before {
-  content: "";
+  content: "\f0a6";
 }
 
 .fa-hand-pointer:before {
-  content: "";
+  content: "\f25a";
 }
 
 .fa-hand-rock:before {
-  content: "";
+  content: "\f255";
 }
 
 .fa-hand-scissors:before {
-  content: "";
+  content: "\f257";
 }
 
 .fa-hand-spock:before {
-  content: "";
+  content: "\f259";
 }
 
 .fa-hands:before {
-  content: "";
+  content: "\f4c2";
 }
 
 .fa-hands-helping:before {
-  content: "";
+  content: "\f4c4";
 }
 
 .fa-handshake:before {
-  content: "";
+  content: "\f2b5";
 }
 
 .fa-hashtag:before {
-  content: "";
+  content: "\f292";
 }
 
 .fa-haykal:before {
-  content: "";
+  content: "\f666";
 }
 
 .fa-hdd:before {
-  content: "";
+  content: "\f0a0";
 }
 
 .fa-heading:before {
-  content: "";
+  content: "\f1dc";
 }
 
 .fa-headphones:before {
-  content: "";
+  content: "\f025";
 }
 
 .fa-headphones-alt:before {
-  content: "";
+  content: "\f58f";
 }
 
 .fa-headset:before {
-  content: "";
+  content: "\f590";
 }
 
 .fa-heart:before {
-  content: "";
+  content: "\f004";
 }
 
 .fa-heartbeat:before {
-  content: "";
+  content: "\f21e";
 }
 
 .fa-helicopter:before {
-  content: "";
+  content: "\f533";
 }
 
 .fa-highlighter:before {
-  content: "";
+  content: "\f591";
 }
 
 .fa-hips:before {
-  content: "";
+  content: "\f452";
 }
 
 .fa-hire-a-helper:before {
-  content: "";
+  content: "\f3b0";
 }
 
 .fa-history:before {
-  content: "";
+  content: "\f1da";
 }
 
 .fa-hockey-puck:before {
-  content: "";
+  content: "\f453";
 }
 
 .fa-home:before {
-  content: "";
+  content: "\f015";
 }
 
 .fa-hooli:before {
-  content: "";
+  content: "\f427";
 }
 
 .fa-hornbill:before {
-  content: "";
+  content: "\f592";
 }
 
 .fa-hospital:before {
-  content: "";
+  content: "\f0f8";
 }
 
 .fa-hospital-alt:before {
-  content: "";
+  content: "\f47d";
 }
 
 .fa-hospital-symbol:before {
-  content: "";
+  content: "\f47e";
 }
 
 .fa-hot-tub:before {
-  content: "";
+  content: "\f593";
 }
 
 .fa-hotel:before {
-  content: "";
+  content: "\f594";
 }
 
 .fa-hotjar:before {
-  content: "";
+  content: "\f3b1";
 }
 
 .fa-hourglass:before {
-  content: "";
+  content: "\f254";
 }
 
 .fa-hourglass-end:before {
-  content: "";
+  content: "\f253";
 }
 
 .fa-hourglass-half:before {
-  content: "";
+  content: "\f252";
 }
 
 .fa-hourglass-start:before {
-  content: "";
+  content: "\f251";
 }
 
 .fa-houzz:before {
-  content: "";
+  content: "\f27c";
 }
 
 .fa-html5:before {
-  content: "";
+  content: "\f13b";
 }
 
 .fa-hubspot:before {
-  content: "";
+  content: "\f3b2";
 }
 
 .fa-i-cursor:before {
-  content: "";
+  content: "\f246";
 }
 
 .fa-id-badge:before {
-  content: "";
+  content: "\f2c1";
 }
 
 .fa-id-card:before {
-  content: "";
+  content: "\f2c2";
 }
 
 .fa-id-card-alt:before {
-  content: "";
+  content: "\f47f";
 }
 
 .fa-image:before {
-  content: "";
+  content: "\f03e";
 }
 
 .fa-images:before {
-  content: "";
+  content: "\f302";
 }
 
 .fa-imdb:before {
-  content: "";
+  content: "\f2d8";
 }
 
 .fa-inbox:before {
-  content: "";
+  content: "\f01c";
 }
 
 .fa-indent:before {
-  content: "";
+  content: "\f03c";
 }
 
 .fa-industry:before {
-  content: "";
+  content: "\f275";
 }
 
 .fa-infinity:before {
-  content: "";
+  content: "\f534";
 }
 
 .fa-info:before {
-  content: "";
+  content: "\f129";
 }
 
 .fa-info-circle:before {
-  content: "";
+  content: "\f05a";
 }
 
 .fa-instagram:before {
-  content: "";
+  content: "\f16d";
 }
 
 .fa-internet-explorer:before {
-  content: "";
+  content: "\f26b";
 }
 
 .fa-ioxhost:before {
-  content: "";
+  content: "\f208";
 }
 
 .fa-italic:before {
-  content: "";
+  content: "\f033";
 }
 
 .fa-itunes:before {
-  content: "";
+  content: "\f3b4";
 }
 
 .fa-itunes-note:before {
-  content: "";
+  content: "\f3b5";
 }
 
 .fa-java:before {
-  content: "";
+  content: "\f4e4";
 }
 
 .fa-jedi:before {
-  content: "";
+  content: "\f669";
 }
 
 .fa-jedi-order:before {
-  content: "";
+  content: "\f50e";
 }
 
 .fa-jenkins:before {
-  content: "";
+  content: "\f3b6";
 }
 
 .fa-joget:before {
-  content: "";
+  content: "\f3b7";
 }
 
 .fa-joint:before {
-  content: "";
+  content: "\f595";
 }
 
 .fa-joomla:before {
-  content: "";
+  content: "\f1aa";
 }
 
 .fa-journal-whills:before {
-  content: "";
+  content: "\f66a";
 }
 
 .fa-js:before {
-  content: "";
+  content: "\f3b8";
 }
 
 .fa-js-square:before {
-  content: "";
+  content: "\f3b9";
 }
 
 .fa-jsfiddle:before {
-  content: "";
+  content: "\f1cc";
 }
 
 .fa-kaaba:before {
-  content: "";
+  content: "\f66b";
 }
 
 .fa-kaggle:before {
-  content: "";
+  content: "\f5fa";
 }
 
 .fa-key:before {
-  content: "";
+  content: "\f084";
 }
 
 .fa-keybase:before {
-  content: "";
+  content: "\f4f5";
 }
 
 .fa-keyboard:before {
-  content: "";
+  content: "\f11c";
 }
 
 .fa-keycdn:before {
-  content: "";
+  content: "\f3ba";
 }
 
 .fa-khanda:before {
-  content: "";
+  content: "\f66d";
 }
 
 .fa-kickstarter:before {
-  content: "";
+  content: "\f3bb";
 }
 
 .fa-kickstarter-k:before {
-  content: "";
+  content: "\f3bc";
 }
 
 .fa-kiss:before {
-  content: "";
+  content: "\f596";
 }
 
 .fa-kiss-beam:before {
-  content: "";
+  content: "\f597";
 }
 
 .fa-kiss-wink-heart:before {
-  content: "";
+  content: "\f598";
 }
 
 .fa-kiwi-bird:before {
-  content: "";
+  content: "\f535";
 }
 
 .fa-korvue:before {
-  content: "";
+  content: "\f42f";
 }
 
 .fa-landmark:before {
-  content: "";
+  content: "\f66f";
 }
 
 .fa-language:before {
-  content: "";
+  content: "\f1ab";
 }
 
 .fa-laptop:before {
-  content: "";
+  content: "\f109";
 }
 
 .fa-laptop-code:before {
-  content: "";
+  content: "\f5fc";
 }
 
 .fa-laravel:before {
-  content: "";
+  content: "\f3bd";
 }
 
 .fa-lastfm:before {
-  content: "";
+  content: "\f202";
 }
 
 .fa-lastfm-square:before {
-  content: "";
+  content: "\f203";
 }
 
 .fa-laugh:before {
-  content: "";
+  content: "\f599";
 }
 
 .fa-laugh-beam:before {
-  content: "";
+  content: "\f59a";
 }
 
 .fa-laugh-squint:before {
-  content: "";
+  content: "\f59b";
 }
 
 .fa-laugh-wink:before {
-  content: "";
+  content: "\f59c";
 }
 
 .fa-layer-group:before {
-  content: "";
+  content: "\f5fd";
 }
 
 .fa-leaf:before {
-  content: "";
+  content: "\f06c";
 }
 
 .fa-leanpub:before {
-  content: "";
+  content: "\f212";
 }
 
 .fa-lemon:before {
-  content: "";
+  content: "\f094";
 }
 
 .fa-less:before {
-  content: "";
+  content: "\f41d";
 }
 
 .fa-less-than:before {
-  content: "";
+  content: "\f536";
 }
 
 .fa-less-than-equal:before {
-  content: "";
+  content: "\f537";
 }
 
 .fa-level-down-alt:before {
-  content: "";
+  content: "\f3be";
 }
 
 .fa-level-up-alt:before {
-  content: "";
+  content: "\f3bf";
 }
 
 .fa-life-ring:before {
-  content: "";
+  content: "\f1cd";
 }
 
 .fa-lightbulb:before {
-  content: "";
+  content: "\f0eb";
 }
 
 .fa-line:before {
-  content: "";
+  content: "\f3c0";
 }
 
 .fa-link:before {
-  content: "";
+  content: "\f0c1";
 }
 
 .fa-linkedin:before {
-  content: "";
+  content: "\f08c";
 }
 
 .fa-linkedin-in:before {
-  content: "";
+  content: "\f0e1";
 }
 
 .fa-linode:before {
-  content: "";
+  content: "\f2b8";
 }
 
 .fa-linux:before {
-  content: "";
+  content: "\f17c";
 }
 
 .fa-lira-sign:before {
-  content: "";
+  content: "\f195";
 }
 
 .fa-list:before {
-  content: "";
+  content: "\f03a";
 }
 
 .fa-list-alt:before {
-  content: "";
+  content: "\f022";
 }
 
 .fa-list-ol:before {
-  content: "";
+  content: "\f0cb";
 }
 
 .fa-list-ul:before {
-  content: "";
+  content: "\f0ca";
 }
 
 .fa-location-arrow:before {
-  content: "";
+  content: "\f124";
 }
 
 .fa-lock:before {
-  content: "";
+  content: "\f023";
 }
 
 .fa-lock-open:before {
-  content: "";
+  content: "\f3c1";
 }
 
 .fa-long-arrow-alt-down:before {
-  content: "";
+  content: "\f309";
 }
 
 .fa-long-arrow-alt-left:before {
-  content: "";
+  content: "\f30a";
 }
 
 .fa-long-arrow-alt-right:before {
-  content: "";
+  content: "\f30b";
 }
 
 .fa-long-arrow-alt-up:before {
-  content: "";
+  content: "\f30c";
 }
 
 .fa-low-vision:before {
-  content: "";
+  content: "\f2a8";
 }
 
 .fa-luggage-cart:before {
-  content: "";
+  content: "\f59d";
 }
 
 .fa-lyft:before {
-  content: "";
+  content: "\f3c3";
 }
 
 .fa-magento:before {
-  content: "";
+  content: "\f3c4";
 }
 
 .fa-magic:before {
-  content: "";
+  content: "\f0d0";
 }
 
 .fa-magnet:before {
-  content: "";
+  content: "\f076";
 }
 
 .fa-mail-bulk:before {
-  content: "";
+  content: "\f674";
 }
 
 .fa-mailchimp:before {
-  content: "";
+  content: "\f59e";
 }
 
 .fa-male:before {
-  content: "";
+  content: "\f183";
 }
 
 .fa-mandalorian:before {
-  content: "";
+  content: "\f50f";
 }
 
 .fa-map:before {
-  content: "";
+  content: "\f279";
 }
 
 .fa-map-marked:before {
-  content: "";
+  content: "\f59f";
 }
 
 .fa-map-marked-alt:before {
-  content: "";
+  content: "\f5a0";
 }
 
 .fa-map-marker:before {
-  content: "";
+  content: "\f041";
 }
 
 .fa-map-marker-alt:before {
-  content: "";
+  content: "\f3c5";
 }
 
 .fa-map-pin:before {
-  content: "";
+  content: "\f276";
 }
 
 .fa-map-signs:before {
-  content: "";
+  content: "\f277";
 }
 
 .fa-markdown:before {
-  content: "";
+  content: "\f60f";
 }
 
 .fa-marker:before {
-  content: "";
+  content: "\f5a1";
 }
 
 .fa-mars:before {
-  content: "";
+  content: "\f222";
 }
 
 .fa-mars-double:before {
-  content: "";
+  content: "\f227";
 }
 
 .fa-mars-stroke:before {
-  content: "";
+  content: "\f229";
 }
 
 .fa-mars-stroke-h:before {
-  content: "";
+  content: "\f22b";
 }
 
 .fa-mars-stroke-v:before {
-  content: "";
+  content: "\f22a";
 }
 
 .fa-mastodon:before {
-  content: "";
+  content: "\f4f6";
 }
 
 .fa-maxcdn:before {
-  content: "";
+  content: "\f136";
 }
 
 .fa-medal:before {
-  content: "";
+  content: "\f5a2";
 }
 
 .fa-medapps:before {
-  content: "";
+  content: "\f3c6";
 }
 
 .fa-medium:before {
-  content: "";
+  content: "\f23a";
 }
 
 .fa-medium-m:before {
-  content: "";
+  content: "\f3c7";
 }
 
 .fa-medkit:before {
-  content: "";
+  content: "\f0fa";
 }
 
 .fa-medrt:before {
-  content: "";
+  content: "\f3c8";
 }
 
 .fa-meetup:before {
-  content: "";
+  content: "\f2e0";
 }
 
 .fa-megaport:before {
-  content: "";
+  content: "\f5a3";
 }
 
 .fa-meh:before {
-  content: "";
+  content: "\f11a";
 }
 
 .fa-meh-blank:before {
-  content: "";
+  content: "\f5a4";
 }
 
 .fa-meh-rolling-eyes:before {
-  content: "";
+  content: "\f5a5";
 }
 
 .fa-memory:before {
-  content: "";
+  content: "\f538";
 }
 
 .fa-menorah:before {
-  content: "";
+  content: "\f676";
 }
 
 .fa-mercury:before {
-  content: "";
+  content: "\f223";
 }
 
 .fa-microchip:before {
-  content: "";
+  content: "\f2db";
 }
 
 .fa-microphone:before {
-  content: "";
+  content: "\f130";
 }
 
 .fa-microphone-alt:before {
-  content: "";
+  content: "\f3c9";
 }
 
 .fa-microphone-alt-slash:before {
-  content: "";
+  content: "\f539";
 }
 
 .fa-microphone-slash:before {
-  content: "";
+  content: "\f131";
 }
 
 .fa-microscope:before {
-  content: "";
+  content: "\f610";
 }
 
 .fa-microsoft:before {
-  content: "";
+  content: "\f3ca";
 }
 
 .fa-minus:before {
-  content: "";
+  content: "\f068";
 }
 
 .fa-minus-circle:before {
-  content: "";
+  content: "\f056";
 }
 
 .fa-minus-square:before {
-  content: "";
+  content: "\f146";
 }
 
 .fa-mix:before {
-  content: "";
+  content: "\f3cb";
 }
 
 .fa-mixcloud:before {
-  content: "";
+  content: "\f289";
 }
 
 .fa-mizuni:before {
-  content: "";
+  content: "\f3cc";
 }
 
 .fa-mobile:before {
-  content: "";
+  content: "\f10b";
 }
 
 .fa-mobile-alt:before {
-  content: "";
+  content: "\f3cd";
 }
 
 .fa-modx:before {
-  content: "";
+  content: "\f285";
 }
 
 .fa-monero:before {
-  content: "";
+  content: "\f3d0";
 }
 
 .fa-money-bill:before {
-  content: "";
+  content: "\f0d6";
 }
 
 .fa-money-bill-alt:before {
-  content: "";
+  content: "\f3d1";
 }
 
 .fa-money-bill-wave:before {
-  content: "";
+  content: "\f53a";
 }
 
 .fa-money-bill-wave-alt:before {
-  content: "";
+  content: "\f53b";
 }
 
 .fa-money-check:before {
-  content: "";
+  content: "\f53c";
 }
 
 .fa-money-check-alt:before {
-  content: "";
+  content: "\f53d";
 }
 
 .fa-monument:before {
-  content: "";
+  content: "\f5a6";
 }
 
 .fa-moon:before {
-  content: "";
+  content: "\f186";
 }
 
 .fa-mortar-pestle:before {
-  content: "";
+  content: "\f5a7";
 }
 
 .fa-mosque:before {
-  content: "";
+  content: "\f678";
 }
 
 .fa-motorcycle:before {
-  content: "";
+  content: "\f21c";
 }
 
 .fa-mouse-pointer:before {
-  content: "";
+  content: "\f245";
 }
 
 .fa-music:before {
-  content: "";
+  content: "\f001";
 }
 
 .fa-napster:before {
-  content: "";
+  content: "\f3d2";
 }
 
 .fa-neos:before {
-  content: "";
+  content: "\f612";
 }
 
 .fa-neuter:before {
-  content: "";
+  content: "\f22c";
 }
 
 .fa-newspaper:before {
-  content: "";
+  content: "\f1ea";
 }
 
 .fa-nimblr:before {
-  content: "";
+  content: "\f5a8";
 }
 
 .fa-nintendo-switch:before {
-  content: "";
+  content: "\f418";
 }
 
 .fa-node:before {
-  content: "";
+  content: "\f419";
 }
 
 .fa-node-js:before {
-  content: "";
+  content: "\f3d3";
 }
 
 .fa-not-equal:before {
-  content: "";
+  content: "\f53e";
 }
 
 .fa-notes-medical:before {
-  content: "";
+  content: "\f481";
 }
 
 .fa-npm:before {
-  content: "";
+  content: "\f3d4";
 }
 
 .fa-ns8:before {
-  content: "";
+  content: "\f3d5";
 }
 
 .fa-nutritionix:before {
-  content: "";
+  content: "\f3d6";
 }
 
 .fa-object-group:before {
-  content: "";
+  content: "\f247";
 }
 
 .fa-object-ungroup:before {
-  content: "";
+  content: "\f248";
 }
 
 .fa-odnoklassniki:before {
-  content: "";
+  content: "\f263";
 }
 
 .fa-odnoklassniki-square:before {
-  content: "";
+  content: "\f264";
 }
 
 .fa-oil-can:before {
-  content: "";
+  content: "\f613";
 }
 
 .fa-old-republic:before {
-  content: "";
+  content: "\f510";
 }
 
 .fa-om:before {
-  content: "";
+  content: "\f679";
 }
 
 .fa-opencart:before {
-  content: "";
+  content: "\f23d";
 }
 
 .fa-openid:before {
-  content: "";
+  content: "\f19b";
 }
 
 .fa-opera:before {
-  content: "";
+  content: "\f26a";
 }
 
 .fa-optin-monster:before {
-  content: "";
+  content: "\f23c";
 }
 
 .fa-osi:before {
-  content: "";
+  content: "\f41a";
 }
 
 .fa-outdent:before {
-  content: "";
+  content: "\f03b";
 }
 
 .fa-page4:before {
-  content: "";
+  content: "\f3d7";
 }
 
 .fa-pagelines:before {
-  content: "";
+  content: "\f18c";
 }
 
 .fa-paint-brush:before {
-  content: "";
+  content: "\f1fc";
 }
 
 .fa-paint-roller:before {
-  content: "";
+  content: "\f5aa";
 }
 
 .fa-palette:before {
-  content: "";
+  content: "\f53f";
 }
 
 .fa-palfed:before {
-  content: "";
+  content: "\f3d8";
 }
 
 .fa-pallet:before {
-  content: "";
+  content: "\f482";
 }
 
 .fa-paper-plane:before {
-  content: "";
+  content: "\f1d8";
 }
 
 .fa-paperclip:before {
-  content: "";
+  content: "\f0c6";
 }
 
 .fa-parachute-box:before {
-  content: "";
+  content: "\f4cd";
 }
 
 .fa-paragraph:before {
-  content: "";
+  content: "\f1dd";
 }
 
 .fa-parking:before {
-  content: "";
+  content: "\f540";
 }
 
 .fa-passport:before {
-  content: "";
+  content: "\f5ab";
 }
 
 .fa-pastafarianism:before {
-  content: "";
+  content: "\f67b";
 }
 
 .fa-paste:before {
-  content: "";
+  content: "\f0ea";
 }
 
 .fa-patreon:before {
-  content: "";
+  content: "\f3d9";
 }
 
 .fa-pause:before {
-  content: "";
+  content: "\f04c";
 }
 
 .fa-pause-circle:before {
-  content: "";
+  content: "\f28b";
 }
 
 .fa-paw:before {
-  content: "";
+  content: "\f1b0";
 }
 
 .fa-paypal:before {
-  content: "";
+  content: "\f1ed";
 }
 
 .fa-peace:before {
-  content: "";
+  content: "\f67c";
 }
 
 .fa-pen:before {
-  content: "";
+  content: "\f304";
 }
 
 .fa-pen-alt:before {
-  content: "";
+  content: "\f305";
 }
 
 .fa-pen-fancy:before {
-  content: "";
+  content: "\f5ac";
 }
 
 .fa-pen-nib:before {
-  content: "";
+  content: "\f5ad";
 }
 
 .fa-pen-square:before {
-  content: "";
+  content: "\f14b";
 }
 
 .fa-pencil-alt:before {
-  content: "";
+  content: "\f303";
 }
 
 .fa-pencil-ruler:before {
-  content: "";
+  content: "\f5ae";
 }
 
 .fa-people-carry:before {
-  content: "";
+  content: "\f4ce";
 }
 
 .fa-percent:before {
-  content: "";
+  content: "\f295";
 }
 
 .fa-percentage:before {
-  content: "";
+  content: "\f541";
 }
 
 .fa-periscope:before {
-  content: "";
+  content: "\f3da";
 }
 
 .fa-phabricator:before {
-  content: "";
+  content: "\f3db";
 }
 
 .fa-phoenix-framework:before {
-  content: "";
+  content: "\f3dc";
 }
 
 .fa-phoenix-squadron:before {
-  content: "";
+  content: "\f511";
 }
 
 .fa-phone:before {
-  content: "";
+  content: "\f095";
 }
 
 .fa-phone-slash:before {
-  content: "";
+  content: "\f3dd";
 }
 
 .fa-phone-square:before {
-  content: "";
+  content: "\f098";
 }
 
 .fa-phone-volume:before {
-  content: "";
+  content: "\f2a0";
 }
 
 .fa-php:before {
-  content: "";
+  content: "\f457";
 }
 
 .fa-pied-piper:before {
-  content: "";
+  content: "\f2ae";
 }
 
 .fa-pied-piper-alt:before {
-  content: "";
+  content: "\f1a8";
 }
 
 .fa-pied-piper-hat:before {
-  content: "";
+  content: "\f4e5";
 }
 
 .fa-pied-piper-pp:before {
-  content: "";
+  content: "\f1a7";
 }
 
 .fa-piggy-bank:before {
-  content: "";
+  content: "\f4d3";
 }
 
 .fa-pills:before {
-  content: "";
+  content: "\f484";
 }
 
 .fa-pinterest:before {
-  content: "";
+  content: "\f0d2";
 }
 
 .fa-pinterest-p:before {
-  content: "";
+  content: "\f231";
 }
 
 .fa-pinterest-square:before {
-  content: "";
+  content: "\f0d3";
 }
 
 .fa-place-of-worship:before {
-  content: "";
+  content: "\f67f";
 }
 
 .fa-plane:before {
-  content: "";
+  content: "\f072";
 }
 
 .fa-plane-arrival:before {
-  content: "";
+  content: "\f5af";
 }
 
 .fa-plane-departure:before {
-  content: "";
+  content: "\f5b0";
 }
 
 .fa-play:before {
-  content: "";
+  content: "\f04b";
 }
 
 .fa-play-circle:before {
-  content: "";
+  content: "\f144";
 }
 
 .fa-playstation:before {
-  content: "";
+  content: "\f3df";
 }
 
 .fa-plug:before {
-  content: "";
+  content: "\f1e6";
 }
 
 .fa-plus:before {
-  content: "";
+  content: "\f067";
 }
 
 .fa-plus-circle:before {
-  content: "";
+  content: "\f055";
 }
 
 .fa-plus-square:before {
-  content: "";
+  content: "\f0fe";
 }
 
 .fa-podcast:before {
-  content: "";
+  content: "\f2ce";
 }
 
 .fa-poll:before {
-  content: "";
+  content: "\f681";
 }
 
 .fa-poll-h:before {
-  content: "";
+  content: "\f682";
 }
 
 .fa-poo:before {
-  content: "";
+  content: "\f2fe";
 }
 
 .fa-poop:before {
-  content: "";
+  content: "\f619";
 }
 
 .fa-portrait:before {
-  content: "";
+  content: "\f3e0";
 }
 
 .fa-pound-sign:before {
-  content: "";
+  content: "\f154";
 }
 
 .fa-power-off:before {
-  content: "";
+  content: "\f011";
 }
 
 .fa-pray:before {
-  content: "";
+  content: "\f683";
 }
 
 .fa-praying-hands:before {
-  content: "";
+  content: "\f684";
 }
 
 .fa-prescription:before {
-  content: "";
+  content: "\f5b1";
 }
 
 .fa-prescription-bottle:before {
-  content: "";
+  content: "\f485";
 }
 
 .fa-prescription-bottle-alt:before {
-  content: "";
+  content: "\f486";
 }
 
 .fa-print:before {
-  content: "";
+  content: "\f02f";
 }
 
 .fa-procedures:before {
-  content: "";
+  content: "\f487";
 }
 
 .fa-product-hunt:before {
-  content: "";
+  content: "\f288";
 }
 
 .fa-project-diagram:before {
-  content: "";
+  content: "\f542";
 }
 
 .fa-pushed:before {
-  content: "";
+  content: "\f3e1";
 }
 
 .fa-puzzle-piece:before {
-  content: "";
+  content: "\f12e";
 }
 
 .fa-python:before {
-  content: "";
+  content: "\f3e2";
 }
 
 .fa-qq:before {
-  content: "";
+  content: "\f1d6";
 }
 
 .fa-qrcode:before {
-  content: "";
+  content: "\f029";
 }
 
 .fa-question:before {
-  content: "";
+  content: "\f128";
 }
 
 .fa-question-circle:before {
-  content: "";
+  content: "\f059";
 }
 
 .fa-quidditch:before {
-  content: "";
+  content: "\f458";
 }
 
 .fa-quinscape:before {
-  content: "";
+  content: "\f459";
 }
 
 .fa-quora:before {
-  content: "";
+  content: "\f2c4";
 }
 
 .fa-quote-left:before {
-  content: "";
+  content: "\f10d";
 }
 
 .fa-quote-right:before {
-  content: "";
+  content: "\f10e";
 }
 
 .fa-quran:before {
-  content: "";
+  content: "\f687";
 }
 
 .fa-r-project:before {
-  content: "";
+  content: "\f4f7";
 }
 
 .fa-random:before {
-  content: "";
+  content: "\f074";
 }
 
 .fa-ravelry:before {
-  content: "";
+  content: "\f2d9";
 }
 
 .fa-react:before {
-  content: "";
+  content: "\f41b";
 }
 
 .fa-readme:before {
-  content: "";
+  content: "\f4d5";
 }
 
 .fa-rebel:before {
-  content: "";
+  content: "\f1d0";
 }
 
 .fa-receipt:before {
-  content: "";
+  content: "\f543";
 }
 
 .fa-recycle:before {
-  content: "";
+  content: "\f1b8";
 }
 
 .fa-red-river:before {
-  content: "";
+  content: "\f3e3";
 }
 
 .fa-reddit:before {
-  content: "";
+  content: "\f1a1";
 }
 
 .fa-reddit-alien:before {
-  content: "";
+  content: "\f281";
 }
 
 .fa-reddit-square:before {
-  content: "";
+  content: "\f1a2";
 }
 
 .fa-redo:before {
-  content: "";
+  content: "\f01e";
 }
 
 .fa-redo-alt:before {
-  content: "";
+  content: "\f2f9";
 }
 
 .fa-registered:before {
-  content: "";
+  content: "\f25d";
 }
 
 .fa-rendact:before {
-  content: "";
+  content: "\f3e4";
 }
 
 .fa-renren:before {
-  content: "";
+  content: "\f18b";
 }
 
 .fa-reply:before {
-  content: "";
+  content: "\f3e5";
 }
 
 .fa-reply-all:before {
-  content: "";
+  content: "\f122";
 }
 
 .fa-replyd:before {
-  content: "";
+  content: "\f3e6";
 }
 
 .fa-researchgate:before {
-  content: "";
+  content: "\f4f8";
 }
 
 .fa-resolving:before {
-  content: "";
+  content: "\f3e7";
 }
 
 .fa-retweet:before {
-  content: "";
+  content: "\f079";
 }
 
 .fa-rev:before {
-  content: "";
+  content: "\f5b2";
 }
 
 .fa-ribbon:before {
-  content: "";
+  content: "\f4d6";
 }
 
 .fa-road:before {
-  content: "";
+  content: "\f018";
 }
 
 .fa-robot:before {
-  content: "";
+  content: "\f544";
 }
 
 .fa-rocket:before {
-  content: "";
+  content: "\f135";
 }
 
 .fa-rocketchat:before {
-  content: "";
+  content: "\f3e8";
 }
 
 .fa-rockrms:before {
-  content: "";
+  content: "\f3e9";
 }
 
 .fa-route:before {
-  content: "";
+  content: "\f4d7";
 }
 
 .fa-rss:before {
-  content: "";
+  content: "\f09e";
 }
 
 .fa-rss-square:before {
-  content: "";
+  content: "\f143";
 }
 
 .fa-ruble-sign:before {
-  content: "";
+  content: "\f158";
 }
 
 .fa-ruler:before {
-  content: "";
+  content: "\f545";
 }
 
 .fa-ruler-combined:before {
-  content: "";
+  content: "\f546";
 }
 
 .fa-ruler-horizontal:before {
-  content: "";
+  content: "\f547";
 }
 
 .fa-ruler-vertical:before {
-  content: "";
+  content: "\f548";
 }
 
 .fa-rupee-sign:before {
-  content: "";
+  content: "\f156";
 }
 
 .fa-sad-cry:before {
-  content: "";
+  content: "\f5b3";
 }
 
 .fa-sad-tear:before {
-  content: "";
+  content: "\f5b4";
 }
 
 .fa-safari:before {
-  content: "";
+  content: "\f267";
 }
 
 .fa-sass:before {
-  content: "";
+  content: "\f41e";
 }
 
 .fa-save:before {
-  content: "";
+  content: "\f0c7";
 }
 
 .fa-schlix:before {
-  content: "";
+  content: "\f3ea";
 }
 
 .fa-school:before {
-  content: "";
+  content: "\f549";
 }
 
 .fa-screwdriver:before {
-  content: "";
+  content: "\f54a";
 }
 
 .fa-scribd:before {
-  content: "";
+  content: "\f28a";
 }
 
 .fa-search:before {
-  content: "";
+  content: "\f002";
 }
 
 .fa-search-dollar:before {
-  content: "";
+  content: "\f688";
 }
 
 .fa-search-location:before {
-  content: "";
+  content: "\f689";
 }
 
 .fa-search-minus:before {
-  content: "";
+  content: "\f010";
 }
 
 .fa-search-plus:before {
-  content: "";
+  content: "\f00e";
 }
 
 .fa-searchengin:before {
-  content: "";
+  content: "\f3eb";
 }
 
 .fa-seedling:before {
-  content: "";
+  content: "\f4d8";
 }
 
 .fa-sellcast:before {
-  content: "";
+  content: "\f2da";
 }
 
 .fa-sellsy:before {
-  content: "";
+  content: "\f213";
 }
 
 .fa-server:before {
-  content: "";
+  content: "\f233";
 }
 
 .fa-servicestack:before {
-  content: "";
+  content: "\f3ec";
 }
 
 .fa-shapes:before {
-  content: "";
+  content: "\f61f";
 }
 
 .fa-share:before {
-  content: "";
+  content: "\f064";
 }
 
 .fa-share-alt:before {
-  content: "";
+  content: "\f1e0";
 }
 
 .fa-share-alt-square:before {
-  content: "";
+  content: "\f1e1";
 }
 
 .fa-share-square:before {
-  content: "";
+  content: "\f14d";
 }
 
 .fa-shekel-sign:before {
-  content: "";
+  content: "\f20b";
 }
 
 .fa-shield-alt:before {
-  content: "";
+  content: "\f3ed";
 }
 
 .fa-ship:before {
-  content: "";
+  content: "\f21a";
 }
 
 .fa-shipping-fast:before {
-  content: "";
+  content: "\f48b";
 }
 
 .fa-shirtsinbulk:before {
-  content: "";
+  content: "\f214";
 }
 
 .fa-shoe-prints:before {
-  content: "";
+  content: "\f54b";
 }
 
 .fa-shopping-bag:before {
-  content: "";
+  content: "\f290";
 }
 
 .fa-shopping-basket:before {
-  content: "";
+  content: "\f291";
 }
 
 .fa-shopping-cart:before {
-  content: "";
+  content: "\f07a";
 }
 
 .fa-shopware:before {
-  content: "";
+  content: "\f5b5";
 }
 
 .fa-shower:before {
-  content: "";
+  content: "\f2cc";
 }
 
 .fa-shuttle-van:before {
-  content: "";
+  content: "\f5b6";
 }
 
 .fa-sign:before {
-  content: "";
+  content: "\f4d9";
 }
 
 .fa-sign-in-alt:before {
-  content: "";
+  content: "\f2f6";
 }
 
 .fa-sign-language:before {
-  content: "";
+  content: "\f2a7";
 }
 
 .fa-sign-out-alt:before {
-  content: "";
+  content: "\f2f5";
 }
 
 .fa-signal:before {
-  content: "";
+  content: "\f012";
 }
 
 .fa-signature:before {
-  content: "";
+  content: "\f5b7";
 }
 
 .fa-simplybuilt:before {
-  content: "";
+  content: "\f215";
 }
 
 .fa-sistrix:before {
-  content: "";
+  content: "\f3ee";
 }
 
 .fa-sitemap:before {
-  content: "";
+  content: "\f0e8";
 }
 
 .fa-sith:before {
-  content: "";
+  content: "\f512";
 }
 
 .fa-skull:before {
-  content: "";
+  content: "\f54c";
 }
 
 .fa-skyatlas:before {
-  content: "";
+  content: "\f216";
 }
 
 .fa-skype:before {
-  content: "";
+  content: "\f17e";
 }
 
 .fa-slack:before {
-  content: "";
+  content: "\f198";
 }
 
 .fa-slack-hash:before {
-  content: "";
+  content: "\f3ef";
 }
 
 .fa-sliders-h:before {
-  content: "";
+  content: "\f1de";
 }
 
 .fa-slideshare:before {
-  content: "";
+  content: "\f1e7";
 }
 
 .fa-smile:before {
-  content: "";
+  content: "\f118";
 }
 
 .fa-smile-beam:before {
-  content: "";
+  content: "\f5b8";
 }
 
 .fa-smile-wink:before {
-  content: "";
+  content: "\f4da";
 }
 
 .fa-smoking:before {
-  content: "";
+  content: "\f48d";
 }
 
 .fa-smoking-ban:before {
-  content: "";
+  content: "\f54d";
 }
 
 .fa-snapchat:before {
-  content: "";
+  content: "\f2ab";
 }
 
 .fa-snapchat-ghost:before {
-  content: "";
+  content: "\f2ac";
 }
 
 .fa-snapchat-square:before {
-  content: "";
+  content: "\f2ad";
 }
 
 .fa-snowflake:before {
-  content: "";
+  content: "\f2dc";
 }
 
 .fa-socks:before {
-  content: "";
+  content: "\f696";
 }
 
 .fa-solar-panel:before {
-  content: "";
+  content: "\f5ba";
 }
 
 .fa-sort:before {
-  content: "";
+  content: "\f0dc";
 }
 
 .fa-sort-alpha-down:before {
-  content: "";
+  content: "\f15d";
 }
 
 .fa-sort-alpha-up:before {
-  content: "";
+  content: "\f15e";
 }
 
 .fa-sort-amount-down:before {
-  content: "";
+  content: "\f160";
 }
 
 .fa-sort-amount-up:before {
-  content: "";
+  content: "\f161";
 }
 
 .fa-sort-down:before {
-  content: "";
+  content: "\f0dd";
 }
 
 .fa-sort-numeric-down:before {
-  content: "";
+  content: "\f162";
 }
 
 .fa-sort-numeric-up:before {
-  content: "";
+  content: "\f163";
 }
 
 .fa-sort-up:before {
-  content: "";
+  content: "\f0de";
 }
 
 .fa-soundcloud:before {
-  content: "";
+  content: "\f1be";
 }
 
 .fa-spa:before {
-  content: "";
+  content: "\f5bb";
 }
 
 .fa-space-shuttle:before {
-  content: "";
+  content: "\f197";
 }
 
 .fa-speakap:before {
-  content: "";
+  content: "\f3f3";
 }
 
 .fa-spinner:before {
-  content: "";
+  content: "\f110";
 }
 
 .fa-splotch:before {
-  content: "";
+  content: "\f5bc";
 }
 
 .fa-spotify:before {
-  content: "";
+  content: "\f1bc";
 }
 
 .fa-spray-can:before {
-  content: "";
+  content: "\f5bd";
 }
 
 .fa-square:before {
-  content: "";
+  content: "\f0c8";
 }
 
 .fa-square-full:before {
-  content: "";
+  content: "\f45c";
 }
 
 .fa-square-root-alt:before {
-  content: "";
+  content: "\f698";
 }
 
 .fa-squarespace:before {
-  content: "";
+  content: "\f5be";
 }
 
 .fa-stack-exchange:before {
-  content: "";
+  content: "\f18d";
 }
 
 .fa-stack-overflow:before {
-  content: "";
+  content: "\f16c";
 }
 
 .fa-stamp:before {
-  content: "";
+  content: "\f5bf";
 }
 
 .fa-star:before {
-  content: "";
+  content: "\f005";
 }
 
 .fa-star-and-crescent:before {
-  content: "";
+  content: "\f699";
 }
 
 .fa-star-half:before {
-  content: "";
+  content: "\f089";
 }
 
 .fa-star-half-alt:before {
-  content: "";
+  content: "\f5c0";
 }
 
 .fa-star-of-david:before {
-  content: "";
+  content: "\f69a";
 }
 
 .fa-star-of-life:before {
-  content: "";
+  content: "\f621";
 }
 
 .fa-staylinked:before {
-  content: "";
+  content: "\f3f5";
 }
 
 .fa-steam:before {
-  content: "";
+  content: "\f1b6";
 }
 
 .fa-steam-square:before {
-  content: "";
+  content: "\f1b7";
 }
 
 .fa-steam-symbol:before {
-  content: "";
+  content: "\f3f6";
 }
 
 .fa-step-backward:before {
-  content: "";
+  content: "\f048";
 }
 
 .fa-step-forward:before {
-  content: "";
+  content: "\f051";
 }
 
 .fa-stethoscope:before {
-  content: "";
+  content: "\f0f1";
 }
 
 .fa-sticker-mule:before {
-  content: "";
+  content: "\f3f7";
 }
 
 .fa-sticky-note:before {
-  content: "";
+  content: "\f249";
 }
 
 .fa-stop:before {
-  content: "";
+  content: "\f04d";
 }
 
 .fa-stop-circle:before {
-  content: "";
+  content: "\f28d";
 }
 
 .fa-stopwatch:before {
-  content: "";
+  content: "\f2f2";
 }
 
 .fa-store:before {
-  content: "";
+  content: "\f54e";
 }
 
 .fa-store-alt:before {
-  content: "";
+  content: "\f54f";
 }
 
 .fa-strava:before {
-  content: "";
+  content: "\f428";
 }
 
 .fa-stream:before {
-  content: "";
+  content: "\f550";
 }
 
 .fa-street-view:before {
-  content: "";
+  content: "\f21d";
 }
 
 .fa-strikethrough:before {
-  content: "";
+  content: "\f0cc";
 }
 
 .fa-stripe:before {
-  content: "";
+  content: "\f429";
 }
 
 .fa-stripe-s:before {
-  content: "";
+  content: "\f42a";
 }
 
 .fa-stroopwafel:before {
-  content: "";
+  content: "\f551";
 }
 
 .fa-studiovinari:before {
-  content: "";
+  content: "\f3f8";
 }
 
 .fa-stumbleupon:before {
-  content: "";
+  content: "\f1a4";
 }
 
 .fa-stumbleupon-circle:before {
-  content: "";
+  content: "\f1a3";
 }
 
 .fa-subscript:before {
-  content: "";
+  content: "\f12c";
 }
 
 .fa-subway:before {
-  content: "";
+  content: "\f239";
 }
 
 .fa-suitcase:before {
-  content: "";
+  content: "\f0f2";
 }
 
 .fa-suitcase-rolling:before {
-  content: "";
+  content: "\f5c1";
 }
 
 .fa-sun:before {
-  content: "";
+  content: "\f185";
 }
 
 .fa-superpowers:before {
-  content: "";
+  content: "\f2dd";
 }
 
 .fa-superscript:before {
-  content: "";
+  content: "\f12b";
 }
 
 .fa-supple:before {
-  content: "";
+  content: "\f3f9";
 }
 
 .fa-surprise:before {
-  content: "";
+  content: "\f5c2";
 }
 
 .fa-swatchbook:before {
-  content: "";
+  content: "\f5c3";
 }
 
 .fa-swimmer:before {
-  content: "";
+  content: "\f5c4";
 }
 
 .fa-swimming-pool:before {
-  content: "";
+  content: "\f5c5";
 }
 
 .fa-synagogue:before {
-  content: "";
+  content: "\f69b";
 }
 
 .fa-sync:before {
-  content: "";
+  content: "\f021";
 }
 
 .fa-sync-alt:before {
-  content: "";
+  content: "\f2f1";
 }
 
 .fa-syringe:before {
-  content: "";
+  content: "\f48e";
 }
 
 .fa-table:before {
-  content: "";
+  content: "\f0ce";
 }
 
 .fa-table-tennis:before {
-  content: "";
+  content: "\f45d";
 }
 
 .fa-tablet:before {
-  content: "";
+  content: "\f10a";
 }
 
 .fa-tablet-alt:before {
-  content: "";
+  content: "\f3fa";
 }
 
 .fa-tablets:before {
-  content: "";
+  content: "\f490";
 }
 
 .fa-tachometer-alt:before {
-  content: "";
+  content: "\f3fd";
 }
 
 .fa-tag:before {
-  content: "";
+  content: "\f02b";
 }
 
 .fa-tags:before {
-  content: "";
+  content: "\f02c";
 }
 
 .fa-tape:before {
-  content: "";
+  content: "\f4db";
 }
 
 .fa-tasks:before {
-  content: "";
+  content: "\f0ae";
 }
 
 .fa-taxi:before {
-  content: "";
+  content: "\f1ba";
 }
 
 .fa-teamspeak:before {
-  content: "";
+  content: "\f4f9";
 }
 
 .fa-teeth:before {
-  content: "";
+  content: "\f62e";
 }
 
 .fa-teeth-open:before {
-  content: "";
+  content: "\f62f";
 }
 
 .fa-telegram:before {
-  content: "";
+  content: "\f2c6";
 }
 
 .fa-telegram-plane:before {
-  content: "";
+  content: "\f3fe";
 }
 
 .fa-tencent-weibo:before {
-  content: "";
+  content: "\f1d5";
 }
 
 .fa-terminal:before {
-  content: "";
+  content: "\f120";
 }
 
 .fa-text-height:before {
-  content: "";
+  content: "\f034";
 }
 
 .fa-text-width:before {
-  content: "";
+  content: "\f035";
 }
 
 .fa-th:before {
-  content: "";
+  content: "\f00a";
 }
 
 .fa-th-large:before {
-  content: "";
+  content: "\f009";
 }
 
 .fa-th-list:before {
-  content: "";
+  content: "\f00b";
 }
 
 .fa-the-red-yeti:before {
-  content: "";
+  content: "\f69d";
 }
 
 .fa-theater-masks:before {
-  content: "";
+  content: "\f630";
 }
 
 .fa-themeco:before {
-  content: "";
+  content: "\f5c6";
 }
 
 .fa-themeisle:before {
-  content: "";
+  content: "\f2b2";
 }
 
 .fa-thermometer:before {
-  content: "";
+  content: "\f491";
 }
 
 .fa-thermometer-empty:before {
-  content: "";
+  content: "\f2cb";
 }
 
 .fa-thermometer-full:before {
-  content: "";
+  content: "\f2c7";
 }
 
 .fa-thermometer-half:before {
-  content: "";
+  content: "\f2c9";
 }
 
 .fa-thermometer-quarter:before {
-  content: "";
+  content: "\f2ca";
 }
 
 .fa-thermometer-three-quarters:before {
-  content: "";
+  content: "\f2c8";
 }
 
 .fa-thumbs-down:before {
-  content: "";
+  content: "\f165";
 }
 
 .fa-thumbs-up:before {
-  content: "";
+  content: "\f164";
 }
 
 .fa-thumbtack:before {
-  content: "";
+  content: "\f08d";
 }
 
 .fa-ticket-alt:before {
-  content: "";
+  content: "\f3ff";
 }
 
 .fa-times:before {
-  content: "";
+  content: "\f00d";
 }
 
 .fa-times-circle:before {
-  content: "";
+  content: "\f057";
 }
 
 .fa-tint:before {
-  content: "";
+  content: "\f043";
 }
 
 .fa-tint-slash:before {
-  content: "";
+  content: "\f5c7";
 }
 
 .fa-tired:before {
-  content: "";
+  content: "\f5c8";
 }
 
 .fa-toggle-off:before {
-  content: "";
+  content: "\f204";
 }
 
 .fa-toggle-on:before {
-  content: "";
+  content: "\f205";
 }
 
 .fa-toolbox:before {
-  content: "";
+  content: "\f552";
 }
 
 .fa-tooth:before {
-  content: "";
+  content: "\f5c9";
 }
 
 .fa-torah:before {
-  content: "";
+  content: "\f6a0";
 }
 
 .fa-torii-gate:before {
-  content: "";
+  content: "\f6a1";
 }
 
 .fa-trade-federation:before {
-  content: "";
+  content: "\f513";
 }
 
 .fa-trademark:before {
-  content: "";
+  content: "\f25c";
 }
 
 .fa-traffic-light:before {
-  content: "";
+  content: "\f637";
 }
 
 .fa-train:before {
-  content: "";
+  content: "\f238";
 }
 
 .fa-transgender:before {
-  content: "";
+  content: "\f224";
 }
 
 .fa-transgender-alt:before {
-  content: "";
+  content: "\f225";
 }
 
 .fa-trash:before {
-  content: "";
+  content: "\f1f8";
 }
 
 .fa-trash-alt:before {
-  content: "";
+  content: "\f2ed";
 }
 
 .fa-tree:before {
-  content: "";
+  content: "\f1bb";
 }
 
 .fa-trello:before {
-  content: "";
+  content: "\f181";
 }
 
 .fa-tripadvisor:before {
-  content: "";
+  content: "\f262";
 }
 
 .fa-trophy:before {
-  content: "";
+  content: "\f091";
 }
 
 .fa-truck:before {
-  content: "";
+  content: "\f0d1";
 }
 
 .fa-truck-loading:before {
-  content: "";
+  content: "\f4de";
 }
 
 .fa-truck-monster:before {
-  content: "";
+  content: "\f63b";
 }
 
 .fa-truck-moving:before {
-  content: "";
+  content: "\f4df";
 }
 
 .fa-truck-pickup:before {
-  content: "";
+  content: "\f63c";
 }
 
 .fa-tshirt:before {
-  content: "";
+  content: "\f553";
 }
 
 .fa-tty:before {
-  content: "";
+  content: "\f1e4";
 }
 
 .fa-tumblr:before {
-  content: "";
+  content: "\f173";
 }
 
 .fa-tumblr-square:before {
-  content: "";
+  content: "\f174";
 }
 
 .fa-tv:before {
-  content: "";
+  content: "\f26c";
 }
 
 .fa-twitch:before {
-  content: "";
+  content: "\f1e8";
 }
 
 .fa-twitter:before {
-  content: "";
+  content: "\f099";
 }
 
 .fa-twitter-square:before {
-  content: "";
+  content: "\f081";
 }
 
 .fa-typo3:before {
-  content: "";
+  content: "\f42b";
 }
 
 .fa-uber:before {
-  content: "";
+  content: "\f402";
 }
 
 .fa-uikit:before {
-  content: "";
+  content: "\f403";
 }
 
 .fa-umbrella:before {
-  content: "";
+  content: "\f0e9";
 }
 
 .fa-umbrella-beach:before {
-  content: "";
+  content: "\f5ca";
 }
 
 .fa-underline:before {
-  content: "";
+  content: "\f0cd";
 }
 
 .fa-undo:before {
-  content: "";
+  content: "\f0e2";
 }
 
 .fa-undo-alt:before {
-  content: "";
+  content: "\f2ea";
 }
 
 .fa-uniregistry:before {
-  content: "";
+  content: "\f404";
 }
 
 .fa-universal-access:before {
-  content: "";
+  content: "\f29a";
 }
 
 .fa-university:before {
-  content: "";
+  content: "\f19c";
 }
 
 .fa-unlink:before {
-  content: "";
+  content: "\f127";
 }
 
 .fa-unlock:before {
-  content: "";
+  content: "\f09c";
 }
 
 .fa-unlock-alt:before {
-  content: "";
+  content: "\f13e";
 }
 
 .fa-untappd:before {
-  content: "";
+  content: "\f405";
 }
 
 .fa-upload:before {
-  content: "";
+  content: "\f093";
 }
 
 .fa-usb:before {
-  content: "";
+  content: "\f287";
 }
 
 .fa-user:before {
-  content: "";
+  content: "\f007";
 }
 
 .fa-user-alt:before {
-  content: "";
+  content: "\f406";
 }
 
 .fa-user-alt-slash:before {
-  content: "";
+  content: "\f4fa";
 }
 
 .fa-user-astronaut:before {
-  content: "";
+  content: "\f4fb";
 }
 
 .fa-user-check:before {
-  content: "";
+  content: "\f4fc";
 }
 
 .fa-user-circle:before {
-  content: "";
+  content: "\f2bd";
 }
 
 .fa-user-clock:before {
-  content: "";
+  content: "\f4fd";
 }
 
 .fa-user-cog:before {
-  content: "";
+  content: "\f4fe";
 }
 
 .fa-user-edit:before {
-  content: "";
+  content: "\f4ff";
 }
 
 .fa-user-friends:before {
-  content: "";
+  content: "\f500";
 }
 
 .fa-user-graduate:before {
-  content: "";
+  content: "\f501";
 }
 
 .fa-user-lock:before {
-  content: "";
+  content: "\f502";
 }
 
 .fa-user-md:before {
-  content: "";
+  content: "\f0f0";
 }
 
 .fa-user-minus:before {
-  content: "";
+  content: "\f503";
 }
 
 .fa-user-ninja:before {
-  content: "";
+  content: "\f504";
 }
 
 .fa-user-plus:before {
-  content: "";
+  content: "\f234";
 }
 
 .fa-user-secret:before {
-  content: "";
+  content: "\f21b";
 }
 
 .fa-user-shield:before {
-  content: "";
+  content: "\f505";
 }
 
 .fa-user-slash:before {
-  content: "";
+  content: "\f506";
 }
 
 .fa-user-tag:before {
-  content: "";
+  content: "\f507";
 }
 
 .fa-user-tie:before {
-  content: "";
+  content: "\f508";
 }
 
 .fa-user-times:before {
-  content: "";
+  content: "\f235";
 }
 
 .fa-users:before {
-  content: "";
+  content: "\f0c0";
 }
 
 .fa-users-cog:before {
-  content: "";
+  content: "\f509";
 }
 
 .fa-ussunnah:before {
-  content: "";
+  content: "\f407";
 }
 
 .fa-utensil-spoon:before {
-  content: "";
+  content: "\f2e5";
 }
 
 .fa-utensils:before {
-  content: "";
+  content: "\f2e7";
 }
 
 .fa-vaadin:before {
-  content: "";
+  content: "\f408";
 }
 
 .fa-vector-square:before {
-  content: "";
+  content: "\f5cb";
 }
 
 .fa-venus:before {
-  content: "";
+  content: "\f221";
 }
 
 .fa-venus-double:before {
-  content: "";
+  content: "\f226";
 }
 
 .fa-venus-mars:before {
-  content: "";
+  content: "\f228";
 }
 
 .fa-viacoin:before {
-  content: "";
+  content: "\f237";
 }
 
 .fa-viadeo:before {
-  content: "";
+  content: "\f2a9";
 }
 
 .fa-viadeo-square:before {
-  content: "";
+  content: "\f2aa";
 }
 
 .fa-vial:before {
-  content: "";
+  content: "\f492";
 }
 
 .fa-vials:before {
-  content: "";
+  content: "\f493";
 }
 
 .fa-viber:before {
-  content: "";
+  content: "\f409";
 }
 
 .fa-video:before {
-  content: "";
+  content: "\f03d";
 }
 
 .fa-video-slash:before {
-  content: "";
+  content: "\f4e2";
 }
 
 .fa-vihara:before {
-  content: "";
+  content: "\f6a7";
 }
 
 .fa-vimeo:before {
-  content: "";
+  content: "\f40a";
 }
 
 .fa-vimeo-square:before {
-  content: "";
+  content: "\f194";
 }
 
 .fa-vimeo-v:before {
-  content: "";
+  content: "\f27d";
 }
 
 .fa-vine:before {
-  content: "";
+  content: "\f1ca";
 }
 
 .fa-vk:before {
-  content: "";
+  content: "\f189";
 }
 
 .fa-vnv:before {
-  content: "";
+  content: "\f40b";
 }
 
 .fa-volleyball-ball:before {
-  content: "";
+  content: "\f45f";
 }
 
 .fa-volume-down:before {
-  content: "";
+  content: "\f027";
 }
 
 .fa-volume-off:before {
-  content: "";
+  content: "\f026";
 }
 
 .fa-volume-up:before {
-  content: "";
+  content: "\f028";
 }
 
 .fa-vuejs:before {
-  content: "";
+  content: "\f41f";
 }
 
 .fa-walking:before {
-  content: "";
+  content: "\f554";
 }
 
 .fa-wallet:before {
-  content: "";
+  content: "\f555";
 }
 
 .fa-warehouse:before {
-  content: "";
+  content: "\f494";
 }
 
 .fa-weebly:before {
-  content: "";
+  content: "\f5cc";
 }
 
 .fa-weibo:before {
-  content: "";
+  content: "\f18a";
 }
 
 .fa-weight:before {
-  content: "";
+  content: "\f496";
 }
 
 .fa-weight-hanging:before {
-  content: "";
+  content: "\f5cd";
 }
 
 .fa-weixin:before {
-  content: "";
+  content: "\f1d7";
 }
 
 .fa-whatsapp:before {
-  content: "";
+  content: "\f232";
 }
 
 .fa-whatsapp-square:before {
-  content: "";
+  content: "\f40c";
 }
 
 .fa-wheelchair:before {
-  content: "";
+  content: "\f193";
 }
 
 .fa-whmcs:before {
-  content: "";
+  content: "\f40d";
 }
 
 .fa-wifi:before {
-  content: "";
+  content: "\f1eb";
 }
 
 .fa-wikipedia-w:before {
-  content: "";
+  content: "\f266";
 }
 
 .fa-window-close:before {
-  content: "";
+  content: "\f410";
 }
 
 .fa-window-maximize:before {
-  content: "";
+  content: "\f2d0";
 }
 
 .fa-window-minimize:before {
-  content: "";
+  content: "\f2d1";
 }
 
 .fa-window-restore:before {
-  content: "";
+  content: "\f2d2";
 }
 
 .fa-windows:before {
-  content: "";
+  content: "\f17a";
 }
 
 .fa-wine-glass:before {
-  content: "";
+  content: "\f4e3";
 }
 
 .fa-wine-glass-alt:before {
-  content: "";
+  content: "\f5ce";
 }
 
 .fa-wix:before {
-  content: "";
+  content: "\f5cf";
 }
 
 .fa-wolf-pack-battalion:before {
-  content: "";
+  content: "\f514";
 }
 
 .fa-won-sign:before {
-  content: "";
+  content: "\f159";
 }
 
 .fa-wordpress:before {
-  content: "";
+  content: "\f19a";
 }
 
 .fa-wordpress-simple:before {
-  content: "";
+  content: "\f411";
 }
 
 .fa-wpbeginner:before {
-  content: "";
+  content: "\f297";
 }
 
 .fa-wpexplorer:before {
-  content: "";
+  content: "\f2de";
 }
 
 .fa-wpforms:before {
-  content: "";
+  content: "\f298";
 }
 
 .fa-wrench:before {
-  content: "";
+  content: "\f0ad";
 }
 
 .fa-x-ray:before {
-  content: "";
+  content: "\f497";
 }
 
 .fa-xbox:before {
-  content: "";
+  content: "\f412";
 }
 
 .fa-xing:before {
-  content: "";
+  content: "\f168";
 }
 
 .fa-xing-square:before {
-  content: "";
+  content: "\f169";
 }
 
 .fa-y-combinator:before {
-  content: "";
+  content: "\f23b";
 }
 
 .fa-yahoo:before {
-  content: "";
+  content: "\f19e";
 }
 
 .fa-yandex:before {
-  content: "";
+  content: "\f413";
 }
 
 .fa-yandex-international:before {
-  content: "";
+  content: "\f414";
 }
 
 .fa-yelp:before {
-  content: "";
+  content: "\f1e9";
 }
 
 .fa-yen-sign:before {
-  content: "";
+  content: "\f157";
 }
 
 .fa-yin-yang:before {
-  content: "";
+  content: "\f6ad";
 }
 
 .fa-yoast:before {
-  content: "";
+  content: "\f2b1";
 }
 
 .fa-youtube:before {
-  content: "";
+  content: "\f167";
 }
 
 .fa-youtube-square:before {
-  content: "";
+  content: "\f431";
 }
 
 .fa-zhihu:before {
-  content: "";
+  content: "\f63f";
 }
 
 .sr-only {
@@ -5353,22 +5353,22 @@ and open the template in the editor.
   color: #E5E5E5;
 }
 .enka-custom-radio.star::before {
-  content: "";
+  content: "\f005";
 }
 .enka-custom-radio.thumb::before {
-  content: "";
+  content: "\f164";
 }
 .enka-custom-radio.smiley::before {
-  content: "";
+  content: "\f118";
 }
 .enka-custom-radio.heart::before {
-  content: "";
+  content: "\f004";
 }
 .enka-custom-radio.flag::before {
-  content: "";
+  content: "\f024";
 }
 .enka-custom-radio.user::before {
-  content: "";
+  content: "\f007";
 }
 
 /* visual analog scale - radio buttons */
@@ -5379,25 +5379,25 @@ and open the template in the editor.
   color: #E5E5E5;
 }
 .enka-vizualna-skala.siv-61::before, .enka-vizualna-skala.siv-71::before {
-  content: "";
+  content: "\f5b4";
 }
 .enka-vizualna-skala.siv-41::before, .enka-vizualna-skala.siv-51::before, .enka-vizualna-skala.siv-62::before, .enka-vizualna-skala.siv-72::before {
-  content: "";
+  content: "\f57a";
 }
 .enka-vizualna-skala.siv-21::before, .enka-vizualna-skala.siv-31::before, .enka-vizualna-skala.siv-42::before, .enka-vizualna-skala.siv-52::before, .enka-vizualna-skala.siv-63::before, .enka-vizualna-skala.siv-73::before {
-  content: "";
+  content: "\f119";
 }
 .enka-vizualna-skala.siv-32::before, .enka-vizualna-skala.siv-53::before, .enka-vizualna-skala.siv-74::before {
-  content: "";
+  content: "\f11a";
 }
 .enka-vizualna-skala.siv-22::before, .enka-vizualna-skala.siv-33::before, .enka-vizualna-skala.siv-43::before, .enka-vizualna-skala.siv-54::before, .enka-vizualna-skala.siv-64::before, .enka-vizualna-skala.siv-75::before {
-  content: "";
+  content: "\f118";
 }
 .enka-vizualna-skala.siv-44::before, .enka-vizualna-skala.siv-55::before, .enka-vizualna-skala.siv-65::before, .enka-vizualna-skala.siv-76::before {
-  content: "";
+  content: "\f580";
 }
 .enka-vizualna-skala.siv-66::before, .enka-vizualna-skala.siv-77::before {
-  content: "";
+  content: "\f59c";
 }
 
 /*
@@ -5411,88 +5411,88 @@ and open the template in the editor.
 */
 /* icons */
 span.faicon.plus::before {
-  content: "";
+  content: "\f067";
 }
 
 span.faicon.minus::before {
-  content: "";
+  content: "\f068";
 }
 
 span.faicon.success::before,
 span.circle-check::before {
-  content: "";
+  content: "\f058";
 }
 
 span.faicon.close::before {
   font-size: 18px;
   font-weight: 400;
-  content: "";
+  content: "\f057";
 }
 
 span.faicon.dropdown_blue::before {
   font-size: 16px;
-  content: "";
+  content: "\f13a";
 }
 
 span.faicon.dropup_blue::before {
   font-size: 16px;
-  content: "";
+  content: "\f139";
 }
 
 span.faicon.arrow_back::before {
   font-weight: 600;
   font-size: 16px;
-  content: "";
+  content: "\f137";
 }
 
 span.faicon.add::before {
   font-size: 18px;
-  content: "";
+  content: "\f055";
 }
 
 span.faicon.remove::before {
   font-size: 18px;
-  content: "";
+  content: "\f056";
 }
 
 span.faicon.delete::before {
   font-size: 18px;
   font-weight: 400;
-  content: "";
+  content: "\f2ed";
 }
 
 span.faicon.anketa_delete::before {
   font-size: 24px;
   font-weight: 400;
-  content: "";
+  content: "\f2ed";
 }
 
 span.faicon.copy::before {
   font-size: 18px;
-  content: "";
+  content: "\f0c5";
   font-weight: 400;
 }
 
 span.faicon.anketa_copy::before {
   font-size: 24px;
-  content: "";
+  content: "\f0c5";
   font-weight: 400;
 }
 
 span.faicon.export::before {
   font-size: 24px;
-  content: "";
+  content: "\f56e";
 }
 
 span.faicon.file-import::before {
-  content: "";
+  content: "\f56f";
   transform: scaleX(-1);
 }
 
 span.faicon.import::before {
   font-size: 24px;
   font-weight: 400;
-  content: "";
+  content: "\f1c2";
 }
 
 /*span.faicon.import::after{
@@ -5502,137 +5502,137 @@ span.faicon.import::before {
 }*/
 span.faicon.library::before {
   font-size: 24px;
-  content: "";
+  content: "\f518";
 }
 
 span.faicon.folder::before {
   font-size: 16px;
   font-weight: 600;
-  content: "";
+  content: "\f07b";
 }
 
 span.faicon.folder_empty::before {
   font-size: 16px;
   font-weight: 400;
-  content: "";
+  content: "\f07b";
 }
 
 span.faicon.after.sort_down_arrow::after {
-  content: "";
+  content: "\f0d7";
   margin-left: 5px;
 }
 
 span.faicon.after.sort_up_arrow::after {
-  content: "";
+  content: "\f0d8";
   margin-left: 5px;
 }
 
 span.faicon.info::before {
   font-size: 28px;
-  content: "";
+  content: "\f05a";
   vertical-align: middle;
 }
 
 span.faicon.pagination_left::before {
   margin: 0 1px 0 1px;
-  content: "";
+  content: "\f104";
 }
 
 span.faicon.pagination_right::before {
   margin: 0 0 0 1px;
-  content: "";
+  content: "\f105";
 }
 
 span.faicon.edit::before,
 span.faicon.edit2::before {
-  content: "";
+  content: "\f304";
 }
 
 span.faicon.refresh::before {
   font-size: 18px;
-  content: "";
+  content: "\f2f1";
 }
 
 span.faicon.filter::before {
   font-size: 18px;
-  content: "";
+  content: "\f0b0";
 }
 
 span.faicon.grip::before {
-  content: "";
+  content: "\f58e";
 }
 
 span.faicon.star::before,
 span.faicon.star_off::before {
   font-size: 14px;
   font-weight: 400;
-  content: "";
+  content: "\f005";
 }
 
 span.faicon.star_on::before {
   font-size: 14px;
   font-weight: 700;
-  content: "";
+  content: "\f005";
 }
 
 span.faicon.search::before {
   font-size: 20px;
-  content: "";
+  content: "\f002";
 }
 
 span.faicon.clipboard_notes::before {
   font-size: 20px;
-  content: "";
+  content: "\f46d";
 }
 
 span.faicon.help2::before {
   font-size: 20px;
-  content: "";
+  content: "\f059";
 }
 
 span.faicon.user::before {
   font-size: 18px;
-  content: "";
+  content: "\f007";
 }
 
 span.faicon.logout::before {
   font-size: 20px;
-  content: "";
+  content: "\f2f5";
 }
 
 .faicon.monitor::before {
-  content: "";
+  content: "\f108";
 }
 
 .faicon.mobile::before {
-  content: "";
+  content: "\f3cd";
 }
 
 .faicon.tablet::before {
-  content: "";
+  content: "\f3fa";
 }
 
 span.faicon.users::before {
-  content: "";
+  content: "\f500";
 }
 
 span.faicon.lock_open::before {
-  content: "";
+  content: "\f3c1";
 }
 
 span.faicon.lock_close::before {
-  content: "";
+  content: "\f023";
 }
 
 span.faicon.bottom_saving::before {
   font-size: 24px;
   font-weight: 400;
-  content: "";
+  content: "\f0c7";
 }
 
 span.faicon.bottom_publish::before {
   font-size: 24px;
-  content: "";
+  content: "\f093";
 }
 
 span.faicon.bottom_preview {
@@ -5642,63 +5642,63 @@ span.faicon.bottom_preview {
 span.faicon.bottom_preview::before {
   font-size: 24px;
   font-weight: 400;
-  content: "";
+  content: "\f15b";
 }
 
 span.faicon.bottom_preview::after {
   font-size: 14px;
-  content: "";
+  content: "\f002";
   display: inline-block;
   margin-left: -70%;
 }
 
 span.faicon.bottom_test::before {
   font-size: 24px;
-  content: "";
+  content: "\f492";
 }
 
 span.faicon.language::before {
   font-size: 24px;
-  content: "";
+  content: "\f0ac";
 }
 
 span.faicon.mobile_off::before {
   font-size: 24px;
-  content: "";
+  content: "\f3cd";
 }
 
 span.faicon.mobile_off::after {
   font-size: 24px;
-  content: "";
+  content: "\f715";
   margin-left: -23px;
 }
 
 span.faicon.comments::before {
-  content: "";
+  content: "\f27a";
   font-weight: 700;
 }
 
 span.faicon.comments_empty::before {
-  content: "";
+  content: "\f27a";
   font-weight: 400;
 }
 
 span.faicon.data_link::before {
-  content: "";
+  content: "\f0c1";
 }
 
 span.faicon.data_link_small::before {
-  content: "";
+  content: "\f0c1";
 }
 
 span.faicon.print::before {
   font-size: 24px;
-  content: "";
+  content: "\f02f";
 }
 
 span.faicon.print_small::before {
   font-size: 16px;
-  content: "";
+  content: "\f02f";
 }
 
 span.faicon.preview {
@@ -5708,11 +5708,11 @@ span.faicon.preview {
 span.faicon.preview::before {
   font-size: 18px;
   font-weight: 400;
-  content: "";
+  content: "\f15b";
 }
 
 span.faicon.preview::after {
-  content: "";
+  content: "\f002";
   display: inline-block;
   font-size: 11px;
   margin-left: -50%;
@@ -5720,87 +5720,87 @@ span.faicon.preview::after {
 
 span.faicon.palette::before {
   font-size: 18px;
-  content: "";
+  content: "\f53f";
 }
 
 span.faicon.inline_comment::before {
   font-size: 14px;
   font-weight: 400;
-  content: "";
+  content: "\f075";
 }
 
 span.faicon.inline_double_comment::before {
   font-size: 14px;
   font-weight: 400;
-  content: "";
+  content: "\f086";
 }
 
 span.faicon.comments_creport::before {
   font-size: 16px;
-  content: "";
+  content: "\f086";
 }
 
 span.faicon.compress::before {
   font-size: 15px;
-  content: "";
+  content: "\f066";
 }
 
 span.faicon.expand::before {
   font-size: 15px;
-  content: "";
+  content: "\f065";
 }
 
 span.faicon.hashtag::before {
   font-size: 15px;
-  content: "";
+  content: "\f292";
 }
 
 span.faicon.bug::before {
   font-size: 15px;
-  content: "";
+  content: "\f188";
 }
 
 span.faicon.paragraph::before {
   font-size: 15px;
-  content: "";
+  content: "\f1dd";
 }
 
 span.faicon.replace::before {
   font-size: 15px;
-  content: "";
+  content: "\f362";
 }
 
 span.faicon.plus_square::before {
   font-size: 15px;
   font-weight: 400;
-  content: "";
+  content: "\f0fe";
 }
 
 span.faicon.minus_square::before {
   font-size: 15px;
   font-weight: 400;
-  content: "";
+  content: "\f146";
 }
 
 span.faicon.delete_circle::before {
   font-size: 14px;
-  content: "";
+  content: "\f056";
 }
 
 span.faicon.quick_view::before {
   font-size: 15px;
   font-weight: 400;
-  content: "";
+  content: "\f06e";
 }
 
 span.faicon.edit_square::before {
   font-size: 15px;
-  content: "";
+  content: "\f044";
 }
 
 span.faicon.test::before {
   font-size: 15px;
-  content: "";
+  content: "\f492";
 }
 
 a.faicon.if_add {
@@ -5836,7 +5836,7 @@ span.faicon.if_add:hover:before {
 }
 
 span.faicon.text_file::before {
-  content: "";
+  content: "\f15c";
 }
 
 span.faicon.text_file_small {
@@ -5846,40 +5846,40 @@ span.faicon.text_file_small {
 span.faicon.text_file_small:before {
   font-size: 18px;
   font-weight: 400;
-  content: "";
+  content: "\f15c";
 }
 
 span.faicon.warning::before {
   font-size: 16px;
-  content: "";
+  content: "\f071";
 }
 
 span.faicon.users_small::before {
   font-size: 16px;
-  content: "";
+  content: "\f0c0";
 }
 
 span.faicon.popup_0::before {
   font-size: 14px;
-  content: "";
+  content: "\f065";
   color: #1E88E5;
 }
 
 span.faicon.popup_1::before {
   font-size: 14px;
-  content: "";
+  content: "\f065";
   color: #0059ab;
 }
 
 span.faicon.flat_0::before {
   font-size: 14px;
-  content: "";
+  content: "\f03c";
   color: #0059ab;
 }
 
 span.faicon.flat_1::before {
   font-size: 14px;
-  content: "";
+  content: "\f03c";
   color: #1E88E5;
 }
 
@@ -5894,46 +5894,46 @@ span.basic-icon.spss::before {
 span.faicon.external_link::before {
   font-size: 14px;
   font-weight: 600;
-  content: "";
+  content: "\f35d";
 }
 
 span.faicon.cog_large::before {
   font-size: 34px;
   font-weight: 600;
-  content: "";
+  content: "\f013";
 }
 
 span.faicon.chart_large::before {
   font-size: 34px;
   font-weight: 600;
-  content: "";
+  content: "\f201";
 }
 
 span.faicon.reload_large::before {
   font-size: 34px;
   font-weight: 600;
-  content: "";
+  content: "\f021";
 }
 
 span.faicon.chart::before {
-  content: "";
+  content: "\f080";
   font-size: 16px;
   font-weight: 600;
 }
 
 span.faicon.data::before {
-  content: "";
+  content: "\f1c0";
   font-size: 16px;
   font-weight: 600;
 }
 
 span.faicon.publish::before {
-  content: "";
+  content: "\f093";
   font-size: 16px;
 }
 
 span.faicon.test::before {
-  content: "";
+  content: "\f492";
   font-size: 16px;
 }
 
@@ -5943,63 +5943,63 @@ button.ui-datepicker-trigger::before {
   font-family: "Font Awesome 5 Free";
   font-weight: 400;
   font-size: 16px;
-  content: "";
+  content: "\f073";
 }
 
 /* ARROWS */
 span.faicon.arrow_up::before {
   font-size: 14px;
-  content: "";
+  content: "\f062";
 }
 
 span.faicon.arrow2_r::before {
   font-size: 14px;
-  content: "";
+  content: "\f054";
 }
 
 span.faicon.arrow2_l::before {
   font-size: 14px;
-  content: "";
+  content: "\f053";
 }
 
 span.faicon.arrow2_d::before {
   font-size: 14px;
-  content: "";
+  content: "\f078";
 }
 
 span.faicon.arrow2_u::before {
   font-size: 14px;
-  content: "";
+  content: "\f077";
 }
 
 span.faicon.arrow_large2_r::before {
   font-size: 35px;
-  content: "";
+  content: "\f054";
 }
 
 span.faicon.arrow_large2_l::before {
   font-size: 35px;
-  content: "";
+  content: "\f053";
 }
 
 span.faicon.arrow_verylarge2_r::before {
   font-size: 40px;
-  content: "";
+  content: "\f054";
 }
 
 span.faicon.arrow_verylarge2_l::before {
   font-size: 40px;
-  content: "";
+  content: "\f053";
 }
 
 span.faicon.sort_descending::before {
   font-size: 14px;
-  content: "";
+  content: "\f0d7";
 }
 
 span.faicon.sort_ascending::before {
   font-size: 14px;
-  content: "";
+  content: "\f0d8";
 }
 
 /* Plus/minus sqare */
@@ -6011,127 +6011,127 @@ span.folder_plusminus {
 span.faicon.plus_orange::before {
   font-size: 12px;
   font-weight: 400;
-  content: "";
+  content: "\f0fe";
 }
 
 span.faicon.minus_orange::before {
   font-size: 12px;
   font-weight: 400;
-  content: "";
+  content: "\f146";
 }
 
 /* Spinner */
 span.faicon.spinner::before {
   font-size: 18px;
-  content: "";
+  content: "\f1ce";
 }
 
 /* Bars - mobile menu */
 span.faicon.bars::before {
   font-size: 26px;
-  content: "";
+  content: "\f0c9";
 }
 
 span.faicon.lock_open::before {
-  content: "";
+  content: "\f3c1";
 }
 
 span.faicon.lock_close::before {
-  content: "";
+  content: "\f023";
 }
 
 span.faicon.bell::before {
-  content: "";
+  content: "\f0f3";
 }
 
 span.faicon.bell_slash::before {
-  content: "";
+  content: "\f1f6";
 }
 
 span.faicon.trash::before {
-  content: "";
+  content: "\f2ed";
 }
 
 span.faicon.copy::before {
-  content: "";
+  content: "\f0c5";
 }
 
 span.faicon.circle::before {
-  content: "";
+  content: "\f111";
   vertical-align: middle;
 }
 
 span.faicon.plus::before {
-  content: "";
+  content: "\f067";
 }
 
 span.faicon.plus_circle::before {
-  content: "";
+  content: "\f055";
 }
 
 span.faicon.minus_circle::before {
-  content: "";
+  content: "\f056";
 }
 
 span.faicon.calendar_icon::before {
-  content: "";
+  content: "\f073";
 }
 
 span.faicon.clipboard::before {
-  content: "";
+  content: "\f328";
 }
 
 span.faicon.list-alt::before {
-  content: "";
+  content: "\f022";
 }
 
 span.faicon.vote-yes::before {
-  content: "";
+  content: "\f772";
 }
 
 span.faicon.file-preview::before {
-  content: "";
+  content: "\f865";
 }
 
 span.faicon.dots::before {
-  content: "";
+  content: "\f141";
   font-size: 16px;
   font-weight: 600;
 }
 
 span.faicon.dots_ver:before {
-  content: "";
+  content: "\f142";
   font-size: 16px;
   font-weight: 600;
 }
 
 span.faicon.open_icon::before,
 a.faicon.open_icon::before {
-  content: "";
+  content: "\f35d";
 }
 
 span.faicon.table_icon::before {
-  content: "";
+  content: "\f0ce";
 }
 
 span.faicon.list::before {
-  content: "";
+  content: "\f03a";
 }
 
 span.faicon.link-chain::before {
-  content: "";
+  content: "\f0c1";
 }
 
 span.fa-brands.html5::before {
-  content: "";
+  content: "\f13b";
 }
 
 span.faicon.stopwatch20::before {
-  content: "";
+  content: "\e06f";
 }
 
 span.faicon.checkbox-empty::before {
-  content: "";
+  content: "\f0c8";
   font-weight: 400 !important;
 }
 
@@ -6140,11 +6140,11 @@ span.faicon.fa-1::before {
 }
 
 span.faicon.phone::before {
-  content: "";
+  content: "\f095";
 }
 
 span.faicon.screwdriver::before {
-  content: "";
+  content: "\f7d9";
   font-weight: 600 !important;
 }
 
@@ -6282,23 +6282,23 @@ and open the template in the editor.
 */
 /* Toolbox na levi strani */
 span.faicon.wheel_32::before {
-  content: "";
+  content: "\f013";
 }
 
 span.faicon.radio_32::before {
-  content: "";
+  content: "\f192";
   font-weight: 400;
   font-size: 18px;
 }
 
 span.faicon.check_32::before {
-  content: "";
+  content: "\f14a";
   font-weight: 400;
   font-size: 18px;
 }
 
 span.faicon.matrix_32::before {
-  content: "\a";
+  content: "\f192\f192\a\f192\f192";
   white-space: pre;
   font-weight: 400;
   font-size: 12px;
@@ -6322,7 +6322,7 @@ span.faicon.nagovor::before {
 }
 
 span.faicon.plus_32::before {
-  content: "";
+  content: "\f055";
   font-size: 18px;
 }
 
@@ -6366,12 +6366,12 @@ span.faicon.edit-vprasanje {
 }
 span.faicon.edit-vprasanje:before {
   font-size: 18px;
-  content: "";
+  content: "\f031";
 }
 
 a.faicon.edit::before {
   font-size: 16px;
-  content: "";
+  content: "\f304";
 }
 
 a.faicon.addif::before {
@@ -6383,22 +6383,22 @@ a.faicon.addif::before {
 a.faicon.copy::before {
   font-size: 18px;
   font-weight: 400;
-  content: "";
+  content: "\f0c5";
 }
 
 a.faicon.copycond::before {
   font-size: 18px;
-  content: "";
+  content: "\f0c5";
 }
 
 a.faicon.preview::before {
   font-size: 18px;
   font-weight: 400;
-  content: "";
+  content: "\f15b";
 }
 
 a.faicon.preview::after {
-  content: "";
+  content: "\f002";
   display: inline-block;
   font-size: 11px;
   margin-left: -50%;
@@ -6406,25 +6406,25 @@ a.faicon.preview::after {
 
 a.faicon.arhiv::before {
   font-size: 18px;
-  content: "";
+  content: "\f044";
 }
 
 a.faicon.delete::before {
   font-size: 18px;
   font-weight: 400;
-  content: "";
+  content: "\f2ed";
 }
 
 a.faicon.hide::before {
   font-size: 18px;
   font-weight: 400;
-  content: "";
+  content: "\f06e";
 }
 
 a.faicon.unhide_icon::before {
   font-size: 18px;
   font-weight: 400;
-  content: "";
+  content: "\f070";
 }
 
 /* Urejanje vrednosti inline */
@@ -6438,12 +6438,12 @@ a.faicon.unhide_icon::before {
 
 .variabla span.inline.faicon.edit2::before {
   font-size: 14px;
-  content: "";
+  content: "\f304";
 }
 
 .variabla span.inline.faicon.odg_hidden::before {
   font-size: 14px;
-  content: "";
+  content: "\f05e";
 }
 
 .variabla span.inline.faicon.odg_hidden.show-hidden::before {
@@ -6471,23 +6471,23 @@ span.inline.faicon.odg_if_not::before {
 .variabla span.inline.faicon.odg_if_follow::after {
   font-size: 14px;
   margin-left: 2px;
-  content: "";
+  content: "\f0da";
 }
 
 .variabla span.inline.faicon.correct::before {
   font-size: 14px;
   font-weight: 900;
-  content: "";
+  content: "\f00c";
 }
 
 .faicon.move_updown::before {
   font-size: 16px;
   color: #0059ab;
-  content: "";
+  content: "\f338";
 }
 
 .faicon.image_upload::before {
-  content: "";
+  content: "\f03e";
   font-weight: 400;
 }
 
@@ -6504,22 +6504,22 @@ and open the template in the editor.
 span.faicon.mapca.anketa::before {
   font-size: 16px;
   font-weight: 400;
-  content: "";
+  content: "\f022";
 }
 
 span.faicon.table::before {
   font-size: 16px;
-  content: "";
+  content: "\f00b";
 }
 
 span.faicon.other_vprasanja::before {
   font-size: 16px;
-  content: "" !important;
+  content: "\f0ca" !important;
 }
 
 span.faicon.osnovna_vprasanja::before {
   font-size: 16px;
-  content: "";
+  content: "\f0ca";
 }
 
 span.faicon.mapca.if::before {
@@ -6547,7 +6547,7 @@ and open the template in the editor.
 */
 /* Izvozi */
 span.faicon.pdf::before {
-  content: "";
+  content: "\f1c1";
   font-size: 16px;
   font-weight: 400;
   color: #ed1c24;
@@ -6571,7 +6571,7 @@ span.faicon.pdf.black::before {
 span.faicon.xls::before {
   font-size: 16px;
   font-weight: 400;
-  content: "";
+  content: "\f1c3";
   color: #008000;
 }
 
@@ -6593,7 +6593,7 @@ span.faicon.xls.black::before {
 span.faicon.rtf::before {
   font-size: 16px;
   font-weight: 400;
-  content: "";
+  content: "\f1c2";
   color: #0f3ea8;
 }
 
@@ -6615,7 +6615,7 @@ span.faicon.rtf.black::before {
 span.faicon.ppt::before {
   font-size: 16px;
   font-weight: 400;
-  content: "";
+  content: "\f1c4";
   color: #fa4913;
 }
 
@@ -6637,7 +6637,7 @@ span.faicon.ppt.black::before {
 span.faicon.xml::before {
   font-size: 16px;
   font-weight: 400;
-  content: "";
+  content: "\f1c9";
   color: #00a000;
 }
 
@@ -6657,17 +6657,17 @@ span.faicon.xml.black::before {
 }
 
 span.faicon.arhiv::before {
-  content: "";
+  content: "\f187";
 }
 
 span.faicon.arhiv_mail::before {
   font-size: 16px;
   font-weight: 400;
-  content: "";
+  content: "\f14d";
 }
 
 span.faicon.share-arrow::before {
-  content: "";
+  content: "\f14d";
 }
 
 /*
@@ -6717,7 +6717,7 @@ span.faicon.an_chart_bar::before {
   font-size: 14px;
   font-weight: 700;
   /*content: "\f080";*/
-  content: "";
+  content: "\f200";
 }
 
 /*
@@ -6731,35 +6731,35 @@ and open the template in the editor.
 */
 /* Invitation table */
 span.faicon.inv_sent_0::before {
-  content: "";
+  content: "\f2b6";
 }
 
 span.faicon.inv_sent_1::before {
-  content: "";
+  content: "\f0e0";
 }
 
 span.faicon.inv_responded_0::before {
   font-size: 14px;
   font-weight: 400;
-  content: "";
+  content: "\f005";
 }
 
 span.faicon.inv_responded_1::before {
   font-size: 14px;
   font-weight: 700;
-  content: "";
+  content: "\f005";
 }
 
 span.faicon.inv_unsubscribed_0::before {
   font-size: 14px;
   font-weight: 400;
-  content: "";
+  content: "\f111";
 }
 
 span.faicon.inv_unsubscribed_1::before {
   font-size: 14px;
   font-weight: 700;
-  content: "";
+  content: "\f111";
   color: #FF0000;
 }
 
@@ -6860,7 +6860,7 @@ a.read-more .faicon:before {
 .qtip .qtip-wrapper .qtip-contentWrapper .qtip-content h1::before {
   padding-right: 8px;
   font-family: "Font Awesome 5 Free";
-  content: "";
+  content: "\f059";
   font-size: 20px;
   color: #1E88E5;
   vertical-align: -1px;
@@ -6897,7 +6897,7 @@ a.read-more .faicon:before {
   padding-left: 8px;
   vertical-align: middle;
   font-family: "Font Awesome 5 Free";
-  content: "";
+  content: "\f054";
   font-size: 8px;
   color: #1E88E5;
   transition: 0.2s;
@@ -7220,7 +7220,7 @@ a.read-more .faicon:before {
 .divPopUp.warning_popup h2::before {
   padding-right: 8px;
   font-family: "Font Awesome 5 Free";
-  content: "";
+  content: "\f071";
   font-size: 14px;
   color: #FFC700;
 }
@@ -7261,7 +7261,7 @@ a.read-more .faicon:before {
 .divPopUp_info.warning_popup h2::before {
   padding-right: 8px;
   font-family: "Font Awesome 5 Free";
-  content: "";
+  content: "\f071";
   font-size: 14px;
   color: #FFC700;
 }
@@ -7753,7 +7753,7 @@ body.waitlong #loading {
 #check_pogoji.warning_popup h2::before {
   padding-right: 8px;
   font-family: "Font Awesome 5 Free";
-  content: "";
+  content: "\f071";
   font-size: 14px;
   color: #FFC700;
 }
@@ -7934,7 +7934,7 @@ body.waitlong #loading {
 #dropped_alert.warning_popup h2::before {
   padding-right: 8px;
   font-family: "Font Awesome 5 Free";
-  content: "";
+  content: "\f071";
   font-size: 14px;
   color: #FFC700;
 }
@@ -9175,7 +9175,7 @@ header #topSettingsHolder .left_options_holder #analizaSubNav #globalSetingsLink
   right: 8px;
   top: 5px;
   font-family: "Font Awesome 5 Free";
-  content: "";
+  content: "\f078";
   font-size: 10px;
   font-weight: 600;
 }
@@ -9448,7 +9448,7 @@ footer#srv_footer .footer_right span.faicon.external_link:before {
 footer#srv_footer .footer_right .right_help_button {
   position: fixed;
   right: -71px;
-  top: calc(50%);
+  top: 50%;
   width: 150px;
   padding: 4px 8px;
   border: 1px #1E88E5 solid;
@@ -9828,17 +9828,17 @@ input[type=radio]:checked + label:before, input[type=checkbox]:checked + label:b
   color: #1E88E5;
 }
 input[type=checkbox] + label:before {
-  content: "";
+  content: "\f0c8";
 }
 input[type=checkbox]:checked + label:before {
-  content: "";
+  content: "\f14a";
   font-weight: bold;
 }
 input[type=radio] + label:before {
-  content: "";
+  content: "\f111";
 }
 input[type=radio]:checked + label:before {
-  content: "";
+  content: "\f192";
 }
 input[type=checkbox][disabled] + label:before {
   color: #C4C4C4;
@@ -10336,7 +10336,7 @@ header #top_line #enka_nav .anketa_header_upgrade_package button {
 #popup_user_access.warning_popup h2::before {
   padding-right: 8px;
   font-family: "Font Awesome 5 Free";
-  content: "";
+  content: "\f071";
   font-size: 14px;
   color: #FFC700;
 }
@@ -10623,7 +10623,7 @@ header #top_line #enka_nav .anketa_header_upgrade_package button {
 #survey_list .second_line .filters #folderSwitch#sortButton:after {
   position: absolute;
   font-family: "Font Awesome 5 Free";
-  content: "";
+  content: "\f078";
   right: 8px;
   top: 13px;
   font-weight: 600;
@@ -10969,13 +10969,13 @@ body.eng #survey_list .filters #folderSwitch {
   cursor: pointer;
 }
 #survey_list .div_sl_new.folders .folder_holder .folder_title .folder_arrow_icon::before {
-  content: "";
+  content: "\f078";
   font-size: 14px;
   color: #333333;
   margin-right: 8px;
 }
 #survey_list .div_sl_new.folders .folder_holder .folder_title .folder_icon::before {
-  content: "";
+  content: "\f07b";
   font-size: 16px;
   font-weight: 400;
   color: #1E88E5;
@@ -10985,7 +10985,7 @@ body.eng #survey_list .filters #folderSwitch {
   background-color: #F8F8F8;
 }
 #survey_list .div_sl_new.folders .folder_holder .folder_title.open .folder_arrow_icon::before {
-  content: "";
+  content: "\f077";
 }
 #survey_list .div_sl_new.folders .folder_holder .folder_title.open .folder_icon::before {
   font-weight: 600;
@@ -12080,13 +12080,13 @@ div.page_obvestila #unread_notifications .gdpr_popup_radio input {
   cursor: pointer;
 }
 #anketa_knjiznica #libraryInner ul li .folder_box_holder .folder_box .folder_arrow_icon::before {
-  content: "";
+  content: "\f078";
   font-size: 14px;
   color: #333333;
   margin-right: 8px;
 }
 #anketa_knjiznica #libraryInner ul li .folder_box_holder .folder_box .folder::before {
-  content: "";
+  content: "\f07b";
   font-size: 16px;
   font-weight: 400;
   color: #1E88E5;
@@ -12112,7 +12112,7 @@ div.page_obvestila #unread_notifications .gdpr_popup_radio input {
   }*/
 }
 #anketa_knjiznica #libraryInner ul li .folder_box_holder .folder_box.open .folder_arrow_icon::before {
-  content: "";
+  content: "\f077";
 }
 #anketa_knjiznica #libraryInner ul li .folder_box_holder .folder_box.open .folder::before {
   font-weight: 600;
@@ -12365,7 +12365,7 @@ and open the template in the editor.
 #new_anketa_div .layout_right_item .layout_right_centering .fieldset .setting input[type=radio] + span.enka-checkbox-radio:before {
   font-family: "Font Awesome 5 Free";
   display: inline-block;
-  content: "";
+  content: "\f111";
   letter-spacing: 10px;
 }
 #new_anketa_div .layout_right_item .layout_right_centering .fieldset .setting input[type=radio] + span.enka-custom-radio:before {
@@ -12373,7 +12373,7 @@ and open the template in the editor.
   display: inline-block;
 }
 #new_anketa_div .layout_right_item .layout_right_centering .fieldset .setting input[type=radio]:checked + span.enka-checkbox-radio:before {
-  content: "";
+  content: "\f192";
 }
 #new_anketa_div .layout_right_item .layout_right_centering .fieldset .setting input[type=checkbox] {
   display: none !important;
@@ -12386,11 +12386,11 @@ and open the template in the editor.
 #new_anketa_div .layout_right_item .layout_right_centering .fieldset .setting input[type=checkbox] + span.enka-checkbox-radio:before {
   font-family: "Font Awesome 5 Free";
   display: inline-block;
-  content: "";
+  content: "\f0c8";
   letter-spacing: 10px;
 }
 #new_anketa_div .layout_right_item .layout_right_centering .fieldset .setting input[type=checkbox]:checked + span.enka-checkbox-radio:before {
-  content: "";
+  content: "\f14a";
   letter-spacing: 8px;
 }
 #new_anketa_div .layout_right_item .layout_right_centering .fieldset .setting .custom_radio_picture.obarvan > label > span.enka-custom-radio:before {
@@ -12683,7 +12683,7 @@ and open the template in the editor.
 }
 #new_anketa_div .layout_right_item .layout_right_centering .anketa_from_text .from_text_sidebyside_holder #preview_field_holder #preview_field span.variable input[type=radio] + span.enka-checkbox-radio:before {
   font-family: "Font Awesome 5 Free";
-  content: "";
+  content: "\f111";
   display: inline-block;
   font-size: 14px;
   color: #C4C4C4;
@@ -13295,20 +13295,20 @@ div.drop_setting_transition {
   font-weight: 400;
 }
 #branching input[type=checkbox].enka-admin-custom + span.enka-checkbox-radio:before {
-  content: "";
+  content: "\f0c8";
   letter-spacing: 10px;
 }
 #branching input[type=radio].enka-admin-custom + span.enka-checkbox-radio:before {
-  content: "";
+  content: "\f111";
   letter-spacing: 8px;
 }
 #branching input[type=checkbox].enka-admin-custom:checked + span.enka-checkbox-radio:before {
-  content: "";
+  content: "\f14a";
   color: #D3D3D3;
   letter-spacing: 8px;
 }
 #branching input[type=radio].enka-admin-custom:checked + span.enka-checkbox-radio:before {
-  content: "";
+  content: "\f192";
   color: #D3D3D3;
 }
 #branching span.faicon.delete_circle::before {
@@ -19858,6 +19858,10 @@ and open the template in the editor.
   margin: 12px 0 0 0;
 }
 
+.comment_inline {
+  margin-left: 16px;
+}
+
 /*
     Knjiznica v urejanju ankete
 */
@@ -19923,7 +19927,7 @@ and open the template in the editor.
   transition: 0.2s;
 }
 .tab_content .content_left ul li.folder_item .faicon.arrow:before {
-  content: "";
+  content: "\f078";
 }
 .tab_content .content_left ul li.folder_item .faicon.folder:before,
 .tab_content .content_left ul li.folder_item .faicon.clipboard:before {
@@ -19940,7 +19944,7 @@ and open the template in the editor.
   color: #1E88E5;
 }
 .tab_content .content_left ul li.folder_item.open .faicon.arrow:before {
-  content: "";
+  content: "\f077";
 }
 .tab_content .content_left ul li.folder_item.no_arrow .faicon.arrow:before {
   display: none;
@@ -20431,7 +20435,7 @@ img.mapster_el {
   border-radius: 4px;
 }
 .jquery-selectbox .jquery-selectbox-moreButton::before {
-  content: "";
+  content: "\f078";
   padding-left: 2px;
   color: #333333;
   font-size: 10px;
@@ -21044,7 +21048,7 @@ div#theme-edit-wrap div#theme-editor #picker .button_holder button:last-child {
 div#theme-edit-wrap div#theme-editor #picker.warning_popup h2::before {
   padding-right: 8px;
   font-family: "Font Awesome 5 Free";
-  content: "";
+  content: "\f071";
   font-size: 14px;
   color: #FFC700;
 }
@@ -21403,7 +21407,7 @@ span.faicon.st-besede-popup {
 #vrednost_edit.warning_popup h2::before {
   padding-right: 8px;
   font-family: "Font Awesome 5 Free";
-  content: "";
+  content: "\f071";
   font-size: 14px;
   color: #FFC700;
 }
@@ -21644,7 +21648,7 @@ span.faicon.st-besede-popup {
 #quota.warning_popup h2::before {
   padding-right: 8px;
   font-family: "Font Awesome 5 Free";
-  content: "";
+  content: "\f071";
   font-size: 14px;
   color: #FFC700;
 }
@@ -21971,7 +21975,7 @@ and open the template in the editor.
 #preview_spremenljivka.warning_popup h2::before {
   padding-right: 8px;
   font-family: "Font Awesome 5 Free";
-  content: "";
+  content: "\f071";
   font-size: 14px;
   color: #FFC700;
 }
@@ -22592,22 +22596,22 @@ and open the template in the editor.
 }
 #preview_spremenljivka #variable_holder input[type=checkbox].enka-admin-custom + span.enka-checkbox-radio:before {
   /*content: "\f096";*/
-  content: "";
+  content: "\f0c8";
   letter-spacing: 10px;
 }
 #preview_spremenljivka #variable_holder input[type=radio].enka-admin-custom + span.enka-checkbox-radio:before {
   /*content: "\f10c";*/
-  content: "";
+  content: "\f111";
   letter-spacing: 8px;
 }
 #preview_spremenljivka #variable_holder input[type=checkbox].enka-admin-custom:checked + span.enka-checkbox-radio:before {
   /*content: "\f046";*/
-  content: "";
+  content: "\f14a";
   letter-spacing: 8px;
 }
 #preview_spremenljivka #variable_holder input[type=radio].enka-admin-custom:checked + span.enka-checkbox-radio:before {
   /*content: "\f192";*/
-  content: "";
+  content: "\f192";
 }
 #preview_spremenljivka input[type=radio] {
   margin: 0 8px 4px 0;
@@ -22620,7 +22624,7 @@ and open the template in the editor.
 #preview_spremenljivka input[type=radio] + span.enka-checkbox-radio:before {
   font-family: "Font Awesome 5 Free";
   display: inline-block;
-  content: "";
+  content: "\f111";
   letter-spacing: 10px;
 }
 #preview_spremenljivka input[type=radio] + span.enka-custom-radio:before {
@@ -22628,7 +22632,7 @@ and open the template in the editor.
   display: inline-block;
 }
 #preview_spremenljivka input[type=radio]:checked + span.enka-checkbox-radio:before {
-  content: "";
+  content: "\f192";
 }
 #preview_spremenljivka input[type=checkbox] {
   display: none !important;
@@ -22641,11 +22645,11 @@ and open the template in the editor.
 #preview_spremenljivka input[type=checkbox] + span.enka-checkbox-radio:before {
   font-family: "Font Awesome 5 Free";
   display: inline-block;
-  content: "";
+  content: "\f0c8";
   letter-spacing: 10px;
 }
 #preview_spremenljivka input[type=checkbox]:checked + span.enka-checkbox-radio:before {
-  content: "";
+  content: "\f14a";
   letter-spacing: 8px;
 }
 
@@ -22730,7 +22734,7 @@ and open the template in the editor.
 }
 #popup_import_from_text .anketa_from_text .import_holder #preview_field_holder #preview_field span.variable input[type=radio] + span.enka-checkbox-radio:before {
   font-family: "Font Awesome 5 Free";
-  content: "";
+  content: "\f111";
   display: inline-block;
   font-size: 14px;
   color: #E5E5E5;
@@ -22738,7 +22742,7 @@ and open the template in the editor.
   font-weight: 400;
 }
 #popup_import_from_text .anketa_from_text .import_holder #preview_field_holder #preview_field span.variable input[type=radio]:checked + span.enka-checkbox-radio:before {
-  content: "";
+  content: "\f192";
   color: #E5E5E5;
 }
 
@@ -23001,7 +23005,7 @@ dl.arch_email dd {
 #inv_view_arch_recipients.warning_popup h2::before {
   padding-right: 8px;
   font-family: "Font Awesome 5 Free";
-  content: "";
+  content: "\f071";
   font-size: 14px;
   color: #FFC700;
 }
@@ -23995,23 +23999,23 @@ div.page_komentarji_anketa ul .spremenljivka_content input[type=radio].enka-admi
 }
 div.page_komentarji ul .spremenljivka_content input[type=checkbox].enka-admin-custom + span.enka-checkbox-radio:before,
 div.page_komentarji_anketa ul .spremenljivka_content input[type=checkbox].enka-admin-custom + span.enka-checkbox-radio:before {
-  content: "";
+  content: "\f0c8";
   letter-spacing: 10px;
 }
 div.page_komentarji ul .spremenljivka_content input[type=radio].enka-admin-custom + span.enka-checkbox-radio:before,
 div.page_komentarji_anketa ul .spremenljivka_content input[type=radio].enka-admin-custom + span.enka-checkbox-radio:before {
-  content: "";
+  content: "\f111";
   letter-spacing: 8px;
 }
 div.page_komentarji ul .spremenljivka_content input[type=checkbox].enka-admin-custom:checked + span.enka-checkbox-radio:before,
 div.page_komentarji_anketa ul .spremenljivka_content input[type=checkbox].enka-admin-custom:checked + span.enka-checkbox-radio:before {
-  content: "";
+  content: "\f14a";
   color: #D3D3D3;
   letter-spacing: 8px;
 }
 div.page_komentarji ul .spremenljivka_content input[type=radio].enka-admin-custom:checked + span.enka-checkbox-radio:before,
 div.page_komentarji_anketa ul .spremenljivka_content input[type=radio].enka-admin-custom:checked + span.enka-checkbox-radio:before {
-  content: "";
+  content: "\f192";
   color: #D3D3D3;
 }
 div.page_komentarji ul .spremenljivka_content input[type=radio],
@@ -24028,7 +24032,7 @@ div.page_komentarji ul .spremenljivka_content input[type=radio] + span.enka-chec
 div.page_komentarji_anketa ul .spremenljivka_content input[type=radio] + span.enka-checkbox-radio:before {
   font-family: "Font Awesome 5 Free";
   display: inline-block;
-  content: "";
+  content: "\f111";
   letter-spacing: 10px;
 }
 div.page_komentarji ul .spremenljivka_content input[type=radio] + span.enka-custom-radio:before,
@@ -24038,7 +24042,7 @@ div.page_komentarji_anketa ul .spremenljivka_content input[type=radio] + span.en
 }
 div.page_komentarji ul .spremenljivka_content input[type=radio]:checked + span.enka-checkbox-radio:before,
 div.page_komentarji_anketa ul .spremenljivka_content input[type=radio]:checked + span.enka-checkbox-radio:before {
-  content: "";
+  content: "\f192";
 }
 div.page_komentarji ul .spremenljivka_content input[type=checkbox],
 div.page_komentarji_anketa ul .spremenljivka_content input[type=checkbox] {
@@ -24054,12 +24058,12 @@ div.page_komentarji ul .spremenljivka_content input[type=checkbox] + span.enka-c
 div.page_komentarji_anketa ul .spremenljivka_content input[type=checkbox] + span.enka-checkbox-radio:before {
   font-family: "Font Awesome 5 Free";
   display: inline-block;
-  content: "";
+  content: "\f0c8";
   letter-spacing: 10px;
 }
 div.page_komentarji ul .spremenljivka_content input[type=checkbox]:checked + span.enka-checkbox-radio:before,
 div.page_komentarji_anketa ul .spremenljivka_content input[type=checkbox]:checked + span.enka-checkbox-radio:before {
-  content: "";
+  content: "\f14a";
   letter-spacing: 8px;
 }
 div.page_komentarji ul div.question_comment_holder,
@@ -25971,7 +25975,7 @@ div.subpage_coding .coding-refresh .button_holder button:last-child {
 div.subpage_coding .coding-refresh.warning_popup h2::before {
   padding-right: 8px;
   font-family: "Font Awesome 5 Free";
-  content: "";
+  content: "\f071";
   font-size: 14px;
   color: #FFC700;
 }
@@ -26153,7 +26157,7 @@ div.subpage_coding #coding .button_holder button:last-child {
 div.subpage_coding #coding.warning_popup h2::before {
   padding-right: 8px;
   font-family: "Font Awesome 5 Free";
-  content: "";
+  content: "\f071";
   font-size: 14px;
   color: #FFC700;
 }
@@ -26477,7 +26481,7 @@ div.subpage_coding .floatRecodeSpremenljivka .button_holder button:last-child {
 div.subpage_coding .floatRecodeSpremenljivka.warning_popup h2::before {
   padding-right: 8px;
   font-family: "Font Awesome 5 Free";
-  content: "";
+  content: "\f071";
   font-size: 14px;
   color: #FFC700;
 }
@@ -26828,18 +26832,18 @@ ul#merge li {
   -webkit-text-stroke: 0.35px;
 }
 .quick_edit_container #edit_survey_data .quick_edit_inner .spremenljivka input[type=checkbox] + span.enka-checkbox-radio:before {
-  content: "";
+  content: "\f0c8";
   letter-spacing: 10px;
 }
 .quick_edit_container #edit_survey_data .quick_edit_inner .spremenljivka input[type=checkbox]:checked + span.enka-checkbox-radio:before {
-  content: "";
+  content: "\f14a";
 }
 .quick_edit_container #edit_survey_data .quick_edit_inner .spremenljivka input[type=radio] + span.enka-checkbox-radio:before {
-  content: "";
+  content: "\f111";
   letter-spacing: 10px;
 }
 .quick_edit_container #edit_survey_data .quick_edit_inner .spremenljivka input[type=radio]:checked + span.enka-checkbox-radio:before {
-  content: "";
+  content: "\f192";
 }
 .quick_edit_container #edit_survey_data .quick_edit_inner .spremenljivka input[type=checkbox] + span.enka-checkbox-radio,
 .quick_edit_container #edit_survey_data .quick_edit_inner .spremenljivka input[type=radio] + span.enka-checkbox-radio,
@@ -27338,7 +27342,7 @@ and open the template in the editor.
 #div_export_setting_show.warning_popup h2::before {
   padding-right: 8px;
   font-family: "Font Awesome 5 Free";
-  content: "";
+  content: "\f071";
   font-size: 14px;
   color: #FFC700;
 }
@@ -30396,7 +30400,7 @@ ul.vrednost_sort input[type=text] {
 .subpage_analysis_creport #anketa_custom_report #newCReportProfile.warning_popup h2::before {
   padding-right: 8px;
   font-family: "Font Awesome 5 Free";
-  content: "";
+  content: "\f071";
   font-size: 14px;
   color: #FFC700;
 }
@@ -30680,7 +30684,7 @@ and open the template in the editor.
 #dsp_inspect_cover.warning_popup h2::before {
   padding-right: 8px;
   font-family: "Font Awesome 5 Free";
-  content: "";
+  content: "\f071";
   font-size: 14px;
   color: #FFC700;
 }
@@ -31214,7 +31218,7 @@ input#endDate {
 .mc_table_settings.warning_popup h2::before {
   padding-right: 8px;
   font-family: "Font Awesome 5 Free";
-  content: "";
+  content: "\f071";
   font-size: 14px;
   color: #FFC700;
 }
@@ -31427,7 +31431,7 @@ input#endDate {
 #newMCTable.warning_popup h2::before {
   padding-right: 8px;
   font-family: "Font Awesome 5 Free";
-  content: "";
+  content: "\f071";
   font-size: 14px;
   color: #FFC700;
 }
@@ -31616,7 +31620,7 @@ input#endDate {
 #renameMCTable.warning_popup h2::before {
   padding-right: 8px;
   font-family: "Font Awesome 5 Free";
-  content: "";
+  content: "\f071";
   font-size: 14px;
   color: #FFC700;
 }
@@ -31805,7 +31809,7 @@ input#endDate {
 #deleteMCTable.warning_popup h2::before {
   padding-right: 8px;
   font-family: "Font Awesome 5 Free";
-  content: "";
+  content: "\f071";
   font-size: 14px;
   color: #FFC700;
 }
@@ -32191,7 +32195,7 @@ button.buttons-columnVisibility.active {
 table.usersTable {
   margin-left: 14px;
   margin-right: 14px;
-  width: calc(100% - 2*14px);
+  width: calc(100% - 28px);
   white-space: nowrap;
   border-collapse: collapse !important;
 }
diff --git a/resources/sass/admin_new/pages/survey_edit/conditions.scss b/resources/sass/admin_new/pages/survey_edit/conditions.scss
index be4b97d03..10760eecf 100644
--- a/resources/sass/admin_new/pages/survey_edit/conditions.scss
+++ b/resources/sass/admin_new/pages/survey_edit/conditions.scss
@@ -711,4 +711,9 @@ and open the template in the editor.
             margin: 12px 0 0 0;
         }
     }
+}
+
+//Inline komentarji pri IF in BLOK
+.comment_inline {
+    margin-left: 16px;
 }
\ No newline at end of file

From 3696d25291b386b705486fdbb8ad6d98815e9290 Mon Sep 17 00:00:00 2001
From: tejagerjovic <teja.gerjovic@fdv.uni-lj.si>
Date: Fri, 8 Jul 2022 08:02:54 +0200
Subject: [PATCH 049/110] Napredne nastavitve v sredino vsebine - v delu

Manjka dropdown meni
---
 admin/survey/Branching.php                    | 41 ++++++++++-
 admin/survey/script/script.js                 |  7 ++
 public/css/admin_new.css                      | 65 +++++++++++++++++
 .../pages/survey_edit/survey_edit.scss        |  2 +
 .../survey_edit/top_center_settings.scss      | 69 +++++++++++++++++++
 5 files changed, 183 insertions(+), 1 deletion(-)
 create mode 100644 resources/sass/admin_new/pages/survey_edit/top_center_settings.scss

diff --git a/admin/survey/Branching.php b/admin/survey/Branching.php
index fe479ea9c..9294b7714 100644
--- a/admin/survey/Branching.php
+++ b/admin/survey/Branching.php
@@ -1773,7 +1773,46 @@ class Branching {
 			}
 			
 			echo '</div>';
-		}		
+		}
+		
+		// Napredne nastavitve v sredini zgoraj
+		echo '<div class="top_center_settings">';
+		
+		echo '<div class="left_settings">';
+		// Arhiviraj - ENKLIK ARHIV
+		echo '<div class="button" onclick="create_archive_survey(\'' . $this->anketa .'\'); return false;">';
+		echo '<span class="faicon arhiv blue"></span>';
+		echo $lang['srv_analiza_arhiviraj'];
+		echo '</div>';
+
+		// Napredne nastavitve dropdown
+		echo '<div id="top_napredne_gumb" class="button" onclick="toggleSurveyTopSettings();">';
+		echo $lang['srv_quick_settings_napredno'];
+		echo '<span id="top_napredne_icon" class="faicon fa-angle-down blue left"></span>';
+		echo '</div>';
+
+		echo '</div>'; //left_settings
+		echo '<div class="right_settings">';
+
+		$url0 = "'" . "index.php?anketa=".$this->anketa."&a=branching&change_mode=1&what=expanded&value=0" . "'";
+		$url1 = "'" .  "index.php?anketa=".$this->anketa."&a=branching&change_mode=1&what=expanded&value=1" . "'";
+
+		// Razširi
+		echo '<div title="'.$lang['srv_expanded_1'].'" class="square '.($this->expanded ? 'active':'').'" onClick="window.location='.$url1.';return false;">';
+		echo '<span class="faicon expand"></span>';
+		echo '</div>';
+
+		echo '<div class="line"></div>';
+
+		//Skrči
+		echo '<div title="'.$lang['srv_expanded_0'].'" class="square '.($this->expanded ? '':'active').'" onClick="window.location='.$url0.';return false;">';
+		echo '<span class="faicon compress"></span>';
+		echo '</div>';
+
+		echo '</div>'; //right_settings
+
+		
+		echo '</div>'; //top_center_settings
 
 		
 		echo '<ul class="first '.($this->locked?'locked':'').'">';
diff --git a/admin/survey/script/script.js b/admin/survey/script/script.js
index 5e86fa61a..d8505db69 100644
--- a/admin/survey/script/script.js
+++ b/admin/survey/script/script.js
@@ -5622,4 +5622,11 @@ function closeCommentQtip (box_id) {
 
 function toggleGrafiColorWheel () {
 	$("#chart_custom_skin_cover").css("pointer-events", "auto");
+}
+
+function toggleSurveyTopSettings() {
+	$("#top_napredne_icon").toggleClass("fa-angle-down");
+	$("#top_napredne_icon").toggleClass("fa-angle-up");
+	$("#top_napredne_gumb").toggleClass("border_blue");
+
 }
\ No newline at end of file
diff --git a/public/css/admin_new.css b/public/css/admin_new.css
index e57589f2c..1fc5fc889 100644
--- a/public/css/admin_new.css
+++ b/public/css/admin_new.css
@@ -20460,6 +20460,71 @@ img.mapster_el {
   background-color: #777777;
 }
 
+.top_center_settings {
+  display: flex;
+  flex-direction: row;
+  margin-bottom: 20px;
+  padding-bottom: 22px;
+  border-bottom: 1px solid #D3D3D3;
+  width: 100%;
+  justify-content: space-between;
+}
+.top_center_settings .left_settings,
+.top_center_settings .right_settings {
+  display: flex;
+  flex-direction: row;
+}
+.top_center_settings .left_settings .button,
+.top_center_settings .right_settings .button {
+  border: 1px solid #E5E5E5;
+  box-sizing: border-box;
+  border-radius: 2px;
+  padding: 5px 16px;
+  font-size: 14px;
+  margin-right: 8px;
+  cursor: pointer;
+  transition: 0.2s;
+}
+.top_center_settings .left_settings .button.border_blue,
+.top_center_settings .right_settings .button.border_blue {
+  border-color: #1E88E5;
+}
+.top_center_settings .left_settings .button span.faicon,
+.top_center_settings .right_settings .button span.faicon {
+  font-size: 14px;
+  margin-right: 8px;
+  transition: 0.2s;
+}
+.top_center_settings .left_settings .button span.faicon.left,
+.top_center_settings .right_settings .button span.faicon.left {
+  margin: 0 0 0 8px;
+}
+.top_center_settings .left_settings .square,
+.top_center_settings .right_settings .square {
+  width: 28px;
+  height: 28px;
+  border-radius: 2px;
+  border: 1px solid #E5E5E5;
+  color: #777777;
+  background-color: #FFFFFF;
+  cursor: pointer;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
+.top_center_settings .left_settings .square.active,
+.top_center_settings .right_settings .square.active {
+  border-color: #1E88E5;
+  color: #1E88E5;
+  background-color: #EAF9FE;
+}
+.top_center_settings .left_settings .line,
+.top_center_settings .right_settings .line {
+  border-left: 1px solid #D3D3D3;
+  margin: 0 8px;
+  height: 28px;
+}
+
 fieldset #obvescanje_sidebyside_holder {
   display: flex;
   flex-direction: row;
diff --git a/resources/sass/admin_new/pages/survey_edit/survey_edit.scss b/resources/sass/admin_new/pages/survey_edit/survey_edit.scss
index 22203e5a6..fed9a20a9 100644
--- a/resources/sass/admin_new/pages/survey_edit/survey_edit.scss
+++ b/resources/sass/admin_new/pages/survey_edit/survey_edit.scss
@@ -11,6 +11,8 @@
 @import "conditions";
 @import "library";
 @import "jquery";
+@import "top_center_settings";
+
 
 // Urejanje -> Nastavitve
 @import "survey_settings/survey_settings";
diff --git a/resources/sass/admin_new/pages/survey_edit/top_center_settings.scss b/resources/sass/admin_new/pages/survey_edit/top_center_settings.scss
new file mode 100644
index 000000000..201bfeb94
--- /dev/null
+++ b/resources/sass/admin_new/pages/survey_edit/top_center_settings.scss
@@ -0,0 +1,69 @@
+.top_center_settings {
+    display: flex;
+    flex-direction: row;
+    margin-bottom: 20px;
+    padding-bottom: 22px;
+    border-bottom: 1px solid $dark-gray2;
+    width: 100%;
+
+    justify-content: space-between;
+
+    .left_settings,
+    .right_settings {
+        display: flex;
+        flex-direction: row;
+
+        .button {
+            border: 1px solid $gray;
+            box-sizing: border-box;
+            border-radius: 2px;
+            padding: 5px 16px;
+            font-size: 14px;
+            margin-right: 8px;
+            cursor: pointer;
+
+            transition: 0.2s;
+    
+            &.border_blue {
+                border-color: $blue;
+            }
+    
+            span.faicon {
+                font-size: 14px;
+                margin-right: 8px;
+                transition: 0.2s;
+                
+                &.left {
+                    margin: 0 0 0 8px;
+                }
+            }
+        }
+
+        .square {
+            width: 28px;
+            height: 28px;
+            border-radius: 2px;
+            border: 1px solid $gray;
+            color: $very-dark-gray;
+            background-color: $white;
+            cursor: pointer;
+
+            display: flex;
+            justify-content: center;
+            align-items: center;
+
+            &.active {
+                border-color: $blue;
+                color: $blue;
+                background-color: $light-blue;
+            }          
+        }
+
+        .line {
+            border-left: 1px solid $dark-gray2;
+            margin: 0 8px;
+            height: 28px;
+        }
+    }
+
+}
\ No newline at end of file

From 050f6cc431694f6e26da61fec11223b6af4839c1 Mon Sep 17 00:00:00 2001
From: pero1203 <peter.hrvatin@gmail.com>
Date: Fri, 8 Jul 2022 11:23:54 +0200
Subject: [PATCH 050/110] Popravek nastavitve stevila odprtih odgovorov

---
 admin/survey/script/dataSettingProfiles.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/admin/survey/script/dataSettingProfiles.js b/admin/survey/script/dataSettingProfiles.js
index b428d568f..c45ad4008 100644
--- a/admin/survey/script/dataSettingProfiles.js
+++ b/admin/survey/script/dataSettingProfiles.js
@@ -139,7 +139,7 @@ function dataSettingProfileAction(action) {
 		var chartPieZeros   = $("#chartPieZeros").is(':checked') ? '1' : '0';
 		var hideEmpty   = $("#hideEmpty").is(':checked') ? '1' : '0';
 		var hideAllSystem   = $("#hideAllSystem").is(':checked') ? '1' : '0';
-		var numOpenAnswers   = $("#numOpenAnswers").val();
+		var numOpenAnswers   = $("#dsp_content #numOpenAnswers").val();
 //		var enableInspect = $('input[name="enableInspect"]:checked').val();
 		var dataPdfType   = $('#dataPdfType').val();
 		var exportDataNumbering   = $("#exportDataNumbering").is(':checked') ? '1' : '0';
@@ -157,7 +157,7 @@ function dataSettingProfileAction(action) {
 		var dataShowIcons   = $('input[name="dataShowIcons"]:checked').val();
 		var analysisGoTo   = $('#analysisGoTo').val();
 		var analiza_legenda   = $("#analiza_legenda").is(':checked') ? '1' : '0';
-		
+
 		$.post("ajax.php?t=dataSettingProfile&a=saveProfile", {anketa:srv_meta_anketa_id, pid:pid, dsp_ndp:dsp_ndp, dsp_nda:dsp_nda, dsp_ndd:dsp_ndd, dsp_res:dsp_res, dsp_sep:dsp_sep,
 					crossChk0:crossChk0, crossChk1:crossChk1, crossChk2:crossChk2, crossChk3:crossChk3, 
 					crossChkEC:crossChkEC, crossChkRE:crossChkRE, crossChkSR:crossChkSR, crossChkAR:crossChkAR, doColor:doColor, doValues:doValues,

From a8563bf40069e8615fb7df3ea7785ed4e1dca1e6 Mon Sep 17 00:00:00 2001
From: pero1203 <peter.hrvatin@gmail.com>
Date: Fri, 8 Jul 2022 11:34:05 +0200
Subject: [PATCH 051/110] Popravek predogleda razbitja - slike ni zato jo
 zacasno izkljucimo

---
 admin/survey/classes/class.SurveyStaticHtml.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/admin/survey/classes/class.SurveyStaticHtml.php b/admin/survey/classes/class.SurveyStaticHtml.php
index cae651e66..2fc6568ce 100644
--- a/admin/survey/classes/class.SurveyStaticHtml.php
+++ b/admin/survey/classes/class.SurveyStaticHtml.php
@@ -94,7 +94,8 @@ class SurveyStaticHtml
             echo '</div>';
             
             echo '<div class="content">';
-            echo '  <img src="../../../public/img/analysis_previews/'.$preview_files[$i].'">';
+            if($i != 7)
+                echo '  <img src="../../../public/img/analysis_previews/'.$preview_files[$i].'">';
             echo '</div>';
 
             echo '</div>';

From 523d96ce00ef2552055cc642e14beaf58d1620a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nejc=20Kova=C4=8D?= <nejc.kouko@gmail.com>
Date: Sun, 10 Jul 2022 12:05:59 +0200
Subject: [PATCH 052/110] GDPR - spremenjen font , barva ozadja

---
 frontend/simple/css/style.css                    | 7 ++++++-
 resources/sass/frontend_simple/basic/colors.scss | 1 +
 resources/sass/frontend_simple/modules/GDPR.scss | 5 +++++
 resources/sass/frontend_simple/modules/main.scss | 2 +-
 4 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/frontend/simple/css/style.css b/frontend/simple/css/style.css
index 0bea9ee4d..8ce29a160 100644
--- a/frontend/simple/css/style.css
+++ b/frontend/simple/css/style.css
@@ -159,7 +159,7 @@ header nav span.menu_item a:hover {
   color: #1e88e5;
 }
 #main {
-  background-color: #f7f7f7;
+  background-color: #F5F5F5;
 }
 #main .main_content {
   max-width: 1400px;
@@ -1256,12 +1256,17 @@ iframe {
 }
 
 /* GDPR ZAHTEVEK -------------------------------------- */
+#main {
+  background-color: #FFFFFF;
+}
+
 body.gdpr {
   line-height: 20px;
 }
 
 .gdpr #main .main_content {
   padding: 0px;
+  font-family: "Source Sans Pro", "sans-serif" !important;
 }
 
 .register_holder {
diff --git a/resources/sass/frontend_simple/basic/colors.scss b/resources/sass/frontend_simple/basic/colors.scss
index 964ecac81..b63f875df 100644
--- a/resources/sass/frontend_simple/basic/colors.scss
+++ b/resources/sass/frontend_simple/basic/colors.scss
@@ -10,6 +10,7 @@ $border_color: #646464;
 
 $color_background: #ffffff;
 $color_background_dark: #f7f7f7;
+$color_background_grey: #F5F5F5;
 $color_background_very_dark: #e6e6e6;
 
 $color_border: #cccccc;
\ No newline at end of file
diff --git a/resources/sass/frontend_simple/modules/GDPR.scss b/resources/sass/frontend_simple/modules/GDPR.scss
index f3753cd3d..a6175e517 100644
--- a/resources/sass/frontend_simple/modules/GDPR.scss
+++ b/resources/sass/frontend_simple/modules/GDPR.scss
@@ -1,11 +1,16 @@
 /* GDPR ZAHTEVEK -------------------------------------- */
 
+#main {
+    background-color: #FFFFFF;
+}
+
 body.gdpr {
     line-height: 20px;
 }
 
 .gdpr #main .main_content {
     padding: 0px;
+    font-family: "Source Sans Pro", "sans-serif" !important;
 }
 
  .register_holder{
diff --git a/resources/sass/frontend_simple/modules/main.scss b/resources/sass/frontend_simple/modules/main.scss
index 02ce7223d..a1b63f156 100644
--- a/resources/sass/frontend_simple/modules/main.scss
+++ b/resources/sass/frontend_simple/modules/main.scss
@@ -1,5 +1,5 @@
 #main{
-    background-color: $color_background_dark;
+    background-color: $color_background_grey;
 
     .main_content{
         max-width: 1400px;

From 06c4e4fd7c89802bb0b049c3ed113442d06d9d3e Mon Sep 17 00:00:00 2001
From: pero1203 <peter.hrvatin@gmail.com>
Date: Mon, 11 Jul 2022 10:22:05 +0200
Subject: [PATCH 053/110] Dodano opozorilo pri preklopu tipa vprasanja, ce so v
 anketi ze podatki (pri preklopu se podatki izgubijo)

---
 admin/survey/classes/class.Vprasanje.php | 35 +++++++++++++++++++++++-
 admin/survey/script/vprasanje.js         | 24 ++++++++++++----
 lang/1.php                               |  3 ++
 lang/2.php                               |  5 +++-
 4 files changed, 60 insertions(+), 7 deletions(-)

diff --git a/admin/survey/classes/class.Vprasanje.php b/admin/survey/classes/class.Vprasanje.php
index 785ed3fc7..64b13f5df 100644
--- a/admin/survey/classes/class.Vprasanje.php
+++ b/admin/survey/classes/class.Vprasanje.php
@@ -1758,7 +1758,7 @@ class Vprasanje {
 
             echo '<label>'.$lang['srv_question_type'].':</label>';
 
-			echo '<span class="content"><select name="tip" id="spremenljivka_tip_' . $row['id'] . '" size="1" spr_id="' . $row['id'] . '" onChange="change_tip(\'' . $row['id'] . '\', $(this).val());">';
+			echo '<span class="content"><select name="tip" id="spremenljivka_tip_' . $row['id'] . '" size="1" spr_id="' . $row['id'] . '" onChange="change_tip(\'' . $row['id'] . '\', $(this).val(), \'0\');">';
 			echo '<option value="1"' . ($row['tip'] == 1 ? ' selected="true"' : '') . '>' . $lang['srv_vprasanje_radio'] . '</option>';
 			echo '<option value="2"' . ($row['tip'] == 2 ? ' selected="true"' : '') . '>' . $lang['srv_vprasanje_checkbox'] . '</option>';
             
@@ -7362,10 +7362,43 @@ class Vprasanje {
 	}
 	
 	function ajax_change_tip () {
+        global $lang;
+
 		Common::getInstance()->Init($this->anketa);
     	Common::getInstance()->updateEditStamp();
     	
 		$tip = $_POST['tip'];
+		$confirmed = (int)$_POST['confirmed'];
+
+		// preverimo, ce obstajajo ze podatki za spremenljivko - v tem primeru damo dodaten error
+        if($confirmed != '1'){
+            
+            $return = array();
+            
+            $sql = sisplet_query("SELECT count(*) AS count FROM srv_user WHERE ank_id='$this->anketa' AND deleted='0' AND preview='0'");
+            $row = mysqli_fetch_array($sql);
+            
+            if ($row['count'] > 0) {
+
+                $return['error'] = 1;
+                
+                $return['output'] = '<h2>'.$lang['srv_warning'].'</h2>';
+                $return['output'] .= '<div class="popup_close"><a href="#" onClick="$(\'#dropped_alert\').hide(); $(\'#fade\').fadeOut(); return false;">✕</a></div>';
+
+                $return['output'] .= '<p>'.$lang['spremenljivka_change_type_data'].'</p>';
+                $return['output'] .= '<p class="top16">'.$lang['srv_change_question_confirm_data'].'</p>';
+                
+                //ce se spremeni onclick, se prosim spremeni v datoteki vprasanjeInline.js v funkciji inline_vrednost_delete v else if (data.error == 2)
+                $return['output'] .= '<div class="button_holder">';
+                $return['output'] .= '<button class="medium white-blue" onclick="$(\'#dropped_alert\').hide(); $(\'#fade\').fadeOut(); return false;">'.$lang['srv_analiza_arhiviraj_cancle'].'</button>';
+                $return['output'] .= '<button class="medium blue" onClick="change_tip(\''.$this->spremenljivka.'\', \''.$tip.'\', \'1\'); $(\'#dropped_alert\').html(\'\').hide(); $(\'#fade\').fadeOut(); return false;">'.$lang['srv_spremeni_tip_vprasanja'].'</button>';
+                $return['output'] .= '</div>';
+                
+                echo json_encode($return);
+                
+                return;
+            }
+        }
 		
 		self::change_tip($this->spremenljivka, $tip);
 		
diff --git a/admin/survey/script/vprasanje.js b/admin/survey/script/vprasanje.js
index f3e48776b..0f9c89c5c 100644
--- a/admin/survey/script/vprasanje.js
+++ b/admin/survey/script/vprasanje.js
@@ -596,12 +596,26 @@ function change_subtype_number (spremenljivka) {
 		vprasanje_fullscreen(spremenljivka);
 	});
 }
-function change_tip(spremenljivka, tip) {
+function change_tip(spremenljivka, tip, confirmed) {
 	
-	$.post('ajax.php?t=vprasanje&a=change_tip', {spremenljivka: spremenljivka, tip: tip, anketa: srv_meta_anketa_id}, function (data) {
-		vprasanje_fullscreen(spremenljivka, data, false, true);
-		vprasanje_save(true);
-	});
+	$.post('ajax.php?t=vprasanje&a=change_tip', {spremenljivka: spremenljivka, tip: tip, confirmed: confirmed, anketa: srv_meta_anketa_id}, 
+        function (data) {
+
+            try {
+                var data_json = JSON.parse(data); 
+
+                if (data_json.error == 1) {
+                    $('#fade').fadeIn("fast");
+                    $('#dropped_alert').html(data_json.output).fadeIn("fast").css('width', '600px');
+
+                    return;
+                }
+            }
+            catch(e){}
+
+            vprasanje_fullscreen(spremenljivka, data, false, true);
+            vprasanje_save(true);
+        });
 }
 
 function change_demografija(spremenljivka, podtip) {
diff --git a/lang/1.php b/lang/1.php
index 96bae3f80..a74833897 100644
--- a/lang/1.php
+++ b/lang/1.php
@@ -1869,6 +1869,7 @@ $lang = array (
 	"srv_novavrednost_grid"		=>	"Novo podvpra&#353;anje",
 	"srv_brisivrednost"			=>	"Izbri&#353;i kategorijo",
 	"srv_brisispremenljivko"	=>	"Izbriši vprašanje",
+	"srv_spremeni_tip_vprasanja"	=>	"Spremeni tip vprašanja",
 	"srv_anketalist"			=>	"Seznam anket",
 	"srv_grupe"					=>	"Anketa na ve&#269;ih straneh",
 	"srv_grupe_recount"			=>	"Pre&#353;tevil&#269;i",
@@ -1939,6 +1940,7 @@ $lang = array (
 	"srv_brisispremenljivkoconfirm_data"	=>	"Ali ste prepričani, da želite izbrisati vprašanje in s tem tudi podatke?",
 	"srv_brisivrednostconfirm"		=>	"Ali ste prepričani, da želite izbrisati odgovor?",
 	"srv_brisivrednostconfirm_data"		=>	"Ali ste prepričani, da želite izbrisati odgovor in s tem tudi podatke?",
+	"srv_change_question_confirm_data"		=>	"Ali ste prepričani, da želite spremeniti tip vprašanja?",
 	"srv_brisiifconfirm"			=>	"Ali ste prepričani, da želite odstraniti pogoj?",
     "srv_brisiifconfirm_all"	    =>	"Ali ste prepričani, da želite odstraniti pogoj in vsa vprašanja znotraj pogoja?",
 	"srv_brisiblockconfirm"			=>	"Ali ste prepričani, da želite odstraniti blok?",
@@ -4027,6 +4029,7 @@ $lang = array (
 	"spremenljivka_delete_in_if"		=>	"Spremenljivke ne morete zbrisati, ker se pojavi v vsaj enem od pogojev",			
 	"spremenljivka_delete_data"			=>	"Vaša anketa vsebuje odgovore respondentov. Z brisanjem vprašanja boste izbrisali tudi morebitne odgovore na to vprašanje.<br><br>Če ne želite zgubiti podatkov, predlagamo, da vprašanja ne izbrišete, temveč vprašanje označite, da ni vidno za respondente. To storite v zavihku \"Napredno\" pri urejanju vprašanja.",			
 	"spremenljivka_delete_data_vre"		=>	"Vaša anketa vsebuje odgovore respondentov. Z brisanjem odgovorov vprašanja boste izbrisali tudi morebitne odgovore na to vprašanje.<br><br>Če ne želite zgubiti podatkov, predlagamo, da odgovora ne izbrišete, temveč ga skrijete za respondente. Postopek je opisan <a href=\"https://www.1ka.si/d/sl/pomoc/prirocniki/skrivanje-odgovorov-ze-aktivni-anketi\" target=\"_blank\">tukaj</a>.",			
+	"spremenljivka_change_type_data"	=>	"Vaša anketa vsebuje odgovore respondentov. S spremembo tipa vprašanja boste izbrisali morebitne odgovore na to vprašanje.<br><br>Če ne želite zgubiti podatkov, predlagamo, da ustvarite novo vprašanje, obstoječe vprašanje pa skrijete za respondente. Postopek je opisan <a href=\"https://www.1ka.si/d/sl/pomoc/prirocniki/skrivanje-odgovorov-ze-aktivni-anketi\" target=\"_blank\">tukaj</a>.",
 	"if_delete_data"			=>	"Vaša anketa vsebuje odgovore respondentov. Z brisanjem pogoja in vseh vprašanj znotraj pogoja boste izbrisali tudi morebitne odgovore na ta vprašanja.<br><br>Če ne želite zgubiti podatkov, predlagamo, da pogoja z vprašanji ne izbrišete, temveč v nastavitvah pogoja označite, da vsebine pogoja ne prikaže.",				
 	"oid_auth_rejected"			=>	"Avtentikacija je bila zavrnjena",
 	"google_auth_rejected"			=>	"Avtentikacija preko ponudnika google je bila zavrnjena.",
diff --git a/lang/2.php b/lang/2.php
index d9959a2b6..45ef31645 100644
--- a/lang/2.php
+++ b/lang/2.php
@@ -1852,6 +1852,7 @@ $lang = array (
 	"srv_novavrednost_grid"			=>	"New Sub-question",
 	"srv_brisivrednost"				=>	"Delete category",
 	"srv_brisispremenljivko"		=>	"Delete question",
+    "srv_spremeni_tip_vprasanja"	=>	"Change question type",
 	"srv_anketalist"				=>	"Survey list",
 	"srv_grupe"						=>	"Pages",
 	"srv_grupe_recount"				=>	"Enumerate pages",
@@ -1927,6 +1928,7 @@ $lang = array (
     "srv_brisispremenljivkoconfirm_data"	=>	"Are you sure you want to delete the question and responses for this question?",
     "srv_brisivrednostconfirm"		=>	"Are you sure you want to delete the answer?",
     "srv_brisivrednostconfirm_data"		=>	"Are you sure you want to delete the answer and responses for this answer?",
+    "srv_change_question_confirm_data"	=>	"Are you sure you want to change question type?",
     "srv_brisiifconfirm"			=>	"Are you sure you want to delete this condition?",
     "srv_brisiifconfirm_all"		=>	"Are you sure you want to delete this condition and all questions inside this condition?",
 	"srv_brisiblockconfirm"			=>	"Are you sure you want to delete this block?",
@@ -4008,7 +4010,8 @@ $lang = array (
 	"spremenljivka_delete_in_if"		=>	"Question cannot be deleted, because it appears in at least on of the conditions",
 	"spremenljivka_delete_data"			=>	"This survey already has some data collected. With deleting this question, you will also be deleting question data.",
 	"spremenljivka_delete_data_vre"		=>	"This survey already has some data collected. With deleting this answer, you will also be deleting question data.",
-	"if_delete_data"			=>	"This survey already has some data collected. With deleting this condition and all questions inside condition, you will also be deleting question data.",					
+    "spremenljivka_change_type_data"	=>	"This survey already has some data collected. With changing of question type, you will also be deleting question data.",
+    "if_delete_data"			=>	"This survey already has some data collected. With deleting this condition and all questions inside condition, you will also be deleting question data.",					
 	"oid_auth_rejected"					=>	"Authentication has been rejected",
 	"google_auth_rejected"				=>	"Google rejected authentication.",
 	"oid_maybe_you_rejected"			=>	"Have you accidentally rejected login through Google?",

From c00725bc652e05455abb3833022d961ba872abf7 Mon Sep 17 00:00:00 2001
From: tejagerjovic <teja.gerjovic@fdv.uni-lj.si>
Date: Mon, 11 Jul 2022 13:33:44 +0200
Subject: [PATCH 054/110] Napredne nastavitve v sredino vsebine - v1

---
 admin/survey/Branching.php                    | 61 +++++++++++++++++++
 admin/survey/script/script.js                 |  2 +-
 public/css/admin_new.css                      | 49 +++++++++++++++
 .../survey_edit/top_center_settings.scss      | 52 ++++++++++++++++
 4 files changed, 163 insertions(+), 1 deletion(-)

diff --git a/admin/survey/Branching.php b/admin/survey/Branching.php
index 9294b7714..14802b853 100644
--- a/admin/survey/Branching.php
+++ b/admin/survey/Branching.php
@@ -1786,10 +1786,71 @@ class Branching {
 		echo '</div>';
 
 		// Napredne nastavitve dropdown
+		$row = SurveyInfo::getInstance()->getSurveyRow();
+    	# preverimo ali imamo ife. Če so, izpisujemo vse ikonce
+		$sql_select = "SELECT count(*) AS if_count FROM srv_branching WHERE element_if > 0 AND ank_id = '".$this->anketa."'";
+		$sql_query = sisplet_query($sql_select);
+		$row_query = mysqli_fetch_array($sql_query);
+		$has_if = (int)$row_query['if_count'] > 0 ? true : false;
+
+		# ali prikazujemo vse ikonice ali samo "simpl" ikonice
+		$sql_select_fv = "SELECT count(*) AS full_view FROM srv_user_setting_for_survey WHERE sid='".$this->anketa."' AND uid='".$global_user_id."' AND what='display_full_toolbox' AND value='1'";
+		$sql_query_fv = sisplet_query($sql_select_fv);
+		$row_query_fv = mysqli_fetch_array($sql_query_fv);
+		$full_view = (int)$row_query_fv['full_view'] == 1 ? true : false;
+		$full_view = true;
+
+		echo '<div id="top_napredne_holder">';
+		
 		echo '<div id="top_napredne_gumb" class="button" onclick="toggleSurveyTopSettings();">';
 		echo $lang['srv_quick_settings_napredno'];
 		echo '<span id="top_napredne_icon" class="faicon fa-angle-down blue left"></span>';
 		echo '</div>';
+		
+		echo '<div id="top_napredne_dropdown" class="displayNone">';
+		# find & replace
+		if ($row['locked'] == 0) {
+			echo '<p class="segment_option">';
+			echo '<a href="#" onclick="find_replace(); toggleSurveyTopSettings(); return false;" title="'.$lang['srv_find_replace_words'].'" ><span class="faicon replace"></span>'.$lang['srv_find_replace_words'].'</a>';
+			echo '</p>';
+		}
+
+		if ($row['locked'] == 0 && $full_view == true) {
+			echo '<p class="segment_option">';
+			echo '<a href="#" onclick="javascript:pagebreak_all(); toggleSurveyTopSettings(); return false;" title="'.$lang['srv_pagebreak_all'].'"><span class="faicon paragraph"></span>'.$lang['srv_pagebreak_all'].'</a> '."\n";
+			echo '</p>';
+		}
+
+		# Hrošč je viden samo če imamo ife in razširjen pogled
+		if ($row['locked'] == 0 && $full_view == true) { // if ($row['flat'] == 0)
+			echo '<p class="segment_option">';
+			echo '<a href="#" onclick="javascript:check_pogoji(); toggleSurveyTopSettings(); return false;" title="'.$lang['srv_check_pogoji'].'"><span class="faicon bug"></span>'.$lang['srv_check_pogoji'].'</a> '."\n";
+			echo '</p>';
+		}
+
+		if ($row['locked'] == 0 && $full_view == true) {
+			echo '<p class="segment_option">';
+			echo '<a href="#" onclick="prestevilci(); toggleSurveyTopSettings(); return false;"><span class="faicon hashtag" title="'.$lang['srv_grupe_recount_branching'].'"></span>'.$lang['srv_grupe_recount_branching'].'</a>' . Help :: display('srv_grupe_recount_branching')  ."\n";
+			echo '</p>';
+		}
+		echo '</div>';
+
+		// Klik izven razprith nastavitev - zapremo okno
+        /**echo '<script>
+            $(document).mouseup(function(e){
+                var container = $("#top_napredne_dropdown");
+            
+				if (!container.is(e.target) && container.has(e.target).length === 0){
+                    $("#top_napredne_dropdown").addClass("displayNone");
+					$("#top_napredne_gumb").removeClass("border_blue");
+					$("#top_napredne_gumb").removeClass("border_blue");
+					$("#top_napredne_icon").addClass("fa-angle-down");
+					$("#top_napredne_icon").removeClass("fa-angle-up");
+                }
+            });
+        </script>';**/
+
+		echo '</div>';
 
 		echo '</div>'; //left_settings
 		echo '<div class="right_settings">';
diff --git a/admin/survey/script/script.js b/admin/survey/script/script.js
index d8505db69..9187c562a 100644
--- a/admin/survey/script/script.js
+++ b/admin/survey/script/script.js
@@ -5628,5 +5628,5 @@ function toggleSurveyTopSettings() {
 	$("#top_napredne_icon").toggleClass("fa-angle-down");
 	$("#top_napredne_icon").toggleClass("fa-angle-up");
 	$("#top_napredne_gumb").toggleClass("border_blue");
-
+	$("#top_napredne_dropdown").toggleClass("displayNone");
 }
\ No newline at end of file
diff --git a/public/css/admin_new.css b/public/css/admin_new.css
index 1fc5fc889..91f812133 100644
--- a/public/css/admin_new.css
+++ b/public/css/admin_new.css
@@ -20499,6 +20499,55 @@ img.mapster_el {
 .top_center_settings .right_settings .button span.faicon.left {
   margin: 0 0 0 8px;
 }
+.top_center_settings .left_settings #top_napredne_holder,
+.top_center_settings .right_settings #top_napredne_holder {
+  position: relative;
+}
+.top_center_settings .left_settings #top_napredne_holder #top_napredne_dropdown,
+.top_center_settings .right_settings #top_napredne_holder #top_napredne_dropdown {
+  position: absolute;
+  z-index: 99;
+  width: auto;
+  padding-bottom: 8px;
+  background: #FFFFFF;
+  border: 1px solid #E5E5E5;
+  box-shadow: 0px 0px 7px rgba(0, 0, 0, 0.15);
+  top: 32px;
+  width: 300px;
+}
+.top_center_settings .left_settings #top_napredne_holder #top_napredne_dropdown .segment_option,
+.top_center_settings .right_settings #top_napredne_holder #top_napredne_dropdown .segment_option {
+  cursor: pointer;
+  white-space: nowrap;
+  padding: 5px 16px 5px 16px;
+  font-size: 14px;
+  line-height: 18px;
+  transition: 0.2s;
+}
+.top_center_settings .left_settings #top_napredne_holder #top_napredne_dropdown .segment_option:hover,
+.top_center_settings .right_settings #top_napredne_holder #top_napredne_dropdown .segment_option:hover {
+  background-color: #F8F8F8;
+}
+.top_center_settings .left_settings #top_napredne_holder #top_napredne_dropdown .segment_option a:not(.help),
+.top_center_settings .left_settings #top_napredne_holder #top_napredne_dropdown .segment_option a:hover:not(.help),
+.top_center_settings .right_settings #top_napredne_holder #top_napredne_dropdown .segment_option a:not(.help),
+.top_center_settings .right_settings #top_napredne_holder #top_napredne_dropdown .segment_option a:hover:not(.help) {
+  color: #333333;
+  text-decoration: none;
+}
+.top_center_settings .left_settings #top_napredne_holder #top_napredne_dropdown .segment_option a:not(.help) .faicon,
+.top_center_settings .left_settings #top_napredne_holder #top_napredne_dropdown .segment_option a:hover:not(.help) .faicon,
+.top_center_settings .right_settings #top_napredne_holder #top_napredne_dropdown .segment_option a:not(.help) .faicon,
+.top_center_settings .right_settings #top_napredne_holder #top_napredne_dropdown .segment_option a:hover:not(.help) .faicon {
+  margin-right: 8px;
+}
+.top_center_settings .left_settings #top_napredne_holder #top_napredne_dropdown .segment_option a:not(.help) .faicon:before,
+.top_center_settings .left_settings #top_napredne_holder #top_napredne_dropdown .segment_option a:hover:not(.help) .faicon:before,
+.top_center_settings .right_settings #top_napredne_holder #top_napredne_dropdown .segment_option a:not(.help) .faicon:before,
+.top_center_settings .right_settings #top_napredne_holder #top_napredne_dropdown .segment_option a:hover:not(.help) .faicon:before {
+  font-size: 14px;
+  color: #1E88E5;
+}
 .top_center_settings .left_settings .square,
 .top_center_settings .right_settings .square {
   width: 28px;
diff --git a/resources/sass/admin_new/pages/survey_edit/top_center_settings.scss b/resources/sass/admin_new/pages/survey_edit/top_center_settings.scss
index 201bfeb94..6b32feeda 100644
--- a/resources/sass/admin_new/pages/survey_edit/top_center_settings.scss
+++ b/resources/sass/admin_new/pages/survey_edit/top_center_settings.scss
@@ -13,6 +13,7 @@
         display: flex;
         flex-direction: row;
 
+
         .button {
             border: 1px solid $gray;
             box-sizing: border-box;
@@ -39,6 +40,57 @@
             }
         }
 
+        #top_napredne_holder {
+            position: relative;
+
+            #top_napredne_dropdown {
+                position: absolute;
+                
+                z-index: 99;
+
+                width: auto;
+                padding-bottom: 8px;
+                background: $white;
+                border: 1px solid $gray;
+                
+                box-shadow: 0px 0px 7px rgba(0, 0, 0, 0.15);
+
+                top: 32px;
+                width: 300px;
+
+                .segment_option{
+                    cursor: pointer;
+                    white-space: nowrap;
+        
+                    padding: 5px 16px 5px 16px;
+        
+                    font-size: 14px;
+                    line-height: 18px;
+        
+                    transition: 0.2s;
+        
+                    &:hover{
+                        background-color: $light-gray;
+                    }
+
+                    a:not(.help),
+                    a:hover:not(.help){
+                        color: $black;
+                        text-decoration: none;
+
+                        .faicon{
+                            margin-right: 8px;
+
+                            &:before{
+                                font-size: 14px;
+                                color: $blue;
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
         .square {
             width: 28px;
             height: 28px;

From 231a451c1368b5c76682656967ef8ba501efa430 Mon Sep 17 00:00:00 2001
From: tejagerjovic <teja.gerjovic@fdv.uni-lj.si>
Date: Mon, 11 Jul 2022 13:35:03 +0200
Subject: [PATCH 055/110] Lang popravki

---
 lang/1.php | 4 +++-
 lang/2.php | 6 ++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/lang/1.php b/lang/1.php
index 96bae3f80..c333cdedb 100644
--- a/lang/1.php
+++ b/lang/1.php
@@ -5403,7 +5403,7 @@ $lang = array (
 	"srv_grid_defaults_3_5"						=>	"Zelo mi je všeč",
 	"srv_diagnostic_bad_start_words" 			=> array('spol', 'starost', 'rojstva', 'izobrazba', 'šola'),
 	"srv_diagnostic_1_element_0" 				=> 'Predviden čas:',
-	"srv_diagnostic_1_element_4" 				=> 'Kompleksnost:',
+	"srv_diagnostic_1_element_4" 				=> 'Kompleksnost ankete',
 	"srv_diagnostic_1_element_1" 				=> 'Število vprašanj na strani',
 	"srv_diagnostic_1_element_2" 				=> 'Število vprašanj v bloku',
 	"srv_diagnostic_1_element_3" 				=> 'Število podvprašanj v tabeli',
@@ -5437,11 +5437,13 @@ $lang = array (
 	"srv_diagnostic_time_5" 					=> 'Zelo dolga anketa',
 	"srv_diagnostic_time_6" 					=> 'Obsežna anketa',
 	"srv_diagnostic_time_7" 					=> 'Zelo obsežna anketa',
+	"srv_diagnostic_time_extra" 				=> 'Več informacij o dolžini ankete',
 	"srv_diagnostic_complexity_1" 				=> 'Zelo enostavna anketa',
 	"srv_diagnostic_complexity_2" 				=> 'Enostavna anketa',
 	"srv_diagnostic_complexity_3" 				=> 'Zahtevna anketa',
 	"srv_diagnostic_complexity_4" 				=> 'Kompleksna anketa',
 	"srv_diagnostic_complexity_5" 				=> 'Zelo kompleksna anketa',
+	"srv_diagnostic_complexity_extra" 			=> 'Več informacij o težavnosti ankete',
 	"srv_diagnostic_noComments" 				=> 'Niste uporabili komentarjev',
 	"srv_diagnostic_note" 						=> 'Uspešno ste izdelali anketo.',
 	"srv_diagnostic_note_1" 					=> 'Vaša anketa ima',
diff --git a/lang/2.php b/lang/2.php
index d9959a2b6..4d0e75944 100644
--- a/lang/2.php
+++ b/lang/2.php
@@ -5384,11 +5384,11 @@ $lang = array (
 	"srv_metadata_time"							=> 'Hide input and edit time',
 	"srv_diagnostic_bad_start_words" 			=> array('gender', 'old', 'birth', 'education', 'school'),
 	"srv_diagnostic_1_element_0" 				=> 'Estimated duration:',
-	"srv_diagnostic_1_element_4" 				=> 'Complexity:',
+	"srv_diagnostic_1_element_4" 				=> 'Survey complexity',
 	"srv_diagnostic_1_element_1" 				=> 'Number of questions per page',
 	"srv_diagnostic_1_element_2" 				=> 'Number of questions in a block',
 	"srv_diagnostic_1_element_3" 				=> 'Number of sub-questions in a table',
-	"srv_diagnostic_1_element_5" 				=> 'Duration type',
+	"srv_diagnostic_1_element_5" 				=> 'Survey duration',
 	"srv_diagnostic_2_element_1" 				=> 'Inappropriate questions at the beginning of the survey',
 	"srv_diagnostic_2_element_2" 				=> 'Check the options for shortening the questionnaire',
 	"srv_diagnostic_3_element_1" 				=> 'Questions, upon which conditions are based, should display a notification',
@@ -5418,11 +5418,13 @@ $lang = array (
 	"srv_diagnostic_time_5" 					=> 'Very long survey',
 	"srv_diagnostic_time_6" 					=> 'Extensive survey',
 	"srv_diagnostic_time_7" 					=> 'Very extensive survey',
+	"srv_diagnostic_time_extra" 				=> 'More info about survey length',
 	"srv_diagnostic_complexity_1" 				=> 'Very simple survey',
 	"srv_diagnostic_complexity_2" 				=> 'Simple survey',
 	"srv_diagnostic_complexity_3" 				=> 'Difficult survey',
 	"srv_diagnostic_complexity_4" 				=> 'Complex survey',
 	"srv_diagnostic_complexity_5" 				=> 'Very complex survey',
+	"srv_diagnostic_complexity_extra" 			=> 'More info about survey complexity',
 	"srv_diagnostic_noComments" 				=> 'You have not used comments',
 	"srv_diagnostic_note" 						=> 'You have successfully created the survey.',
 	"srv_diagnostic_note_1" 					=> 'Your survey has',

From bdcf00e53774eee9bdd53d6213a3df5e7fd37b05 Mon Sep 17 00:00:00 2001
From: pero1203 <peter.hrvatin@gmail.com>
Date: Tue, 12 Jul 2022 09:27:46 +0200
Subject: [PATCH 056/110] Zacasno ugasnjeni toggle na fieldsetu pri nastavitvah
 vprasanja na desni

---
 admin/survey/classes/class.Vprasanje.php | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/admin/survey/classes/class.Vprasanje.php b/admin/survey/classes/class.Vprasanje.php
index 64b13f5df..605d6487b 100644
--- a/admin/survey/classes/class.Vprasanje.php
+++ b/admin/survey/classes/class.Vprasanje.php
@@ -474,9 +474,11 @@ class Vprasanje {
 					if ($row['ranking_k'] == 0){	
 
                         echo '<fieldset>';
-                        echo '  <legend class="pointer" onClick="fieldsetToggle(this);"><span class="faicon arrow2_d"></span>'.$lang['srv_num_limits'].'</legend>';
+                        //echo '  <legend class="pointer" onClick="fieldsetToggle(this);"><span class="faicon arrow2_d"></span>'.$lang['srv_num_limits'].'</legend>';
+                        echo '  <legend>'.$lang['srv_num_limits'].'</legend>';
 
-                        echo '  <div class="fieldset_holder" style="display:none;">';
+                        //echo '  <div class="fieldset_holder" style="display:none;">';
+                        echo '  <div class="fieldset_holder">';
 
                         if ($row['tip'] != 21)
 						    $this->edit_number();
@@ -491,9 +493,11 @@ class Vprasanje {
 
                 if ($row['tip'] == 7) {
                     echo '<fieldset>';
-                    echo '  <legend class="pointer" onClick="fieldsetToggle(this);"><span class="faicon arrow2_d"></span>'.$lang['srv_manjkajoce_vrednosti2'].' '.Help::display('srv_missing_values').'</legend>';
+                    //echo '  <legend class="pointer" onClick="fieldsetToggle(this);"><span class="faicon arrow2_d"></span>'.$lang['srv_manjkajoce_vrednosti2'].' '.Help::display('srv_missing_values').'</legend>';
+                    echo '  <legend>'.$lang['srv_manjkajoce_vrednosti2'].' '.Help::display('srv_missing_values').'</legend>';
                     
-                    echo '  <div class="fieldset_holder" style="display:none;">';
+                    //echo '  <div class="fieldset_holder" style="display:none;">';
+                    echo '  <div class="fieldset_holder">';
                     $this->edit_vrednost_missing();
                     echo '  </div>';
 

From 5d39c24b06f58fe55dc4095791d697333825659b Mon Sep 17 00:00:00 2001
From: patrik2020 <patrik.pucer@gmail.com>
Date: Tue, 12 Jul 2022 16:48:58 +0200
Subject: [PATCH 057/110] Latex za izvoze: ureditev tezave z izpisom e-naslova
 s piko na koncu

---
 .../latexclasses/class.LatexDocument.php      | 41 +++++++++++++++++++
 .../export/latexclasses/class.LatexSurvey.php | 28 ++++++++-----
 .../latexclasses/class.LatexSurveyElement.php | 22 ++++++----
 3 files changed, 74 insertions(+), 17 deletions(-)

diff --git a/admin/survey/export/latexclasses/class.LatexDocument.php b/admin/survey/export/latexclasses/class.LatexDocument.php
index d5b021162..827ba3c12 100644
--- a/admin/survey/export/latexclasses/class.LatexDocument.php
+++ b/admin/survey/export/latexclasses/class.LatexDocument.php
@@ -1358,6 +1358,10 @@ class LatexDocument{
 		if($text == ''){	//ce ni teksta, vrni se
 			return;			
 		}
+
+		$findSpace = ' ';
+		$posSpace1 = strpos($text, $findSpace);	//najdi pozicijo prvega presledka v besedilu
+		$posSpace2 = strripos($text, $findSpace);	//najdi pozicijo zadnjega presledka v besedilu
 			
 		//ureditev posebnih karakterjev za Latex	http://www.cespedes.org/blog/85/how-to-escape-latex-special-characters, https://en.wikibooks.org/wiki/LaTeX/Special_Characters#Other_symbols
 		$text = str_replace('\\','\textbackslash{} ',$text);
@@ -1410,6 +1414,43 @@ class LatexDocument{
 		//ureditev grskih crk - konec
 
 
+		//detekcija prisotnosti e-naslova v besedilu in primerna preureditev, da pride do pravilnega izpisa
+		$findAt = '@';
+		$numOfAt = substr_count($text, $findAt);	//stevilo '@' v besedilu
+		$findNewline = 'br';
+
+		$posAt = strpos($text, $findAt);
+		if($posAt && $posSpace1){	//ce je prisotna afna in je prisoten presledek v besedilu
+			$posSpace1Mail = strpos(substr($text, $posAt), $findSpace);	//najdi pozicijo prvega presledka v besedilu po e-naslovu
+			$posSpace1Mail = $posSpace1Mail+$posAt;	//koncna pozicija, ce se gleda celotno besedilo
+			//echo $posSpace1Mail."</br>";	
+			
+			//najdi prvi presledek pred afno			
+			$posSpace2Mail = strripos(substr($text, 0, $posAt), $findSpace);	//najdi pozicijo zadnjega presledka v besedilu pred e-naslovom
+			//echo $posSpace2Mail."</br>";
+
+			//najdi prvi simbol za v novo vrstico "br" po afni
+			//echo substr($text, $posAt) ."</br>";			
+			$posNewLineMail = strpos(substr($text, $posAt), $findNewline);	//najdi pozicijo prvega simbola za v novo vrstico v besedilu po e-naslovu
+			$posNewLineMail = $posNewLineMail+$posAt-1;	//koncna pozicija, ce se gleda celotno besedilo
+			
+			if($posSpace1Mail<$posNewLineMail){	//ce se po e-naslovu pojavi prej presledek
+				$posKonec = $posSpace1Mail; //se zakljuci pri presledku, ker je ta lokacija za zakljucek url
+			}else{
+				$posKonec = $posNewLineMail;	//se zakljuci pred simbolom za novo vrstico, ker je ta lokacija za zakljucek url
+			}
+			
+			//dodaj po e-naslovu potrebno latex kodo za zakljucek url
+			//$text = substr_replace($text, '}', $posSpace1Mail, 0);
+			$text = substr_replace($text, '}', $posKonec, 0);
+			
+			//dodaj pred e-naslovom potrebno latex kodo za url			
+			//substr_replace(string_name, replacement_string, start_pos, length) 
+			$text = substr_replace($text, ' \url{', $posSpace2Mail+1, 0);
+			//echo $text."</br>";
+		}
+		//detekcija prisotnosti e-naslova v besedilu  in primerna preureditev, da pride do pravilnega izpisa - konec
+
 		//RESEVANJE BESEDILA V CIRILICI
 		$contains_cyrillic = (bool) preg_match('/[\p{Cyrillic}]/u', $text);	//ali je v besedilu cirilica?		
 		if($contains_cyrillic){	// ce je cirilica v besedilu
diff --git a/admin/survey/export/latexclasses/class.LatexSurvey.php b/admin/survey/export/latexclasses/class.LatexSurvey.php
index c378f6e31..a9f7503bc 100644
--- a/admin/survey/export/latexclasses/class.LatexSurvey.php
+++ b/admin/survey/export/latexclasses/class.LatexSurvey.php
@@ -1337,8 +1337,8 @@ class LatexSurvey{
 			
 			//pred ureditvijo posebnih karakterjev, odstrani del teksta s kodo za sliko, da se ne pojavijo tezave zaradi imena datoteke od slike - konec
 		}
-		//ureditev izrisa slike - konec	
-		
+		//ureditev izrisa slike - konec
+
 		//ureditev posebnih karakterjev za Latex	http://www.cespedes.org/blog/85/how-to-escape-latex-special-characters, https://en.wikibooks.org/wiki/LaTeX/Special_Characters#Other_symbols
 		$text = str_replace('\\','\textbackslash{} ',$text);
 		//$text = str_replace('{','\{',$text);		
@@ -1480,24 +1480,32 @@ class LatexSurvey{
 		//detekcija prisotnosti e-naslova v besedilu in primerna preureditev, da pride do pravilnega izpisa
 		$findAt = '@';
 		$numOfAt = substr_count($text, $findAt);	//stevilo '@' v besedilu
+		$findNewline = 'br';
 
 		$posAt = strpos($text, $findAt);
-		if($posAt && $posSpace1){	//ce je prisotna afna in je prisoten presledek v besedilu
-			//echo "afna je: $posAt </br>";
-			//echo "Encoding: ".$text."</br>";
-
-			//najdi prvi presledek po afni
-			//echo substr($text, $posAt) ."</br>";			
+		if($posAt && $posSpace1){	//ce je prisotna afna in je prisoten presledek v besedilu		
 			$posSpace1Mail = strpos(substr($text, $posAt), $findSpace);	//najdi pozicijo prvega presledka v besedilu po e-naslovu
 			$posSpace1Mail = $posSpace1Mail+$posAt;	//koncna pozicija, ce se gleda celotno besedilo
-			//echo $posSpace1Mail."</br>";			
+			//echo $posSpace1Mail."</br>";	
 			
 			//najdi prvi presledek pred afno			
 			$posSpace2Mail = strripos(substr($text, 0, $posAt), $findSpace);	//najdi pozicijo zadnjega presledka v besedilu pred e-naslovom
 			//echo $posSpace2Mail."</br>";
+
+			//najdi prvi simbol za v novo vrstico "br" po afni
+			//echo substr($text, $posAt) ."</br>";			
+			$posNewLineMail = strpos(substr($text, $posAt), $findNewline);	//najdi pozicijo prvega simbola za v novo vrstico v besedilu po e-naslovu
+			$posNewLineMail = $posNewLineMail+$posAt-1;	//koncna pozicija, ce se gleda celotno besedilo
+			
+			if($posSpace1Mail<$posNewLineMail){	//ce se po e-naslovu pojavi prej presledek
+				$posKonec = $posSpace1Mail; //se zakljuci pri presledku, ker je ta lokacija za zakljucek url
+			}else{
+				$posKonec = $posNewLineMail;	//se zakljuci pred simbolom za novo vrstico, ker je ta lokacija za zakljucek url
+			}
 			
 			//dodaj po e-naslovu potrebno latex kodo za zakljucek url
-			$text = substr_replace($text, '}', $posSpace1Mail, 0);
+			//$text = substr_replace($text, '}', $posSpace1Mail, 0);
+			$text = substr_replace($text, '}', $posKonec, 0);
 			
 			//dodaj pred e-naslovom potrebno latex kodo za url			
 			//substr_replace(string_name, replacement_string, start_pos, length) 
diff --git a/admin/survey/export/latexclasses/class.LatexSurveyElement.php b/admin/survey/export/latexclasses/class.LatexSurveyElement.php
index 3c7443909..f32704732 100644
--- a/admin/survey/export/latexclasses/class.LatexSurveyElement.php
+++ b/admin/survey/export/latexclasses/class.LatexSurveyElement.php
@@ -1058,24 +1058,32 @@ class LatexSurveyElement{
 		//detekcija prisotnosti e-naslova v besedilu in primerna preureditev, da pride do pravilnega izpisa
 		$findAt = '@';
 		$numOfAt = substr_count($text, $findAt);	//stevilo '@' v besedilu
+		$findNewline = 'br';
 
 		$posAt = strpos($text, $findAt);
 		if($posAt && $posSpace1){	//ce je prisotna afna in je prisoten presledek v besedilu
-			//echo "afna je: $posAt </br>";
-			//echo "Encoding: ".$text."</br>";
-
-			//najdi prvi presledek po afni
-			//echo substr($text, $posAt) ."</br>";			
 			$posSpace1Mail = strpos(substr($text, $posAt), $findSpace);	//najdi pozicijo prvega presledka v besedilu po e-naslovu
 			$posSpace1Mail = $posSpace1Mail+$posAt;	//koncna pozicija, ce se gleda celotno besedilo
-			//echo $posSpace1Mail."</br>";			
+			//echo $posSpace1Mail."</br>";	
 			
 			//najdi prvi presledek pred afno			
 			$posSpace2Mail = strripos(substr($text, 0, $posAt), $findSpace);	//najdi pozicijo zadnjega presledka v besedilu pred e-naslovom
 			//echo $posSpace2Mail."</br>";
+
+			//najdi prvi simbol za v novo vrstico "br" po afni
+			//echo substr($text, $posAt) ."</br>";			
+			$posNewLineMail = strpos(substr($text, $posAt), $findNewline);	//najdi pozicijo prvega simbola za v novo vrstico v besedilu po e-naslovu
+			$posNewLineMail = $posNewLineMail+$posAt-1;	//koncna pozicija, ce se gleda celotno besedilo
+			
+			if($posSpace1Mail<$posNewLineMail){	//ce se po e-naslovu pojavi prej presledek
+				$posKonec = $posSpace1Mail; //se zakljuci pri presledku, ker je ta lokacija za zakljucek url
+			}else{
+				$posKonec = $posNewLineMail;	//se zakljuci pred simbolom za novo vrstico, ker je ta lokacija za zakljucek url
+			}
 			
 			//dodaj po e-naslovu potrebno latex kodo za zakljucek url
-			$text = substr_replace($text, '}', $posSpace1Mail, 0);
+			//$text = substr_replace($text, '}', $posSpace1Mail, 0);
+			$text = substr_replace($text, '}', $posKonec, 0);
 			
 			//dodaj pred e-naslovom potrebno latex kodo za url			
 			//substr_replace(string_name, replacement_string, start_pos, length) 

From 934e9ca8b2b83601a4bac5cf07a205deb6834044 Mon Sep 17 00:00:00 2001
From: pero1203 <peter.hrvatin@gmail.com>
Date: Wed, 13 Jul 2022 10:40:19 +0200
Subject: [PATCH 058/110] Kolektor - composer za nove razrede, dodan modul v
 navigacijo

---
 admin/survey/SurveyAdmin.php                  |   8 +
 admin/survey/classes/class.SurveyList.php     |  13 +
 .../modules/mod_KOLEKTOR/class.Kolektor.php   |  19 +-
 composer.lock                                 | 231 +++++----
 sql/update2.sql                               |   1 +
 vendor/composer/autoload_classmap.php         |  24 +
 vendor/composer/autoload_static.php           |  24 +
 vendor/composer/ca-bundle/res/cacert.pem      | 477 +++++++++++-------
 vendor/composer/installed.json                | 223 ++++----
 vendor/composer/installed.php                 |  64 +--
 vendor/guzzlehttp/guzzle/CHANGELOG.md         |  14 +
 vendor/guzzlehttp/guzzle/LICENSE              |  10 +-
 vendor/guzzlehttp/guzzle/README.md            |  39 +-
 vendor/guzzlehttp/guzzle/composer.json        |  39 +-
 .../guzzle/src/Cookie/CookieJar.php           |   5 +
 .../guzzle/src/Cookie/SetCookie.php           |  11 +-
 .../guzzle/src/RedirectMiddleware.php         |  21 +-
 vendor/guzzlehttp/psr7/CHANGELOG.md           |  22 +-
 vendor/guzzlehttp/psr7/README.md              |  24 +-
 vendor/guzzlehttp/psr7/composer.json          |   7 +-
 vendor/guzzlehttp/psr7/src/MessageTrait.php   |  66 ++-
 vendor/guzzlehttp/psr7/src/UriComparator.php  |  55 ++
 .../maxmind/web-service-common/CHANGELOG.md   |  20 +
 vendor/maxmind/web-service-common/README.md   |   2 +-
 .../maxmind/web-service-common/composer.json  |   9 +-
 .../web-service-common/dev-bin/release.sh     |   6 +-
 .../maxmind/web-service-common/phpstan.neon   |   7 +
 .../src/Exception/AuthenticationException.php |   2 +
 .../src/Exception/HttpException.php           |  14 +-
 .../Exception/InsufficientFundsException.php  |   2 +
 .../src/Exception/InvalidInputException.php   |   2 +
 .../src/Exception/InvalidRequestException.php |  16 +-
 .../Exception/IpAddressNotFoundException.php  |   2 +
 .../Exception/PermissionRequiredException.php |   2 +
 .../src/Exception/WebServiceException.php     |   2 +
 .../src/WebService/Client.php                 | 180 ++++---
 .../src/WebService/Http/CurlRequest.php       |  74 +--
 .../src/WebService/Http/Request.php           |  20 +-
 .../src/WebService/Http/RequestFactory.php    |  15 +-
 .../sodium_compat/.github/workflows/ci.yml    |  10 +-
 .../sodium_compat/.github/workflows/psalm.yml |   4 +-
 .../paragonie/sodium_compat/phpunit.xml.dist  |   2 +-
 .../paragonie/sodium_compat/psalm-above-3.xml |   1 -
 .../paragonie/sodium_compat/psalm-below-3.xml |   1 -
 vendor/paragonie/sodium_compat/src/Compat.php |   4 +
 .../sodium_compat/src/Core/BLAKE2b.php        |  19 +-
 .../sodium_compat/src/Core/Curve25519.php     | 151 ++++--
 .../paragonie/sodium_compat/src/Core/Util.php |   8 +-
 .../sodium_compat/src/Core32/Curve25519.php   |  57 +--
 .../src/Core32/Curve25519/Fe.php              |   3 +
 .../sodium_compat/src/Core32/Int32.php        |   9 +-
 .../sodium_compat/src/Core32/Int64.php        |   6 +-
 .../src/Core32/Poly1305/State.php             |   2 +-
 .../sodium_compat/src/Core32/XChaCha20.php    |  23 +
 vendor/paragonie/sodium_compat/src/File.php   |  15 +-
 vendor/phpmailer/phpmailer/README.md          |   2 +
 vendor/phpmailer/phpmailer/VERSION            |   2 +-
 vendor/phpmailer/phpmailer/composer.json      |   6 +-
 .../phpmailer/phpmailer/get_oauth_token.php   |  44 +-
 .../phpmailer/language/phpmailer.lang-ch.php  |  27 -
 .../phpmailer/language/phpmailer.lang-mn.php  |  27 +
 vendor/phpmailer/phpmailer/src/OAuth.php      |   2 +-
 .../phpmailer/src/OAuthTokenProvider.php      |  44 ++
 vendor/phpmailer/phpmailer/src/PHPMailer.php  |  97 ++--
 vendor/phpmailer/phpmailer/src/POP3.php       |   2 +-
 vendor/phpmailer/phpmailer/src/SMTP.php       |   9 +-
 vendor/stripe/stripe-php/.php-cs-fixer.php    |   4 +
 vendor/stripe/stripe-php/CHANGELOG.md         | 100 +++-
 vendor/stripe/stripe-php/Makefile             |   8 +
 vendor/stripe/stripe-php/VERSION              |   2 +-
 vendor/stripe/stripe-php/init.php             |  18 +
 vendor/stripe/stripe-php/lib/Account.php      |   2 +-
 .../stripe-php/lib/ApiOperations/Search.php   |  37 ++
 .../stripe-php/lib/BaseStripeClient.php       |  24 +
 .../lib/BillingPortal/Configuration.php       |   2 +-
 vendor/stripe/stripe-php/lib/Card.php         |   1 +
 vendor/stripe/stripe-php/lib/CashBalance.php  |  66 +++
 vendor/stripe/stripe-php/lib/Charge.php       |  17 +
 .../stripe-php/lib/Checkout/Session.php       |   2 +-
 vendor/stripe/stripe-php/lib/Customer.php     |  49 ++
 vendor/stripe/stripe-php/lib/Discount.php     |  12 +-
 vendor/stripe/stripe-php/lib/Event.php        |  44 +-
 .../lib/FinancialConnections/Account.php      |  84 +++
 .../lib/FinancialConnections/AccountOwner.php |  20 +
 .../FinancialConnections/AccountOwnership.php |  18 +
 .../lib/FinancialConnections/Session.php      |  27 +
 .../stripe-php/lib/FundingInstructions.php    |  28 +
 .../stripe-php/lib/HttpClient/CurlClient.php  |  11 +-
 vendor/stripe/stripe-php/lib/Invoice.php      |  18 +
 vendor/stripe/stripe-php/lib/InvoiceItem.php  |   1 +
 .../stripe/stripe-php/lib/InvoiceLineItem.php |   1 +
 vendor/stripe/stripe-php/lib/Order.php        |   4 +-
 .../stripe/stripe-php/lib/PaymentIntent.php   |  53 +-
 .../stripe/stripe-php/lib/PaymentMethod.php   |  12 +-
 vendor/stripe/stripe-php/lib/Person.php       |   1 +
 vendor/stripe/stripe-php/lib/Price.php        |  16 +
 vendor/stripe/stripe-php/lib/Product.php      |  21 +-
 vendor/stripe/stripe-php/lib/Quote.php        |   2 +
 vendor/stripe/stripe-php/lib/Refund.php       |  19 +
 vendor/stripe/stripe-php/lib/SKU.php          |   3 -
 vendor/stripe/stripe-php/lib/SearchResult.php | 234 +++++++++
 .../lib/Service/AbstractService.php           |   5 +
 .../stripe-php/lib/Service/ChargeService.php  |  20 +
 .../lib/Service/CoreServiceFactory.php        |   4 +
 .../lib/Service/CustomerService.php           |  72 +++
 .../FinancialConnections/AccountService.php   |  58 +++
 .../FinancialConnectionsServiceFactory.php    |  27 +
 .../FinancialConnections/SessionService.php   |  41 ++
 .../stripe-php/lib/Service/InvoiceService.php |  20 +
 .../lib/Service/PaymentIntentService.php      |  85 ++++
 .../lib/Service/PaymentMethodService.php      |   3 +-
 .../stripe-php/lib/Service/PriceService.php   |  20 +
 .../stripe-php/lib/Service/ProductService.php |  20 +
 .../stripe-php/lib/Service/RefundService.php  |  19 +
 .../lib/Service/SubscriptionService.php       |  31 ++
 .../stripe-php/lib/Service/TaxCodeService.php |   2 +-
 .../Service/Terminal/ConfigurationService.php |  86 ++++
 .../lib/Service/Terminal/ReaderService.php    |  64 +++
 .../Terminal/TerminalServiceFactory.php       |   2 +
 .../lib/Service/TestHelpers/RefundService.php |  24 +
 .../TestHelpers/Terminal/ReaderService.php    |  25 +
 .../Terminal/TerminalServiceFactory.php       |  25 +
 .../Service/TestHelpers/TestClockService.php  |  87 ++++
 .../TestHelpers/TestHelpersServiceFactory.php |  29 ++
 vendor/stripe/stripe-php/lib/SetupIntent.php  |   2 +-
 vendor/stripe/stripe-php/lib/ShippingRate.php |   2 +-
 vendor/stripe/stripe-php/lib/Stripe.php       |   2 +-
 vendor/stripe/stripe-php/lib/StripeClient.php |   2 +
 vendor/stripe/stripe-php/lib/StripeObject.php |   7 +-
 vendor/stripe/stripe-php/lib/Subscription.php |  19 +
 .../stripe-php/lib/SubscriptionSchedule.php   |   2 +
 vendor/stripe/stripe-php/lib/TaxCode.php      |   4 +-
 vendor/stripe/stripe-php/lib/TaxId.php        |   6 +-
 .../stripe-php/lib/Terminal/Configuration.php |  28 +
 .../stripe-php/lib/Terminal/Location.php      |   1 +
 .../stripe/stripe-php/lib/Terminal/Reader.php |  71 ++-
 .../stripe-php/lib/TestHelpers/TestClock.php  |  53 ++
 .../lib/Util/CaseInsensitiveArray.php         |  15 +
 .../stripe-php/lib/Util/ObjectTypes.php       |   9 +
 vendor/stripe/stripe-php/lib/Util/Set.php     |   3 +
 vendor/symfony/polyfill-intl-idn/README.md    |   2 +-
 .../symfony/polyfill-intl-idn/composer.json   |   2 +-
 .../polyfill-intl-normalizer/README.md        |   2 +-
 .../polyfill-intl-normalizer/composer.json    |   2 +-
 vendor/symfony/polyfill-php72/README.md       |   9 +-
 vendor/symfony/polyfill-php72/composer.json   |   2 +-
 146 files changed, 3474 insertions(+), 850 deletions(-)
 create mode 100644 vendor/guzzlehttp/psr7/src/UriComparator.php
 create mode 100644 vendor/maxmind/web-service-common/phpstan.neon
 delete mode 100644 vendor/phpmailer/phpmailer/language/phpmailer.lang-ch.php
 create mode 100644 vendor/phpmailer/phpmailer/language/phpmailer.lang-mn.php
 create mode 100644 vendor/phpmailer/phpmailer/src/OAuthTokenProvider.php
 create mode 100644 vendor/stripe/stripe-php/lib/ApiOperations/Search.php
 create mode 100644 vendor/stripe/stripe-php/lib/CashBalance.php
 create mode 100644 vendor/stripe/stripe-php/lib/FinancialConnections/Account.php
 create mode 100644 vendor/stripe/stripe-php/lib/FinancialConnections/AccountOwner.php
 create mode 100644 vendor/stripe/stripe-php/lib/FinancialConnections/AccountOwnership.php
 create mode 100644 vendor/stripe/stripe-php/lib/FinancialConnections/Session.php
 create mode 100644 vendor/stripe/stripe-php/lib/FundingInstructions.php
 create mode 100644 vendor/stripe/stripe-php/lib/SearchResult.php
 create mode 100644 vendor/stripe/stripe-php/lib/Service/FinancialConnections/AccountService.php
 create mode 100644 vendor/stripe/stripe-php/lib/Service/FinancialConnections/FinancialConnectionsServiceFactory.php
 create mode 100644 vendor/stripe/stripe-php/lib/Service/FinancialConnections/SessionService.php
 create mode 100644 vendor/stripe/stripe-php/lib/Service/Terminal/ConfigurationService.php
 create mode 100644 vendor/stripe/stripe-php/lib/Service/TestHelpers/RefundService.php
 create mode 100644 vendor/stripe/stripe-php/lib/Service/TestHelpers/Terminal/ReaderService.php
 create mode 100644 vendor/stripe/stripe-php/lib/Service/TestHelpers/Terminal/TerminalServiceFactory.php
 create mode 100644 vendor/stripe/stripe-php/lib/Service/TestHelpers/TestClockService.php
 create mode 100644 vendor/stripe/stripe-php/lib/Service/TestHelpers/TestHelpersServiceFactory.php
 create mode 100644 vendor/stripe/stripe-php/lib/Terminal/Configuration.php
 create mode 100644 vendor/stripe/stripe-php/lib/TestHelpers/TestClock.php

diff --git a/admin/survey/SurveyAdmin.php b/admin/survey/SurveyAdmin.php
index ca5b5ce43..0893767ee 100644
--- a/admin/survey/SurveyAdmin.php
+++ b/admin/survey/SurveyAdmin.php
@@ -3750,6 +3750,14 @@ class SurveyAdmin
             }
         }
 
+        // kolektor modul
+        if ($_GET['a'] == 'kolektor') { 
+            echo '  <div id="kolektor">';
+            $kolektor = new Kolektor();
+            $kolektor->display();
+            echo '  </div>';
+        }
+
         // Konec moje_ankete_edit
         echo '</div>';
     }
diff --git a/admin/survey/classes/class.SurveyList.php b/admin/survey/classes/class.SurveyList.php
index 0c33bdb59..fb37c0fe3 100644
--- a/admin/survey/classes/class.SurveyList.php
+++ b/admin/survey/classes/class.SurveyList.php
@@ -606,6 +606,10 @@ class SurveyList {
 			$css_1 = 'off';
 			$css_10 = 'on';
 		}
+        if ($_GET['a'] == 'kolektor') {
+			$css_1 = 'off';
+			$css_11 = 'on';
+		}
 		
 		echo '<div id="firstNavigation" class="frontpage">';
 		
@@ -696,6 +700,15 @@ class SurveyList {
 			echo '</a>';
 			echo '</li>';
 		}
+
+        # kolektor modul - samo na njihovi instalaciji
+		if (Common::checkModule('kolektor') == '1') {	
+			echo '<li class="active_'.$css_11.'">';
+			echo '<a href="index.php?a=kolektor" title="Kolektor">';
+			echo '<div class="smaller-singlebutton-'.$css_11.'">Kolektor</div>';
+			echo '</a>';
+			echo '</li>';
+		}
 	
 		echo '</ol>';
 
diff --git a/admin/survey/modules/mod_KOLEKTOR/class.Kolektor.php b/admin/survey/modules/mod_KOLEKTOR/class.Kolektor.php
index a4cb7441f..d6d8c2a32 100644
--- a/admin/survey/modules/mod_KOLEKTOR/class.Kolektor.php
+++ b/admin/survey/modules/mod_KOLEKTOR/class.Kolektor.php
@@ -66,14 +66,31 @@ class Kolektor {
     // Osnovni pogled
     public function display(){
 
+        echo 'kolektor';
 
-
+        $this->displayClientList();
     }
 	
 
     public function displayClientList(){
 
+        echo '<div class="kolektor_clients_holder">';
+        
+        echo '  <div class="kolektor_clients">';
 
+        // Loop cez vse stranke
+        foreach($this->clients as $client_id => $client){
+            
+            echo '  <div class="kolektor_client">';
+            
+            var_dump($client);
+            
+            echo '  </div>';
+        }
+        
+        echo '  </div>';
+        
+        echo '</div>';
     }
 
     // Prikaze formo za dodajanje novega responsa
diff --git a/composer.lock b/composer.lock
index 0ec54a920..f77102490 100644
--- a/composer.lock
+++ b/composer.lock
@@ -8,16 +8,16 @@
     "packages": [
         {
             "name": "composer/ca-bundle",
-            "version": "1.3.1",
+            "version": "1.3.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/composer/ca-bundle.git",
-                "reference": "4c679186f2aca4ab6a0f1b0b9cf9252decb44d0b"
+                "reference": "fd5dd441932a7e10ca6e5b490e272d34c8430640"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/composer/ca-bundle/zipball/4c679186f2aca4ab6a0f1b0b9cf9252decb44d0b",
-                "reference": "4c679186f2aca4ab6a0f1b0b9cf9252decb44d0b",
+                "url": "https://api.github.com/repos/composer/ca-bundle/zipball/fd5dd441932a7e10ca6e5b490e272d34c8430640",
+                "reference": "fd5dd441932a7e10ca6e5b490e272d34c8430640",
                 "shasum": ""
             },
             "require": {
@@ -64,7 +64,7 @@
             "support": {
                 "irc": "irc://irc.freenode.org/composer",
                 "issues": "https://github.com/composer/ca-bundle/issues",
-                "source": "https://github.com/composer/ca-bundle/tree/1.3.1"
+                "source": "https://github.com/composer/ca-bundle/tree/1.3.2"
             },
             "funding": [
                 {
@@ -80,7 +80,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-10-28T20:44:15+00:00"
+            "time": "2022-05-24T11:56:16+00:00"
         },
         {
             "name": "fgrosse/phpasn1",
@@ -217,24 +217,24 @@
         },
         {
             "name": "guzzlehttp/guzzle",
-            "version": "6.5.5",
+            "version": "6.5.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/guzzle/guzzle.git",
-                "reference": "9d4290de1cfd701f38099ef7e183b64b4b7b0c5e"
+                "reference": "a52f0440530b54fa079ce76e8c5d196a42cad981"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/guzzle/zipball/9d4290de1cfd701f38099ef7e183b64b4b7b0c5e",
-                "reference": "9d4290de1cfd701f38099ef7e183b64b4b7b0c5e",
+                "url": "https://api.github.com/repos/guzzle/guzzle/zipball/a52f0440530b54fa079ce76e8c5d196a42cad981",
+                "reference": "a52f0440530b54fa079ce76e8c5d196a42cad981",
                 "shasum": ""
             },
             "require": {
                 "ext-json": "*",
                 "guzzlehttp/promises": "^1.0",
-                "guzzlehttp/psr7": "^1.6.1",
+                "guzzlehttp/psr7": "^1.9",
                 "php": ">=5.5",
-                "symfony/polyfill-intl-idn": "^1.17.0"
+                "symfony/polyfill-intl-idn": "^1.17"
             },
             "require-dev": {
                 "ext-curl": "*",
@@ -263,10 +263,40 @@
                 "MIT"
             ],
             "authors": [
+                {
+                    "name": "Graham Campbell",
+                    "email": "hello@gjcampbell.co.uk",
+                    "homepage": "https://github.com/GrahamCampbell"
+                },
                 {
                     "name": "Michael Dowling",
                     "email": "mtdowling@gmail.com",
                     "homepage": "https://github.com/mtdowling"
+                },
+                {
+                    "name": "Jeremy Lindblom",
+                    "email": "jeremeamia@gmail.com",
+                    "homepage": "https://github.com/jeremeamia"
+                },
+                {
+                    "name": "George Mponos",
+                    "email": "gmponos@gmail.com",
+                    "homepage": "https://github.com/gmponos"
+                },
+                {
+                    "name": "Tobias Nyholm",
+                    "email": "tobias.nyholm@gmail.com",
+                    "homepage": "https://github.com/Nyholm"
+                },
+                {
+                    "name": "Márk Sági-Kazár",
+                    "email": "mark.sagikazar@gmail.com",
+                    "homepage": "https://github.com/sagikazarmark"
+                },
+                {
+                    "name": "Tobias Schultze",
+                    "email": "webmaster@tubo-world.de",
+                    "homepage": "https://github.com/Tobion"
                 }
             ],
             "description": "Guzzle is a PHP HTTP client library",
@@ -282,9 +312,23 @@
             ],
             "support": {
                 "issues": "https://github.com/guzzle/guzzle/issues",
-                "source": "https://github.com/guzzle/guzzle/tree/6.5"
+                "source": "https://github.com/guzzle/guzzle/tree/6.5.8"
             },
-            "time": "2020-06-16T21:01:06+00:00"
+            "funding": [
+                {
+                    "url": "https://github.com/GrahamCampbell",
+                    "type": "github"
+                },
+                {
+                    "url": "https://github.com/Nyholm",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/guzzlehttp/guzzle",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2022-06-20T22:16:07+00:00"
         },
         {
             "name": "guzzlehttp/promises",
@@ -313,12 +357,12 @@
                 }
             },
             "autoload": {
-                "psr-4": {
-                    "GuzzleHttp\\Promise\\": "src/"
-                },
                 "files": [
                     "src/functions_include.php"
-                ]
+                ],
+                "psr-4": {
+                    "GuzzleHttp\\Promise\\": "src/"
+                }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
@@ -372,16 +416,16 @@
         },
         {
             "name": "guzzlehttp/psr7",
-            "version": "1.8.3",
+            "version": "1.9.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/guzzle/psr7.git",
-                "reference": "1afdd860a2566ed3c2b0b4a3de6e23434a79ec85"
+                "reference": "e98e3e6d4f86621a9b75f623996e6bbdeb4b9318"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/psr7/zipball/1afdd860a2566ed3c2b0b4a3de6e23434a79ec85",
-                "reference": "1afdd860a2566ed3c2b0b4a3de6e23434a79ec85",
+                "url": "https://api.github.com/repos/guzzle/psr7/zipball/e98e3e6d4f86621a9b75f623996e6bbdeb4b9318",
+                "reference": "e98e3e6d4f86621a9b75f623996e6bbdeb4b9318",
                 "shasum": ""
             },
             "require": {
@@ -402,7 +446,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.7-dev"
+                    "dev-master": "1.9-dev"
                 }
             },
             "autoload": {
@@ -462,7 +506,7 @@
             ],
             "support": {
                 "issues": "https://github.com/guzzle/psr7/issues",
-                "source": "https://github.com/guzzle/psr7/tree/1.8.3"
+                "source": "https://github.com/guzzle/psr7/tree/1.9.0"
             },
             "funding": [
                 {
@@ -478,7 +522,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-10-05T13:56:00+00:00"
+            "time": "2022-06-20T21:43:03+00:00"
         },
         {
             "name": "maxmind-db/reader",
@@ -547,16 +591,16 @@
         },
         {
             "name": "maxmind/web-service-common",
-            "version": "v0.8.1",
+            "version": "v0.9.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/maxmind/web-service-common-php.git",
-                "reference": "32f274051c543fc865e5a84d3a2c703913641ea8"
+                "reference": "4dc5a3e8df38aea4ca3b1096cee3a038094e9b53"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/maxmind/web-service-common-php/zipball/32f274051c543fc865e5a84d3a2c703913641ea8",
-                "reference": "32f274051c543fc865e5a84d3a2c703913641ea8",
+                "url": "https://api.github.com/repos/maxmind/web-service-common-php/zipball/4dc5a3e8df38aea4ca3b1096cee3a038094e9b53",
+                "reference": "4dc5a3e8df38aea4ca3b1096cee3a038094e9b53",
                 "shasum": ""
             },
             "require": {
@@ -566,7 +610,8 @@
                 "php": ">=7.2"
             },
             "require-dev": {
-                "friendsofphp/php-cs-fixer": "2.*",
+                "friendsofphp/php-cs-fixer": "3.*",
+                "phpstan/phpstan": "*",
                 "phpunit/phpunit": "^8.0 || ^9.0",
                 "squizlabs/php_codesniffer": "3.*"
             },
@@ -591,9 +636,9 @@
             "homepage": "https://github.com/maxmind/web-service-common-php",
             "support": {
                 "issues": "https://github.com/maxmind/web-service-common-php/issues",
-                "source": "https://github.com/maxmind/web-service-common-php/tree/v0.8.1"
+                "source": "https://github.com/maxmind/web-service-common-php/tree/v0.9.0"
             },
-            "time": "2020-11-02T17:00:53+00:00"
+            "time": "2022-03-28T17:43:20+00:00"
         },
         {
             "name": "minishlink/web-push",
@@ -707,16 +752,16 @@
         },
         {
             "name": "paragonie/sodium_compat",
-            "version": "v1.17.0",
+            "version": "v1.17.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/paragonie/sodium_compat.git",
-                "reference": "c59cac21abbcc0df06a3dd18076450ea4797b321"
+                "reference": "ac994053faac18d386328c91c7900f930acadf1e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/paragonie/sodium_compat/zipball/c59cac21abbcc0df06a3dd18076450ea4797b321",
-                "reference": "c59cac21abbcc0df06a3dd18076450ea4797b321",
+                "url": "https://api.github.com/repos/paragonie/sodium_compat/zipball/ac994053faac18d386328c91c7900f930acadf1e",
+                "reference": "ac994053faac18d386328c91c7900f930acadf1e",
                 "shasum": ""
             },
             "require": {
@@ -787,9 +832,9 @@
             ],
             "support": {
                 "issues": "https://github.com/paragonie/sodium_compat/issues",
-                "source": "https://github.com/paragonie/sodium_compat/tree/v1.17.0"
+                "source": "https://github.com/paragonie/sodium_compat/tree/v1.17.1"
             },
-            "time": "2021-08-10T02:43:50+00:00"
+            "time": "2022-03-23T19:32:04+00:00"
         },
         {
             "name": "paypal/paypal-checkout-sdk",
@@ -888,16 +933,16 @@
         },
         {
             "name": "phpmailer/phpmailer",
-            "version": "v6.5.4",
+            "version": "v6.6.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/PHPMailer/PHPMailer.git",
-                "reference": "c0d9f7dd3c2aa247ca44791e9209233829d82285"
+                "reference": "9400f305a898f194caff5521f64e5dfa926626f3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/PHPMailer/PHPMailer/zipball/c0d9f7dd3c2aa247ca44791e9209233829d82285",
-                "reference": "c0d9f7dd3c2aa247ca44791e9209233829d82285",
+                "url": "https://api.github.com/repos/PHPMailer/PHPMailer/zipball/9400f305a898f194caff5521f64e5dfa926626f3",
+                "reference": "9400f305a898f194caff5521f64e5dfa926626f3",
                 "shasum": ""
             },
             "require": {
@@ -909,8 +954,8 @@
             "require-dev": {
                 "dealerdirect/phpcodesniffer-composer-installer": "^0.7.0",
                 "doctrine/annotations": "^1.2",
-                "php-parallel-lint/php-console-highlighter": "^0.5.0",
-                "php-parallel-lint/php-parallel-lint": "^1.3.1",
+                "php-parallel-lint/php-console-highlighter": "^1.0.0",
+                "php-parallel-lint/php-parallel-lint": "^1.3.2",
                 "phpcompatibility/php-compatibility": "^9.3.5",
                 "roave/security-advisories": "dev-latest",
                 "squizlabs/php_codesniffer": "^3.6.2",
@@ -954,7 +999,7 @@
             "description": "PHPMailer is a full-featured email creation and transfer class for PHP",
             "support": {
                 "issues": "https://github.com/PHPMailer/PHPMailer/issues",
-                "source": "https://github.com/PHPMailer/PHPMailer/tree/v6.5.4"
+                "source": "https://github.com/PHPMailer/PHPMailer/tree/v6.6.3"
             },
             "funding": [
                 {
@@ -962,7 +1007,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2022-02-17T08:19:04+00:00"
+            "time": "2022-06-20T09:21:02+00:00"
         },
         {
             "name": "psr/http-message",
@@ -1208,16 +1253,16 @@
         },
         {
             "name": "stripe/stripe-php",
-            "version": "v7.114.0",
+            "version": "v7.128.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/stripe/stripe-php.git",
-                "reference": "63be231686c6874befb5b3a47fb8effb4c30b78b"
+                "reference": "c704949c49b72985c76cc61063aa26fefbd2724e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/stripe/stripe-php/zipball/63be231686c6874befb5b3a47fb8effb4c30b78b",
-                "reference": "63be231686c6874befb5b3a47fb8effb4c30b78b",
+                "url": "https://api.github.com/repos/stripe/stripe-php/zipball/c704949c49b72985c76cc61063aa26fefbd2724e",
+                "reference": "c704949c49b72985c76cc61063aa26fefbd2724e",
                 "shasum": ""
             },
             "require": {
@@ -1262,22 +1307,22 @@
             ],
             "support": {
                 "issues": "https://github.com/stripe/stripe-php/issues",
-                "source": "https://github.com/stripe/stripe-php/tree/v7.114.0"
+                "source": "https://github.com/stripe/stripe-php/tree/v7.128.0"
             },
-            "time": "2022-02-15T22:48:31+00:00"
+            "time": "2022-05-05T17:18:02+00:00"
         },
         {
             "name": "symfony/polyfill-intl-idn",
-            "version": "v1.24.0",
+            "version": "v1.26.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-intl-idn.git",
-                "reference": "749045c69efb97c70d25d7463abba812e91f3a44"
+                "reference": "59a8d271f00dd0e4c2e518104cc7963f655a1aa8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/749045c69efb97c70d25d7463abba812e91f3a44",
-                "reference": "749045c69efb97c70d25d7463abba812e91f3a44",
+                "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/59a8d271f00dd0e4c2e518104cc7963f655a1aa8",
+                "reference": "59a8d271f00dd0e4c2e518104cc7963f655a1aa8",
                 "shasum": ""
             },
             "require": {
@@ -1291,7 +1336,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "1.23-dev"
+                    "dev-main": "1.26-dev"
                 },
                 "thanks": {
                     "name": "symfony/polyfill",
@@ -1335,7 +1380,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-intl-idn/tree/v1.24.0"
+                "source": "https://github.com/symfony/polyfill-intl-idn/tree/v1.26.0"
             },
             "funding": [
                 {
@@ -1351,20 +1396,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-09-14T14:02:44+00:00"
+            "time": "2022-05-24T11:49:31+00:00"
         },
         {
             "name": "symfony/polyfill-intl-normalizer",
-            "version": "v1.24.0",
+            "version": "v1.26.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-intl-normalizer.git",
-                "reference": "8590a5f561694770bdcd3f9b5c69dde6945028e8"
+                "reference": "219aa369ceff116e673852dce47c3a41794c14bd"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/8590a5f561694770bdcd3f9b5c69dde6945028e8",
-                "reference": "8590a5f561694770bdcd3f9b5c69dde6945028e8",
+                "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/219aa369ceff116e673852dce47c3a41794c14bd",
+                "reference": "219aa369ceff116e673852dce47c3a41794c14bd",
                 "shasum": ""
             },
             "require": {
@@ -1376,7 +1421,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "1.23-dev"
+                    "dev-main": "1.26-dev"
                 },
                 "thanks": {
                     "name": "symfony/polyfill",
@@ -1419,7 +1464,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.24.0"
+                "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.26.0"
             },
             "funding": [
                 {
@@ -1435,20 +1480,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-02-19T12:13:01+00:00"
+            "time": "2022-05-24T11:49:31+00:00"
         },
         {
             "name": "symfony/polyfill-php72",
-            "version": "v1.24.0",
+            "version": "v1.26.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-php72.git",
-                "reference": "9a142215a36a3888e30d0a9eeea9766764e96976"
+                "reference": "bf44a9fd41feaac72b074de600314a93e2ae78e2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/9a142215a36a3888e30d0a9eeea9766764e96976",
-                "reference": "9a142215a36a3888e30d0a9eeea9766764e96976",
+                "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/bf44a9fd41feaac72b074de600314a93e2ae78e2",
+                "reference": "bf44a9fd41feaac72b074de600314a93e2ae78e2",
                 "shasum": ""
             },
             "require": {
@@ -1457,7 +1502,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "1.23-dev"
+                    "dev-main": "1.26-dev"
                 },
                 "thanks": {
                     "name": "symfony/polyfill",
@@ -1495,7 +1540,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-php72/tree/v1.24.0"
+                "source": "https://github.com/symfony/polyfill-php72/tree/v1.26.0"
             },
             "funding": [
                 {
@@ -1511,7 +1556,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-05-27T09:17:38+00:00"
+            "time": "2022-05-24T11:49:31+00:00"
         },
         {
             "name": "web-token/jwt-core",
@@ -2476,16 +2521,16 @@
         },
         {
             "name": "symfony/polyfill-mbstring",
-            "version": "v1.24.0",
+            "version": "v1.26.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-mbstring.git",
-                "reference": "0abb51d2f102e00a4eefcf46ba7fec406d245825"
+                "reference": "9344f9cb97f3b19424af1a21a3b0e75b0a7d8d7e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/0abb51d2f102e00a4eefcf46ba7fec406d245825",
-                "reference": "0abb51d2f102e00a4eefcf46ba7fec406d245825",
+                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/9344f9cb97f3b19424af1a21a3b0e75b0a7d8d7e",
+                "reference": "9344f9cb97f3b19424af1a21a3b0e75b0a7d8d7e",
                 "shasum": ""
             },
             "require": {
@@ -2500,7 +2545,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "1.23-dev"
+                    "dev-main": "1.26-dev"
                 },
                 "thanks": {
                     "name": "symfony/polyfill",
@@ -2539,7 +2584,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.24.0"
+                "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.26.0"
             },
             "funding": [
                 {
@@ -2555,20 +2600,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-11-30T18:21:41+00:00"
+            "time": "2022-05-24T11:49:31+00:00"
         },
         {
             "name": "symfony/polyfill-php80",
-            "version": "v1.24.0",
+            "version": "v1.26.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-php80.git",
-                "reference": "57b712b08eddb97c762a8caa32c84e037892d2e9"
+                "reference": "cfa0ae98841b9e461207c13ab093d76b0fa7bace"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/57b712b08eddb97c762a8caa32c84e037892d2e9",
-                "reference": "57b712b08eddb97c762a8caa32c84e037892d2e9",
+                "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/cfa0ae98841b9e461207c13ab093d76b0fa7bace",
+                "reference": "cfa0ae98841b9e461207c13ab093d76b0fa7bace",
                 "shasum": ""
             },
             "require": {
@@ -2577,7 +2622,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "1.23-dev"
+                    "dev-main": "1.26-dev"
                 },
                 "thanks": {
                     "name": "symfony/polyfill",
@@ -2622,7 +2667,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-php80/tree/v1.24.0"
+                "source": "https://github.com/symfony/polyfill-php80/tree/v1.26.0"
             },
             "funding": [
                 {
@@ -2638,20 +2683,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-09-13T13:58:33+00:00"
+            "time": "2022-05-10T07:21:04+00:00"
         },
         {
             "name": "symfony/var-dumper",
-            "version": "v4.4.37",
+            "version": "v4.4.42",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/var-dumper.git",
-                "reference": "e74eee4ec02de71db3d60151aa5b203c990556df"
+                "reference": "742aab50ad097bcb62d91fccb613f66b8047d2ca"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/var-dumper/zipball/e74eee4ec02de71db3d60151aa5b203c990556df",
-                "reference": "e74eee4ec02de71db3d60151aa5b203c990556df",
+                "url": "https://api.github.com/repos/symfony/var-dumper/zipball/742aab50ad097bcb62d91fccb613f66b8047d2ca",
+                "reference": "742aab50ad097bcb62d91fccb613f66b8047d2ca",
                 "shasum": ""
             },
             "require": {
@@ -2711,7 +2756,7 @@
                 "dump"
             ],
             "support": {
-                "source": "https://github.com/symfony/var-dumper/tree/v4.4.37"
+                "source": "https://github.com/symfony/var-dumper/tree/v4.4.42"
             },
             "funding": [
                 {
@@ -2727,7 +2772,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-01-02T09:41:36+00:00"
+            "time": "2022-05-21T10:00:54+00:00"
         }
     ],
     "aliases": [],
diff --git a/sql/update2.sql b/sql/update2.sql
index d5e7d8694..5b54fd030 100644
--- a/sql/update2.sql
+++ b/sql/update2.sql
@@ -9651,3 +9651,4 @@ CREATE TABLE kolektor_podjetje_funkcija(
     PRIMARY KEY (id)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
+UPDATE misc SET value='22.07.13' WHERE what="version";
diff --git a/vendor/composer/autoload_classmap.php b/vendor/composer/autoload_classmap.php
index c55479ec5..19d936379 100644
--- a/vendor/composer/autoload_classmap.php
+++ b/vendor/composer/autoload_classmap.php
@@ -240,6 +240,7 @@ return array(
     'GuzzleHttp\\Psr7\\StreamWrapper' => $vendorDir . '/guzzlehttp/psr7/src/StreamWrapper.php',
     'GuzzleHttp\\Psr7\\UploadedFile' => $vendorDir . '/guzzlehttp/psr7/src/UploadedFile.php',
     'GuzzleHttp\\Psr7\\Uri' => $vendorDir . '/guzzlehttp/psr7/src/Uri.php',
+    'GuzzleHttp\\Psr7\\UriComparator' => $vendorDir . '/guzzlehttp/psr7/src/UriComparator.php',
     'GuzzleHttp\\Psr7\\UriNormalizer' => $vendorDir . '/guzzlehttp/psr7/src/UriNormalizer.php',
     'GuzzleHttp\\Psr7\\UriResolver' => $vendorDir . '/guzzlehttp/psr7/src/UriResolver.php',
     'GuzzleHttp\\Psr7\\Utils' => $vendorDir . '/guzzlehttp/psr7/src/Utils.php',
@@ -558,6 +559,9 @@ return array(
     'Jose\\Component\\Signature\\Signature' => $vendorDir . '/web-token/jwt-signature/Signature.php',
     'Jose\\Component\\Signature\\Util\\RSA' => $vendorDir . '/web-token/jwt-signature/Util/RSA.php',
     'KalkulacijaLatex' => $baseDir . '/admin/survey/export/latexclasses/Vprasanja/KalkulacijaLatex.php',
+    'Kolektor' => $baseDir . '/admin/survey/modules/mod_KOLEKTOR/class.Kolektor.php',
+    'KolektorNotifications' => $baseDir . '/admin/survey/modules/mod_KOLEKTOR/class.KolektorNotifications.php',
+    'KolektorResponse' => $baseDir . '/admin/survey/modules/mod_KOLEKTOR/class.KolektorResponse.php',
     'KvotaLatex' => $baseDir . '/admin/survey/export/latexclasses/Vprasanja/KvotaLatex.php',
     'LatexAnalysis' => $baseDir . '/admin/survey/export/latexclasses/class.LatexAnalysis.php',
     'LatexAnalysisElement' => $baseDir . '/admin/survey/export/latexclasses/class.LatexAnalysisElement.php',
@@ -610,6 +614,7 @@ return array(
     'Notifications' => $baseDir . '/admin/survey/classes/class.Notifications.php',
     'PHPMailer\\PHPMailer\\Exception' => $vendorDir . '/phpmailer/phpmailer/src/Exception.php',
     'PHPMailer\\PHPMailer\\OAuth' => $vendorDir . '/phpmailer/phpmailer/src/OAuth.php',
+    'PHPMailer\\PHPMailer\\OAuthTokenProvider' => $vendorDir . '/phpmailer/phpmailer/src/OAuthTokenProvider.php',
     'PHPMailer\\PHPMailer\\PHPMailer' => $vendorDir . '/phpmailer/phpmailer/src/PHPMailer.php',
     'PHPMailer\\PHPMailer\\POP3' => $vendorDir . '/phpmailer/phpmailer/src/POP3.php',
     'PHPMailer\\PHPMailer\\SMTP' => $vendorDir . '/phpmailer/phpmailer/src/SMTP.php',
@@ -698,6 +703,7 @@ return array(
     'Stripe\\ApiOperations\\NestedResource' => $vendorDir . '/stripe/stripe-php/lib/ApiOperations/NestedResource.php',
     'Stripe\\ApiOperations\\Request' => $vendorDir . '/stripe/stripe-php/lib/ApiOperations/Request.php',
     'Stripe\\ApiOperations\\Retrieve' => $vendorDir . '/stripe/stripe-php/lib/ApiOperations/Retrieve.php',
+    'Stripe\\ApiOperations\\Search' => $vendorDir . '/stripe/stripe-php/lib/ApiOperations/Search.php',
     'Stripe\\ApiOperations\\Update' => $vendorDir . '/stripe/stripe-php/lib/ApiOperations/Update.php',
     'Stripe\\ApiRequestor' => $vendorDir . '/stripe/stripe-php/lib/ApiRequestor.php',
     'Stripe\\ApiResource' => $vendorDir . '/stripe/stripe-php/lib/ApiResource.php',
@@ -716,6 +722,7 @@ return array(
     'Stripe\\BitcoinTransaction' => $vendorDir . '/stripe/stripe-php/lib/BitcoinTransaction.php',
     'Stripe\\Capability' => $vendorDir . '/stripe/stripe-php/lib/Capability.php',
     'Stripe\\Card' => $vendorDir . '/stripe/stripe-php/lib/Card.php',
+    'Stripe\\CashBalance' => $vendorDir . '/stripe/stripe-php/lib/CashBalance.php',
     'Stripe\\Charge' => $vendorDir . '/stripe/stripe-php/lib/Charge.php',
     'Stripe\\Checkout\\Session' => $vendorDir . '/stripe/stripe-php/lib/Checkout/Session.php',
     'Stripe\\Collection' => $vendorDir . '/stripe/stripe-php/lib/Collection.php',
@@ -756,6 +763,11 @@ return array(
     'Stripe\\ExchangeRate' => $vendorDir . '/stripe/stripe-php/lib/ExchangeRate.php',
     'Stripe\\File' => $vendorDir . '/stripe/stripe-php/lib/File.php',
     'Stripe\\FileLink' => $vendorDir . '/stripe/stripe-php/lib/FileLink.php',
+    'Stripe\\FinancialConnections\\Account' => $vendorDir . '/stripe/stripe-php/lib/FinancialConnections/Account.php',
+    'Stripe\\FinancialConnections\\AccountOwner' => $vendorDir . '/stripe/stripe-php/lib/FinancialConnections/AccountOwner.php',
+    'Stripe\\FinancialConnections\\AccountOwnership' => $vendorDir . '/stripe/stripe-php/lib/FinancialConnections/AccountOwnership.php',
+    'Stripe\\FinancialConnections\\Session' => $vendorDir . '/stripe/stripe-php/lib/FinancialConnections/Session.php',
+    'Stripe\\FundingInstructions' => $vendorDir . '/stripe/stripe-php/lib/FundingInstructions.php',
     'Stripe\\HttpClient\\ClientInterface' => $vendorDir . '/stripe/stripe-php/lib/HttpClient/ClientInterface.php',
     'Stripe\\HttpClient\\CurlClient' => $vendorDir . '/stripe/stripe-php/lib/HttpClient/CurlClient.php',
     'Stripe\\HttpClient\\StreamingClientInterface' => $vendorDir . '/stripe/stripe-php/lib/HttpClient/StreamingClientInterface.php',
@@ -799,6 +811,7 @@ return array(
     'Stripe\\RequestTelemetry' => $vendorDir . '/stripe/stripe-php/lib/RequestTelemetry.php',
     'Stripe\\Review' => $vendorDir . '/stripe/stripe-php/lib/Review.php',
     'Stripe\\SKU' => $vendorDir . '/stripe/stripe-php/lib/SKU.php',
+    'Stripe\\SearchResult' => $vendorDir . '/stripe/stripe-php/lib/SearchResult.php',
     'Stripe\\Service\\AbstractService' => $vendorDir . '/stripe/stripe-php/lib/Service/AbstractService.php',
     'Stripe\\Service\\AbstractServiceFactory' => $vendorDir . '/stripe/stripe-php/lib/Service/AbstractServiceFactory.php',
     'Stripe\\Service\\AccountLinkService' => $vendorDir . '/stripe/stripe-php/lib/Service/AccountLinkService.php',
@@ -824,6 +837,9 @@ return array(
     'Stripe\\Service\\ExchangeRateService' => $vendorDir . '/stripe/stripe-php/lib/Service/ExchangeRateService.php',
     'Stripe\\Service\\FileLinkService' => $vendorDir . '/stripe/stripe-php/lib/Service/FileLinkService.php',
     'Stripe\\Service\\FileService' => $vendorDir . '/stripe/stripe-php/lib/Service/FileService.php',
+    'Stripe\\Service\\FinancialConnections\\AccountService' => $vendorDir . '/stripe/stripe-php/lib/Service/FinancialConnections/AccountService.php',
+    'Stripe\\Service\\FinancialConnections\\FinancialConnectionsServiceFactory' => $vendorDir . '/stripe/stripe-php/lib/Service/FinancialConnections/FinancialConnectionsServiceFactory.php',
+    'Stripe\\Service\\FinancialConnections\\SessionService' => $vendorDir . '/stripe/stripe-php/lib/Service/FinancialConnections/SessionService.php',
     'Stripe\\Service\\Identity\\IdentityServiceFactory' => $vendorDir . '/stripe/stripe-php/lib/Service/Identity/IdentityServiceFactory.php',
     'Stripe\\Service\\Identity\\VerificationReportService' => $vendorDir . '/stripe/stripe-php/lib/Service/Identity/VerificationReportService.php',
     'Stripe\\Service\\Identity\\VerificationSessionService' => $vendorDir . '/stripe/stripe-php/lib/Service/Identity/VerificationSessionService.php',
@@ -869,10 +885,16 @@ return array(
     'Stripe\\Service\\SubscriptionService' => $vendorDir . '/stripe/stripe-php/lib/Service/SubscriptionService.php',
     'Stripe\\Service\\TaxCodeService' => $vendorDir . '/stripe/stripe-php/lib/Service/TaxCodeService.php',
     'Stripe\\Service\\TaxRateService' => $vendorDir . '/stripe/stripe-php/lib/Service/TaxRateService.php',
+    'Stripe\\Service\\Terminal\\ConfigurationService' => $vendorDir . '/stripe/stripe-php/lib/Service/Terminal/ConfigurationService.php',
     'Stripe\\Service\\Terminal\\ConnectionTokenService' => $vendorDir . '/stripe/stripe-php/lib/Service/Terminal/ConnectionTokenService.php',
     'Stripe\\Service\\Terminal\\LocationService' => $vendorDir . '/stripe/stripe-php/lib/Service/Terminal/LocationService.php',
     'Stripe\\Service\\Terminal\\ReaderService' => $vendorDir . '/stripe/stripe-php/lib/Service/Terminal/ReaderService.php',
     'Stripe\\Service\\Terminal\\TerminalServiceFactory' => $vendorDir . '/stripe/stripe-php/lib/Service/Terminal/TerminalServiceFactory.php',
+    'Stripe\\Service\\TestHelpers\\RefundService' => $vendorDir . '/stripe/stripe-php/lib/Service/TestHelpers/RefundService.php',
+    'Stripe\\Service\\TestHelpers\\Terminal\\ReaderService' => $vendorDir . '/stripe/stripe-php/lib/Service/TestHelpers/Terminal/ReaderService.php',
+    'Stripe\\Service\\TestHelpers\\Terminal\\TerminalServiceFactory' => $vendorDir . '/stripe/stripe-php/lib/Service/TestHelpers/Terminal/TerminalServiceFactory.php',
+    'Stripe\\Service\\TestHelpers\\TestClockService' => $vendorDir . '/stripe/stripe-php/lib/Service/TestHelpers/TestClockService.php',
+    'Stripe\\Service\\TestHelpers\\TestHelpersServiceFactory' => $vendorDir . '/stripe/stripe-php/lib/Service/TestHelpers/TestHelpersServiceFactory.php',
     'Stripe\\Service\\TokenService' => $vendorDir . '/stripe/stripe-php/lib/Service/TokenService.php',
     'Stripe\\Service\\TopupService' => $vendorDir . '/stripe/stripe-php/lib/Service/TopupService.php',
     'Stripe\\Service\\TransferService' => $vendorDir . '/stripe/stripe-php/lib/Service/TransferService.php',
@@ -895,9 +917,11 @@ return array(
     'Stripe\\TaxCode' => $vendorDir . '/stripe/stripe-php/lib/TaxCode.php',
     'Stripe\\TaxId' => $vendorDir . '/stripe/stripe-php/lib/TaxId.php',
     'Stripe\\TaxRate' => $vendorDir . '/stripe/stripe-php/lib/TaxRate.php',
+    'Stripe\\Terminal\\Configuration' => $vendorDir . '/stripe/stripe-php/lib/Terminal/Configuration.php',
     'Stripe\\Terminal\\ConnectionToken' => $vendorDir . '/stripe/stripe-php/lib/Terminal/ConnectionToken.php',
     'Stripe\\Terminal\\Location' => $vendorDir . '/stripe/stripe-php/lib/Terminal/Location.php',
     'Stripe\\Terminal\\Reader' => $vendorDir . '/stripe/stripe-php/lib/Terminal/Reader.php',
+    'Stripe\\TestHelpers\\TestClock' => $vendorDir . '/stripe/stripe-php/lib/TestHelpers/TestClock.php',
     'Stripe\\ThreeDSecure' => $vendorDir . '/stripe/stripe-php/lib/ThreeDSecure.php',
     'Stripe\\Token' => $vendorDir . '/stripe/stripe-php/lib/Token.php',
     'Stripe\\Topup' => $vendorDir . '/stripe/stripe-php/lib/Topup.php',
diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php
index 54d5e7fe8..f9efccb2e 100644
--- a/vendor/composer/autoload_static.php
+++ b/vendor/composer/autoload_static.php
@@ -444,6 +444,7 @@ class ComposerStaticInit6b03163c371c5541881b55b762b8c779
         'GuzzleHttp\\Psr7\\StreamWrapper' => __DIR__ . '/..' . '/guzzlehttp/psr7/src/StreamWrapper.php',
         'GuzzleHttp\\Psr7\\UploadedFile' => __DIR__ . '/..' . '/guzzlehttp/psr7/src/UploadedFile.php',
         'GuzzleHttp\\Psr7\\Uri' => __DIR__ . '/..' . '/guzzlehttp/psr7/src/Uri.php',
+        'GuzzleHttp\\Psr7\\UriComparator' => __DIR__ . '/..' . '/guzzlehttp/psr7/src/UriComparator.php',
         'GuzzleHttp\\Psr7\\UriNormalizer' => __DIR__ . '/..' . '/guzzlehttp/psr7/src/UriNormalizer.php',
         'GuzzleHttp\\Psr7\\UriResolver' => __DIR__ . '/..' . '/guzzlehttp/psr7/src/UriResolver.php',
         'GuzzleHttp\\Psr7\\Utils' => __DIR__ . '/..' . '/guzzlehttp/psr7/src/Utils.php',
@@ -762,6 +763,9 @@ class ComposerStaticInit6b03163c371c5541881b55b762b8c779
         'Jose\\Component\\Signature\\Signature' => __DIR__ . '/..' . '/web-token/jwt-signature/Signature.php',
         'Jose\\Component\\Signature\\Util\\RSA' => __DIR__ . '/..' . '/web-token/jwt-signature/Util/RSA.php',
         'KalkulacijaLatex' => __DIR__ . '/../..' . '/admin/survey/export/latexclasses/Vprasanja/KalkulacijaLatex.php',
+        'Kolektor' => __DIR__ . '/../..' . '/admin/survey/modules/mod_KOLEKTOR/class.Kolektor.php',
+        'KolektorNotifications' => __DIR__ . '/../..' . '/admin/survey/modules/mod_KOLEKTOR/class.KolektorNotifications.php',
+        'KolektorResponse' => __DIR__ . '/../..' . '/admin/survey/modules/mod_KOLEKTOR/class.KolektorResponse.php',
         'KvotaLatex' => __DIR__ . '/../..' . '/admin/survey/export/latexclasses/Vprasanja/KvotaLatex.php',
         'LatexAnalysis' => __DIR__ . '/../..' . '/admin/survey/export/latexclasses/class.LatexAnalysis.php',
         'LatexAnalysisElement' => __DIR__ . '/../..' . '/admin/survey/export/latexclasses/class.LatexAnalysisElement.php',
@@ -814,6 +818,7 @@ class ComposerStaticInit6b03163c371c5541881b55b762b8c779
         'Notifications' => __DIR__ . '/../..' . '/admin/survey/classes/class.Notifications.php',
         'PHPMailer\\PHPMailer\\Exception' => __DIR__ . '/..' . '/phpmailer/phpmailer/src/Exception.php',
         'PHPMailer\\PHPMailer\\OAuth' => __DIR__ . '/..' . '/phpmailer/phpmailer/src/OAuth.php',
+        'PHPMailer\\PHPMailer\\OAuthTokenProvider' => __DIR__ . '/..' . '/phpmailer/phpmailer/src/OAuthTokenProvider.php',
         'PHPMailer\\PHPMailer\\PHPMailer' => __DIR__ . '/..' . '/phpmailer/phpmailer/src/PHPMailer.php',
         'PHPMailer\\PHPMailer\\POP3' => __DIR__ . '/..' . '/phpmailer/phpmailer/src/POP3.php',
         'PHPMailer\\PHPMailer\\SMTP' => __DIR__ . '/..' . '/phpmailer/phpmailer/src/SMTP.php',
@@ -902,6 +907,7 @@ class ComposerStaticInit6b03163c371c5541881b55b762b8c779
         'Stripe\\ApiOperations\\NestedResource' => __DIR__ . '/..' . '/stripe/stripe-php/lib/ApiOperations/NestedResource.php',
         'Stripe\\ApiOperations\\Request' => __DIR__ . '/..' . '/stripe/stripe-php/lib/ApiOperations/Request.php',
         'Stripe\\ApiOperations\\Retrieve' => __DIR__ . '/..' . '/stripe/stripe-php/lib/ApiOperations/Retrieve.php',
+        'Stripe\\ApiOperations\\Search' => __DIR__ . '/..' . '/stripe/stripe-php/lib/ApiOperations/Search.php',
         'Stripe\\ApiOperations\\Update' => __DIR__ . '/..' . '/stripe/stripe-php/lib/ApiOperations/Update.php',
         'Stripe\\ApiRequestor' => __DIR__ . '/..' . '/stripe/stripe-php/lib/ApiRequestor.php',
         'Stripe\\ApiResource' => __DIR__ . '/..' . '/stripe/stripe-php/lib/ApiResource.php',
@@ -920,6 +926,7 @@ class ComposerStaticInit6b03163c371c5541881b55b762b8c779
         'Stripe\\BitcoinTransaction' => __DIR__ . '/..' . '/stripe/stripe-php/lib/BitcoinTransaction.php',
         'Stripe\\Capability' => __DIR__ . '/..' . '/stripe/stripe-php/lib/Capability.php',
         'Stripe\\Card' => __DIR__ . '/..' . '/stripe/stripe-php/lib/Card.php',
+        'Stripe\\CashBalance' => __DIR__ . '/..' . '/stripe/stripe-php/lib/CashBalance.php',
         'Stripe\\Charge' => __DIR__ . '/..' . '/stripe/stripe-php/lib/Charge.php',
         'Stripe\\Checkout\\Session' => __DIR__ . '/..' . '/stripe/stripe-php/lib/Checkout/Session.php',
         'Stripe\\Collection' => __DIR__ . '/..' . '/stripe/stripe-php/lib/Collection.php',
@@ -960,6 +967,11 @@ class ComposerStaticInit6b03163c371c5541881b55b762b8c779
         'Stripe\\ExchangeRate' => __DIR__ . '/..' . '/stripe/stripe-php/lib/ExchangeRate.php',
         'Stripe\\File' => __DIR__ . '/..' . '/stripe/stripe-php/lib/File.php',
         'Stripe\\FileLink' => __DIR__ . '/..' . '/stripe/stripe-php/lib/FileLink.php',
+        'Stripe\\FinancialConnections\\Account' => __DIR__ . '/..' . '/stripe/stripe-php/lib/FinancialConnections/Account.php',
+        'Stripe\\FinancialConnections\\AccountOwner' => __DIR__ . '/..' . '/stripe/stripe-php/lib/FinancialConnections/AccountOwner.php',
+        'Stripe\\FinancialConnections\\AccountOwnership' => __DIR__ . '/..' . '/stripe/stripe-php/lib/FinancialConnections/AccountOwnership.php',
+        'Stripe\\FinancialConnections\\Session' => __DIR__ . '/..' . '/stripe/stripe-php/lib/FinancialConnections/Session.php',
+        'Stripe\\FundingInstructions' => __DIR__ . '/..' . '/stripe/stripe-php/lib/FundingInstructions.php',
         'Stripe\\HttpClient\\ClientInterface' => __DIR__ . '/..' . '/stripe/stripe-php/lib/HttpClient/ClientInterface.php',
         'Stripe\\HttpClient\\CurlClient' => __DIR__ . '/..' . '/stripe/stripe-php/lib/HttpClient/CurlClient.php',
         'Stripe\\HttpClient\\StreamingClientInterface' => __DIR__ . '/..' . '/stripe/stripe-php/lib/HttpClient/StreamingClientInterface.php',
@@ -1003,6 +1015,7 @@ class ComposerStaticInit6b03163c371c5541881b55b762b8c779
         'Stripe\\RequestTelemetry' => __DIR__ . '/..' . '/stripe/stripe-php/lib/RequestTelemetry.php',
         'Stripe\\Review' => __DIR__ . '/..' . '/stripe/stripe-php/lib/Review.php',
         'Stripe\\SKU' => __DIR__ . '/..' . '/stripe/stripe-php/lib/SKU.php',
+        'Stripe\\SearchResult' => __DIR__ . '/..' . '/stripe/stripe-php/lib/SearchResult.php',
         'Stripe\\Service\\AbstractService' => __DIR__ . '/..' . '/stripe/stripe-php/lib/Service/AbstractService.php',
         'Stripe\\Service\\AbstractServiceFactory' => __DIR__ . '/..' . '/stripe/stripe-php/lib/Service/AbstractServiceFactory.php',
         'Stripe\\Service\\AccountLinkService' => __DIR__ . '/..' . '/stripe/stripe-php/lib/Service/AccountLinkService.php',
@@ -1028,6 +1041,9 @@ class ComposerStaticInit6b03163c371c5541881b55b762b8c779
         'Stripe\\Service\\ExchangeRateService' => __DIR__ . '/..' . '/stripe/stripe-php/lib/Service/ExchangeRateService.php',
         'Stripe\\Service\\FileLinkService' => __DIR__ . '/..' . '/stripe/stripe-php/lib/Service/FileLinkService.php',
         'Stripe\\Service\\FileService' => __DIR__ . '/..' . '/stripe/stripe-php/lib/Service/FileService.php',
+        'Stripe\\Service\\FinancialConnections\\AccountService' => __DIR__ . '/..' . '/stripe/stripe-php/lib/Service/FinancialConnections/AccountService.php',
+        'Stripe\\Service\\FinancialConnections\\FinancialConnectionsServiceFactory' => __DIR__ . '/..' . '/stripe/stripe-php/lib/Service/FinancialConnections/FinancialConnectionsServiceFactory.php',
+        'Stripe\\Service\\FinancialConnections\\SessionService' => __DIR__ . '/..' . '/stripe/stripe-php/lib/Service/FinancialConnections/SessionService.php',
         'Stripe\\Service\\Identity\\IdentityServiceFactory' => __DIR__ . '/..' . '/stripe/stripe-php/lib/Service/Identity/IdentityServiceFactory.php',
         'Stripe\\Service\\Identity\\VerificationReportService' => __DIR__ . '/..' . '/stripe/stripe-php/lib/Service/Identity/VerificationReportService.php',
         'Stripe\\Service\\Identity\\VerificationSessionService' => __DIR__ . '/..' . '/stripe/stripe-php/lib/Service/Identity/VerificationSessionService.php',
@@ -1073,10 +1089,16 @@ class ComposerStaticInit6b03163c371c5541881b55b762b8c779
         'Stripe\\Service\\SubscriptionService' => __DIR__ . '/..' . '/stripe/stripe-php/lib/Service/SubscriptionService.php',
         'Stripe\\Service\\TaxCodeService' => __DIR__ . '/..' . '/stripe/stripe-php/lib/Service/TaxCodeService.php',
         'Stripe\\Service\\TaxRateService' => __DIR__ . '/..' . '/stripe/stripe-php/lib/Service/TaxRateService.php',
+        'Stripe\\Service\\Terminal\\ConfigurationService' => __DIR__ . '/..' . '/stripe/stripe-php/lib/Service/Terminal/ConfigurationService.php',
         'Stripe\\Service\\Terminal\\ConnectionTokenService' => __DIR__ . '/..' . '/stripe/stripe-php/lib/Service/Terminal/ConnectionTokenService.php',
         'Stripe\\Service\\Terminal\\LocationService' => __DIR__ . '/..' . '/stripe/stripe-php/lib/Service/Terminal/LocationService.php',
         'Stripe\\Service\\Terminal\\ReaderService' => __DIR__ . '/..' . '/stripe/stripe-php/lib/Service/Terminal/ReaderService.php',
         'Stripe\\Service\\Terminal\\TerminalServiceFactory' => __DIR__ . '/..' . '/stripe/stripe-php/lib/Service/Terminal/TerminalServiceFactory.php',
+        'Stripe\\Service\\TestHelpers\\RefundService' => __DIR__ . '/..' . '/stripe/stripe-php/lib/Service/TestHelpers/RefundService.php',
+        'Stripe\\Service\\TestHelpers\\Terminal\\ReaderService' => __DIR__ . '/..' . '/stripe/stripe-php/lib/Service/TestHelpers/Terminal/ReaderService.php',
+        'Stripe\\Service\\TestHelpers\\Terminal\\TerminalServiceFactory' => __DIR__ . '/..' . '/stripe/stripe-php/lib/Service/TestHelpers/Terminal/TerminalServiceFactory.php',
+        'Stripe\\Service\\TestHelpers\\TestClockService' => __DIR__ . '/..' . '/stripe/stripe-php/lib/Service/TestHelpers/TestClockService.php',
+        'Stripe\\Service\\TestHelpers\\TestHelpersServiceFactory' => __DIR__ . '/..' . '/stripe/stripe-php/lib/Service/TestHelpers/TestHelpersServiceFactory.php',
         'Stripe\\Service\\TokenService' => __DIR__ . '/..' . '/stripe/stripe-php/lib/Service/TokenService.php',
         'Stripe\\Service\\TopupService' => __DIR__ . '/..' . '/stripe/stripe-php/lib/Service/TopupService.php',
         'Stripe\\Service\\TransferService' => __DIR__ . '/..' . '/stripe/stripe-php/lib/Service/TransferService.php',
@@ -1099,9 +1121,11 @@ class ComposerStaticInit6b03163c371c5541881b55b762b8c779
         'Stripe\\TaxCode' => __DIR__ . '/..' . '/stripe/stripe-php/lib/TaxCode.php',
         'Stripe\\TaxId' => __DIR__ . '/..' . '/stripe/stripe-php/lib/TaxId.php',
         'Stripe\\TaxRate' => __DIR__ . '/..' . '/stripe/stripe-php/lib/TaxRate.php',
+        'Stripe\\Terminal\\Configuration' => __DIR__ . '/..' . '/stripe/stripe-php/lib/Terminal/Configuration.php',
         'Stripe\\Terminal\\ConnectionToken' => __DIR__ . '/..' . '/stripe/stripe-php/lib/Terminal/ConnectionToken.php',
         'Stripe\\Terminal\\Location' => __DIR__ . '/..' . '/stripe/stripe-php/lib/Terminal/Location.php',
         'Stripe\\Terminal\\Reader' => __DIR__ . '/..' . '/stripe/stripe-php/lib/Terminal/Reader.php',
+        'Stripe\\TestHelpers\\TestClock' => __DIR__ . '/..' . '/stripe/stripe-php/lib/TestHelpers/TestClock.php',
         'Stripe\\ThreeDSecure' => __DIR__ . '/..' . '/stripe/stripe-php/lib/ThreeDSecure.php',
         'Stripe\\Token' => __DIR__ . '/..' . '/stripe/stripe-php/lib/Token.php',
         'Stripe\\Topup' => __DIR__ . '/..' . '/stripe/stripe-php/lib/Topup.php',
diff --git a/vendor/composer/ca-bundle/res/cacert.pem b/vendor/composer/ca-bundle/res/cacert.pem
index 0bf312fe5..26f135040 100644
--- a/vendor/composer/ca-bundle/res/cacert.pem
+++ b/vendor/composer/ca-bundle/res/cacert.pem
@@ -1,7 +1,7 @@
 ##
 ## Bundle of CA Root Certificates
 ##
-## Certificate data from Mozilla as of: Tue Oct 26 03:12:05 2021 GMT
+## Certificate data from Mozilla as of: Tue Apr 26 03:12:05 2022 GMT
 ##
 ## This is a bundle of X.509 certificates of public Certificate Authorities
 ## (CA). These were automatically extracted from Mozilla's root certificates
@@ -13,8 +13,8 @@
 ## an Apache+mod_ssl webserver for SSL client authentication.
 ## Just configure this file as the SSLCACertificateFile.
 ##
-## Conversion done with mk-ca-bundle.pl version 1.28.
-## SHA256: bb36818a81feaa4cca61101e6d6276cd09e972efcb08112dfed846918ca41d7f
+## Conversion done with mk-ca-bundle.pl version 1.29.
+## SHA256: 34a54d5191775c1bd37be6cfd3f09e831e072555dc3a2e51f4a2c4b0f8ada5cc
 ##
 
 
@@ -39,28 +39,6 @@ hm4qxFYxldBniYUr+WymXUadDKqC5JlR3XC321Y9YeRq4VzW9v493kHMB65jUr9TU/Qr6cf9tveC
 X4XSQRjbgbMEHMUfpIBvFSDJ3gyICh3WZlXi/EjJKSZp4A==
 -----END CERTIFICATE-----
 
-GlobalSign Root CA - R2
-=======================
------BEGIN CERTIFICATE-----
-MIIDujCCAqKgAwIBAgILBAAAAAABD4Ym5g0wDQYJKoZIhvcNAQEFBQAwTDEgMB4GA1UECxMXR2xv
-YmFsU2lnbiBSb290IENBIC0gUjIxEzARBgNVBAoTCkdsb2JhbFNpZ24xEzARBgNVBAMTCkdsb2Jh
-bFNpZ24wHhcNMDYxMjE1MDgwMDAwWhcNMjExMjE1MDgwMDAwWjBMMSAwHgYDVQQLExdHbG9iYWxT
-aWduIFJvb3QgQ0EgLSBSMjETMBEGA1UEChMKR2xvYmFsU2lnbjETMBEGA1UEAxMKR2xvYmFsU2ln
-bjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKbPJA6+Lm8omUVCxKs+IVSbC9N/hHD6
-ErPLv4dfxn+G07IwXNb9rfF73OX4YJYJkhD10FPe+3t+c4isUoh7SqbKSaZeqKeMWhG8eoLrvozp
-s6yWJQeXSpkqBy+0Hne/ig+1AnwblrjFuTosvNYSuetZfeLQBoZfXklqtTleiDTsvHgMCJiEbKjN
-S7SgfQx5TfC4LcshytVsW33hoCmEofnTlEnLJGKRILzdC9XZzPnqJworc5HGnRusyMvo4KD0L5CL
-TfuwNhv2GXqF4G3yYROIXJ/gkwpRl4pazq+r1feqCapgvdzZX99yqWATXgAByUr6P6TqBwMhAo6C
-ygPCm48CAwEAAaOBnDCBmTAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4E
-FgQUm+IHV2ccHsBqBt5ZtJot39wZhi4wNgYDVR0fBC8wLTAroCmgJ4YlaHR0cDovL2NybC5nbG9i
-YWxzaWduLm5ldC9yb290LXIyLmNybDAfBgNVHSMEGDAWgBSb4gdXZxwewGoG3lm0mi3f3BmGLjAN
-BgkqhkiG9w0BAQUFAAOCAQEAmYFThxxol4aR7OBKuEQLq4GsJ0/WwbgcQ3izDJr86iw8bmEbTUsp
-9Z8FHSbBuOmDAGJFtqkIk7mpM0sYmsL4h4hO291xNBrBVNpGP+DTKqttVCL1OmLNIG+6KYnX3ZHu
-01yiPqFbQfXf5WRDLenVOavSot+3i9DAgBkcRcAtjOj4LaR0VknFBbVPFd5uRHg5h6h+u/N5GJG7
-9G+dwfCMNYxdAfvDbbnvRG15RjF+Cv6pgsH/76tuIMRQyV+dTZsXjAzlAcmgQWpzU/qlULRuJQ/7
-TBj0/VLZjmmx6BEP3ojY+x1J96relc8geMJgEtslQIxq/H5COEBkEveegeGTLg==
------END CERTIFICATE-----
-
 Entrust.net Premium 2048 Secure Server CA
 =========================================
 -----BEGIN CERTIFICATE-----
@@ -573,28 +551,6 @@ PBS1xp81HlDQwY9qcEQCYsuuHWhBp6pX6FOqB9IG9tUUBguRA3UsbHK1YZWaDYu5Def131TN3ubY
 WyH8EZE0vkHve52Xdf+XlcCWWC/qu0bXu+TZLg==
 -----END CERTIFICATE-----
 
-Cybertrust Global Root
-======================
------BEGIN CERTIFICATE-----
-MIIDoTCCAomgAwIBAgILBAAAAAABD4WqLUgwDQYJKoZIhvcNAQEFBQAwOzEYMBYGA1UEChMPQ3li
-ZXJ0cnVzdCwgSW5jMR8wHQYDVQQDExZDeWJlcnRydXN0IEdsb2JhbCBSb290MB4XDTA2MTIxNTA4
-MDAwMFoXDTIxMTIxNTA4MDAwMFowOzEYMBYGA1UEChMPQ3liZXJ0cnVzdCwgSW5jMR8wHQYDVQQD
-ExZDeWJlcnRydXN0IEdsb2JhbCBSb290MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-+Mi8vRRQZhP/8NN57CPytxrHjoXxEnOmGaoQ25yiZXRadz5RfVb23CO21O1fWLE3TdVJDm71aofW
-0ozSJ8bi/zafmGWgE07GKmSb1ZASzxQG9Dvj1Ci+6A74q05IlG2OlTEQXO2iLb3VOm2yHLtgwEZL
-AfVJrn5GitB0jaEMAs7u/OePuGtm839EAL9mJRQr3RAwHQeWP032a7iPt3sMpTjr3kfb1V05/Iin
-89cqdPHoWqI7n1C6poxFNcJQZZXcY4Lv3b93TZxiyWNzFtApD0mpSPCzqrdsxacwOUBdrsTiXSZT
-8M4cIwhhqJQZugRiQOwfOHB3EgZxpzAYXSUnpQIDAQABo4GlMIGiMA4GA1UdDwEB/wQEAwIBBjAP
-BgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBS2CHsNesysIEyGVjJez6tuhS1wVzA/BgNVHR8EODA2
-MDSgMqAwhi5odHRwOi8vd3d3Mi5wdWJsaWMtdHJ1c3QuY29tL2NybC9jdC9jdHJvb3QuY3JsMB8G
-A1UdIwQYMBaAFLYIew16zKwgTIZWMl7Pq26FLXBXMA0GCSqGSIb3DQEBBQUAA4IBAQBW7wojoFRO
-lZfJ+InaRcHUowAl9B8Tq7ejhVhpwjCt2BWKLePJzYFa+HMjWqd8BfP9IjsO0QbE2zZMcwSO5bAi
-5MXzLqXZI+O4Tkogp24CJJ8iYGd7ix1yCcUxXOl5n4BHPa2hCwcUPUf/A2kaDAtE52Mlp3+yybh2
-hO0j9n0Hq0V+09+zv+mKts2oomcrUtW3ZfA5TGOgkXmTUg9U3YO7n9GPp1Nzw8v/MOx8BLjYRB+T
-X3EJIrduPuocA06dGiBh+4E37F78CkWr1+cXVdCg6mCbpvbjjFspwgZgFJ0tl0ypkxWdYcQBX0jW
-WL1WMRJOEcgh4LMRkWXbtKaIOM5V
------END CERTIFICATE-----
-
 ePKI Root Certification Authority
 =================================
 -----BEGIN CERTIFICATE-----
@@ -1037,36 +993,6 @@ tnRGEmyR7jTV7JqR50S+kDFy1UkC9gLl9B/rfNmWVan/7Ir5mUf/NVoCqgTLiluHcSmRvaS0eg29
 mvVXIwAHIRc/SjnRBUkLp7Y3gaVdjKozXoEofKd9J+sAro03
 -----END CERTIFICATE-----
 
-EC-ACC
-======
------BEGIN CERTIFICATE-----
-MIIFVjCCBD6gAwIBAgIQ7is969Qh3hSoYqwE893EATANBgkqhkiG9w0BAQUFADCB8zELMAkGA1UE
-BhMCRVMxOzA5BgNVBAoTMkFnZW5jaWEgQ2F0YWxhbmEgZGUgQ2VydGlmaWNhY2lvIChOSUYgUS0w
-ODAxMTc2LUkpMSgwJgYDVQQLEx9TZXJ2ZWlzIFB1YmxpY3MgZGUgQ2VydGlmaWNhY2lvMTUwMwYD
-VQQLEyxWZWdldSBodHRwczovL3d3dy5jYXRjZXJ0Lm5ldC92ZXJhcnJlbCAoYykwMzE1MDMGA1UE
-CxMsSmVyYXJxdWlhIEVudGl0YXRzIGRlIENlcnRpZmljYWNpbyBDYXRhbGFuZXMxDzANBgNVBAMT
-BkVDLUFDQzAeFw0wMzAxMDcyMzAwMDBaFw0zMTAxMDcyMjU5NTlaMIHzMQswCQYDVQQGEwJFUzE7
-MDkGA1UEChMyQWdlbmNpYSBDYXRhbGFuYSBkZSBDZXJ0aWZpY2FjaW8gKE5JRiBRLTA4MDExNzYt
-SSkxKDAmBgNVBAsTH1NlcnZlaXMgUHVibGljcyBkZSBDZXJ0aWZpY2FjaW8xNTAzBgNVBAsTLFZl
-Z2V1IGh0dHBzOi8vd3d3LmNhdGNlcnQubmV0L3ZlcmFycmVsIChjKTAzMTUwMwYDVQQLEyxKZXJh
-cnF1aWEgRW50aXRhdHMgZGUgQ2VydGlmaWNhY2lvIENhdGFsYW5lczEPMA0GA1UEAxMGRUMtQUND
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsyLHT+KXQpWIR4NA9h0X84NzJB5R85iK
-w5K4/0CQBXCHYMkAqbWUZRkiFRfCQ2xmRJoNBD45b6VLeqpjt4pEndljkYRm4CgPukLjbo73FCeT
-ae6RDqNfDrHrZqJyTxIThmV6PttPB/SnCWDaOkKZx7J/sxaVHMf5NLWUhdWZXqBIoH7nF2W4onW4
-HvPlQn2v7fOKSGRdghST2MDk/7NQcvJ29rNdQlB50JQ+awwAvthrDk4q7D7SzIKiGGUzE3eeml0a
-E9jD2z3Il3rucO2n5nzbcc8tlGLfbdb1OL4/pYUKGbio2Al1QnDE6u/LDsg0qBIimAy4E5S2S+zw
-0JDnJwIDAQABo4HjMIHgMB0GA1UdEQQWMBSBEmVjX2FjY0BjYXRjZXJ0Lm5ldDAPBgNVHRMBAf8E
-BTADAQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUoMOLRKo3pUW/l4Ba0fF4opvpXY0wfwYD
-VR0gBHgwdjB0BgsrBgEEAfV4AQMBCjBlMCwGCCsGAQUFBwIBFiBodHRwczovL3d3dy5jYXRjZXJ0
-Lm5ldC92ZXJhcnJlbDA1BggrBgEFBQcCAjApGidWZWdldSBodHRwczovL3d3dy5jYXRjZXJ0Lm5l
-dC92ZXJhcnJlbCAwDQYJKoZIhvcNAQEFBQADggEBAKBIW4IB9k1IuDlVNZyAelOZ1Vr/sXE7zDkJ
-lF7W2u++AVtd0x7Y/X1PzaBB4DSTv8vihpw3kpBWHNzrKQXlxJ7HNd+KDM3FIUPpqojlNcAZQmNa
-Al6kSBg6hW/cnbw/nZzBh7h6YQjpdwt/cKt63dmXLGQehb+8dJahw3oS7AwaboMMPOhyRp/7SNVe
-l+axofjk70YllJyJ22k4vuxcDlbHZVHlUIiIv0LVKz3l+bqeLrPK9HOSAgu+TGbrIP65y7WZf+a2
-E/rKS03Z7lNGBjvGTq2TWoF+bCpLagVFjPIhpDGQh2xlnJ2lYJU6Un/10asIbvPuW/mIPX64b24D
-5EI=
------END CERTIFICATE-----
-
 Hellenic Academic and Research Institutions RootCA 2011
 =======================================================
 -----BEGIN CERTIFICATE-----
@@ -1737,20 +1663,6 @@ HU6+4WMBzzuqQhFkoJ2UOQIReVx7Hfpkue4WQrO/isIJxOzksU0CMQDpKmFHjFJKS04YcPbWRNZu
 9YO6bVi9JNlWSOrvxKJGgYhqOkbRqZtNyWHa0V1Xahg=
 -----END CERTIFICATE-----
 
-GlobalSign ECC Root CA - R4
-===========================
------BEGIN CERTIFICATE-----
-MIIB4TCCAYegAwIBAgIRKjikHJYKBN5CsiilC+g0mAIwCgYIKoZIzj0EAwIwUDEkMCIGA1UECxMb
-R2xvYmFsU2lnbiBFQ0MgUm9vdCBDQSAtIFI0MRMwEQYDVQQKEwpHbG9iYWxTaWduMRMwEQYDVQQD
-EwpHbG9iYWxTaWduMB4XDTEyMTExMzAwMDAwMFoXDTM4MDExOTAzMTQwN1owUDEkMCIGA1UECxMb
-R2xvYmFsU2lnbiBFQ0MgUm9vdCBDQSAtIFI0MRMwEQYDVQQKEwpHbG9iYWxTaWduMRMwEQYDVQQD
-EwpHbG9iYWxTaWduMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEuMZ5049sJQ6fLjkZHAOkrprl
-OQcJFspjsbmG+IpXwVfOQvpzofdlQv8ewQCybnMO/8ch5RikqtlxP6jUuc6MHaNCMEAwDgYDVR0P
-AQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFFSwe61FuOJAf/sKbvu+M8k8o4TV
-MAoGCCqGSM49BAMCA0gAMEUCIQDckqGgE6bPA7DmxCGXkPoUVy0D7O48027KqGx2vKLeuwIgJ6iF
-JzWbVsaj8kfSt24bAgAXqmemFZHe+pTsewv4n4Q=
------END CERTIFICATE-----
-
 GlobalSign ECC Root CA - R5
 ===========================
 -----BEGIN CERTIFICATE-----
@@ -2472,96 +2384,6 @@ AwMDaAAwZQIwJsdpW9zV57LnyAyMjMPdeYwbY9XJUpROTYJKcx6ygISpJcBMWm1JKWB4E+J+SOtk
 AjEA2zQgMgj/mkkCtojeFK9dbJlxjRo/i9fgojaGHAeCOnZT/cKi7e97sIBPWA9LUzm9
 -----END CERTIFICATE-----
 
-GTS Root R1
-===========
------BEGIN CERTIFICATE-----
-MIIFWjCCA0KgAwIBAgIQbkepxUtHDA3sM9CJuRz04TANBgkqhkiG9w0BAQwFADBHMQswCQYDVQQG
-EwJVUzEiMCAGA1UEChMZR29vZ2xlIFRydXN0IFNlcnZpY2VzIExMQzEUMBIGA1UEAxMLR1RTIFJv
-b3QgUjEwHhcNMTYwNjIyMDAwMDAwWhcNMzYwNjIyMDAwMDAwWjBHMQswCQYDVQQGEwJVUzEiMCAG
-A1UEChMZR29vZ2xlIFRydXN0IFNlcnZpY2VzIExMQzEUMBIGA1UEAxMLR1RTIFJvb3QgUjEwggIi
-MA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQC2EQKLHuOhd5s73L+UPreVp0A8of2C+X0yBoJx
-9vaMf/vo27xqLpeXo4xL+Sv2sfnOhB2x+cWX3u+58qPpvBKJXqeqUqv4IyfLpLGcY9vXmX7wCl7r
-aKb0xlpHDU0QM+NOsROjyBhsS+z8CZDfnWQpJSMHobTSPS5g4M/SCYe7zUjwTcLCeoiKu7rPWRnW
-r4+wB7CeMfGCwcDfLqZtbBkOtdh+JhpFAz2weaSUKK0PfyblqAj+lug8aJRT7oM6iCsVlgmy4HqM
-LnXWnOunVmSPlk9orj2XwoSPwLxAwAtcvfaHszVsrBhQf4TgTM2S0yDpM7xSma8ytSmzJSq0SPly
-4cpk9+aCEI3oncKKiPo4Zor8Y/kB+Xj9e1x3+naH+uzfsQ55lVe0vSbv1gHR6xYKu44LtcXFilWr
-06zqkUspzBmkMiVOKvFlRNACzqrOSbTqn3yDsEB750Orp2yjj32JgfpMpf/VjsPOS+C12LOORc92
-wO1AK/1TD7Cn1TsNsYqiA94xrcx36m97PtbfkSIS5r762DL8EGMUUXLeXdYWk70paDPvOmbsB4om
-3xPXV2V4J95eSRQAogB/mqghtqmxlbCluQ0WEdrHbEg8QOB+DVrNVjzRlwW5y0vtOUucxD/SVRNu
-JLDWcfr0wbrM7Rv1/oFB2ACYPTrIrnqYNxgFlQIDAQABo0IwQDAOBgNVHQ8BAf8EBAMCAQYwDwYD
-VR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQU5K8rJnEaK0gnhS9SZizv8IkTcT4wDQYJKoZIhvcNAQEM
-BQADggIBADiWCu49tJYeX++dnAsznyvgyv3SjgofQXSlfKqE1OXyHuY3UjKcC9FhHb8owbZEKTV1
-d5iyfNm9dKyKaOOpMQkpAWBz40d8U6iQSifvS9efk+eCNs6aaAyC58/UEBZvXw6ZXPYfcX3v73sv
-fuo21pdwCxXu11xWajOl40k4DLh9+42FpLFZXvRq4d2h9mREruZRgyFmxhE+885H7pwoHyXa/6xm
-ld01D1zvICxi/ZG6qcz8WpyTgYMpl0p8WnK0OdC3d8t5/Wk6kjftbjhlRn7pYL15iJdfOBL07q9b
-gsiG1eGZbYwE8na6SfZu6W0eX6DvJ4J2QPim01hcDyxC2kLGe4g0x8HYRZvBPsVhHdljUEn2NIVq
-4BjFbkerQUIpm/ZgDdIx02OYI5NaAIFItO/Nis3Jz5nu2Z6qNuFoS3FJFDYoOj0dzpqPJeaAcWEr
-tXvM+SUWgeExX6GjfhaknBZqlxi9dnKlC54dNuYvoS++cJEPqOba+MSSQGwlfnuzCdyyF62ARPBo
-pY+Udf90WuioAnwMCeKpSwughQtiue+hMZL77/ZRBIls6Kl0obsXs7X9SQ98POyDGCBDTtWTurQ0
-sR8WNh8M5mQ5Fkzc4P4dyKliPUDqysU0ArSuiYgzNdwsE3PYJ/HQcu51OyLemGhmW/HGY0dVHLql
-CFF1pkgl
------END CERTIFICATE-----
-
-GTS Root R2
-===========
------BEGIN CERTIFICATE-----
-MIIFWjCCA0KgAwIBAgIQbkepxlqz5yDFMJo/aFLybzANBgkqhkiG9w0BAQwFADBHMQswCQYDVQQG
-EwJVUzEiMCAGA1UEChMZR29vZ2xlIFRydXN0IFNlcnZpY2VzIExMQzEUMBIGA1UEAxMLR1RTIFJv
-b3QgUjIwHhcNMTYwNjIyMDAwMDAwWhcNMzYwNjIyMDAwMDAwWjBHMQswCQYDVQQGEwJVUzEiMCAG
-A1UEChMZR29vZ2xlIFRydXN0IFNlcnZpY2VzIExMQzEUMBIGA1UEAxMLR1RTIFJvb3QgUjIwggIi
-MA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDO3v2m++zsFDQ8BwZabFn3GTXd98GdVarTzTuk
-k3LvCvptnfbwhYBboUhSnznFt+4orO/LdmgUud+tAWyZH8QiHZ/+cnfgLFuv5AS/T3KgGjSY6Dlo
-7JUle3ah5mm5hRm9iYz+re026nO8/4Piy33B0s5Ks40FnotJk9/BW9BuXvAuMC6C/Pq8tBcKSOWI
-m8Wba96wyrQD8Nr0kLhlZPdcTK3ofmZemde4wj7I0BOdre7kRXuJVfeKH2JShBKzwkCX44ofR5Gm
-dFrS+LFjKBC4swm4VndAoiaYecb+3yXuPuWgf9RhD1FLPD+M2uFwdNjCaKH5wQzpoeJ/u1U8dgbu
-ak7MkogwTZq9TwtImoS1mKPV+3PBV2HdKFZ1E66HjucMUQkQdYhMvI35ezzUIkgfKtzra7tEscsz
-cTJGr61K8YzodDqs5xoic4DSMPclQsciOzsSrZYuxsN2B6ogtzVJV+mSSeh2FnIxZyuWfoqjx5RW
-Ir9qS34BIbIjMt/kmkRtWVtd9QCgHJvGeJeNkP+byKq0rxFROV7Z+2et1VsRnTKaG73Vululycsl
-aVNVJ1zgyjbLiGH7HrfQy+4W+9OmTN6SpdTi3/UGVN4unUu0kzCqgc7dGtxRcw1PcOnlthYhGXmy
-5okLdWTK1au8CcEYof/UVKGFPP0UJAOyh9OktwIDAQABo0IwQDAOBgNVHQ8BAf8EBAMCAQYwDwYD
-VR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUu//KjiOfT5nK2+JopqUVJxce2Q4wDQYJKoZIhvcNAQEM
-BQADggIBALZp8KZ3/p7uC4Gt4cCpx/k1HUCCq+YEtN/L9x0Pg/B+E02NjO7jMyLDOfxA325BS0JT
-vhaI8dI4XsRomRyYUpOM52jtG2pzegVATX9lO9ZY8c6DR2Dj/5epnGB3GFW1fgiTz9D2PGcDFWEJ
-+YF59exTpJ/JjwGLc8R3dtyDovUMSRqodt6Sm2T4syzFJ9MHwAiApJiS4wGWAqoC7o87xdFtCjMw
-c3i5T1QWvwsHoaRc5svJXISPD+AVdyx+Jn7axEvbpxZ3B7DNdehyQtaVhJ2Gg/LkkM0JR9SLA3Da
-WsYDQvTtN6LwG1BUSw7YhN4ZKJmBR64JGz9I0cNv4rBgF/XuIwKl2gBbbZCr7qLpGzvpx0QnRY5r
-n/WkhLx3+WuXrD5RRaIRpsyF7gpo8j5QOHokYh4XIDdtak23CZvJ/KRY9bb7nE4Yu5UC56Gtmwfu
-Nmsk0jmGwZODUNKBRqhfYlcsu2xkiAhu7xNUX90txGdj08+JN7+dIPT7eoOboB6BAFDC5AwiWVIQ
-7UNWhwD4FFKnHYuTjKJNRn8nxnGbJN7k2oaLDX5rIMHAnuFl2GqjpuiFizoHCBy69Y9Vmhh1fuXs
-gWbRIXOhNUQLgD1bnF5vKheW0YMjiGZt5obicDIvUiLnyOd/xCxgXS/Dr55FBcOEArf9LAhST4Ld
-o/DUhgkC
------END CERTIFICATE-----
-
-GTS Root R3
-===========
------BEGIN CERTIFICATE-----
-MIICDDCCAZGgAwIBAgIQbkepx2ypcyRAiQ8DVd2NHTAKBggqhkjOPQQDAzBHMQswCQYDVQQGEwJV
-UzEiMCAGA1UEChMZR29vZ2xlIFRydXN0IFNlcnZpY2VzIExMQzEUMBIGA1UEAxMLR1RTIFJvb3Qg
-UjMwHhcNMTYwNjIyMDAwMDAwWhcNMzYwNjIyMDAwMDAwWjBHMQswCQYDVQQGEwJVUzEiMCAGA1UE
-ChMZR29vZ2xlIFRydXN0IFNlcnZpY2VzIExMQzEUMBIGA1UEAxMLR1RTIFJvb3QgUjMwdjAQBgcq
-hkjOPQIBBgUrgQQAIgNiAAQfTzOHMymKoYTey8chWEGJ6ladK0uFxh1MJ7x/JlFyb+Kf1qPKzEUU
-Rout736GjOyxfi//qXGdGIRFBEFVbivqJn+7kAHjSxm65FSWRQmx1WyRRK2EE46ajA2ADDL24Cej
-QjBAMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBTB8Sa6oC2uhYHP
-0/EqEr24Cmf9vDAKBggqhkjOPQQDAwNpADBmAjEAgFukfCPAlaUs3L6JbyO5o91lAFJekazInXJ0
-glMLfalAvWhgxeG4VDvBNhcl2MG9AjEAnjWSdIUlUfUk7GRSJFClH9voy8l27OyCbvWFGFPouOOa
-KaqW04MjyaR7YbPMAuhd
------END CERTIFICATE-----
-
-GTS Root R4
-===========
------BEGIN CERTIFICATE-----
-MIICCjCCAZGgAwIBAgIQbkepyIuUtui7OyrYorLBmTAKBggqhkjOPQQDAzBHMQswCQYDVQQGEwJV
-UzEiMCAGA1UEChMZR29vZ2xlIFRydXN0IFNlcnZpY2VzIExMQzEUMBIGA1UEAxMLR1RTIFJvb3Qg
-UjQwHhcNMTYwNjIyMDAwMDAwWhcNMzYwNjIyMDAwMDAwWjBHMQswCQYDVQQGEwJVUzEiMCAGA1UE
-ChMZR29vZ2xlIFRydXN0IFNlcnZpY2VzIExMQzEUMBIGA1UEAxMLR1RTIFJvb3QgUjQwdjAQBgcq
-hkjOPQIBBgUrgQQAIgNiAATzdHOnaItgrkO4NcWBMHtLSZ37wWHO5t5GvWvVYRg1rkDdc/eJkTBa
-6zzuhXyiQHY7qca4R9gq55KRanPpsXI5nymfopjTX15YhmUPoYRlBtHci8nHc8iMai/lxKvRHYqj
-QjBAMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBSATNbrdP9JNqPV
-2Py1PsVq8JQdjDAKBggqhkjOPQQDAwNnADBkAjBqUFJ0CMRw3J5QdCHojXohw0+WbhXRIjVhLfoI
-N+4Zba3bssx9BzT1YBkstTTZbyACMANxsbqjYAuG7ZoIapVon+Kz4ZNkfF6Tpt95LY2F45TPI11x
-zPKwTdb+mciUqXWi4w==
------END CERTIFICATE-----
-
 UCA Global G2 Root
 ==================
 -----BEGIN CERTIFICATE-----
@@ -3230,3 +3052,296 @@ ECUqqHgtvpBBWJAVcqeht6NCMEAwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUyRtTgRL+BNUW
 rcJRQO9gcS3ujwLEXQNwSaSS6sUUiHCm0w2wqsosQJz76YJumgIwK0eaB8bRwoF8yguWGEEbo/Qw
 CZ61IygNnxS2PFOiTAZpffpskcYqSUXm7LcT4Tps
 -----END CERTIFICATE-----
+
+Autoridad de Certificacion Firmaprofesional CIF A62634068
+=========================================================
+-----BEGIN CERTIFICATE-----
+MIIGFDCCA/ygAwIBAgIIG3Dp0v+ubHEwDQYJKoZIhvcNAQELBQAwUTELMAkGA1UEBhMCRVMxQjBA
+BgNVBAMMOUF1dG9yaWRhZCBkZSBDZXJ0aWZpY2FjaW9uIEZpcm1hcHJvZmVzaW9uYWwgQ0lGIEE2
+MjYzNDA2ODAeFw0xNDA5MjMxNTIyMDdaFw0zNjA1MDUxNTIyMDdaMFExCzAJBgNVBAYTAkVTMUIw
+QAYDVQQDDDlBdXRvcmlkYWQgZGUgQ2VydGlmaWNhY2lvbiBGaXJtYXByb2Zlc2lvbmFsIENJRiBB
+NjI2MzQwNjgwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDKlmuO6vj78aI14H9M2uDD
+Utd9thDIAl6zQyrET2qyyhxdKJp4ERppWVevtSBC5IsP5t9bpgOSL/UR5GLXMnE42QQMcas9UX4P
+B99jBVzpv5RvwSmCwLTaUbDBPLutN0pcyvFLNg4kq7/DhHf9qFD0sefGL9ItWY16Ck6WaVICqjaY
+7Pz6FIMMNx/Jkjd/14Et5cS54D40/mf0PmbR0/RAz15iNA9wBj4gGFrO93IbJWyTdBSTo3OxDqqH
+ECNZXyAFGUftaI6SEspd/NYrspI8IM/hX68gvqB2f3bl7BqGYTM+53u0P6APjqK5am+5hyZvQWyI
+plD9amML9ZMWGxmPsu2bm8mQ9QEM3xk9Dz44I8kvjwzRAv4bVdZO0I08r0+k8/6vKtMFnXkIoctX
+MbScyJCyZ/QYFpM6/EfY0XiWMR+6KwxfXZmtY4laJCB22N/9q06mIqqdXuYnin1oKaPnirjaEbsX
+LZmdEyRG98Xi2J+Of8ePdG1asuhy9azuJBCtLxTa/y2aRnFHvkLfuwHb9H/TKI8xWVvTyQKmtFLK
+bpf7Q8UIJm+K9Lv9nyiqDdVF8xM6HdjAeI9BZzwelGSuewvF6NkBiDkal4ZkQdU7hwxu+g/GvUgU
+vzlN1J5Bto+WHWOWk9mVBngxaJ43BjuAiUVhOSPHG0SjFeUc+JIwuwIDAQABo4HvMIHsMB0GA1Ud
+DgQWBBRlzeurNR4APn7VdMActHNHDhpkLzASBgNVHRMBAf8ECDAGAQH/AgEBMIGmBgNVHSAEgZ4w
+gZswgZgGBFUdIAAwgY8wLwYIKwYBBQUHAgEWI2h0dHA6Ly93d3cuZmlybWFwcm9mZXNpb25hbC5j
+b20vY3BzMFwGCCsGAQUFBwICMFAeTgBQAGEAcwBlAG8AIABkAGUAIABsAGEAIABCAG8AbgBhAG4A
+bwB2AGEAIAA0ADcAIABCAGEAcgBjAGUAbABvAG4AYQAgADAAOAAwADEANzAOBgNVHQ8BAf8EBAMC
+AQYwDQYJKoZIhvcNAQELBQADggIBAHSHKAIrdx9miWTtj3QuRhy7qPj4Cx2Dtjqn6EWKB7fgPiDL
+4QjbEwj4KKE1soCzC1HA01aajTNFSa9J8OA9B3pFE1r/yJfY0xgsfZb43aJlQ3CTkBW6kN/oGbDb
+LIpgD7dvlAceHabJhfa9NPhAeGIQcDq+fUs5gakQ1JZBu/hfHAsdCPKxsIl68veg4MSPi3i1O1il
+I45PVf42O+AMt8oqMEEgtIDNrvx2ZnOorm7hfNoD6JQg5iKj0B+QXSBTFCZX2lSX3xZEEAEeiGaP
+cjiT3SC3NL7X8e5jjkd5KAb881lFJWAiMxujX6i6KtoaPc1A6ozuBRWV1aUsIC+nmCjuRfzxuIgA
+LI9C2lHVnOUTaHFFQ4ueCyE8S1wF3BqfmI7avSKecs2tCsvMo2ebKHTEm9caPARYpoKdrcd7b/+A
+lun4jWq9GJAd/0kakFI3ky88Al2CdgtR5xbHV/g4+afNmyJU72OwFW1TZQNKXkqgsqeOSQBZONXH
+9IBk9W6VULgRfhVwOEqwf9DEMnDAGf/JOC0ULGb0QkTmVXYbgBVX/8Cnp6o5qtjTcNAuuuuUavpf
+NIbnYrX9ivAwhZTJryQCL2/W3Wf+47BVTwSYT6RBVuKT0Gro1vP7ZeDOdcQxWQzugsgMYDNKGbqE
+ZycPvEJdvSRUDewdcAZfpLz6IHxV
+-----END CERTIFICATE-----
+
+vTrus ECC Root CA
+=================
+-----BEGIN CERTIFICATE-----
+MIICDzCCAZWgAwIBAgIUbmq8WapTvpg5Z6LSa6Q75m0c1towCgYIKoZIzj0EAwMwRzELMAkGA1UE
+BhMCQ04xHDAaBgNVBAoTE2lUcnVzQ2hpbmEgQ28uLEx0ZC4xGjAYBgNVBAMTEXZUcnVzIEVDQyBS
+b290IENBMB4XDTE4MDczMTA3MjY0NFoXDTQzMDczMTA3MjY0NFowRzELMAkGA1UEBhMCQ04xHDAa
+BgNVBAoTE2lUcnVzQ2hpbmEgQ28uLEx0ZC4xGjAYBgNVBAMTEXZUcnVzIEVDQyBSb290IENBMHYw
+EAYHKoZIzj0CAQYFK4EEACIDYgAEZVBKrox5lkqqHAjDo6LN/llWQXf9JpRCux3NCNtzslt188+c
+ToL0v/hhJoVs1oVbcnDS/dtitN9Ti72xRFhiQgnH+n9bEOf+QP3A2MMrMudwpremIFUde4BdS49n
+TPEQo0IwQDAdBgNVHQ4EFgQUmDnNvtiyjPeyq+GtJK97fKHbH88wDwYDVR0TAQH/BAUwAwEB/zAO
+BgNVHQ8BAf8EBAMCAQYwCgYIKoZIzj0EAwMDaAAwZQIwV53dVvHH4+m4SVBrm2nDb+zDfSXkV5UT
+QJtS0zvzQBm8JsctBp61ezaf9SXUY2sAAjEA6dPGnlaaKsyh2j/IZivTWJwghfqrkYpwcBE4YGQL
+YgmRWAD5Tfs0aNoJrSEGGJTO
+-----END CERTIFICATE-----
+
+vTrus Root CA
+=============
+-----BEGIN CERTIFICATE-----
+MIIFVjCCAz6gAwIBAgIUQ+NxE9izWRRdt86M/TX9b7wFjUUwDQYJKoZIhvcNAQELBQAwQzELMAkG
+A1UEBhMCQ04xHDAaBgNVBAoTE2lUcnVzQ2hpbmEgQ28uLEx0ZC4xFjAUBgNVBAMTDXZUcnVzIFJv
+b3QgQ0EwHhcNMTgwNzMxMDcyNDA1WhcNNDMwNzMxMDcyNDA1WjBDMQswCQYDVQQGEwJDTjEcMBoG
+A1UEChMTaVRydXNDaGluYSBDby4sTHRkLjEWMBQGA1UEAxMNdlRydXMgUm9vdCBDQTCCAiIwDQYJ
+KoZIhvcNAQEBBQADggIPADCCAgoCggIBAL1VfGHTuB0EYgWgrmy3cLRB6ksDXhA/kFocizuwZots
+SKYcIrrVQJLuM7IjWcmOvFjai57QGfIvWcaMY1q6n6MLsLOaXLoRuBLpDLvPbmyAhykUAyyNJJrI
+ZIO1aqwTLDPxn9wsYTwaP3BVm60AUn/PBLn+NvqcwBauYv6WTEN+VRS+GrPSbcKvdmaVayqwlHeF
+XgQPYh1jdfdr58tbmnDsPmcF8P4HCIDPKNsFxhQnL4Z98Cfe/+Z+M0jnCx5Y0ScrUw5XSmXX+6KA
+YPxMvDVTAWqXcoKv8R1w6Jz1717CbMdHflqUhSZNO7rrTOiwCcJlwp2dCZtOtZcFrPUGoPc2BX70
+kLJrxLT5ZOrpGgrIDajtJ8nU57O5q4IikCc9Kuh8kO+8T/3iCiSn3mUkpF3qwHYw03dQ+A0Em5Q2
+AXPKBlim0zvc+gRGE1WKyURHuFE5Gi7oNOJ5y1lKCn+8pu8fA2dqWSslYpPZUxlmPCdiKYZNpGvu
+/9ROutW04o5IWgAZCfEF2c6Rsffr6TlP9m8EQ5pV9T4FFL2/s1m02I4zhKOQUqqzApVg+QxMaPnu
+1RcN+HFXtSXkKe5lXa/R7jwXC1pDxaWG6iSe4gUH3DRCEpHWOXSuTEGC2/KmSNGzm/MzqvOmwMVO
+9fSddmPmAsYiS8GVP1BkLFTltvA8Kc9XAgMBAAGjQjBAMB0GA1UdDgQWBBRUYnBj8XWEQ1iO0RYg
+scasGrz2iTAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQsFAAOC
+AgEAKbqSSaet8PFww+SX8J+pJdVrnjT+5hpk9jprUrIQeBqfTNqK2uwcN1LgQkv7bHbKJAs5EhWd
+nxEt/Hlk3ODg9d3gV8mlsnZwUKT+twpw1aA08XXXTUm6EdGz2OyC/+sOxL9kLX1jbhd47F18iMjr
+jld22VkE+rxSH0Ws8HqA7Oxvdq6R2xCOBNyS36D25q5J08FsEhvMKar5CKXiNxTKsbhm7xqC5PD4
+8acWabfbqWE8n/Uxy+QARsIvdLGx14HuqCaVvIivTDUHKgLKeBRtRytAVunLKmChZwOgzoy8sHJn
+xDHO2zTlJQNgJXtxmOTAGytfdELSS8VZCAeHvsXDf+eW2eHcKJfWjwXj9ZtOyh1QRwVTsMo554Wg
+icEFOwE30z9J4nfrI8iIZjs9OXYhRvHsXyO466JmdXTBQPfYaJqT4i2pLr0cox7IdMakLXogqzu4
+sEb9b91fUlV1YvCXoHzXOP0l382gmxDPi7g4Xl7FtKYCNqEeXxzP4padKar9mK5S4fNBUvupLnKW
+nyfjqnN9+BojZns7q2WwMgFLFT49ok8MKzWixtlnEjUwzXYuFrOZnk1PTi07NEPhmg4NpGaXutIc
+SkwsKouLgU9xGqndXHt7CMUADTdA43x7VF8vhV929vensBxXVsFy6K2ir40zSbofitzmdHxghm+H
+l3s=
+-----END CERTIFICATE-----
+
+ISRG Root X2
+============
+-----BEGIN CERTIFICATE-----
+MIICGzCCAaGgAwIBAgIQQdKd0XLq7qeAwSxs6S+HUjAKBggqhkjOPQQDAzBPMQswCQYDVQQGEwJV
+UzEpMCcGA1UEChMgSW50ZXJuZXQgU2VjdXJpdHkgUmVzZWFyY2ggR3JvdXAxFTATBgNVBAMTDElT
+UkcgUm9vdCBYMjAeFw0yMDA5MDQwMDAwMDBaFw00MDA5MTcxNjAwMDBaME8xCzAJBgNVBAYTAlVT
+MSkwJwYDVQQKEyBJbnRlcm5ldCBTZWN1cml0eSBSZXNlYXJjaCBHcm91cDEVMBMGA1UEAxMMSVNS
+RyBSb290IFgyMHYwEAYHKoZIzj0CAQYFK4EEACIDYgAEzZvVn4CDCuwJSvMWSj5cz3es3mcFDR0H
+ttwW+1qLFNvicWDEukWVEYmO6gbf9yoWHKS5xcUy4APgHoIYOIvXRdgKam7mAHf7AlF9ItgKbppb
+d9/w+kHsOdx1ymgHDB/qo0IwQDAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAdBgNV
+HQ4EFgQUfEKWrt5LSDv6kviejM9ti6lyN5UwCgYIKoZIzj0EAwMDaAAwZQIwe3lORlCEwkSHRhtF
+cP9Ymd70/aTSVaYgLXTWNLxBo1BfASdWtL4ndQavEi51mI38AjEAi/V3bNTIZargCyzuFJ0nN6T5
+U6VR5CmD1/iQMVtCnwr1/q4AaOeMSQ+2b1tbFfLn
+-----END CERTIFICATE-----
+
+HiPKI Root CA - G1
+==================
+-----BEGIN CERTIFICATE-----
+MIIFajCCA1KgAwIBAgIQLd2szmKXlKFD6LDNdmpeYDANBgkqhkiG9w0BAQsFADBPMQswCQYDVQQG
+EwJUVzEjMCEGA1UECgwaQ2h1bmdod2EgVGVsZWNvbSBDby4sIEx0ZC4xGzAZBgNVBAMMEkhpUEtJ
+IFJvb3QgQ0EgLSBHMTAeFw0xOTAyMjIwOTQ2MDRaFw0zNzEyMzExNTU5NTlaME8xCzAJBgNVBAYT
+AlRXMSMwIQYDVQQKDBpDaHVuZ2h3YSBUZWxlY29tIENvLiwgTHRkLjEbMBkGA1UEAwwSSGlQS0kg
+Um9vdCBDQSAtIEcxMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA9B5/UnMyDHPkvRN0
+o9QwqNCuS9i233VHZvR85zkEHmpwINJaR3JnVfSl6J3VHiGh8Ge6zCFovkRTv4354twvVcg3Px+k
+wJyz5HdcoEb+d/oaoDjq7Zpy3iu9lFc6uux55199QmQ5eiY29yTw1S+6lZgRZq2XNdZ1AYDgr/SE
+YYwNHl98h5ZeQa/rh+r4XfEuiAU+TCK72h8q3VJGZDnzQs7ZngyzsHeXZJzA9KMuH5UHsBffMNsA
+GJZMoYFL3QRtU6M9/Aes1MU3guvklQgZKILSQjqj2FPseYlgSGDIcpJQ3AOPgz+yQlda22rpEZfd
+hSi8MEyr48KxRURHH+CKFgeW0iEPU8DtqX7UTuybCeyvQqww1r/REEXgphaypcXTT3OUM3ECoWqj
+1jOXTyFjHluP2cFeRXF3D4FdXyGarYPM+l7WjSNfGz1BryB1ZlpK9p/7qxj3ccC2HTHsOyDry+K4
+9a6SsvfhhEvyovKTmiKe0xRvNlS9H15ZFblzqMF8b3ti6RZsR1pl8w4Rm0bZ/W3c1pzAtH2lsN0/
+Vm+h+fbkEkj9Bn8SV7apI09bA8PgcSojt/ewsTu8mL3WmKgMa/aOEmem8rJY5AIJEzypuxC00jBF
+8ez3ABHfZfjcK0NVvxaXxA/VLGGEqnKG/uY6fsI/fe78LxQ+5oXdUG+3Se0CAwEAAaNCMEAwDwYD
+VR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQU8ncX+l6o/vY9cdVouslGDDjYr7AwDgYDVR0PAQH/BAQD
+AgGGMA0GCSqGSIb3DQEBCwUAA4ICAQBQUfB13HAE4/+qddRxosuej6ip0691x1TPOhwEmSKsxBHi
+7zNKpiMdDg1H2DfHb680f0+BazVP6XKlMeJ45/dOlBhbQH3PayFUhuaVevvGyuqcSE5XCV0vrPSl
+tJczWNWseanMX/mF+lLFjfiRFOs6DRfQUsJ748JzjkZ4Bjgs6FzaZsT0pPBWGTMpWmWSBUdGSquE
+wx4noR8RkpkndZMPvDY7l1ePJlsMu5wP1G4wB9TcXzZoZjmDlicmisjEOf6aIW/Vcobpf2Lll07Q
+JNBAsNB1CI69aO4I1258EHBGG3zgiLKecoaZAeO/n0kZtCW+VmWuF2PlHt/o/0elv+EmBYTksMCv
+5wiZqAxeJoBF1PhoL5aPruJKHJwWDBNvOIf2u8g0X5IDUXlwpt/L9ZlNec1OvFefQ05rLisY+Gpz
+jLrFNe85akEez3GoorKGB1s6yeHvP2UEgEcyRHCVTjFnanRbEEV16rCf0OY1/k6fi8wrkkVbbiVg
+hUbN0aqwdmaTd5a+g744tiROJgvM7XpWGuDpWsZkrUx6AEhEL7lAuxM+vhV4nYWBSipX3tUZQ9rb
+yltHhoMLP7YNdnhzeSJesYAfz77RP1YQmCuVh6EfnWQUYDksswBVLuT1sw5XxJFBAJw/6KXf6vb/
+yPCtbVKoF6ubYfwSUTXkJf2vqmqGOQ==
+-----END CERTIFICATE-----
+
+GlobalSign ECC Root CA - R4
+===========================
+-----BEGIN CERTIFICATE-----
+MIIB3DCCAYOgAwIBAgINAgPlfvU/k/2lCSGypjAKBggqhkjOPQQDAjBQMSQwIgYDVQQLExtHbG9i
+YWxTaWduIEVDQyBSb290IENBIC0gUjQxEzARBgNVBAoTCkdsb2JhbFNpZ24xEzARBgNVBAMTCkds
+b2JhbFNpZ24wHhcNMTIxMTEzMDAwMDAwWhcNMzgwMTE5MDMxNDA3WjBQMSQwIgYDVQQLExtHbG9i
+YWxTaWduIEVDQyBSb290IENBIC0gUjQxEzARBgNVBAoTCkdsb2JhbFNpZ24xEzARBgNVBAMTCkds
+b2JhbFNpZ24wWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAS4xnnTj2wlDp8uORkcA6SumuU5BwkW
+ymOxuYb4ilfBV85C+nOh92VC/x7BALJucw7/xyHlGKSq2XE/qNS5zowdo0IwQDAOBgNVHQ8BAf8E
+BAMCAYYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUVLB7rUW44kB/+wpu+74zyTyjhNUwCgYI
+KoZIzj0EAwIDRwAwRAIgIk90crlgr/HmnKAWBVBfw147bmF0774BxL4YSFlhgjICICadVGNA3jdg
+UM/I2O2dgq43mLyjj0xMqTQrbO/7lZsm
+-----END CERTIFICATE-----
+
+GTS Root R1
+===========
+-----BEGIN CERTIFICATE-----
+MIIFVzCCAz+gAwIBAgINAgPlk28xsBNJiGuiFzANBgkqhkiG9w0BAQwFADBHMQswCQYDVQQGEwJV
+UzEiMCAGA1UEChMZR29vZ2xlIFRydXN0IFNlcnZpY2VzIExMQzEUMBIGA1UEAxMLR1RTIFJvb3Qg
+UjEwHhcNMTYwNjIyMDAwMDAwWhcNMzYwNjIyMDAwMDAwWjBHMQswCQYDVQQGEwJVUzEiMCAGA1UE
+ChMZR29vZ2xlIFRydXN0IFNlcnZpY2VzIExMQzEUMBIGA1UEAxMLR1RTIFJvb3QgUjEwggIiMA0G
+CSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQC2EQKLHuOhd5s73L+UPreVp0A8of2C+X0yBoJx9vaM
+f/vo27xqLpeXo4xL+Sv2sfnOhB2x+cWX3u+58qPpvBKJXqeqUqv4IyfLpLGcY9vXmX7wCl7raKb0
+xlpHDU0QM+NOsROjyBhsS+z8CZDfnWQpJSMHobTSPS5g4M/SCYe7zUjwTcLCeoiKu7rPWRnWr4+w
+B7CeMfGCwcDfLqZtbBkOtdh+JhpFAz2weaSUKK0PfyblqAj+lug8aJRT7oM6iCsVlgmy4HqMLnXW
+nOunVmSPlk9orj2XwoSPwLxAwAtcvfaHszVsrBhQf4TgTM2S0yDpM7xSma8ytSmzJSq0SPly4cpk
+9+aCEI3oncKKiPo4Zor8Y/kB+Xj9e1x3+naH+uzfsQ55lVe0vSbv1gHR6xYKu44LtcXFilWr06zq
+kUspzBmkMiVOKvFlRNACzqrOSbTqn3yDsEB750Orp2yjj32JgfpMpf/VjsPOS+C12LOORc92wO1A
+K/1TD7Cn1TsNsYqiA94xrcx36m97PtbfkSIS5r762DL8EGMUUXLeXdYWk70paDPvOmbsB4om3xPX
+V2V4J95eSRQAogB/mqghtqmxlbCluQ0WEdrHbEg8QOB+DVrNVjzRlwW5y0vtOUucxD/SVRNuJLDW
+cfr0wbrM7Rv1/oFB2ACYPTrIrnqYNxgFlQIDAQABo0IwQDAOBgNVHQ8BAf8EBAMCAYYwDwYDVR0T
+AQH/BAUwAwEB/zAdBgNVHQ4EFgQU5K8rJnEaK0gnhS9SZizv8IkTcT4wDQYJKoZIhvcNAQEMBQAD
+ggIBAJ+qQibbC5u+/x6Wki4+omVKapi6Ist9wTrYggoGxval3sBOh2Z5ofmmWJyq+bXmYOfg6LEe
+QkEzCzc9zolwFcq1JKjPa7XSQCGYzyI0zzvFIoTgxQ6KfF2I5DUkzps+GlQebtuyh6f88/qBVRRi
+ClmpIgUxPoLW7ttXNLwzldMXG+gnoot7TiYaelpkttGsN/H9oPM47HLwEXWdyzRSjeZ2axfG34ar
+J45JK3VmgRAhpuo+9K4l/3wV3s6MJT/KYnAK9y8JZgfIPxz88NtFMN9iiMG1D53Dn0reWVlHxYci
+NuaCp+0KueIHoI17eko8cdLiA6EfMgfdG+RCzgwARWGAtQsgWSl4vflVy2PFPEz0tv/bal8xa5me
+LMFrUKTX5hgUvYU/Z6tGn6D/Qqc6f1zLXbBwHSs09dR2CQzreExZBfMzQsNhFRAbd03OIozUhfJF
+fbdT6u9AWpQKXCBfTkBdYiJ23//OYb2MI3jSNwLgjt7RETeJ9r/tSQdirpLsQBqvFAnZ0E6yove+
+7u7Y/9waLd64NnHi/Hm3lCXRSHNboTXns5lndcEZOitHTtNCjv0xyBZm2tIMPNuzjsmhDYAPexZ3
+FL//2wmUspO8IFgV6dtxQ/PeEMMA3KgqlbbC1j+Qa3bbbP6MvPJwNQzcmRk13NfIRmPVNnGuV/u3
+gm3c
+-----END CERTIFICATE-----
+
+GTS Root R2
+===========
+-----BEGIN CERTIFICATE-----
+MIIFVzCCAz+gAwIBAgINAgPlrsWNBCUaqxElqjANBgkqhkiG9w0BAQwFADBHMQswCQYDVQQGEwJV
+UzEiMCAGA1UEChMZR29vZ2xlIFRydXN0IFNlcnZpY2VzIExMQzEUMBIGA1UEAxMLR1RTIFJvb3Qg
+UjIwHhcNMTYwNjIyMDAwMDAwWhcNMzYwNjIyMDAwMDAwWjBHMQswCQYDVQQGEwJVUzEiMCAGA1UE
+ChMZR29vZ2xlIFRydXN0IFNlcnZpY2VzIExMQzEUMBIGA1UEAxMLR1RTIFJvb3QgUjIwggIiMA0G
+CSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDO3v2m++zsFDQ8BwZabFn3GTXd98GdVarTzTukk3Lv
+CvptnfbwhYBboUhSnznFt+4orO/LdmgUud+tAWyZH8QiHZ/+cnfgLFuv5AS/T3KgGjSY6Dlo7JUl
+e3ah5mm5hRm9iYz+re026nO8/4Piy33B0s5Ks40FnotJk9/BW9BuXvAuMC6C/Pq8tBcKSOWIm8Wb
+a96wyrQD8Nr0kLhlZPdcTK3ofmZemde4wj7I0BOdre7kRXuJVfeKH2JShBKzwkCX44ofR5GmdFrS
++LFjKBC4swm4VndAoiaYecb+3yXuPuWgf9RhD1FLPD+M2uFwdNjCaKH5wQzpoeJ/u1U8dgbuak7M
+kogwTZq9TwtImoS1mKPV+3PBV2HdKFZ1E66HjucMUQkQdYhMvI35ezzUIkgfKtzra7tEscszcTJG
+r61K8YzodDqs5xoic4DSMPclQsciOzsSrZYuxsN2B6ogtzVJV+mSSeh2FnIxZyuWfoqjx5RWIr9q
+S34BIbIjMt/kmkRtWVtd9QCgHJvGeJeNkP+byKq0rxFROV7Z+2et1VsRnTKaG73VululycslaVNV
+J1zgyjbLiGH7HrfQy+4W+9OmTN6SpdTi3/UGVN4unUu0kzCqgc7dGtxRcw1PcOnlthYhGXmy5okL
+dWTK1au8CcEYof/UVKGFPP0UJAOyh9OktwIDAQABo0IwQDAOBgNVHQ8BAf8EBAMCAYYwDwYDVR0T
+AQH/BAUwAwEB/zAdBgNVHQ4EFgQUu//KjiOfT5nK2+JopqUVJxce2Q4wDQYJKoZIhvcNAQEMBQAD
+ggIBAB/Kzt3HvqGf2SdMC9wXmBFqiN495nFWcrKeGk6c1SuYJF2ba3uwM4IJvd8lRuqYnrYb/oM8
+0mJhwQTtzuDFycgTE1XnqGOtjHsB/ncw4c5omwX4Eu55MaBBRTUoCnGkJE+M3DyCB19m3H0Q/gxh
+swWV7uGugQ+o+MePTagjAiZrHYNSVc61LwDKgEDg4XSsYPWHgJ2uNmSRXbBoGOqKYcl3qJfEycel
+/FVL8/B/uWU9J2jQzGv6U53hkRrJXRqWbTKH7QMgyALOWr7Z6v2yTcQvG99fevX4i8buMTolUVVn
+jWQye+mew4K6Ki3pHrTgSAai/GevHyICc/sgCq+dVEuhzf9gR7A/Xe8bVr2XIZYtCtFenTgCR2y5
+9PYjJbigapordwj6xLEokCZYCDzifqrXPW+6MYgKBesntaFJ7qBFVHvmJ2WZICGoo7z7GJa7Um8M
+7YNRTOlZ4iBgxcJlkoKM8xAfDoqXvneCbT+PHV28SSe9zE8P4c52hgQjxcCMElv924SgJPFI/2R8
+0L5cFtHvma3AH/vLrrw4IgYmZNralw4/KBVEqE8AyvCazM90arQ+POuV7LXTWtiBmelDGDfrs7vR
+WGJB82bSj6p4lVQgw1oudCvV0b4YacCs1aTPObpRhANl6WLAYv7YTVWW4tAR+kg0Eeye7QUd5MjW
+HYbL
+-----END CERTIFICATE-----
+
+GTS Root R3
+===========
+-----BEGIN CERTIFICATE-----
+MIICCTCCAY6gAwIBAgINAgPluILrIPglJ209ZjAKBggqhkjOPQQDAzBHMQswCQYDVQQGEwJVUzEi
+MCAGA1UEChMZR29vZ2xlIFRydXN0IFNlcnZpY2VzIExMQzEUMBIGA1UEAxMLR1RTIFJvb3QgUjMw
+HhcNMTYwNjIyMDAwMDAwWhcNMzYwNjIyMDAwMDAwWjBHMQswCQYDVQQGEwJVUzEiMCAGA1UEChMZ
+R29vZ2xlIFRydXN0IFNlcnZpY2VzIExMQzEUMBIGA1UEAxMLR1RTIFJvb3QgUjMwdjAQBgcqhkjO
+PQIBBgUrgQQAIgNiAAQfTzOHMymKoYTey8chWEGJ6ladK0uFxh1MJ7x/JlFyb+Kf1qPKzEUURout
+736GjOyxfi//qXGdGIRFBEFVbivqJn+7kAHjSxm65FSWRQmx1WyRRK2EE46ajA2ADDL24CejQjBA
+MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBTB8Sa6oC2uhYHP0/Eq
+Er24Cmf9vDAKBggqhkjOPQQDAwNpADBmAjEA9uEglRR7VKOQFhG/hMjqb2sXnh5GmCCbn9MN2azT
+L818+FsuVbu/3ZL3pAzcMeGiAjEA/JdmZuVDFhOD3cffL74UOO0BzrEXGhF16b0DjyZ+hOXJYKaV
+11RZt+cRLInUue4X
+-----END CERTIFICATE-----
+
+GTS Root R4
+===========
+-----BEGIN CERTIFICATE-----
+MIICCTCCAY6gAwIBAgINAgPlwGjvYxqccpBQUjAKBggqhkjOPQQDAzBHMQswCQYDVQQGEwJVUzEi
+MCAGA1UEChMZR29vZ2xlIFRydXN0IFNlcnZpY2VzIExMQzEUMBIGA1UEAxMLR1RTIFJvb3QgUjQw
+HhcNMTYwNjIyMDAwMDAwWhcNMzYwNjIyMDAwMDAwWjBHMQswCQYDVQQGEwJVUzEiMCAGA1UEChMZ
+R29vZ2xlIFRydXN0IFNlcnZpY2VzIExMQzEUMBIGA1UEAxMLR1RTIFJvb3QgUjQwdjAQBgcqhkjO
+PQIBBgUrgQQAIgNiAATzdHOnaItgrkO4NcWBMHtLSZ37wWHO5t5GvWvVYRg1rkDdc/eJkTBa6zzu
+hXyiQHY7qca4R9gq55KRanPpsXI5nymfopjTX15YhmUPoYRlBtHci8nHc8iMai/lxKvRHYqjQjBA
+MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBSATNbrdP9JNqPV2Py1
+PsVq8JQdjDAKBggqhkjOPQQDAwNpADBmAjEA6ED/g94D9J+uHXqnLrmvT/aDHQ4thQEd0dlq7A/C
+r8deVl5c1RxYIigL9zC2L7F8AjEA8GE8p/SgguMh1YQdc4acLa/KNJvxn7kjNuK8YAOdgLOaVsjh
+4rsUecrNIdSUtUlD
+-----END CERTIFICATE-----
+
+Telia Root CA v2
+================
+-----BEGIN CERTIFICATE-----
+MIIFdDCCA1ygAwIBAgIPAWdfJ9b+euPkrL4JWwWeMA0GCSqGSIb3DQEBCwUAMEQxCzAJBgNVBAYT
+AkZJMRowGAYDVQQKDBFUZWxpYSBGaW5sYW5kIE95ajEZMBcGA1UEAwwQVGVsaWEgUm9vdCBDQSB2
+MjAeFw0xODExMjkxMTU1NTRaFw00MzExMjkxMTU1NTRaMEQxCzAJBgNVBAYTAkZJMRowGAYDVQQK
+DBFUZWxpYSBGaW5sYW5kIE95ajEZMBcGA1UEAwwQVGVsaWEgUm9vdCBDQSB2MjCCAiIwDQYJKoZI
+hvcNAQEBBQADggIPADCCAgoCggIBALLQPwe84nvQa5n44ndp586dpAO8gm2h/oFlH0wnrI4AuhZ7
+6zBqAMCzdGh+sq/H1WKzej9Qyow2RCRj0jbpDIX2Q3bVTKFgcmfiKDOlyzG4OiIjNLh9vVYiQJ3q
+9HsDrWj8soFPmNB06o3lfc1jw6P23pLCWBnglrvFxKk9pXSW/q/5iaq9lRdU2HhE8Qx3FZLgmEKn
+pNaqIJLNwaCzlrI6hEKNfdWV5Nbb6WLEWLN5xYzTNTODn3WhUidhOPFZPY5Q4L15POdslv5e2QJl
+tI5c0BE0312/UqeBAMN/mUWZFdUXyApT7GPzmX3MaRKGwhfwAZ6/hLzRUssbkmbOpFPlob/E2wnW
+5olWK8jjfN7j/4nlNW4o6GwLI1GpJQXrSPjdscr6bAhR77cYbETKJuFzxokGgeWKrLDiKca5JLNr
+RBH0pUPCTEPlcDaMtjNXepUugqD0XBCzYYP2AgWGLnwtbNwDRm41k9V6lS/eINhbfpSQBGq6WT0E
+BXWdN6IOLj3rwaRSg/7Qa9RmjtzG6RJOHSpXqhC8fF6CfaamyfItufUXJ63RDolUK5X6wK0dmBR4
+M0KGCqlztft0DbcbMBnEWg4cJ7faGND/isgFuvGqHKI3t+ZIpEYslOqodmJHixBTB0hXbOKSTbau
+BcvcwUpej6w9GU7C7WB1K9vBykLVAgMBAAGjYzBhMB8GA1UdIwQYMBaAFHKs5DN5qkWH9v2sHZ7W
+xy+G2CQ5MB0GA1UdDgQWBBRyrOQzeapFh/b9rB2e1scvhtgkOTAOBgNVHQ8BAf8EBAMCAQYwDwYD
+VR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAgEAoDtZpwmUPjaE0n4vOaWWl/oRrfxn83EJ
+8rKJhGdEr7nv7ZbsnGTbMjBvZ5qsfl+yqwE2foH65IRe0qw24GtixX1LDoJt0nZi0f6X+J8wfBj5
+tFJ3gh1229MdqfDBmgC9bXXYfef6xzijnHDoRnkDry5023X4blMMA8iZGok1GTzTyVR8qPAs5m4H
+eW9q4ebqkYJpCh3DflminmtGFZhb069GHWLIzoBSSRE/yQQSwxN8PzuKlts8oB4KtItUsiRnDe+C
+y748fdHif64W1lZYudogsYMVoe+KTTJvQS8TUoKU1xrBeKJR3Stwbbca+few4GeXVtt8YVMJAygC
+QMez2P2ccGrGKMOF6eLtGpOg3kuYooQ+BXcBlj37tCAPnHICehIv1aO6UXivKitEZU61/Qrowc15
+h2Er3oBXRb9n8ZuRXqWk7FlIEA04x7D6w0RtBPV4UBySllva9bguulvP5fBqnUsvWHMtTy3EHD70
+sz+rFQ47GUGKpMFXEmZxTPpT41frYpUJnlTd0cI8Vzy9OK2YZLe4A5pTVmBds9hCG1xLEooc6+t9
+xnppxyd/pPiL8uSUZodL6ZQHCRJ5irLrdATczvREWeAWysUsWNc8e89ihmpQfTU2Zqf7N+cox9jQ
+raVplI/owd8k+BsHMYeB2F326CjYSlKArBPuUBQemMc=
+-----END CERTIFICATE-----
+
+D-TRUST BR Root CA 1 2020
+=========================
+-----BEGIN CERTIFICATE-----
+MIIC2zCCAmCgAwIBAgIQfMmPK4TX3+oPyWWa00tNljAKBggqhkjOPQQDAzBIMQswCQYDVQQGEwJE
+RTEVMBMGA1UEChMMRC1UcnVzdCBHbWJIMSIwIAYDVQQDExlELVRSVVNUIEJSIFJvb3QgQ0EgMSAy
+MDIwMB4XDTIwMDIxMTA5NDUwMFoXDTM1MDIxMTA5NDQ1OVowSDELMAkGA1UEBhMCREUxFTATBgNV
+BAoTDEQtVHJ1c3QgR21iSDEiMCAGA1UEAxMZRC1UUlVTVCBCUiBSb290IENBIDEgMjAyMDB2MBAG
+ByqGSM49AgEGBSuBBAAiA2IABMbLxyjR+4T1mu9CFCDhQ2tuda38KwOE1HaTJddZO0Flax7mNCq7
+dPYSzuht56vkPE4/RAiLzRZxy7+SmfSk1zxQVFKQhYN4lGdnoxwJGT11NIXe7WB9xwy0QVK5buXu
+QqOCAQ0wggEJMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFHOREKv/VbNafAkl1bK6CKBrqx9t
+MA4GA1UdDwEB/wQEAwIBBjCBxgYDVR0fBIG+MIG7MD6gPKA6hjhodHRwOi8vY3JsLmQtdHJ1c3Qu
+bmV0L2NybC9kLXRydXN0X2JyX3Jvb3RfY2FfMV8yMDIwLmNybDB5oHegdYZzbGRhcDovL2RpcmVj
+dG9yeS5kLXRydXN0Lm5ldC9DTj1ELVRSVVNUJTIwQlIlMjBSb290JTIwQ0ElMjAxJTIwMjAyMCxP
+PUQtVHJ1c3QlMjBHbWJILEM9REU/Y2VydGlmaWNhdGVyZXZvY2F0aW9ubGlzdDAKBggqhkjOPQQD
+AwNpADBmAjEAlJAtE/rhY/hhY+ithXhUkZy4kzg+GkHaQBZTQgjKL47xPoFWwKrY7RjEsK70Pvom
+AjEA8yjixtsrmfu3Ubgko6SUeho/5jbiA1czijDLgsfWFBHVdWNbFJWcHwHP2NVypw87
+-----END CERTIFICATE-----
+
+D-TRUST EV Root CA 1 2020
+=========================
+-----BEGIN CERTIFICATE-----
+MIIC2zCCAmCgAwIBAgIQXwJB13qHfEwDo6yWjfv/0DAKBggqhkjOPQQDAzBIMQswCQYDVQQGEwJE
+RTEVMBMGA1UEChMMRC1UcnVzdCBHbWJIMSIwIAYDVQQDExlELVRSVVNUIEVWIFJvb3QgQ0EgMSAy
+MDIwMB4XDTIwMDIxMTEwMDAwMFoXDTM1MDIxMTA5NTk1OVowSDELMAkGA1UEBhMCREUxFTATBgNV
+BAoTDEQtVHJ1c3QgR21iSDEiMCAGA1UEAxMZRC1UUlVTVCBFViBSb290IENBIDEgMjAyMDB2MBAG
+ByqGSM49AgEGBSuBBAAiA2IABPEL3YZDIBnfl4XoIkqbz52Yv7QFJsnL46bSj8WeeHsxiamJrSc8
+ZRCC/N/DnU7wMyPE0jL1HLDfMxddxfCxivnvubcUyilKwg+pf3VlSSowZ/Rk99Yad9rDwpdhQntJ
+raOCAQ0wggEJMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFH8QARY3OqQo5FD4pPfsazK2/umL
+MA4GA1UdDwEB/wQEAwIBBjCBxgYDVR0fBIG+MIG7MD6gPKA6hjhodHRwOi8vY3JsLmQtdHJ1c3Qu
+bmV0L2NybC9kLXRydXN0X2V2X3Jvb3RfY2FfMV8yMDIwLmNybDB5oHegdYZzbGRhcDovL2RpcmVj
+dG9yeS5kLXRydXN0Lm5ldC9DTj1ELVRSVVNUJTIwRVYlMjBSb290JTIwQ0ElMjAxJTIwMjAyMCxP
+PUQtVHJ1c3QlMjBHbWJILEM9REU/Y2VydGlmaWNhdGVyZXZvY2F0aW9ubGlzdDAKBggqhkjOPQQD
+AwNpADBmAjEAyjzGKnXCXnViOTYAYFqLwZOZzNnbQTs7h5kXO9XMT8oi96CAy/m0sRtW9XLS/BnR
+AjEAkfcwkz8QRitxpNA7RJvAKQIFskF3UfN5Wp6OFKBOQtJbgfM0agPnIjhQW+0ZT0MW
+-----END CERTIFICATE-----
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
index d2abeadcb..72a79363f 100644
--- a/vendor/composer/installed.json
+++ b/vendor/composer/installed.json
@@ -2,17 +2,17 @@
     "packages": [
         {
             "name": "composer/ca-bundle",
-            "version": "1.3.1",
-            "version_normalized": "1.3.1.0",
+            "version": "1.3.2",
+            "version_normalized": "1.3.2.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/composer/ca-bundle.git",
-                "reference": "4c679186f2aca4ab6a0f1b0b9cf9252decb44d0b"
+                "reference": "fd5dd441932a7e10ca6e5b490e272d34c8430640"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/composer/ca-bundle/zipball/4c679186f2aca4ab6a0f1b0b9cf9252decb44d0b",
-                "reference": "4c679186f2aca4ab6a0f1b0b9cf9252decb44d0b",
+                "url": "https://api.github.com/repos/composer/ca-bundle/zipball/fd5dd441932a7e10ca6e5b490e272d34c8430640",
+                "reference": "fd5dd441932a7e10ca6e5b490e272d34c8430640",
                 "shasum": ""
             },
             "require": {
@@ -26,7 +26,7 @@
                 "symfony/phpunit-bridge": "^4.2 || ^5",
                 "symfony/process": "^2.5 || ^3.0 || ^4.0 || ^5.0 || ^6.0"
             },
-            "time": "2021-10-28T20:44:15+00:00",
+            "time": "2022-05-24T11:56:16+00:00",
             "type": "library",
             "extra": {
                 "branch-alias": {
@@ -61,7 +61,7 @@
             "support": {
                 "irc": "irc://irc.freenode.org/composer",
                 "issues": "https://github.com/composer/ca-bundle/issues",
-                "source": "https://github.com/composer/ca-bundle/tree/1.3.1"
+                "source": "https://github.com/composer/ca-bundle/tree/1.3.2"
             },
             "funding": [
                 {
@@ -220,25 +220,25 @@
         },
         {
             "name": "guzzlehttp/guzzle",
-            "version": "6.5.5",
-            "version_normalized": "6.5.5.0",
+            "version": "6.5.8",
+            "version_normalized": "6.5.8.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/guzzle/guzzle.git",
-                "reference": "9d4290de1cfd701f38099ef7e183b64b4b7b0c5e"
+                "reference": "a52f0440530b54fa079ce76e8c5d196a42cad981"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/guzzle/zipball/9d4290de1cfd701f38099ef7e183b64b4b7b0c5e",
-                "reference": "9d4290de1cfd701f38099ef7e183b64b4b7b0c5e",
+                "url": "https://api.github.com/repos/guzzle/guzzle/zipball/a52f0440530b54fa079ce76e8c5d196a42cad981",
+                "reference": "a52f0440530b54fa079ce76e8c5d196a42cad981",
                 "shasum": ""
             },
             "require": {
                 "ext-json": "*",
                 "guzzlehttp/promises": "^1.0",
-                "guzzlehttp/psr7": "^1.6.1",
+                "guzzlehttp/psr7": "^1.9",
                 "php": ">=5.5",
-                "symfony/polyfill-intl-idn": "^1.17.0"
+                "symfony/polyfill-intl-idn": "^1.17"
             },
             "require-dev": {
                 "ext-curl": "*",
@@ -248,7 +248,7 @@
             "suggest": {
                 "psr/log": "Required for using the Log middleware"
             },
-            "time": "2020-06-16T21:01:06+00:00",
+            "time": "2022-06-20T22:16:07+00:00",
             "type": "library",
             "extra": {
                 "branch-alias": {
@@ -257,22 +257,52 @@
             },
             "installation-source": "dist",
             "autoload": {
-                "psr-4": {
-                    "GuzzleHttp\\": "src/"
-                },
                 "files": [
                     "src/functions_include.php"
-                ]
+                ],
+                "psr-4": {
+                    "GuzzleHttp\\": "src/"
+                }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
                 "MIT"
             ],
             "authors": [
+                {
+                    "name": "Graham Campbell",
+                    "email": "hello@gjcampbell.co.uk",
+                    "homepage": "https://github.com/GrahamCampbell"
+                },
                 {
                     "name": "Michael Dowling",
                     "email": "mtdowling@gmail.com",
                     "homepage": "https://github.com/mtdowling"
+                },
+                {
+                    "name": "Jeremy Lindblom",
+                    "email": "jeremeamia@gmail.com",
+                    "homepage": "https://github.com/jeremeamia"
+                },
+                {
+                    "name": "George Mponos",
+                    "email": "gmponos@gmail.com",
+                    "homepage": "https://github.com/gmponos"
+                },
+                {
+                    "name": "Tobias Nyholm",
+                    "email": "tobias.nyholm@gmail.com",
+                    "homepage": "https://github.com/Nyholm"
+                },
+                {
+                    "name": "Márk Sági-Kazár",
+                    "email": "mark.sagikazar@gmail.com",
+                    "homepage": "https://github.com/sagikazarmark"
+                },
+                {
+                    "name": "Tobias Schultze",
+                    "email": "webmaster@tubo-world.de",
+                    "homepage": "https://github.com/Tobion"
                 }
             ],
             "description": "Guzzle is a PHP HTTP client library",
@@ -286,6 +316,24 @@
                 "rest",
                 "web service"
             ],
+            "support": {
+                "issues": "https://github.com/guzzle/guzzle/issues",
+                "source": "https://github.com/guzzle/guzzle/tree/6.5.8"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/GrahamCampbell",
+                    "type": "github"
+                },
+                {
+                    "url": "https://github.com/Nyholm",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/guzzlehttp/guzzle",
+                    "type": "tidelift"
+                }
+            ],
             "install-path": "../guzzlehttp/guzzle"
         },
         {
@@ -377,17 +425,17 @@
         },
         {
             "name": "guzzlehttp/psr7",
-            "version": "1.8.3",
-            "version_normalized": "1.8.3.0",
+            "version": "1.9.0",
+            "version_normalized": "1.9.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/guzzle/psr7.git",
-                "reference": "1afdd860a2566ed3c2b0b4a3de6e23434a79ec85"
+                "reference": "e98e3e6d4f86621a9b75f623996e6bbdeb4b9318"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/psr7/zipball/1afdd860a2566ed3c2b0b4a3de6e23434a79ec85",
-                "reference": "1afdd860a2566ed3c2b0b4a3de6e23434a79ec85",
+                "url": "https://api.github.com/repos/guzzle/psr7/zipball/e98e3e6d4f86621a9b75f623996e6bbdeb4b9318",
+                "reference": "e98e3e6d4f86621a9b75f623996e6bbdeb4b9318",
                 "shasum": ""
             },
             "require": {
@@ -405,21 +453,21 @@
             "suggest": {
                 "laminas/laminas-httphandlerrunner": "Emit PSR-7 responses"
             },
-            "time": "2021-10-05T13:56:00+00:00",
+            "time": "2022-06-20T21:43:03+00:00",
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.7-dev"
+                    "dev-master": "1.9-dev"
                 }
             },
             "installation-source": "dist",
             "autoload": {
-                "psr-4": {
-                    "GuzzleHttp\\Psr7\\": "src/"
-                },
                 "files": [
                     "src/functions_include.php"
-                ]
+                ],
+                "psr-4": {
+                    "GuzzleHttp\\Psr7\\": "src/"
+                }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
@@ -470,7 +518,7 @@
             ],
             "support": {
                 "issues": "https://github.com/guzzle/psr7/issues",
-                "source": "https://github.com/guzzle/psr7/tree/1.8.3"
+                "source": "https://github.com/guzzle/psr7/tree/1.9.0"
             },
             "funding": [
                 {
@@ -558,17 +606,17 @@
         },
         {
             "name": "maxmind/web-service-common",
-            "version": "v0.8.1",
-            "version_normalized": "0.8.1.0",
+            "version": "v0.9.0",
+            "version_normalized": "0.9.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/maxmind/web-service-common-php.git",
-                "reference": "32f274051c543fc865e5a84d3a2c703913641ea8"
+                "reference": "4dc5a3e8df38aea4ca3b1096cee3a038094e9b53"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/maxmind/web-service-common-php/zipball/32f274051c543fc865e5a84d3a2c703913641ea8",
-                "reference": "32f274051c543fc865e5a84d3a2c703913641ea8",
+                "url": "https://api.github.com/repos/maxmind/web-service-common-php/zipball/4dc5a3e8df38aea4ca3b1096cee3a038094e9b53",
+                "reference": "4dc5a3e8df38aea4ca3b1096cee3a038094e9b53",
                 "shasum": ""
             },
             "require": {
@@ -578,11 +626,12 @@
                 "php": ">=7.2"
             },
             "require-dev": {
-                "friendsofphp/php-cs-fixer": "2.*",
+                "friendsofphp/php-cs-fixer": "3.*",
+                "phpstan/phpstan": "*",
                 "phpunit/phpunit": "^8.0 || ^9.0",
                 "squizlabs/php_codesniffer": "3.*"
             },
-            "time": "2020-11-02T17:00:53+00:00",
+            "time": "2022-03-28T17:43:20+00:00",
             "type": "library",
             "installation-source": "dist",
             "autoload": {
@@ -603,6 +652,10 @@
             ],
             "description": "Internal MaxMind Web Service API",
             "homepage": "https://github.com/maxmind/web-service-common-php",
+            "support": {
+                "issues": "https://github.com/maxmind/web-service-common-php/issues",
+                "source": "https://github.com/maxmind/web-service-common-php/tree/v0.9.0"
+            },
             "install-path": "../maxmind/web-service-common"
         },
         {
@@ -714,17 +767,17 @@
         },
         {
             "name": "paragonie/sodium_compat",
-            "version": "v1.17.0",
-            "version_normalized": "1.17.0.0",
+            "version": "v1.17.1",
+            "version_normalized": "1.17.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/paragonie/sodium_compat.git",
-                "reference": "c59cac21abbcc0df06a3dd18076450ea4797b321"
+                "reference": "ac994053faac18d386328c91c7900f930acadf1e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/paragonie/sodium_compat/zipball/c59cac21abbcc0df06a3dd18076450ea4797b321",
-                "reference": "c59cac21abbcc0df06a3dd18076450ea4797b321",
+                "url": "https://api.github.com/repos/paragonie/sodium_compat/zipball/ac994053faac18d386328c91c7900f930acadf1e",
+                "reference": "ac994053faac18d386328c91c7900f930acadf1e",
                 "shasum": ""
             },
             "require": {
@@ -738,7 +791,7 @@
                 "ext-libsodium": "PHP < 7.0: Better performance, password hashing (Argon2i), secure memory management (memzero), and better security.",
                 "ext-sodium": "PHP >= 7.0: Better performance, password hashing (Argon2i), secure memory management (memzero), and better security."
             },
-            "time": "2021-08-10T02:43:50+00:00",
+            "time": "2022-03-23T19:32:04+00:00",
             "type": "library",
             "installation-source": "dist",
             "autoload": {
@@ -797,7 +850,7 @@
             ],
             "support": {
                 "issues": "https://github.com/paragonie/sodium_compat/issues",
-                "source": "https://github.com/paragonie/sodium_compat/tree/v1.17.0"
+                "source": "https://github.com/paragonie/sodium_compat/tree/v1.17.1"
             },
             "install-path": "../paragonie/sodium_compat"
         },
@@ -904,17 +957,17 @@
         },
         {
             "name": "phpmailer/phpmailer",
-            "version": "v6.5.4",
-            "version_normalized": "6.5.4.0",
+            "version": "v6.6.3",
+            "version_normalized": "6.6.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/PHPMailer/PHPMailer.git",
-                "reference": "c0d9f7dd3c2aa247ca44791e9209233829d82285"
+                "reference": "9400f305a898f194caff5521f64e5dfa926626f3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/PHPMailer/PHPMailer/zipball/c0d9f7dd3c2aa247ca44791e9209233829d82285",
-                "reference": "c0d9f7dd3c2aa247ca44791e9209233829d82285",
+                "url": "https://api.github.com/repos/PHPMailer/PHPMailer/zipball/9400f305a898f194caff5521f64e5dfa926626f3",
+                "reference": "9400f305a898f194caff5521f64e5dfa926626f3",
                 "shasum": ""
             },
             "require": {
@@ -926,8 +979,8 @@
             "require-dev": {
                 "dealerdirect/phpcodesniffer-composer-installer": "^0.7.0",
                 "doctrine/annotations": "^1.2",
-                "php-parallel-lint/php-console-highlighter": "^0.5.0",
-                "php-parallel-lint/php-parallel-lint": "^1.3.1",
+                "php-parallel-lint/php-console-highlighter": "^1.0.0",
+                "php-parallel-lint/php-parallel-lint": "^1.3.2",
                 "phpcompatibility/php-compatibility": "^9.3.5",
                 "roave/security-advisories": "dev-latest",
                 "squizlabs/php_codesniffer": "^3.6.2",
@@ -941,7 +994,7 @@
                 "stevenmaguire/oauth2-microsoft": "Needed for Microsoft XOAUTH2 authentication",
                 "symfony/polyfill-mbstring": "To support UTF-8 if the Mbstring PHP extension is not enabled (^1.2)"
             },
-            "time": "2022-02-17T08:19:04+00:00",
+            "time": "2022-06-20T09:21:02+00:00",
             "type": "library",
             "installation-source": "dist",
             "autoload": {
@@ -973,7 +1026,7 @@
             "description": "PHPMailer is a full-featured email creation and transfer class for PHP",
             "support": {
                 "issues": "https://github.com/PHPMailer/PHPMailer/issues",
-                "source": "https://github.com/PHPMailer/PHPMailer/tree/v6.5.4"
+                "source": "https://github.com/PHPMailer/PHPMailer/tree/v6.6.3"
             },
             "funding": [
                 {
@@ -1217,17 +1270,17 @@
         },
         {
             "name": "stripe/stripe-php",
-            "version": "v7.114.0",
-            "version_normalized": "7.114.0.0",
+            "version": "v7.128.0",
+            "version_normalized": "7.128.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/stripe/stripe-php.git",
-                "reference": "63be231686c6874befb5b3a47fb8effb4c30b78b"
+                "reference": "c704949c49b72985c76cc61063aa26fefbd2724e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/stripe/stripe-php/zipball/63be231686c6874befb5b3a47fb8effb4c30b78b",
-                "reference": "63be231686c6874befb5b3a47fb8effb4c30b78b",
+                "url": "https://api.github.com/repos/stripe/stripe-php/zipball/c704949c49b72985c76cc61063aa26fefbd2724e",
+                "reference": "c704949c49b72985c76cc61063aa26fefbd2724e",
                 "shasum": ""
             },
             "require": {
@@ -1242,7 +1295,7 @@
                 "phpunit/phpunit": "^5.7 || ^9.0",
                 "squizlabs/php_codesniffer": "^3.3"
             },
-            "time": "2022-02-15T22:48:31+00:00",
+            "time": "2022-05-05T17:18:02+00:00",
             "type": "library",
             "extra": {
                 "branch-alias": {
@@ -1274,23 +1327,23 @@
             ],
             "support": {
                 "issues": "https://github.com/stripe/stripe-php/issues",
-                "source": "https://github.com/stripe/stripe-php/tree/v7.114.0"
+                "source": "https://github.com/stripe/stripe-php/tree/v7.128.0"
             },
             "install-path": "../stripe/stripe-php"
         },
         {
             "name": "symfony/polyfill-intl-idn",
-            "version": "v1.24.0",
-            "version_normalized": "1.24.0.0",
+            "version": "v1.26.0",
+            "version_normalized": "1.26.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-intl-idn.git",
-                "reference": "749045c69efb97c70d25d7463abba812e91f3a44"
+                "reference": "59a8d271f00dd0e4c2e518104cc7963f655a1aa8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/749045c69efb97c70d25d7463abba812e91f3a44",
-                "reference": "749045c69efb97c70d25d7463abba812e91f3a44",
+                "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/59a8d271f00dd0e4c2e518104cc7963f655a1aa8",
+                "reference": "59a8d271f00dd0e4c2e518104cc7963f655a1aa8",
                 "shasum": ""
             },
             "require": {
@@ -1301,11 +1354,11 @@
             "suggest": {
                 "ext-intl": "For best performance"
             },
-            "time": "2021-09-14T14:02:44+00:00",
+            "time": "2022-05-24T11:49:31+00:00",
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "1.23-dev"
+                    "dev-main": "1.26-dev"
                 },
                 "thanks": {
                     "name": "symfony/polyfill",
@@ -1350,7 +1403,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-intl-idn/tree/v1.24.0"
+                "source": "https://github.com/symfony/polyfill-intl-idn/tree/v1.26.0"
             },
             "funding": [
                 {
@@ -1370,17 +1423,17 @@
         },
         {
             "name": "symfony/polyfill-intl-normalizer",
-            "version": "v1.24.0",
-            "version_normalized": "1.24.0.0",
+            "version": "v1.26.0",
+            "version_normalized": "1.26.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-intl-normalizer.git",
-                "reference": "8590a5f561694770bdcd3f9b5c69dde6945028e8"
+                "reference": "219aa369ceff116e673852dce47c3a41794c14bd"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/8590a5f561694770bdcd3f9b5c69dde6945028e8",
-                "reference": "8590a5f561694770bdcd3f9b5c69dde6945028e8",
+                "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/219aa369ceff116e673852dce47c3a41794c14bd",
+                "reference": "219aa369ceff116e673852dce47c3a41794c14bd",
                 "shasum": ""
             },
             "require": {
@@ -1389,11 +1442,11 @@
             "suggest": {
                 "ext-intl": "For best performance"
             },
-            "time": "2021-02-19T12:13:01+00:00",
+            "time": "2022-05-24T11:49:31+00:00",
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "1.23-dev"
+                    "dev-main": "1.26-dev"
                 },
                 "thanks": {
                     "name": "symfony/polyfill",
@@ -1437,7 +1490,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.24.0"
+                "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.26.0"
             },
             "funding": [
                 {
@@ -1457,27 +1510,27 @@
         },
         {
             "name": "symfony/polyfill-php72",
-            "version": "v1.24.0",
-            "version_normalized": "1.24.0.0",
+            "version": "v1.26.0",
+            "version_normalized": "1.26.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-php72.git",
-                "reference": "9a142215a36a3888e30d0a9eeea9766764e96976"
+                "reference": "bf44a9fd41feaac72b074de600314a93e2ae78e2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/9a142215a36a3888e30d0a9eeea9766764e96976",
-                "reference": "9a142215a36a3888e30d0a9eeea9766764e96976",
+                "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/bf44a9fd41feaac72b074de600314a93e2ae78e2",
+                "reference": "bf44a9fd41feaac72b074de600314a93e2ae78e2",
                 "shasum": ""
             },
             "require": {
                 "php": ">=7.1"
             },
-            "time": "2021-05-27T09:17:38+00:00",
+            "time": "2022-05-24T11:49:31+00:00",
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "1.23-dev"
+                    "dev-main": "1.26-dev"
                 },
                 "thanks": {
                     "name": "symfony/polyfill",
@@ -1516,7 +1569,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-php72/tree/v1.24.0"
+                "source": "https://github.com/symfony/polyfill-php72/tree/v1.26.0"
             },
             "funding": [
                 {
diff --git a/vendor/composer/installed.php b/vendor/composer/installed.php
index ee12e2c89..5e7fbb8cf 100644
--- a/vendor/composer/installed.php
+++ b/vendor/composer/installed.php
@@ -5,7 +5,7 @@
         'type' => 'project',
         'install_path' => __DIR__ . '/../../',
         'aliases' => array(),
-        'reference' => '7ef2de91b37a2ff1ee48d8f7e529d3b34f2b754d',
+        'reference' => 'bdcf00e53774eee9bdd53d6213a3df5e7fd37b05',
         'name' => '1ka/1ka.si',
         'dev' => false,
     ),
@@ -16,16 +16,16 @@
             'type' => 'project',
             'install_path' => __DIR__ . '/../../',
             'aliases' => array(),
-            'reference' => '7ef2de91b37a2ff1ee48d8f7e529d3b34f2b754d',
+            'reference' => 'bdcf00e53774eee9bdd53d6213a3df5e7fd37b05',
             'dev_requirement' => false,
         ),
         'composer/ca-bundle' => array(
-            'pretty_version' => '1.3.1',
-            'version' => '1.3.1.0',
+            'pretty_version' => '1.3.2',
+            'version' => '1.3.2.0',
             'type' => 'library',
             'install_path' => __DIR__ . '/./ca-bundle',
             'aliases' => array(),
-            'reference' => '4c679186f2aca4ab6a0f1b0b9cf9252decb44d0b',
+            'reference' => 'fd5dd441932a7e10ca6e5b490e272d34c8430640',
             'dev_requirement' => false,
         ),
         'fgrosse/phpasn1' => array(
@@ -47,12 +47,12 @@
             'dev_requirement' => false,
         ),
         'guzzlehttp/guzzle' => array(
-            'pretty_version' => '6.5.5',
-            'version' => '6.5.5.0',
+            'pretty_version' => '6.5.8',
+            'version' => '6.5.8.0',
             'type' => 'library',
             'install_path' => __DIR__ . '/../guzzlehttp/guzzle',
             'aliases' => array(),
-            'reference' => '9d4290de1cfd701f38099ef7e183b64b4b7b0c5e',
+            'reference' => 'a52f0440530b54fa079ce76e8c5d196a42cad981',
             'dev_requirement' => false,
         ),
         'guzzlehttp/promises' => array(
@@ -65,12 +65,12 @@
             'dev_requirement' => false,
         ),
         'guzzlehttp/psr7' => array(
-            'pretty_version' => '1.8.3',
-            'version' => '1.8.3.0',
+            'pretty_version' => '1.9.0',
+            'version' => '1.9.0.0',
             'type' => 'library',
             'install_path' => __DIR__ . '/../guzzlehttp/psr7',
             'aliases' => array(),
-            'reference' => '1afdd860a2566ed3c2b0b4a3de6e23434a79ec85',
+            'reference' => 'e98e3e6d4f86621a9b75f623996e6bbdeb4b9318',
             'dev_requirement' => false,
         ),
         'maxmind-db/reader' => array(
@@ -83,12 +83,12 @@
             'dev_requirement' => false,
         ),
         'maxmind/web-service-common' => array(
-            'pretty_version' => 'v0.8.1',
-            'version' => '0.8.1.0',
+            'pretty_version' => 'v0.9.0',
+            'version' => '0.9.0.0',
             'type' => 'library',
             'install_path' => __DIR__ . '/../maxmind/web-service-common',
             'aliases' => array(),
-            'reference' => '32f274051c543fc865e5a84d3a2c703913641ea8',
+            'reference' => '4dc5a3e8df38aea4ca3b1096cee3a038094e9b53',
             'dev_requirement' => false,
         ),
         'minishlink/web-push' => array(
@@ -110,12 +110,12 @@
             'dev_requirement' => false,
         ),
         'paragonie/sodium_compat' => array(
-            'pretty_version' => 'v1.17.0',
-            'version' => '1.17.0.0',
+            'pretty_version' => 'v1.17.1',
+            'version' => '1.17.1.0',
             'type' => 'library',
             'install_path' => __DIR__ . '/../paragonie/sodium_compat',
             'aliases' => array(),
-            'reference' => 'c59cac21abbcc0df06a3dd18076450ea4797b321',
+            'reference' => 'ac994053faac18d386328c91c7900f930acadf1e',
             'dev_requirement' => false,
         ),
         'paypal/paypal-checkout-sdk' => array(
@@ -137,12 +137,12 @@
             'dev_requirement' => false,
         ),
         'phpmailer/phpmailer' => array(
-            'pretty_version' => 'v6.5.4',
-            'version' => '6.5.4.0',
+            'pretty_version' => 'v6.6.3',
+            'version' => '6.6.3.0',
             'type' => 'library',
             'install_path' => __DIR__ . '/../phpmailer/phpmailer',
             'aliases' => array(),
-            'reference' => 'c0d9f7dd3c2aa247ca44791e9209233829d82285',
+            'reference' => '9400f305a898f194caff5521f64e5dfa926626f3',
             'dev_requirement' => false,
         ),
         'psr/http-message' => array(
@@ -188,39 +188,39 @@
             'dev_requirement' => false,
         ),
         'stripe/stripe-php' => array(
-            'pretty_version' => 'v7.114.0',
-            'version' => '7.114.0.0',
+            'pretty_version' => 'v7.128.0',
+            'version' => '7.128.0.0',
             'type' => 'library',
             'install_path' => __DIR__ . '/../stripe/stripe-php',
             'aliases' => array(),
-            'reference' => '63be231686c6874befb5b3a47fb8effb4c30b78b',
+            'reference' => 'c704949c49b72985c76cc61063aa26fefbd2724e',
             'dev_requirement' => false,
         ),
         'symfony/polyfill-intl-idn' => array(
-            'pretty_version' => 'v1.24.0',
-            'version' => '1.24.0.0',
+            'pretty_version' => 'v1.26.0',
+            'version' => '1.26.0.0',
             'type' => 'library',
             'install_path' => __DIR__ . '/../symfony/polyfill-intl-idn',
             'aliases' => array(),
-            'reference' => '749045c69efb97c70d25d7463abba812e91f3a44',
+            'reference' => '59a8d271f00dd0e4c2e518104cc7963f655a1aa8',
             'dev_requirement' => false,
         ),
         'symfony/polyfill-intl-normalizer' => array(
-            'pretty_version' => 'v1.24.0',
-            'version' => '1.24.0.0',
+            'pretty_version' => 'v1.26.0',
+            'version' => '1.26.0.0',
             'type' => 'library',
             'install_path' => __DIR__ . '/../symfony/polyfill-intl-normalizer',
             'aliases' => array(),
-            'reference' => '8590a5f561694770bdcd3f9b5c69dde6945028e8',
+            'reference' => '219aa369ceff116e673852dce47c3a41794c14bd',
             'dev_requirement' => false,
         ),
         'symfony/polyfill-php72' => array(
-            'pretty_version' => 'v1.24.0',
-            'version' => '1.24.0.0',
+            'pretty_version' => 'v1.26.0',
+            'version' => '1.26.0.0',
             'type' => 'library',
             'install_path' => __DIR__ . '/../symfony/polyfill-php72',
             'aliases' => array(),
-            'reference' => '9a142215a36a3888e30d0a9eeea9766764e96976',
+            'reference' => 'bf44a9fd41feaac72b074de600314a93e2ae78e2',
             'dev_requirement' => false,
         ),
         'web-token/jwt-core' => array(
diff --git a/vendor/guzzlehttp/guzzle/CHANGELOG.md b/vendor/guzzlehttp/guzzle/CHANGELOG.md
index 464cf1c50..b053017a9 100644
--- a/vendor/guzzlehttp/guzzle/CHANGELOG.md
+++ b/vendor/guzzlehttp/guzzle/CHANGELOG.md
@@ -1,5 +1,19 @@
 # Change Log
 
+## 6.5.8 - 2022-06-20
+
+* Fix change in port should be considered a change in origin
+* Fix `CURLOPT_HTTPAUTH` option not cleared on change of origin
+
+## 6.5.7 - 2022-06-09
+
+* Fix failure to strip Authorization header on HTTP downgrade
+* Fix failure to strip the Cookie header on change in host or HTTP downgrade
+
+## 6.5.6 - 2022-05-25
+
+* Fix cross-domain cookie leakage
+
 ## 6.5.5 - 2020-06-16
 
 * Unpin version constraint for `symfony/polyfill-intl-idn` [#2678](https://github.com/guzzle/guzzle/pull/2678)
diff --git a/vendor/guzzlehttp/guzzle/LICENSE b/vendor/guzzlehttp/guzzle/LICENSE
index 50a177b03..fd2375d88 100644
--- a/vendor/guzzlehttp/guzzle/LICENSE
+++ b/vendor/guzzlehttp/guzzle/LICENSE
@@ -1,4 +1,12 @@
-Copyright (c) 2011-2018 Michael Dowling, https://github.com/mtdowling <mtdowling@gmail.com>
+The MIT License (MIT)
+
+Copyright (c) 2011 Michael Dowling <mtdowling@gmail.com>
+Copyright (c) 2012 Jeremy Lindblom <jeremeamia@gmail.com>
+Copyright (c) 2014 Graham Campbell <hello@gjcampbell.co.uk>
+Copyright (c) 2015 Márk Sági-Kazár <mark.sagikazar@gmail.com>
+Copyright (c) 2015 Tobias Schultze <webmaster@tubo-world.de>
+Copyright (c) 2016 Tobias Nyholm <tobias.nyholm@gmail.com>
+Copyright (c) 2016 George Mponos <gmponos@gmail.com>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/vendor/guzzlehttp/guzzle/README.md b/vendor/guzzlehttp/guzzle/README.md
index 5fdb6c5f4..bc98e1a10 100644
--- a/vendor/guzzlehttp/guzzle/README.md
+++ b/vendor/guzzlehttp/guzzle/README.md
@@ -1,8 +1,9 @@
-Guzzle, PHP HTTP client
-=======================
+![Guzzle](.github/logo.png?raw=true)
+
+# Guzzle, PHP HTTP client
 
 [![Latest Version](https://img.shields.io/github/release/guzzle/guzzle.svg?style=flat-square)](https://github.com/guzzle/guzzle/releases)
-[![Build Status](https://img.shields.io/travis/guzzle/guzzle.svg?style=flat-square)](https://travis-ci.org/guzzle/guzzle)
+[![Build Status](https://img.shields.io/github/workflow/status/guzzle/guzzle/CI?label=ci%20build&style=flat-square)](https://github.com/guzzle/guzzle/actions?query=workflow%3ACI)
 [![Total Downloads](https://img.shields.io/packagist/dt/guzzlehttp/guzzle.svg?style=flat-square)](https://packagist.org/packages/guzzlehttp/guzzle)
 
 Guzzle is a PHP HTTP client that makes it easy to send HTTP requests and
@@ -38,15 +39,18 @@ $promise->wait();
 
 ## Help and docs
 
-- [Documentation](http://guzzlephp.org/)
-- [Stack Overflow](http://stackoverflow.com/questions/tagged/guzzle)
+We use GitHub issues only to discuss bugs and new features. For support please refer to:
+
+- [Documentation](https://docs.guzzlephp.org)
+- [Stack Overflow](https://stackoverflow.com/questions/tagged/guzzle)
+- [#guzzle](https://app.slack.com/client/T0D2S9JCT/CE6UAAKL4) channel on [PHP-HTTP Slack](https://slack.httplug.io/)
 - [Gitter](https://gitter.im/guzzle/guzzle)
 
 
 ## Installing Guzzle
 
 The recommended way to install Guzzle is through
-[Composer](http://getcomposer.org).
+[Composer](https://getcomposer.org/).
 
 ```bash
 # Install Composer
@@ -74,17 +78,20 @@ composer update
 
 ## Version Guidance
 
-| Version | Status     | Packagist           | Namespace    | Repo                | Docs                | PSR-7 | PHP Version |
-|---------|------------|---------------------|--------------|---------------------|---------------------|-------|-------------|
-| 3.x     | EOL        | `guzzle/guzzle`     | `Guzzle`     | [v3][guzzle-3-repo] | [v3][guzzle-3-docs] | No    | >= 5.3.3    |
-| 4.x     | EOL        | `guzzlehttp/guzzle` | `GuzzleHttp` | [v4][guzzle-4-repo] | N/A                 | No    | >= 5.4      |
-| 5.x     | EOL        | `guzzlehttp/guzzle` | `GuzzleHttp` | [v5][guzzle-5-repo] | [v5][guzzle-5-docs] | No    | >= 5.4      |
-| 6.x     | Latest     | `guzzlehttp/guzzle` | `GuzzleHttp` | [v6][guzzle-6-repo] | [v6][guzzle-6-docs] | Yes   | >= 5.5      |
+| Version | Status         | Packagist           | Namespace    | Repo                | Docs                | PSR-7 | PHP Version  |
+|---------|----------------|---------------------|--------------|---------------------|---------------------|-------|--------------|
+| 3.x     | EOL            | `guzzle/guzzle`     | `Guzzle`     | [v3][guzzle-3-repo] | [v3][guzzle-3-docs] | No    | >=5.3.3,<7.0 |
+| 4.x     | EOL            | `guzzlehttp/guzzle` | `GuzzleHttp` | [v4][guzzle-4-repo] | N/A                 | No    | >=5.4,<7.0   |
+| 5.x     | EOL            | `guzzlehttp/guzzle` | `GuzzleHttp` | [v5][guzzle-5-repo] | [v5][guzzle-5-docs] | No    | >=5.4,<7.4   |
+| 6.x     | Security fixes | `guzzlehttp/guzzle` | `GuzzleHttp` | [v6][guzzle-6-repo] | [v6][guzzle-6-docs] | Yes   | >=5.5,<8.0   |
+| 7.x     | Latest         | `guzzlehttp/guzzle` | `GuzzleHttp` | [v7][guzzle-7-repo] | [v7][guzzle-7-docs] | Yes   | >=7.2.5,<8.2 |
 
 [guzzle-3-repo]: https://github.com/guzzle/guzzle3
 [guzzle-4-repo]: https://github.com/guzzle/guzzle/tree/4.x
 [guzzle-5-repo]: https://github.com/guzzle/guzzle/tree/5.3
-[guzzle-6-repo]: https://github.com/guzzle/guzzle
-[guzzle-3-docs]: http://guzzle3.readthedocs.org
-[guzzle-5-docs]: http://guzzle.readthedocs.org/en/5.3/
-[guzzle-6-docs]: http://guzzle.readthedocs.org/en/latest/
+[guzzle-6-repo]: https://github.com/guzzle/guzzle/tree/6.5
+[guzzle-7-repo]: https://github.com/guzzle/guzzle
+[guzzle-3-docs]: https://guzzle3.readthedocs.io/
+[guzzle-5-docs]: https://docs.guzzlephp.org/en/5.3/
+[guzzle-6-docs]: https://docs.guzzlephp.org/en/6.5/
+[guzzle-7-docs]: https://docs.guzzlephp.org/en/latest/
diff --git a/vendor/guzzlehttp/guzzle/composer.json b/vendor/guzzlehttp/guzzle/composer.json
index c01864f01..a57d78f60 100644
--- a/vendor/guzzlehttp/guzzle/composer.json
+++ b/vendor/guzzlehttp/guzzle/composer.json
@@ -14,18 +14,48 @@
     "homepage": "http://guzzlephp.org/",
     "license": "MIT",
     "authors": [
+        {
+            "name": "Graham Campbell",
+            "email": "hello@gjcampbell.co.uk",
+            "homepage": "https://github.com/GrahamCampbell"
+        },
         {
             "name": "Michael Dowling",
             "email": "mtdowling@gmail.com",
             "homepage": "https://github.com/mtdowling"
+        },
+        {
+            "name": "Jeremy Lindblom",
+            "email": "jeremeamia@gmail.com",
+            "homepage": "https://github.com/jeremeamia"
+        },
+        {
+            "name": "George Mponos",
+            "email": "gmponos@gmail.com",
+            "homepage": "https://github.com/gmponos"
+        },
+        {
+            "name": "Tobias Nyholm",
+            "email": "tobias.nyholm@gmail.com",
+            "homepage": "https://github.com/Nyholm"
+        },
+        {
+            "name": "Márk Sági-Kazár",
+            "email": "mark.sagikazar@gmail.com",
+            "homepage": "https://github.com/sagikazarmark"
+        },
+        {
+            "name": "Tobias Schultze",
+            "email": "webmaster@tubo-world.de",
+            "homepage": "https://github.com/Tobion"
         }
     ],
     "require": {
         "php": ">=5.5",
         "ext-json": "*",
-        "symfony/polyfill-intl-idn": "^1.17.0",
+        "symfony/polyfill-intl-idn": "^1.17",
         "guzzlehttp/promises": "^1.0",
-        "guzzlehttp/psr7": "^1.6.1"
+        "guzzlehttp/psr7": "^1.9"
     },
     "require-dev": {
         "ext-curl": "*",
@@ -36,7 +66,10 @@
         "psr/log": "Required for using the Log middleware"
     },
     "config": {
-        "sort-packages": true
+        "sort-packages": true,
+        "allow-plugins": {
+            "bamarni/composer-bin-plugin": true
+        }
     },
     "extra": {
         "branch-alias": {
diff --git a/vendor/guzzlehttp/guzzle/src/Cookie/CookieJar.php b/vendor/guzzlehttp/guzzle/src/Cookie/CookieJar.php
index 38f98ad7c..394df3a7c 100644
--- a/vendor/guzzlehttp/guzzle/src/Cookie/CookieJar.php
+++ b/vendor/guzzlehttp/guzzle/src/Cookie/CookieJar.php
@@ -240,6 +240,11 @@ class CookieJar implements CookieJarInterface
                 if (0 !== strpos($sc->getPath(), '/')) {
                     $sc->setPath($this->getCookiePathFromRequest($request));
                 }
+                if (!$sc->matchesDomain($request->getUri()->getHost())) {
+                    continue;
+                }
+                // Note: At this point `$sc->getDomain()` being a public suffix should
+                // be rejected, but we don't want to pull in the full PSL dependency.
                 $this->setCookie($sc);
             }
         }
diff --git a/vendor/guzzlehttp/guzzle/src/Cookie/SetCookie.php b/vendor/guzzlehttp/guzzle/src/Cookie/SetCookie.php
index 3d776a70b..55f6901a7 100644
--- a/vendor/guzzlehttp/guzzle/src/Cookie/SetCookie.php
+++ b/vendor/guzzlehttp/guzzle/src/Cookie/SetCookie.php
@@ -333,12 +333,19 @@ class SetCookie
      */
     public function matchesDomain($domain)
     {
+        $cookieDomain = $this->getDomain();
+        if (null === $cookieDomain) {
+            return true;
+        }
+
         // Remove the leading '.' as per spec in RFC 6265.
         // http://tools.ietf.org/html/rfc6265#section-5.2.3
-        $cookieDomain = ltrim($this->getDomain(), '.');
+        $cookieDomain = ltrim(strtolower($cookieDomain), '.');
+
+        $domain = strtolower($domain);
 
         // Domain not set or exact match.
-        if (!$cookieDomain || !strcasecmp($domain, $cookieDomain)) {
+        if ('' === $cookieDomain || $domain === $cookieDomain) {
             return true;
         }
 
diff --git a/vendor/guzzlehttp/guzzle/src/RedirectMiddleware.php b/vendor/guzzlehttp/guzzle/src/RedirectMiddleware.php
index e4644b7ac..008a29b8c 100644
--- a/vendor/guzzlehttp/guzzle/src/RedirectMiddleware.php
+++ b/vendor/guzzlehttp/guzzle/src/RedirectMiddleware.php
@@ -94,6 +94,14 @@ class RedirectMiddleware
         $this->guardMax($request, $options);
         $nextRequest = $this->modifyRequest($request, $options, $response);
 
+        // If authorization is handled by curl, unset it if URI is cross-origin.
+        if (Psr7\UriComparator::isCrossOrigin($request->getUri(), $nextRequest->getUri()) && defined('\CURLOPT_HTTPAUTH')) {
+            unset(
+                $options['curl'][\CURLOPT_HTTPAUTH],
+                $options['curl'][\CURLOPT_USERPWD]
+            );
+        }
+
         if (isset($options['allow_redirects']['on_redirect'])) {
             call_user_func(
                 $options['allow_redirects']['on_redirect'],
@@ -141,7 +149,7 @@ class RedirectMiddleware
     }
 
     /**
-     * Check for too many redirects
+     * Check for too many redirects.
      *
      * @return void
      *
@@ -190,7 +198,7 @@ class RedirectMiddleware
             $modify['body'] = '';
         }
 
-        $uri = $this->redirectUri($request, $response, $protocols);
+        $uri = self::redirectUri($request, $response, $protocols);
         if (isset($options['idn_conversion']) && ($options['idn_conversion'] !== false)) {
             $idnOptions = ($options['idn_conversion'] === true) ? IDNA_DEFAULT : $options['idn_conversion'];
             $uri = Utils::idnUriConvert($uri, $idnOptions);
@@ -210,16 +218,17 @@ class RedirectMiddleware
             $modify['remove_headers'][] = 'Referer';
         }
 
-        // Remove Authorization header if host is different.
-        if ($request->getUri()->getHost() !== $modify['uri']->getHost()) {
+        // Remove Authorization and Cookie headers if URI is cross-origin.
+        if (Psr7\UriComparator::isCrossOrigin($request->getUri(), $modify['uri'])) {
             $modify['remove_headers'][] = 'Authorization';
+            $modify['remove_headers'][] = 'Cookie';
         }
 
         return Psr7\modify_request($request, $modify);
     }
 
     /**
-     * Set the appropriate URL on the request based on the location header
+     * Set the appropriate URL on the request based on the location header.
      *
      * @param RequestInterface  $request
      * @param ResponseInterface $response
@@ -227,7 +236,7 @@ class RedirectMiddleware
      *
      * @return UriInterface
      */
-    private function redirectUri(
+    private static function redirectUri(
         RequestInterface $request,
         ResponseInterface $response,
         array $protocols
diff --git a/vendor/guzzlehttp/psr7/CHANGELOG.md b/vendor/guzzlehttp/psr7/CHANGELOG.md
index f40736c4e..b4fdf3c68 100644
--- a/vendor/guzzlehttp/psr7/CHANGELOG.md
+++ b/vendor/guzzlehttp/psr7/CHANGELOG.md
@@ -3,12 +3,30 @@
 
 All notable changes to this project will be documented in this file.
 
-The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
-and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
+and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 
 ## Unreleased
 
+## 1.9.0 - 2022-06-20
+
+### Added
+
+- Added `UriComparator::isCrossOrigin` method
+
+## 1.8.5 - 2022-03-20
+
+### Fixed
+
+- Correct header value validation
+
+## 1.8.4 - 2022-03-20
+
+### Fixed
+
+- Validate header values properly
+
 ## 1.8.3 - 2021-10-05
 
 ### Fixed
diff --git a/vendor/guzzlehttp/psr7/README.md b/vendor/guzzlehttp/psr7/README.md
index 464cae4f2..64776cb66 100644
--- a/vendor/guzzlehttp/psr7/README.md
+++ b/vendor/guzzlehttp/psr7/README.md
@@ -1,6 +1,6 @@
 # PSR-7 Message Implementation
 
-This repository contains a full [PSR-7](http://www.php-fig.org/psr/psr-7/)
+This repository contains a full [PSR-7](https://www.php-fig.org/psr/psr-7/)
 message implementation, several stream decorators, and some helpful
 functionality like query string parsing.
 
@@ -659,7 +659,7 @@ manually but instead is used indirectly via `Psr\Http\Message\UriInterface::__to
 
 `public static function fromParts(array $parts): UriInterface`
 
-Creates a URI from a hash of [`parse_url`](http://php.net/manual/en/function.parse-url.php) components.
+Creates a URI from a hash of [`parse_url`](https://www.php.net/manual/en/function.parse-url.php) components.
 
 
 ### `GuzzleHttp\Psr7\Uri::withQueryValue`
@@ -684,6 +684,16 @@ associative array of key => value.
 Creates a new URI with a specific query string value removed. Any existing query string values that exactly match the
 provided key are removed.
 
+## Cross-Origin Detection
+
+`GuzzleHttp\Psr7\UriComparator` provides methods to determine if a modified URL should be considered cross-origin.
+
+### `GuzzleHttp\Psr7\UriComparator::isCrossOrigin`
+
+`public static function isCrossOrigin(UriInterface $original, UriInterface $modified): bool`
+
+Determines if a modified URL should be considered cross-origin with respect to an original URL.
+
 ## Reference Resolution
 
 `GuzzleHttp\Psr7\UriResolver` provides methods to resolve a URI reference in the context of a base URI according
@@ -809,14 +819,24 @@ This of course assumes they will be resolved against the same base URI. If this
 equivalence or difference of relative references does not mean anything.
 
 
+## Version Guidance
+
+| Version | Status         | PHP Version      |
+|---------|----------------|------------------|
+| 1.x     | Security fixes | >=5.4,<8.1       |
+| 2.x     | Latest         | ^7.2.5 \|\| ^8.0 |
+
+
 ## Security
 
 If you discover a security vulnerability within this package, please send an email to security@tidelift.com. All security vulnerabilities will be promptly addressed. Please do not disclose security-related issues publicly until a fix has been announced. Please see [Security Policy](https://github.com/guzzle/psr7/security/policy) for more information.
 
+
 ## License
 
 Guzzle is made available under the MIT License (MIT). Please see [License File](LICENSE) for more information.
 
+
 ## For Enterprise
 
 Available as part of the Tidelift Subscription
diff --git a/vendor/guzzlehttp/psr7/composer.json b/vendor/guzzlehttp/psr7/composer.json
index bfa7cfdc1..0e36920db 100644
--- a/vendor/guzzlehttp/psr7/composer.json
+++ b/vendor/guzzlehttp/psr7/composer.json
@@ -63,11 +63,14 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "1.7-dev"
+            "dev-master": "1.9-dev"
         }
     },
     "config": {
         "preferred-install": "dist",
-        "sort-packages": true
+        "sort-packages": true,
+        "allow-plugins": {
+            "bamarni/composer-bin-plugin": true
+        }
     }
 }
diff --git a/vendor/guzzlehttp/psr7/src/MessageTrait.php b/vendor/guzzlehttp/psr7/src/MessageTrait.php
index 99203bb43..0ac8663da 100644
--- a/vendor/guzzlehttp/psr7/src/MessageTrait.php
+++ b/vendor/guzzlehttp/psr7/src/MessageTrait.php
@@ -157,17 +157,22 @@ trait MessageTrait
         }
     }
 
+    /**
+     * @param mixed $value
+     *
+     * @return string[]
+     */
     private function normalizeHeaderValue($value)
     {
         if (!is_array($value)) {
-            return $this->trimHeaderValues([$value]);
+            return $this->trimAndValidateHeaderValues([$value]);
         }
 
         if (count($value) === 0) {
             throw new \InvalidArgumentException('Header value can not be an empty array.');
         }
 
-        return $this->trimHeaderValues($value);
+        return $this->trimAndValidateHeaderValues($value);
     }
 
     /**
@@ -178,13 +183,13 @@ trait MessageTrait
      * header-field = field-name ":" OWS field-value OWS
      * OWS          = *( SP / HTAB )
      *
-     * @param string[] $values Header values
+     * @param mixed[] $values Header values
      *
      * @return string[] Trimmed header values
      *
      * @see https://tools.ietf.org/html/rfc7230#section-3.2.4
      */
-    private function trimHeaderValues(array $values)
+    private function trimAndValidateHeaderValues(array $values)
     {
         return array_map(function ($value) {
             if (!is_scalar($value) && null !== $value) {
@@ -194,10 +199,20 @@ trait MessageTrait
                 ));
             }
 
-            return trim((string) $value, " \t");
+            $trimmed = trim((string) $value, " \t");
+            $this->assertValue($trimmed);
+
+            return $trimmed;
         }, array_values($values));
     }
 
+    /**
+     * @see https://tools.ietf.org/html/rfc7230#section-3.2
+     *
+     * @param mixed $header
+     *
+     * @return void
+     */
     private function assertHeader($header)
     {
         if (!is_string($header)) {
@@ -210,5 +225,46 @@ trait MessageTrait
         if ($header === '') {
             throw new \InvalidArgumentException('Header name can not be empty.');
         }
+
+        if (! preg_match('/^[a-zA-Z0-9\'`#$%&*+.^_|~!-]+$/', $header)) {
+            throw new \InvalidArgumentException(
+                sprintf(
+                    '"%s" is not valid header name',
+                    $header
+                )
+            );
+        }
+    }
+
+    /**
+     * @param string $value
+     *
+     * @return void
+     *
+     * @see https://tools.ietf.org/html/rfc7230#section-3.2
+     *
+     * field-value    = *( field-content / obs-fold )
+     * field-content  = field-vchar [ 1*( SP / HTAB ) field-vchar ]
+     * field-vchar    = VCHAR / obs-text
+     * VCHAR          = %x21-7E
+     * obs-text       = %x80-FF
+     * obs-fold       = CRLF 1*( SP / HTAB )
+     */
+    private function assertValue($value)
+    {
+        // The regular expression intentionally does not support the obs-fold production, because as
+        // per RFC 7230#3.2.4:
+        //
+        // A sender MUST NOT generate a message that includes
+        // line folding (i.e., that has any field-value that contains a match to
+        // the obs-fold rule) unless the message is intended for packaging
+        // within the message/http media type.
+        //
+        // Clients must not send a request with line folding and a server sending folded headers is
+        // likely very rare. Line folding is a fairly obscure feature of HTTP/1.1 and thus not accepting
+        // folding is not likely to break any legitimate use case.
+        if (! preg_match('/^[\x20\x09\x21-\x7E\x80-\xFF]*$/', $value)) {
+            throw new \InvalidArgumentException(sprintf('"%s" is not valid header value', $value));
+        }
     }
 }
diff --git a/vendor/guzzlehttp/psr7/src/UriComparator.php b/vendor/guzzlehttp/psr7/src/UriComparator.php
new file mode 100644
index 000000000..ccf51ffb8
--- /dev/null
+++ b/vendor/guzzlehttp/psr7/src/UriComparator.php
@@ -0,0 +1,55 @@
+<?php
+
+namespace GuzzleHttp\Psr7;
+
+use Psr\Http\Message\UriInterface;
+
+/**
+ * Provides methods to determine if a modified URL should be considered cross-origin.
+ *
+ * @author Graham Campbell
+ */
+final class UriComparator
+{
+    /**
+     * Determines if a modified URL should be considered cross-origin with
+     * respect to an original URL.
+     *
+     * @return bool
+     */
+    public static function isCrossOrigin(UriInterface $original, UriInterface $modified)
+    {
+        if (\strcasecmp($original->getHost(), $modified->getHost()) !== 0) {
+            return true;
+        }
+
+        if ($original->getScheme() !== $modified->getScheme()) {
+            return true;
+        }
+
+        if (self::computePort($original) !== self::computePort($modified)) {
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * @return int
+     */
+    private static function computePort(UriInterface $uri)
+    {
+        $port = $uri->getPort();
+
+        if (null !== $port) {
+            return $port;
+        }
+
+        return 'https' === $uri->getScheme() ? 443 : 80;
+    }
+
+    private function __construct()
+    {
+        // cannot be instantiated
+    }
+}
diff --git a/vendor/maxmind/web-service-common/CHANGELOG.md b/vendor/maxmind/web-service-common/CHANGELOG.md
index 48295470b..d3d208432 100644
--- a/vendor/maxmind/web-service-common/CHANGELOG.md
+++ b/vendor/maxmind/web-service-common/CHANGELOG.md
@@ -1,6 +1,26 @@
 CHANGELOG
 =========
 
+0.9.0 (2022-03-28)
+------------------
+
+* Improved internal type hint usage.
+
+0.8.1 (2020-11-02)
+------------------
+
+* We now correctly handle responses without a `Content-Type` header. In 0.8.0,
+  such responses could lead to a type error. In particular, this affected the
+  minFraud Report Transaction endpoint, which returns a response with no
+  content. Reported by Dmitry Malashko. GitHub #99 on
+  `maxmind/minfraud-api-php`.
+
+0.8.0 (2020-10-01)
+------------------
+
+* PHP 7.2 or greater is now required.
+* Added additional type hints.
+
 0.7.0 (2020-05-06)
 ------------------
 
diff --git a/vendor/maxmind/web-service-common/README.md b/vendor/maxmind/web-service-common/README.md
index bee04ac39..d987e4936 100644
--- a/vendor/maxmind/web-service-common/README.md
+++ b/vendor/maxmind/web-service-common/README.md
@@ -5,7 +5,7 @@ shared code between MaxMind's various web service client APIs.
 
 ## Requirements  ##
 
-The library requires PHP 5.6 or greater.
+The library requires PHP 7.2 or greater.
 
 There are several other dependencies as defined in the `composer.json` file.
 
diff --git a/vendor/maxmind/web-service-common/composer.json b/vendor/maxmind/web-service-common/composer.json
index 21ced3385..c3625058e 100644
--- a/vendor/maxmind/web-service-common/composer.json
+++ b/vendor/maxmind/web-service-common/composer.json
@@ -12,15 +12,16 @@
     }
   ],
   "require": {
-    "php": ">=5.6",
+    "php": ">=7.2",
     "composer/ca-bundle": "^1.0.3",
     "ext-curl": "*",
     "ext-json": "*"
   },
   "require-dev": {
-    "friendsofphp/php-cs-fixer": "2.*",
-    "phpunit/phpunit": "^4.8.36 || ^5.7 || ^6.5 || ^7.0",
-    "squizlabs/php_codesniffer": "3.*"
+    "friendsofphp/php-cs-fixer": "3.*",
+    "phpunit/phpunit": "^8.0 || ^9.0",
+    "squizlabs/php_codesniffer": "3.*",
+    "phpstan/phpstan": "*"
   },
   "autoload": {
     "psr-4": {
diff --git a/vendor/maxmind/web-service-common/dev-bin/release.sh b/vendor/maxmind/web-service-common/dev-bin/release.sh
index a5de03027..96c41607d 100644
--- a/vendor/maxmind/web-service-common/dev-bin/release.sh
+++ b/vendor/maxmind/web-service-common/dev-bin/release.sh
@@ -51,10 +51,6 @@ fi
 
 git push
 
-message="$version
-
-$notes"
-
-hub release create -m "$message" "$tag"
+gh release create --target "$(git branch --show-current)" -t "$version" -n "$notes" "$tag"
 
 git push --tags
diff --git a/vendor/maxmind/web-service-common/phpstan.neon b/vendor/maxmind/web-service-common/phpstan.neon
new file mode 100644
index 000000000..ee1616dbe
--- /dev/null
+++ b/vendor/maxmind/web-service-common/phpstan.neon
@@ -0,0 +1,7 @@
+parameters:
+    level: 6
+    paths:
+        - src
+        - tests
+    checkMissingIterableValueType: false
+
diff --git a/vendor/maxmind/web-service-common/src/Exception/AuthenticationException.php b/vendor/maxmind/web-service-common/src/Exception/AuthenticationException.php
index ba423627b..5b016ce51 100644
--- a/vendor/maxmind/web-service-common/src/Exception/AuthenticationException.php
+++ b/vendor/maxmind/web-service-common/src/Exception/AuthenticationException.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace MaxMind\Exception;
 
 /**
diff --git a/vendor/maxmind/web-service-common/src/Exception/HttpException.php b/vendor/maxmind/web-service-common/src/Exception/HttpException.php
index f158944b5..2bb302aca 100644
--- a/vendor/maxmind/web-service-common/src/Exception/HttpException.php
+++ b/vendor/maxmind/web-service-common/src/Exception/HttpException.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace MaxMind\Exception;
 
 /**
@@ -9,6 +11,8 @@ class HttpException extends WebServiceException
 {
     /**
      * The URI queried.
+     *
+     * @var string
      */
     private $uri;
 
@@ -19,21 +23,21 @@ class HttpException extends WebServiceException
      * @param \Exception $previous   the previous exception, if any
      */
     public function __construct(
-        $message,
-        $httpStatus,
-        $uri,
+        string $message,
+        int $httpStatus,
+        string $uri,
         \Exception $previous = null
     ) {
         $this->uri = $uri;
         parent::__construct($message, $httpStatus, $previous);
     }
 
-    public function getUri()
+    public function getUri(): string
     {
         return $this->uri;
     }
 
-    public function getStatusCode()
+    public function getStatusCode(): int
     {
         return $this->getCode();
     }
diff --git a/vendor/maxmind/web-service-common/src/Exception/InsufficientFundsException.php b/vendor/maxmind/web-service-common/src/Exception/InsufficientFundsException.php
index fe159a2a5..283145650 100644
--- a/vendor/maxmind/web-service-common/src/Exception/InsufficientFundsException.php
+++ b/vendor/maxmind/web-service-common/src/Exception/InsufficientFundsException.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace MaxMind\Exception;
 
 /**
diff --git a/vendor/maxmind/web-service-common/src/Exception/InvalidInputException.php b/vendor/maxmind/web-service-common/src/Exception/InvalidInputException.php
index 3a6b32ae1..0d3c51c23 100644
--- a/vendor/maxmind/web-service-common/src/Exception/InvalidInputException.php
+++ b/vendor/maxmind/web-service-common/src/Exception/InvalidInputException.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace MaxMind\Exception;
 
 /**
diff --git a/vendor/maxmind/web-service-common/src/Exception/InvalidRequestException.php b/vendor/maxmind/web-service-common/src/Exception/InvalidRequestException.php
index 354f4b64f..95fd7dbf6 100644
--- a/vendor/maxmind/web-service-common/src/Exception/InvalidRequestException.php
+++ b/vendor/maxmind/web-service-common/src/Exception/InvalidRequestException.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace MaxMind\Exception;
 
 /**
@@ -9,28 +11,30 @@ class InvalidRequestException extends HttpException
 {
     /**
      * The code returned by the MaxMind web service.
+     *
+     * @var string
      */
     private $error;
 
     /**
      * @param string     $message    the exception message
-     * @param int        $error      the error code returned by the MaxMind web service
+     * @param string     $error      the error code returned by the MaxMind web service
      * @param int        $httpStatus the HTTP status code of the response
      * @param string     $uri        the URI queries
      * @param \Exception $previous   the previous exception, if any
      */
     public function __construct(
-        $message,
-        $error,
-        $httpStatus,
-        $uri,
+        string $message,
+        string $error,
+        int $httpStatus,
+        string $uri,
         \Exception $previous = null
     ) {
         $this->error = $error;
         parent::__construct($message, $httpStatus, $uri, $previous);
     }
 
-    public function getErrorCode()
+    public function getErrorCode(): string
     {
         return $this->error;
     }
diff --git a/vendor/maxmind/web-service-common/src/Exception/IpAddressNotFoundException.php b/vendor/maxmind/web-service-common/src/Exception/IpAddressNotFoundException.php
index 31608f718..581db488b 100644
--- a/vendor/maxmind/web-service-common/src/Exception/IpAddressNotFoundException.php
+++ b/vendor/maxmind/web-service-common/src/Exception/IpAddressNotFoundException.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace MaxMind\Exception;
 
 class IpAddressNotFoundException extends InvalidRequestException
diff --git a/vendor/maxmind/web-service-common/src/Exception/PermissionRequiredException.php b/vendor/maxmind/web-service-common/src/Exception/PermissionRequiredException.php
index 5f8785443..facc1f60f 100644
--- a/vendor/maxmind/web-service-common/src/Exception/PermissionRequiredException.php
+++ b/vendor/maxmind/web-service-common/src/Exception/PermissionRequiredException.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace MaxMind\Exception;
 
 /**
diff --git a/vendor/maxmind/web-service-common/src/Exception/WebServiceException.php b/vendor/maxmind/web-service-common/src/Exception/WebServiceException.php
index ff33452f0..9489c89f9 100644
--- a/vendor/maxmind/web-service-common/src/Exception/WebServiceException.php
+++ b/vendor/maxmind/web-service-common/src/Exception/WebServiceException.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace MaxMind\Exception;
 
 /**
diff --git a/vendor/maxmind/web-service-common/src/WebService/Client.php b/vendor/maxmind/web-service-common/src/WebService/Client.php
index a8eb379dc..2f2744ea0 100644
--- a/vendor/maxmind/web-service-common/src/WebService/Client.php
+++ b/vendor/maxmind/web-service-common/src/WebService/Client.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace MaxMind\WebService;
 
 use Composer\CaBundle\CaBundle;
@@ -22,16 +24,56 @@ use MaxMind\WebService\Http\RequestFactory;
  */
 class Client
 {
-    const VERSION = '0.2.0';
+    public const VERSION = '0.2.0';
 
+    /**
+     * @var string|null
+     */
     private $caBundle;
+
+    /**
+     * @var float|null
+     */
     private $connectTimeout;
+
+    /**
+     * @var string
+     */
     private $host = 'api.maxmind.com';
+
+    /**
+     * @var bool
+     */
+    private $useHttps = true;
+
+    /**
+     * @var RequestFactory
+     */
     private $httpRequestFactory;
+
+    /**
+     * @var string
+     */
     private $licenseKey;
+
+    /**
+     * @var string|null
+     */
     private $proxy;
+
+    /**
+     * @var float|null
+     */
     private $timeout;
+
+    /**
+     * @var string
+     */
     private $userAgentPrefix;
+
+    /**
+     * @var int
+     */
     private $accountId;
 
     /**
@@ -39,6 +81,7 @@ class Client
      * @param string $licenseKey your MaxMind license key
      * @param array  $options    an array of options. Possible keys:
      *                           * `host` - The host to use when connecting to the web service.
+     *                           * `useHttps` - A boolean flag for sending the request via https.(True by default)
      *                           * `userAgent` - The prefix of the User-Agent to use in the request.
      *                           * `caBundle` - The bundle of CA root certificates to use in the request.
      *                           * `connectTimeout` - The connect timeout to use for the request.
@@ -47,9 +90,9 @@ class Client
      *                           username, and password, e.g., `http://username:password@127.0.0.1:10`.
      */
     public function __construct(
-        $accountId,
-        $licenseKey,
-        $options = []
+        int $accountId,
+        string $licenseKey,
+        array $options = []
     ) {
         $this->accountId = $accountId;
         $this->licenseKey = $licenseKey;
@@ -61,6 +104,9 @@ class Client
         if (isset($options['host'])) {
             $this->host = $options['host'];
         }
+        if (isset($options['useHttps'])) {
+            $this->useHttps = $options['useHttps'];
+        }
         if (isset($options['userAgent'])) {
             $this->userAgentPrefix = $options['userAgent'] . ' ';
         }
@@ -96,9 +142,9 @@ class Client
      * @throws WebServiceException        when some other error occurs. This also
      *                                    serves as the base class for the above exceptions.
      *
-     * @return array The decoded content of a successful response
+     * @return array|null The decoded content of a successful response
      */
-    public function post($service, $path, $input)
+    public function post(string $service, string $path, array $input): ?array
     {
         $requestBody = json_encode($input);
         if ($requestBody === false) {
@@ -113,7 +159,7 @@ class Client
             ['Content-Type: application/json']
         );
 
-        list($statusCode, $contentType, $responseBody) = $request->post($requestBody);
+        [$statusCode, $contentType, $responseBody] = $request->post($requestBody);
 
         return $this->handleResponse(
             $statusCode,
@@ -124,11 +170,13 @@ class Client
         );
     }
 
-    public function get($service, $path)
+    public function get(string $service, string $path): ?array
     {
-        $request = $this->createRequest($path);
+        $request = $this->createRequest(
+            $path
+        );
 
-        list($statusCode, $contentType, $responseBody) = $request->get();
+        [$statusCode, $contentType, $responseBody] = $request->get();
 
         return $this->handleResponse(
             $statusCode,
@@ -139,15 +187,15 @@ class Client
         );
     }
 
-    private function userAgent()
+    private function userAgent(): string
     {
         $curlVersion = curl_version();
 
-        return $this->userAgentPrefix . 'MaxMind-WS-API/' . self::VERSION . ' PHP/' . PHP_VERSION .
+        return $this->userAgentPrefix . 'MaxMind-WS-API/' . self::VERSION . ' PHP/' . \PHP_VERSION .
            ' curl/' . $curlVersion['version'];
     }
 
-    private function createRequest($path, $headers = [])
+    private function createRequest(string $path, array $headers = []): Http\Request
     {
         array_push(
             $headers,
@@ -170,11 +218,11 @@ class Client
     }
 
     /**
-     * @param int    $statusCode   the HTTP status code of the response
-     * @param string $contentType  the Content-Type of the response
-     * @param string $responseBody the response body
-     * @param string $service      the name of the service
-     * @param string $path         the path used in the request
+     * @param int         $statusCode   the HTTP status code of the response
+     * @param string|null $contentType  the Content-Type of the response
+     * @param string|null $responseBody the response body
+     * @param string      $service      the name of the service
+     * @param string      $path         the path used in the request
      *
      * @throws AuthenticationException    when there is an issue authenticating the
      *                                    request
@@ -185,15 +233,15 @@ class Client
      * @throws WebServiceException        when some other error occurs. This also
      *                                    serves as the base class for the above exceptions
      *
-     * @return array The decoded content of a successful response
+     * @return array|null The decoded content of a successful response
      */
     private function handleResponse(
-        $statusCode,
-        $contentType,
-        $responseBody,
-        $service,
-        $path
-    ) {
+        int $statusCode,
+        ?string $contentType,
+        ?string $responseBody,
+        string $service,
+        string $path
+    ): ?array {
         if ($statusCode >= 400 && $statusCode <= 499) {
             $this->handle4xx($statusCode, $contentType, $responseBody, $service, $path);
         } elseif ($statusCode >= 500) {
@@ -208,20 +256,26 @@ class Client
     /**
      * @return string describing the JSON error
      */
-    private function jsonErrorDescription()
+    private function jsonErrorDescription(): string
     {
         $errno = json_last_error();
+
         switch ($errno) {
-            case JSON_ERROR_DEPTH:
+            case \JSON_ERROR_DEPTH:
                 return 'The maximum stack depth has been exceeded.';
-            case JSON_ERROR_STATE_MISMATCH:
+
+            case \JSON_ERROR_STATE_MISMATCH:
                 return 'Invalid or malformed JSON.';
-            case JSON_ERROR_CTRL_CHAR:
+
+            case \JSON_ERROR_CTRL_CHAR:
                 return 'Control character error.';
-            case JSON_ERROR_SYNTAX:
+
+            case \JSON_ERROR_SYNTAX:
                 return 'Syntax error.';
-            case JSON_ERROR_UTF8:
+
+            case \JSON_ERROR_UTF8:
                 return 'Malformed UTF-8 characters.';
+
             default:
                 return "Other JSON error ($errno).";
         }
@@ -232,17 +286,17 @@ class Client
      *
      * @return string the constructed URL
      */
-    private function urlFor($path)
+    private function urlFor(string $path): string
     {
-        return 'https://' . $this->host . $path;
+        return ($this->useHttps ? 'https://' : 'http://') . $this->host . $path;
     }
 
     /**
-     * @param int    $statusCode  the HTTP status code
-     * @param string $contentType the response content-type
-     * @param string $body        the response body
-     * @param string $service     the service name
-     * @param string $path        the path used in the request
+     * @param int         $statusCode  the HTTP status code
+     * @param string|null $contentType the response content-type
+     * @param string|null $body        the response body
+     * @param string      $service     the service name
+     * @param string      $path        the path used in the request
      *
      * @throws AuthenticationException
      * @throws HttpException
@@ -250,20 +304,20 @@ class Client
      * @throws InvalidRequestException
      */
     private function handle4xx(
-        $statusCode,
-        $contentType,
-        $body,
-        $service,
-        $path
-    ) {
-        if (\strlen($body) === 0) {
+        int $statusCode,
+        ?string $contentType,
+        ?string $body,
+        string $service,
+        string $path
+    ): void {
+        if ($body === null || $body === '') {
             throw new HttpException(
                 "Received a $statusCode error for $service with no body",
                 $statusCode,
                 $this->urlFor($path)
             );
         }
-        if (!strstr($contentType, 'json')) {
+        if ($contentType === null || !strstr($contentType, 'json')) {
             throw new HttpException(
                 "Received a $statusCode error for $service with " .
                 'the following body: ' . $body,
@@ -311,11 +365,11 @@ class Client
      * @throws InsufficientFundsException
      */
     private function handleWebServiceError(
-        $message,
-        $code,
-        $statusCode,
-        $path
-    ) {
+        string $message,
+        string $code,
+        int $statusCode,
+        string $path
+    ): void {
         switch ($code) {
             case 'IP_ADDRESS_NOT_FOUND':
             case 'IP_ADDRESS_RESERVED':
@@ -325,6 +379,7 @@ class Client
                     $statusCode,
                     $this->urlFor($path)
                 );
+
             case 'ACCOUNT_ID_REQUIRED':
             case 'ACCOUNT_ID_UNKNOWN':
             case 'AUTHORIZATION_INVALID':
@@ -337,6 +392,7 @@ class Client
                     $statusCode,
                     $this->urlFor($path)
                 );
+
             case 'OUT_OF_QUERIES':
             case 'INSUFFICIENT_FUNDS':
                 throw new InsufficientFundsException(
@@ -345,6 +401,7 @@ class Client
                     $statusCode,
                     $this->urlFor($path)
                 );
+
             case 'PERMISSION_REQUIRED':
                 throw new PermissionRequiredException(
                     $message,
@@ -352,6 +409,7 @@ class Client
                     $statusCode,
                     $this->urlFor($path)
                 );
+
             default:
                 throw new InvalidRequestException(
                     $message,
@@ -369,7 +427,7 @@ class Client
      *
      * @throws HttpException
      */
-    private function handle5xx($statusCode, $service, $path)
+    private function handle5xx(int $statusCode, string $service, string $path): void
     {
         throw new HttpException(
             "Received a server error ($statusCode) for $service",
@@ -385,7 +443,7 @@ class Client
      *
      * @throws HttpException
      */
-    private function handleUnexpectedStatus($statusCode, $service, $path)
+    private function handleUnexpectedStatus(int $statusCode, string $service, string $path): void
     {
         throw new HttpException(
             'Received an unexpected HTTP status ' .
@@ -396,22 +454,22 @@ class Client
     }
 
     /**
-     * @param int    $statusCode the HTTP status code
-     * @param string $body       the successful request body
-     * @param string $service    the service name
+     * @param int         $statusCode the HTTP status code
+     * @param string|null $body       the successful request body
+     * @param string      $service    the service name
      *
      * @throws WebServiceException if a response body is included but not
      *                             expected, or is not expected but not
      *                             included, or is expected and included
      *                             but cannot be decoded as JSON
      *
-     * @return array the decoded request body
+     * @return array|null the decoded request body
      */
-    private function handleSuccess($statusCode, $body, $service)
+    private function handleSuccess(int $statusCode, ?string $body, string $service): ?array
     {
         // A 204 should have no response body
         if ($statusCode === 204) {
-            if (\strlen($body) !== 0) {
+            if ($body !== null && $body !== '') {
                 throw new WebServiceException(
                     "Received a 204 response for $service along with an " .
                     "unexpected HTTP body: $body"
@@ -422,7 +480,7 @@ class Client
         }
 
         // A 200 should have a valid JSON body
-        if (\strlen($body) === 0) {
+        if ($body === null || $body === '') {
             throw new WebServiceException(
                 "Received a 200 response for $service but did not " .
                 'receive a HTTP body.'
@@ -441,7 +499,7 @@ class Client
         return $decodedContent;
     }
 
-    private function getCaBundle()
+    private function getCaBundle(): ?string
     {
         $curlVersion = curl_version();
 
diff --git a/vendor/maxmind/web-service-common/src/WebService/Http/CurlRequest.php b/vendor/maxmind/web-service-common/src/WebService/Http/CurlRequest.php
index ce1cf73ad..64db29f63 100644
--- a/vendor/maxmind/web-service-common/src/WebService/Http/CurlRequest.php
+++ b/vendor/maxmind/web-service-common/src/WebService/Http/CurlRequest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace MaxMind\WebService\Http;
 
 use MaxMind\Exception\HttpException;
@@ -12,7 +14,7 @@ use MaxMind\Exception\HttpException;
 class CurlRequest implements Request
 {
     /**
-     * @var resource
+     * @var \CurlHandle
      */
     private $ch;
 
@@ -26,11 +28,7 @@ class CurlRequest implements Request
      */
     private $options;
 
-    /**
-     * @param string $url
-     * @param array  $options
-     */
-    public function __construct($url, $options)
+    public function __construct(string $url, array $options)
     {
         $this->url = $url;
         $this->options = $options;
@@ -38,69 +36,65 @@ class CurlRequest implements Request
     }
 
     /**
-     * @param string $body
-     *
      * @throws HttpException
-     *
-     * @return array
      */
-    public function post($body)
+    public function post(string $body): array
     {
         $curl = $this->createCurl();
 
-        curl_setopt($curl, CURLOPT_POST, true);
-        curl_setopt($curl, CURLOPT_POSTFIELDS, $body);
+        curl_setopt($curl, \CURLOPT_POST, true);
+        curl_setopt($curl, \CURLOPT_POSTFIELDS, $body);
 
         return $this->execute($curl);
     }
 
-    public function get()
+    public function get(): array
     {
         $curl = $this->createCurl();
 
-        curl_setopt($curl, CURLOPT_HTTPGET, true);
+        curl_setopt($curl, \CURLOPT_HTTPGET, true);
 
         return $this->execute($curl);
     }
 
     /**
-     * @return resource
+     * @return \CurlHandle
      */
     private function createCurl()
     {
         curl_reset($this->ch);
 
         $opts = [];
-        $opts[CURLOPT_URL] = $this->url;
+        $opts[\CURLOPT_URL] = $this->url;
 
         if (!empty($this->options['caBundle'])) {
-            $opts[CURLOPT_CAINFO] = $this->options['caBundle'];
+            $opts[\CURLOPT_CAINFO] = $this->options['caBundle'];
         }
 
-        $opts[CURLOPT_ENCODING] = '';
-        $opts[CURLOPT_SSL_VERIFYHOST] = 2;
-        $opts[CURLOPT_FOLLOWLOCATION] = false;
-        $opts[CURLOPT_SSL_VERIFYPEER] = true;
-        $opts[CURLOPT_RETURNTRANSFER] = true;
+        $opts[\CURLOPT_ENCODING] = '';
+        $opts[\CURLOPT_SSL_VERIFYHOST] = 2;
+        $opts[\CURLOPT_FOLLOWLOCATION] = false;
+        $opts[\CURLOPT_SSL_VERIFYPEER] = true;
+        $opts[\CURLOPT_RETURNTRANSFER] = true;
 
-        $opts[CURLOPT_HTTPHEADER] = $this->options['headers'];
-        $opts[CURLOPT_USERAGENT] = $this->options['userAgent'];
-        $opts[CURLOPT_PROXY] = $this->options['proxy'];
+        $opts[\CURLOPT_HTTPHEADER] = $this->options['headers'];
+        $opts[\CURLOPT_USERAGENT] = $this->options['userAgent'];
+        $opts[\CURLOPT_PROXY] = $this->options['proxy'];
 
         // The defined()s are here as the *_MS opts are not available on older
         // cURL versions
         $connectTimeout = $this->options['connectTimeout'];
         if (\defined('CURLOPT_CONNECTTIMEOUT_MS')) {
-            $opts[CURLOPT_CONNECTTIMEOUT_MS] = ceil($connectTimeout * 1000);
+            $opts[\CURLOPT_CONNECTTIMEOUT_MS] = ceil($connectTimeout * 1000);
         } else {
-            $opts[CURLOPT_CONNECTTIMEOUT] = ceil($connectTimeout);
+            $opts[\CURLOPT_CONNECTTIMEOUT] = ceil($connectTimeout);
         }
 
         $timeout = $this->options['timeout'];
         if (\defined('CURLOPT_TIMEOUT_MS')) {
-            $opts[CURLOPT_TIMEOUT_MS] = ceil($timeout * 1000);
+            $opts[\CURLOPT_TIMEOUT_MS] = ceil($timeout * 1000);
         } else {
-            $opts[CURLOPT_TIMEOUT] = ceil($timeout);
+            $opts[\CURLOPT_TIMEOUT] = ceil($timeout);
         }
 
         curl_setopt_array($this->ch, $opts);
@@ -109,13 +103,11 @@ class CurlRequest implements Request
     }
 
     /**
-     * @param resource $curl
+     * @param \CurlHandle $curl
      *
      * @throws HttpException
-     *
-     * @return array
      */
-    private function execute($curl)
+    private function execute($curl): array
     {
         $body = curl_exec($curl);
         if ($errno = curl_errno($curl)) {
@@ -128,9 +120,17 @@ class CurlRequest implements Request
             );
         }
 
-        $statusCode = curl_getinfo($curl, CURLINFO_HTTP_CODE);
-        $contentType = curl_getinfo($curl, CURLINFO_CONTENT_TYPE);
+        $statusCode = curl_getinfo($curl, \CURLINFO_HTTP_CODE);
+        $contentType = curl_getinfo($curl, \CURLINFO_CONTENT_TYPE);
 
-        return [$statusCode, $contentType, $body];
+        return [
+            $statusCode,
+            // The PHP docs say "Content-Type: of the requested document. NULL
+            // indicates server did not send valid Content-Type: header" for
+            // CURLINFO_CONTENT_TYPE. However, it will return FALSE if no header
+            // is set. To keep our types simple, we return null in this case.
+            ($contentType === false ? null : $contentType),
+            $body,
+        ];
     }
 }
diff --git a/vendor/maxmind/web-service-common/src/WebService/Http/Request.php b/vendor/maxmind/web-service-common/src/WebService/Http/Request.php
index 641c1ffcc..994c46964 100644
--- a/vendor/maxmind/web-service-common/src/WebService/Http/Request.php
+++ b/vendor/maxmind/web-service-common/src/WebService/Http/Request.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace MaxMind\WebService\Http;
 
 /**
@@ -9,21 +11,9 @@ namespace MaxMind\WebService\Http;
  */
 interface Request
 {
-    /**
-     * @param string $url
-     * @param array  $options
-     */
-    public function __construct($url, $options);
+    public function __construct(string $url, array $options);
 
-    /**
-     * @param string $body
-     *
-     * @return mixed
-     */
-    public function post($body);
+    public function post(string $body): array;
 
-    /**
-     * @return mixed
-     */
-    public function get();
+    public function get(): array;
 }
diff --git a/vendor/maxmind/web-service-common/src/WebService/Http/RequestFactory.php b/vendor/maxmind/web-service-common/src/WebService/Http/RequestFactory.php
index f4b39c908..9d03fb206 100644
--- a/vendor/maxmind/web-service-common/src/WebService/Http/RequestFactory.php
+++ b/vendor/maxmind/web-service-common/src/WebService/Http/RequestFactory.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace MaxMind\WebService\Http;
 
 /**
@@ -14,7 +16,7 @@ class RequestFactory
      * done the connection is kept alive, SSL resumption can be used
      * etcetera.
      *
-     * @var resource
+     * @var \CurlHandle|null
      */
     private $ch;
 
@@ -25,6 +27,9 @@ class RequestFactory
         }
     }
 
+    /**
+     * @return \CurlHandle
+     */
     private function getCurlHandle()
     {
         if (empty($this->ch)) {
@@ -34,13 +39,7 @@ class RequestFactory
         return $this->ch;
     }
 
-    /**
-     * @param string $url
-     * @param array  $options
-     *
-     * @return Request
-     */
-    public function request($url, $options)
+    public function request(string $url, array $options): Request
     {
         $options['curlHandle'] = $this->getCurlHandle();
 
diff --git a/vendor/paragonie/sodium_compat/.github/workflows/ci.yml b/vendor/paragonie/sodium_compat/.github/workflows/ci.yml
index ebd42fdd6..68c3ab698 100644
--- a/vendor/paragonie/sodium_compat/.github/workflows/ci.yml
+++ b/vendor/paragonie/sodium_compat/.github/workflows/ci.yml
@@ -13,7 +13,7 @@ jobs:
         php-versions: ['5.3', '5.4', '5.5', '5.6', '7.0']
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
@@ -27,7 +27,7 @@ jobs:
         run: composer self-update --1
 
       - name: Install Composer dependencies
-        uses: "ramsey/composer-install@v1"
+        uses: "ramsey/composer-install@v2"
 
       - name: PHPUnit tests
         run: vendor/bin/phpunit
@@ -44,7 +44,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
@@ -56,11 +56,11 @@ jobs:
 
       - name: Install Composer dependencies (PHP < 8.1)
         if: ${{ matrix.php-versions != '8.1' }}
-        uses: "ramsey/composer-install@v1"
+        uses: "ramsey/composer-install@v2"
 
       - name: Install Composer dependencies - ignore-platform-reqs (PHP 8.1)
         if: ${{ matrix.php-versions == '8.1' }}
-        uses: "ramsey/composer-install@v1"
+        uses: "ramsey/composer-install@v2"
         with:
           composer-options: --ignore-platform-reqs
 
diff --git a/vendor/paragonie/sodium_compat/.github/workflows/psalm.yml b/vendor/paragonie/sodium_compat/.github/workflows/psalm.yml
index 9c1981685..11ac4500a 100644
--- a/vendor/paragonie/sodium_compat/.github/workflows/psalm.yml
+++ b/vendor/paragonie/sodium_compat/.github/workflows/psalm.yml
@@ -12,7 +12,7 @@ jobs:
         php-versions: ['7.4']
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
@@ -22,7 +22,7 @@ jobs:
           coverage: none
 
       - name: Install Composer dependencies
-        uses: "ramsey/composer-install@v1"
+        uses: "ramsey/composer-install@v2"
         with:
           composer-options: --no-dev
 
diff --git a/vendor/paragonie/sodium_compat/phpunit.xml.dist b/vendor/paragonie/sodium_compat/phpunit.xml.dist
index 8d45ab9f6..1d34f6d03 100644
--- a/vendor/paragonie/sodium_compat/phpunit.xml.dist
+++ b/vendor/paragonie/sodium_compat/phpunit.xml.dist
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" backupGlobals="true" backupStaticAttributes="false" bootstrap="autoload-phpunit.php" colors="true" convertErrorsToExceptions="true" convertNoticesToExceptions="true" convertWarningsToExceptions="true" processIsolation="false" stopOnError="false" stopOnFailure="false" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" backupGlobals="true" backupStaticAttributes="false" bootstrap="autoload-phpunit.php" colors="true" convertDeprecationsToExceptions="true" convertErrorsToExceptions="true" convertNoticesToExceptions="true" convertWarningsToExceptions="true" processIsolation="false" stopOnError="false" stopOnFailure="false" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
   <coverage processUncoveredFiles="true">
     <include>
       <directory suffix=".php">./src</directory>
diff --git a/vendor/paragonie/sodium_compat/psalm-above-3.xml b/vendor/paragonie/sodium_compat/psalm-above-3.xml
index 8ae2cf114..12548c18a 100644
--- a/vendor/paragonie/sodium_compat/psalm-above-3.xml
+++ b/vendor/paragonie/sodium_compat/psalm-above-3.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0"?>
 <psalm
         useDocblockTypes="true"
-        totallyTyped="true"
 >
     <projectFiles>
         <directory name="src" />
diff --git a/vendor/paragonie/sodium_compat/psalm-below-3.xml b/vendor/paragonie/sodium_compat/psalm-below-3.xml
index 0da3cd9e0..a92a6cf35 100644
--- a/vendor/paragonie/sodium_compat/psalm-below-3.xml
+++ b/vendor/paragonie/sodium_compat/psalm-below-3.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0"?>
 <psalm
     useDocblockTypes="true"
-    totallyTyped="true"
 >
     <projectFiles>
         <directory name="src" />
diff --git a/vendor/paragonie/sodium_compat/src/Compat.php b/vendor/paragonie/sodium_compat/src/Compat.php
index b2ccd21dd..cc6c92b92 100644
--- a/vendor/paragonie/sodium_compat/src/Compat.php
+++ b/vendor/paragonie/sodium_compat/src/Compat.php
@@ -3533,9 +3533,13 @@ class ParagonIE_Sodium_Compat
                 );
             }
         }
+        /** @var positive-int $numBytes */
         if (self::use_fallback('randombytes_buf')) {
             return (string) call_user_func('\\Sodium\\randombytes_buf', $numBytes);
         }
+        if ($numBytes < 0) {
+            throw new SodiumException("Number of bytes must be a positive integer");
+        }
         return random_bytes($numBytes);
     }
 
diff --git a/vendor/paragonie/sodium_compat/src/Core/BLAKE2b.php b/vendor/paragonie/sodium_compat/src/Core/BLAKE2b.php
index 5251bafe7..6ad4ab7ce 100644
--- a/vendor/paragonie/sodium_compat/src/Core/BLAKE2b.php
+++ b/vendor/paragonie/sodium_compat/src/Core/BLAKE2b.php
@@ -50,6 +50,9 @@ abstract class ParagonIE_Sodium_Core_BLAKE2b extends ParagonIE_Sodium_Core_Util
      */
     public static function new64($high, $low)
     {
+        if (PHP_INT_SIZE === 4) {
+            throw new SodiumException("Error, use 32-bit");
+        }
         $i64 = new SplFixedArray(2);
         $i64[0] = $high & 0xffffffff;
         $i64[1] = $low & 0xffffffff;
@@ -86,6 +89,9 @@ abstract class ParagonIE_Sodium_Core_BLAKE2b extends ParagonIE_Sodium_Core_Util
      */
     protected static function add64($x, $y)
     {
+        if (PHP_INT_SIZE === 4) {
+            throw new SodiumException("Error, use 32-bit");
+        }
         $l = ($x[1] + $y[1]) & 0xffffffff;
         return self::new64(
             (int) ($x[0] + $y[0] + (
@@ -119,6 +125,9 @@ abstract class ParagonIE_Sodium_Core_BLAKE2b extends ParagonIE_Sodium_Core_Util
      */
     protected static function xor64(SplFixedArray $x, SplFixedArray $y)
     {
+        if (PHP_INT_SIZE === 4) {
+            throw new SodiumException("Error, use 32-bit");
+        }
         if (!is_numeric($x[0])) {
             throw new SodiumException('x[0] is not an integer');
         }
@@ -147,6 +156,9 @@ abstract class ParagonIE_Sodium_Core_BLAKE2b extends ParagonIE_Sodium_Core_Util
      */
     public static function rotr64($x, $c)
     {
+        if (PHP_INT_SIZE === 4) {
+            throw new SodiumException("Error, use 32-bit");
+        }
         if ($c >= 64) {
             $c %= 64;
         }
@@ -164,8 +176,8 @@ abstract class ParagonIE_Sodium_Core_BLAKE2b extends ParagonIE_Sodium_Core_Util
         $l0 = 0;
         $c = 64 - $c;
 
+        /** @var int $c */
         if ($c < 32) {
-            /** @var int $h0 */
             $h0 = ((int) ($x[0]) << $c) | (
                 (
                     (int) ($x[1]) & ((1 << $c) - 1)
@@ -173,10 +185,8 @@ abstract class ParagonIE_Sodium_Core_BLAKE2b extends ParagonIE_Sodium_Core_Util
                     (32 - $c)
                 ) >> (32 - $c)
             );
-            /** @var int $l0 */
             $l0 = (int) ($x[1]) << $c;
         } else {
-            /** @var int $h0 */
             $h0 = (int) ($x[1]) << ($c - 32);
         }
 
@@ -184,12 +194,9 @@ abstract class ParagonIE_Sodium_Core_BLAKE2b extends ParagonIE_Sodium_Core_Util
         $c1 = 64 - $c;
 
         if ($c1 < 32) {
-            /** @var int $h1 */
             $h1 = (int) ($x[0]) >> $c1;
-            /** @var int $l1 */
             $l1 = ((int) ($x[1]) >> $c1) | ((int) ($x[0]) & ((1 << $c1) - 1)) << (32 - $c1);
         } else {
-            /** @var int $l1 */
             $l1 = (int) ($x[0]) >> ($c1 - 32);
         }
 
diff --git a/vendor/paragonie/sodium_compat/src/Core/Curve25519.php b/vendor/paragonie/sodium_compat/src/Core/Curve25519.php
index 7c31cfc92..dfcf26af0 100644
--- a/vendor/paragonie/sodium_compat/src/Core/Curve25519.php
+++ b/vendor/paragonie/sodium_compat/src/Core/Curve25519.php
@@ -342,6 +342,9 @@ abstract class ParagonIE_Sodium_Core_Curve25519 extends ParagonIE_Sodium_Core_Cu
         ParagonIE_Sodium_Core_Curve25519_Fe $f,
         ParagonIE_Sodium_Core_Curve25519_Fe $g
     ) {
+        // Ensure limbs aren't oversized.
+        $f = self::fe_normalize($f);
+        $g = self::fe_normalize($g);
         $f0 = $f[0];
         $f1 = $f[1];
         $f2 = $f[2];
@@ -476,6 +479,7 @@ abstract class ParagonIE_Sodium_Core_Curve25519 extends ParagonIE_Sodium_Core_Cu
         $f9g7_38 = self::mul($g7_19, $f9_2, 26);
         $f9g8_19 = self::mul($g8_19, $f9, 25);
         $f9g9_38 = self::mul($g9_19, $f9_2, 26);
+
         $h0 = $f0g0 + $f1g9_38 + $f2g8_19 + $f3g7_38 + $f4g6_19 + $f5g5_38 + $f6g4_19 + $f7g3_38 + $f8g2_19 + $f9g1_38;
         $h1 = $f0g1 + $f1g0    + $f2g9_19 + $f3g8_19 + $f4g7_19 + $f5g6_19 + $f6g5_19 + $f7g4_19 + $f8g3_19 + $f9g2_19;
         $h2 = $f0g2 + $f1g1_2  + $f2g0    + $f3g9_38 + $f4g8_19 + $f5g7_38 + $f6g6_19 + $f7g5_38 + $f8g4_19 + $f9g3_38;
@@ -530,18 +534,20 @@ abstract class ParagonIE_Sodium_Core_Curve25519 extends ParagonIE_Sodium_Core_Cu
         $h1 += $carry0;
         $h0 -= $carry0 << 26;
 
-        return ParagonIE_Sodium_Core_Curve25519_Fe::fromArray(
-            array(
-                (int) $h0,
-                (int) $h1,
-                (int) $h2,
-                (int) $h3,
-                (int) $h4,
-                (int) $h5,
-                (int) $h6,
-                (int) $h7,
-                (int) $h8,
-                (int) $h9
+        return self::fe_normalize(
+            ParagonIE_Sodium_Core_Curve25519_Fe::fromArray(
+                array(
+                    (int) $h0,
+                    (int) $h1,
+                    (int) $h2,
+                    (int) $h3,
+                    (int) $h4,
+                    (int) $h5,
+                    (int) $h6,
+                    (int) $h7,
+                    (int) $h8,
+                    (int) $h9
+                )
             )
         );
     }
@@ -563,7 +569,7 @@ abstract class ParagonIE_Sodium_Core_Curve25519 extends ParagonIE_Sodium_Core_Cu
         for ($i = 0; $i < 10; ++$i) {
             $h[$i] = -$f[$i];
         }
-        return $h;
+        return self::fe_normalize($h);
     }
 
     /**
@@ -578,6 +584,7 @@ abstract class ParagonIE_Sodium_Core_Curve25519 extends ParagonIE_Sodium_Core_Cu
      */
     public static function fe_sq(ParagonIE_Sodium_Core_Curve25519_Fe $f)
     {
+        $f = self::fe_normalize($f);
         $f0 = (int) $f[0];
         $f1 = (int) $f[1];
         $f2 = (int) $f[2];
@@ -711,18 +718,20 @@ abstract class ParagonIE_Sodium_Core_Curve25519 extends ParagonIE_Sodium_Core_Cu
         $h1 += $carry0;
         $h0 -= $carry0 << 26;
 
-        return ParagonIE_Sodium_Core_Curve25519_Fe::fromArray(
-            array(
-                (int) $h0,
-                (int) $h1,
-                (int) $h2,
-                (int) $h3,
-                (int) $h4,
-                (int) $h5,
-                (int) $h6,
-                (int) $h7,
-                (int) $h8,
-                (int) $h9
+        return self::fe_normalize(
+            ParagonIE_Sodium_Core_Curve25519_Fe::fromArray(
+                array(
+                    (int) $h0,
+                    (int) $h1,
+                    (int) $h2,
+                    (int) $h3,
+                    (int) $h4,
+                    (int) $h5,
+                    (int) $h6,
+                    (int) $h7,
+                    (int) $h8,
+                    (int) $h9
+                )
             )
         );
     }
@@ -740,6 +749,7 @@ abstract class ParagonIE_Sodium_Core_Curve25519 extends ParagonIE_Sodium_Core_Cu
      */
     public static function fe_sq2(ParagonIE_Sodium_Core_Curve25519_Fe $f)
     {
+        $f = self::fe_normalize($f);
         $f0 = (int) $f[0];
         $f1 = (int) $f[1];
         $f2 = (int) $f[2];
@@ -874,18 +884,20 @@ abstract class ParagonIE_Sodium_Core_Curve25519 extends ParagonIE_Sodium_Core_Cu
         $h1 += $carry0;
         $h0 -= $carry0 << 26;
 
-        return ParagonIE_Sodium_Core_Curve25519_Fe::fromArray(
-            array(
-                (int) $h0,
-                (int) $h1,
-                (int) $h2,
-                (int) $h3,
-                (int) $h4,
-                (int) $h5,
-                (int) $h6,
-                (int) $h7,
-                (int) $h8,
-                (int) $h9
+        return self::fe_normalize(
+            ParagonIE_Sodium_Core_Curve25519_Fe::fromArray(
+                array(
+                    (int) $h0,
+                    (int) $h1,
+                    (int) $h2,
+                    (int) $h3,
+                    (int) $h4,
+                    (int) $h5,
+                    (int) $h6,
+                    (int) $h7,
+                    (int) $h8,
+                    (int) $h9
+                )
             )
         );
     }
@@ -958,6 +970,7 @@ abstract class ParagonIE_Sodium_Core_Curve25519 extends ParagonIE_Sodium_Core_Cu
      */
     public static function fe_pow22523(ParagonIE_Sodium_Core_Curve25519_Fe $z)
     {
+        $z = self::fe_normalize($z);
         # fe_sq(t0, z);
         # fe_sq(t1, t0);
         # fe_sq(t1, t1);
@@ -1085,18 +1098,20 @@ abstract class ParagonIE_Sodium_Core_Curve25519 extends ParagonIE_Sodium_Core_Cu
      */
     public static function fe_sub(ParagonIE_Sodium_Core_Curve25519_Fe $f, ParagonIE_Sodium_Core_Curve25519_Fe $g)
     {
-        return ParagonIE_Sodium_Core_Curve25519_Fe::fromArray(
-            array(
-                (int) ($f[0] - $g[0]),
-                (int) ($f[1] - $g[1]),
-                (int) ($f[2] - $g[2]),
-                (int) ($f[3] - $g[3]),
-                (int) ($f[4] - $g[4]),
-                (int) ($f[5] - $g[5]),
-                (int) ($f[6] - $g[6]),
-                (int) ($f[7] - $g[7]),
-                (int) ($f[8] - $g[8]),
-                (int) ($f[9] - $g[9])
+        return self::fe_normalize(
+            ParagonIE_Sodium_Core_Curve25519_Fe::fromArray(
+                array(
+                    (int) ($f[0] - $g[0]),
+                    (int) ($f[1] - $g[1]),
+                    (int) ($f[2] - $g[2]),
+                    (int) ($f[3] - $g[3]),
+                    (int) ($f[4] - $g[4]),
+                    (int) ($f[5] - $g[5]),
+                    (int) ($f[6] - $g[6]),
+                    (int) ($f[7] - $g[7]),
+                    (int) ($f[8] - $g[8]),
+                    (int) ($f[9] - $g[9])
+                )
             )
         );
     }
@@ -2535,7 +2550,7 @@ abstract class ParagonIE_Sodium_Core_Curve25519 extends ParagonIE_Sodium_Core_Cu
         $s20 = 2097151 & (self::load_4(self::substr($s, 52, 4)) >> 4);
         $s21 = 2097151 & (self::load_3(self::substr($s, 55, 3)) >> 1);
         $s22 = 2097151 & (self::load_4(self::substr($s, 57, 4)) >> 6);
-        $s23 = (self::load_4(self::substr($s, 60, 4)) >> 3);
+        $s23 = 0x1fffffff & (self::load_4(self::substr($s, 60, 4)) >> 3);
 
         $s11 += self::mul($s23,  666643, 20);
         $s12 += self::mul($s23,  470296, 19);
@@ -3782,4 +3797,40 @@ abstract class ParagonIE_Sodium_Core_Curve25519 extends ParagonIE_Sodium_Core_Cu
         $s_[31] &= 128;
         return self::intArrayToString($s_);
     }
+
+    /**
+     * Ensure limbs are less than 28 bits long to prevent float promotion.
+     *
+     * This uses a constant-time conditional swap under the hood.
+     *
+     * @param ParagonIE_Sodium_Core_Curve25519_Fe $f
+     * @return ParagonIE_Sodium_Core_Curve25519_Fe
+     */
+    public static function fe_normalize(ParagonIE_Sodium_Core_Curve25519_Fe $f)
+    {
+        $x = (PHP_INT_SIZE << 3) - 1; // 31 or 63
+
+        $g = self::fe_copy($f);
+        for ($i = 0; $i < 10; ++$i) {
+            $mask = -(($g[$i] >> $x) & 1);
+
+            /*
+             * Get two candidate normalized values for $g[$i], depending on the sign of $g[$i]:
+             */
+            $a = $g[$i] & 0x7ffffff;
+            $b = -((-$g[$i]) & 0x7ffffff);
+
+            /*
+             * Return the appropriate candidate value, based on the sign of the original input:
+             *
+             * The following is equivalent to this ternary:
+             *
+             * $g[$i] = (($g[$i] >> $x) & 1) ? $a : $b;
+             *
+             * Except what's written doesn't contain timing leaks.
+             */
+            $g[$i] = ($a ^ (($a ^ $b) & $mask));
+        }
+        return $g;
+    }
 }
diff --git a/vendor/paragonie/sodium_compat/src/Core/Util.php b/vendor/paragonie/sodium_compat/src/Core/Util.php
index bde9df110..13221b366 100644
--- a/vendor/paragonie/sodium_compat/src/Core/Util.php
+++ b/vendor/paragonie/sodium_compat/src/Core/Util.php
@@ -458,7 +458,7 @@ abstract class ParagonIE_Sodium_Core_Util
         }
         /** @var array<int, int> $unpacked */
         $unpacked = unpack('V', $string);
-        return (int) ($unpacked[1] & 0xffffffff);
+        return (int) $unpacked[1];
     }
 
     /**
@@ -613,7 +613,11 @@ abstract class ParagonIE_Sodium_Core_Util
     {
         $high = 0;
         /** @var int $low */
-        $low = $num & 0xffffffff;
+        if (PHP_INT_SIZE === 4) {
+            $low = (int) $num;
+        } else {
+            $low = $num & 0xffffffff;
+        }
 
         if ((+(abs($num))) >= 1) {
             if ($num > 0) {
diff --git a/vendor/paragonie/sodium_compat/src/Core32/Curve25519.php b/vendor/paragonie/sodium_compat/src/Core32/Curve25519.php
index d6d700e0f..aafffcd13 100644
--- a/vendor/paragonie/sodium_compat/src/Core32/Curve25519.php
+++ b/vendor/paragonie/sodium_compat/src/Core32/Curve25519.php
@@ -325,25 +325,15 @@ abstract class ParagonIE_Sodium_Core32_Curve25519 extends ParagonIE_Sodium_Core3
         $carry9 = $f[9]->shiftRight(25);
         $f[9] = $f[9]->subInt64($carry9->shiftLeft(25));
 
-        /** @var int $h0 */
         $h0 = $f[0]->toInt32()->toInt();
-        /** @var int $h1 */
         $h1 = $f[1]->toInt32()->toInt();
-        /** @var int $h2 */
         $h2 = $f[2]->toInt32()->toInt();
-        /** @var int $h3 */
         $h3 = $f[3]->toInt32()->toInt();
-        /** @var int $h4 */
         $h4 = $f[4]->toInt32()->toInt();
-        /** @var int $h5 */
         $h5 = $f[5]->toInt32()->toInt();
-        /** @var int $h6 */
         $h6 = $f[6]->toInt32()->toInt();
-        /** @var int $h7 */
         $h7 = $f[7]->toInt32()->toInt();
-        /** @var int $h8 */
         $h8 = $f[8]->toInt32()->toInt();
-        /** @var int $h9 */
         $h9 = $f[9]->toInt32()->toInt();
 
         /**
@@ -418,7 +408,6 @@ abstract class ParagonIE_Sodium_Core32_Curve25519 extends ParagonIE_Sodium_Core3
         if ($zero === null) {
             $zero = str_repeat("\x00", 32);
         }
-        /** @var string $str */
         $str = self::fe_tobytes($f);
         /** @var string $zero */
         return !self::verify_32($str, $zero);
@@ -497,15 +486,10 @@ abstract class ParagonIE_Sodium_Core32_Curve25519 extends ParagonIE_Sodium_Core3
         $g7_19 = $g7->mulInt(19, 5);
         $g8_19 = $g8->mulInt(19, 5);
         $g9_19 = $g9->mulInt(19, 5);
-        /** @var ParagonIE_Sodium_Core32_Int64 $f1_2 */
         $f1_2 = $f1->shiftLeft(1);
-        /** @var ParagonIE_Sodium_Core32_Int64 $f3_2 */
         $f3_2 = $f3->shiftLeft(1);
-        /** @var ParagonIE_Sodium_Core32_Int64 $f5_2 */
         $f5_2 = $f5->shiftLeft(1);
-        /** @var ParagonIE_Sodium_Core32_Int64 $f7_2 */
         $f7_2 = $f7->shiftLeft(1);
-        /** @var ParagonIE_Sodium_Core32_Int64 $f9_2 */
         $f9_2 = $f9->shiftLeft(1);
         $f0g0    = $f0->mulInt64($g0, 27);
         $f0g1    = $f0->mulInt64($g1, 27);
@@ -775,28 +759,17 @@ abstract class ParagonIE_Sodium_Core32_Curve25519 extends ParagonIE_Sodium_Core3
      */
     public static function fe_sq(ParagonIE_Sodium_Core32_Curve25519_Fe $f)
     {
-        /** @var ParagonIE_Sodium_Core32_Int64 $f0 */
         $f0 = $f[0]->toInt64();
-        /** @var ParagonIE_Sodium_Core32_Int64 $f1 */
         $f1 = $f[1]->toInt64();
-        /** @var ParagonIE_Sodium_Core32_Int64 $f2 */
         $f2 = $f[2]->toInt64();
-        /** @var ParagonIE_Sodium_Core32_Int64 $f3 */
         $f3 = $f[3]->toInt64();
-        /** @var ParagonIE_Sodium_Core32_Int64 $f4 */
         $f4 = $f[4]->toInt64();
-        /** @var ParagonIE_Sodium_Core32_Int64 $f5 */
         $f5 = $f[5]->toInt64();
-        /** @var ParagonIE_Sodium_Core32_Int64 $f6 */
         $f6 = $f[6]->toInt64();
-        /** @var ParagonIE_Sodium_Core32_Int64 $f7 */
         $f7 = $f[7]->toInt64();
-        /** @var ParagonIE_Sodium_Core32_Int64 $f8 */
         $f8 = $f[8]->toInt64();
-        /** @var ParagonIE_Sodium_Core32_Int64 $f9 */
         $f9 = $f[9]->toInt64();
 
-        /** @var ParagonIE_Sodium_Core32_Int64 $f0_2 */
         $f0_2 = $f0->shiftLeft(1);
         $f1_2 = $f1->shiftLeft(1);
         $f2_2 = $f2->shiftLeft(1);
@@ -810,7 +783,7 @@ abstract class ParagonIE_Sodium_Core32_Curve25519 extends ParagonIE_Sodium_Core3
         $f7_38 = $f7->mulInt(38, 6);
         $f8_19 = $f8->mulInt(19, 5);
         $f9_38 = $f9->mulInt(38, 6);
-        /** @var ParagonIE_Sodium_Core32_Int64 $f0f0*/
+
         $f0f0    = $f0->mulInt64($f0, 28);
         $f0f1_2  = $f0_2->mulInt64($f1, 28);
         $f0f2_2 =  $f0_2->mulInt64($f2, 28);
@@ -979,25 +952,15 @@ abstract class ParagonIE_Sodium_Core32_Curve25519 extends ParagonIE_Sodium_Core3
      */
     public static function fe_sq2(ParagonIE_Sodium_Core32_Curve25519_Fe $f)
     {
-        /** @var ParagonIE_Sodium_Core32_Int64 $f0 */
         $f0 = $f[0]->toInt64();
-        /** @var ParagonIE_Sodium_Core32_Int64 $f1 */
         $f1 = $f[1]->toInt64();
-        /** @var ParagonIE_Sodium_Core32_Int64 $f2 */
         $f2 = $f[2]->toInt64();
-        /** @var ParagonIE_Sodium_Core32_Int64 $f3 */
         $f3 = $f[3]->toInt64();
-        /** @var ParagonIE_Sodium_Core32_Int64 $f4 */
         $f4 = $f[4]->toInt64();
-        /** @var ParagonIE_Sodium_Core32_Int64 $f5 */
         $f5 = $f[5]->toInt64();
-        /** @var ParagonIE_Sodium_Core32_Int64 $f6 */
         $f6 = $f[6]->toInt64();
-        /** @var ParagonIE_Sodium_Core32_Int64 $f7 */
         $f7 = $f[7]->toInt64();
-        /** @var ParagonIE_Sodium_Core32_Int64 $f8 */
         $f8 = $f[8]->toInt64();
-        /** @var ParagonIE_Sodium_Core32_Int64 $f9 */
         $f9 = $f[9]->toInt64();
 
         $f0_2 = $f0->shiftLeft(1);
@@ -1479,7 +1442,6 @@ abstract class ParagonIE_Sodium_Core32_Curve25519 extends ParagonIE_Sodium_Core3
     {
         static $d = null;
         if (!$d) {
-            /** @var ParagonIE_Sodium_Core32_Curve25519_Fe $d */
             $d = ParagonIE_Sodium_Core32_Curve25519_Fe::fromArray(
                 array(
                     ParagonIE_Sodium_Core32_Int32::fromInt(self::$d[0]),
@@ -1495,6 +1457,7 @@ abstract class ParagonIE_Sodium_Core32_Curve25519 extends ParagonIE_Sodium_Core3
                 )
             );
         }
+        /** @var ParagonIE_Sodium_Core32_Curve25519_Fe $d */
 
         # fe_frombytes(h->Y,s);
         # fe_1(h->Z);
@@ -1833,7 +1796,14 @@ abstract class ParagonIE_Sodium_Core32_Curve25519 extends ParagonIE_Sodium_Core3
      */
     public static function equal($b, $c)
     {
-        return (int) ((($b ^ $c) - 1 & 0xffffffff) >> 31);
+        $b0 = $b & 0xffff;
+        $b1 = ($b >> 16) & 0xffff;
+        $c0 = $c & 0xffff;
+        $c1 = ($c >> 16) & 0xffff;
+
+        $d0 = (($b0 ^ $c0) - 1) >> 31;
+        $d1 = (($b1 ^ $c1) - 1) >> 31;
+        return ($d0 & $d1) & 1;
     }
 
     /**
@@ -1850,7 +1820,6 @@ abstract class ParagonIE_Sodium_Core32_Curve25519 extends ParagonIE_Sodium_Core3
             return $char < 0 ? 1 : 0;
         }
         /** @var string $char */
-        /** @var int $x */
         $x = self::chrToInt(self::substr($char, 0, 1));
         return (int) ($x >> 31);
     }
@@ -1956,7 +1925,6 @@ abstract class ParagonIE_Sodium_Core32_Curve25519 extends ParagonIE_Sodium_Core3
         }
 
         $bnegative = self::negative($b);
-        /** @var int $babs */
         $babs = $b - (((-$bnegative) & $b) << 1);
 
         $t = self::ge_precomp_0();
@@ -1964,7 +1932,7 @@ abstract class ParagonIE_Sodium_Core32_Curve25519 extends ParagonIE_Sodium_Core3
             $t = self::cmov(
                 $t,
                 $base[$pos][$i],
-                self::equal($babs, $i + 1)
+                -self::equal($babs, $i + 1)
             );
         }
         $minusT = new ParagonIE_Sodium_Core32_Curve25519_Ge_Precomp(
@@ -2230,9 +2198,7 @@ abstract class ParagonIE_Sodium_Core32_Curve25519 extends ParagonIE_Sodium_Core3
         $carry = 0;
         for ($i = 0; $i < 63; ++$i) {
             $e[$i] += $carry;
-            /** @var int $carry */
             $carry = $e[$i] + 8;
-            /** @var int $carry */
             $carry >>= 4;
             $e[$i] -= $carry << 4;
         }
@@ -3140,7 +3106,6 @@ abstract class ParagonIE_Sodium_Core32_Curve25519 extends ParagonIE_Sodium_Core3
      */
     public static function ge_mul_l(ParagonIE_Sodium_Core32_Curve25519_Ge_P3 $A)
     {
-        /** @var array<int, int> $aslide */
         $aslide = array(
             13, 0, 0, 0, 0, -1, 0, 0, 0, 0, -11, 0, 0, 0, 0, 0, 0, -5, 0, 0, 0,
             0, 0, 0, -3, 0, 0, 0, 0, -13, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 3, 0,
diff --git a/vendor/paragonie/sodium_compat/src/Core32/Curve25519/Fe.php b/vendor/paragonie/sodium_compat/src/Core32/Curve25519/Fe.php
index 27537a6f1..21b318822 100644
--- a/vendor/paragonie/sodium_compat/src/Core32/Curve25519/Fe.php
+++ b/vendor/paragonie/sodium_compat/src/Core32/Curve25519/Fe.php
@@ -48,6 +48,9 @@ class ParagonIE_Sodium_Core32_Curve25519_Fe implements ArrayAccess
             }
         } else {
             for ($i = 0; $i < $count; ++$i) {
+                if (!($array[$i] instanceof ParagonIE_Sodium_Core32_Int32)) {
+                    throw new TypeError('Expected ParagonIE_Sodium_Core32_Int32');
+                }
                 $array[$i]->overflow = 0;
                 $obj->offsetSet($i, $array[$i]);
             }
diff --git a/vendor/paragonie/sodium_compat/src/Core32/Int32.php b/vendor/paragonie/sodium_compat/src/Core32/Int32.php
index c3a17900a..81821556d 100644
--- a/vendor/paragonie/sodium_compat/src/Core32/Int32.php
+++ b/vendor/paragonie/sodium_compat/src/Core32/Int32.php
@@ -138,9 +138,10 @@ class ParagonIE_Sodium_Core32_Int32
     public function mask($m = 0)
     {
         /** @var int $hi */
-        $hi = ($m >> 16) & 0xffff;
+        $hi = ((int) $m >> 16);
+        $hi &= 0xffff;
         /** @var int $lo */
-        $lo = ($m & 0xffff);
+        $lo = ((int) $m) & 0xffff;
         return new ParagonIE_Sodium_Core32_Int32(
             array(
                 (int) ($this->limbs[0] & $hi),
@@ -168,8 +169,8 @@ class ParagonIE_Sodium_Core32_Int32
             for ($j = 0; $j < $a_l; ++$j) {
                 $b_j = $b[$j];
                 $product = ($a_i * $b_j) + $r[$i + $j];
-                $carry = ($product >> $baseLog2 & 0xffff);
-                $r[$i + $j] = ($product - (int) ($carry * $base)) & 0xffff;
+                $carry = ((int) $product >> $baseLog2 & 0xffff);
+                $r[$i + $j] = ((int) $product - (int) ($carry * $base)) & 0xffff;
                 $r[$i + $j + 1] += $carry;
             }
         }
diff --git a/vendor/paragonie/sodium_compat/src/Core32/Int64.php b/vendor/paragonie/sodium_compat/src/Core32/Int64.php
index dd06a3fbe..e94d79823 100644
--- a/vendor/paragonie/sodium_compat/src/Core32/Int64.php
+++ b/vendor/paragonie/sodium_compat/src/Core32/Int64.php
@@ -337,9 +337,9 @@ class ParagonIE_Sodium_Core32_Int64
             $a_i = $a[$i];
             for ($j = 0; $j < $a_l; ++$j) {
                 $b_j = $b[$j];
-                $product = ($a_i * $b_j) + $r[$i + $j];
-                $carry = ($product >> $baseLog2 & 0xffff);
-                $r[$i + $j] = ($product - (int) ($carry * $base)) & 0xffff;
+                $product = (($a_i * $b_j) + $r[$i + $j]);
+                $carry = (((int) $product >> $baseLog2) & 0xffff);
+                $r[$i + $j] = ((int) $product - (int) ($carry * $base)) & 0xffff;
                 $r[$i + $j + 1] += $carry;
             }
         }
diff --git a/vendor/paragonie/sodium_compat/src/Core32/Poly1305/State.php b/vendor/paragonie/sodium_compat/src/Core32/Poly1305/State.php
index d80e1ff98..e77a8f42e 100644
--- a/vendor/paragonie/sodium_compat/src/Core32/Poly1305/State.php
+++ b/vendor/paragonie/sodium_compat/src/Core32/Poly1305/State.php
@@ -419,7 +419,7 @@ class ParagonIE_Sodium_Core32_Poly1305_State extends ParagonIE_Sodium_Core32_Uti
         $g4 = $g4->mask($mask);
 
         /** @var int $mask */
-        $mask = (~$mask) & 0xffffffff;
+        $mask = ~$mask;
 
         $h0 = $h0->mask($mask)->orInt32($g0);
         $h1 = $h1->mask($mask)->orInt32($g1);
diff --git a/vendor/paragonie/sodium_compat/src/Core32/XChaCha20.php b/vendor/paragonie/sodium_compat/src/Core32/XChaCha20.php
index 1dfc8591d..404e8d244 100644
--- a/vendor/paragonie/sodium_compat/src/Core32/XChaCha20.php
+++ b/vendor/paragonie/sodium_compat/src/Core32/XChaCha20.php
@@ -61,4 +61,27 @@ class ParagonIE_Sodium_Core32_XChaCha20 extends ParagonIE_Sodium_Core32_HChaCha2
             $message
         );
     }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @param string $message
+     * @param string $nonce
+     * @param string $key
+     * @param string $ic
+     * @return string
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    public static function ietfStreamXorIc($message, $nonce = '', $key = '', $ic = '')
+    {
+        return self::encryptBytes(
+            new ParagonIE_Sodium_Core32_ChaCha20_IetfCtx(
+                self::hChaCha20(self::substr($nonce, 0, 16), $key),
+                "\x00\x00\x00\x00" . self::substr($nonce, 16, 8),
+                $ic
+            ),
+            $message
+        );
+    }
 }
diff --git a/vendor/paragonie/sodium_compat/src/File.php b/vendor/paragonie/sodium_compat/src/File.php
index d71bc7e5a..e8622c7eb 100644
--- a/vendor/paragonie/sodium_compat/src/File.php
+++ b/vendor/paragonie/sodium_compat/src/File.php
@@ -1154,19 +1154,15 @@ class ParagonIE_Sodium_File extends ParagonIE_Sodium_Core_Util
      */
     private static function sign_core32($filePath, $secretKey)
     {
-        /** @var int|bool $size */
         $size = filesize($filePath);
         if (!is_int($size)) {
             throw new SodiumException('Could not obtain the file size');
         }
-        /** @var int $size */
 
-        /** @var resource|bool $fp */
         $fp = fopen($filePath, 'rb');
         if (!is_resource($fp)) {
             throw new SodiumException('Could not open input file for reading');
         }
-        /** @var resource $fp */
 
         /** @var string $az */
         $az = hash('sha512', self::substr($secretKey, 0, 32), true);
@@ -1179,16 +1175,9 @@ class ParagonIE_Sodium_File extends ParagonIE_Sodium_Core_Util
         /** @var resource $hs */
         $hs = self::updateHashWithFile($hs, $fp, $size);
 
-        /** @var string $nonceHash */
         $nonceHash = hash_final($hs, true);
-
-        /** @var string $pk */
         $pk = self::substr($secretKey, 32, 32);
-
-        /** @var string $nonce */
         $nonce = ParagonIE_Sodium_Core32_Ed25519::sc_reduce($nonceHash) . self::substr($nonceHash, 32);
-
-        /** @var string $sig */
         $sig = ParagonIE_Sodium_Core32_Ed25519::ge_p3_tobytes(
             ParagonIE_Sodium_Core32_Ed25519::ge_scalarmult_base($nonce)
         );
@@ -1199,13 +1188,10 @@ class ParagonIE_Sodium_File extends ParagonIE_Sodium_Core_Util
         /** @var resource $hs */
         $hs = self::updateHashWithFile($hs, $fp, $size);
 
-        /** @var string $hramHash */
         $hramHash = hash_final($hs, true);
 
-        /** @var string $hram */
         $hram = ParagonIE_Sodium_Core32_Ed25519::sc_reduce($hramHash);
 
-        /** @var string $sigAfter */
         $sigAfter = ParagonIE_Sodium_Core32_Ed25519::sc_muladd($hram, $az, $nonce);
 
         /** @var string $sig */
@@ -1243,6 +1229,7 @@ class ParagonIE_Sodium_File extends ParagonIE_Sodium_Core_Util
         if (ParagonIE_Sodium_Core32_Ed25519::small_order($sig)) {
             throw new SodiumException('Signature is on too small of an order');
         }
+
         if ((self::chrToInt($sig[63]) & 224) !== 0) {
             throw new SodiumException('Invalid signature');
         }
diff --git a/vendor/phpmailer/phpmailer/README.md b/vendor/phpmailer/phpmailer/README.md
index 81b089763..3a1a05b26 100644
--- a/vendor/phpmailer/phpmailer/README.md
+++ b/vendor/phpmailer/phpmailer/README.md
@@ -1,3 +1,5 @@
+[![SWUbanner](https://raw.githubusercontent.com/vshymanskyy/StandWithUkraine/main/banner2-direct.svg)](https://supportukrainenow.org/)
+
 ![PHPMailer](https://raw.github.com/PHPMailer/PHPMailer/master/examples/images/phpmailer.png)
 
 # PHPMailer – A full-featured email creation and transfer class for PHP
diff --git a/vendor/phpmailer/phpmailer/VERSION b/vendor/phpmailer/phpmailer/VERSION
index c19261717..a45cc0adf 100644
--- a/vendor/phpmailer/phpmailer/VERSION
+++ b/vendor/phpmailer/phpmailer/VERSION
@@ -1 +1 @@
-6.5.4
\ No newline at end of file
+6.6.3
\ No newline at end of file
diff --git a/vendor/phpmailer/phpmailer/composer.json b/vendor/phpmailer/phpmailer/composer.json
index b13732bed..1db6f03d8 100644
--- a/vendor/phpmailer/phpmailer/composer.json
+++ b/vendor/phpmailer/phpmailer/composer.json
@@ -39,8 +39,8 @@
     "require-dev": {
         "dealerdirect/phpcodesniffer-composer-installer": "^0.7.0",
         "doctrine/annotations": "^1.2",
-        "php-parallel-lint/php-console-highlighter": "^0.5.0",
-        "php-parallel-lint/php-parallel-lint": "^1.3.1",
+        "php-parallel-lint/php-console-highlighter": "^1.0.0",
+        "php-parallel-lint/php-parallel-lint": "^1.3.2",
         "phpcompatibility/php-compatibility": "^9.3.5",
         "roave/security-advisories": "dev-latest",
         "squizlabs/php_codesniffer": "^3.6.2",
@@ -70,7 +70,7 @@
         "test": "./vendor/bin/phpunit --no-coverage",
         "coverage": "./vendor/bin/phpunit",
         "lint": [
-            "@php ./vendor/php-parallel-lint/php-parallel-lint/parallel-lint . -e php,phps --exclude vendor --exclude .git --exclude build"
+            "@php ./vendor/php-parallel-lint/php-parallel-lint/parallel-lint . --show-deprecated -e php,phps --exclude vendor --exclude .git --exclude build"
         ]
     }
 }
diff --git a/vendor/phpmailer/phpmailer/get_oauth_token.php b/vendor/phpmailer/phpmailer/get_oauth_token.php
index befdc34a5..ba66f6cae 100644
--- a/vendor/phpmailer/phpmailer/get_oauth_token.php
+++ b/vendor/phpmailer/phpmailer/get_oauth_token.php
@@ -45,13 +45,25 @@ use Hayageek\OAuth2\Client\Provider\Yahoo;
 //@see https://github.com/stevenmaguire/oauth2-microsoft
 use Stevenmaguire\OAuth2\Client\Provider\Microsoft;
 
-if (!isset($_GET['code']) && !isset($_GET['provider'])) {
+if (!isset($_GET['code']) && !isset($_POST['provider'])) {
     ?>
 <html>
-<body>Select Provider:<br>
-<a href='?provider=Google'>Google</a><br>
-<a href='?provider=Yahoo'>Yahoo</a><br>
-<a href='?provider=Microsoft'>Microsoft/Outlook/Hotmail/Live/Office365</a><br>
+<body>
+<form method="post">
+    <h1>Select Provider</h1>
+    <input type="radio" name="provider" value="Google" id="providerGoogle">
+    <label for="providerGoogle">Google</label><br>
+    <input type="radio" name="provider" value="Yahoo" id="providerYahoo">
+    <label for="providerYahoo">Yahoo</label><br>
+    <input type="radio" name="provider" value="Microsoft" id="providerMicrosoft">
+    <label for="providerMicrosoft">Microsoft</label><br>
+    <h1>Enter id and secret</h1>
+    <p>These details are obtained by setting up an app in your provider's developer console.
+    </p>
+    <p>ClientId: <input type="text" name="clientId"><p>
+    <p>ClientSecret: <input type="text" name="clientSecret"></p>
+    <input type="submit" value="Continue">
+</form>
 </body>
 </html>
     <?php
@@ -63,21 +75,25 @@ require 'vendor/autoload.php';
 session_start();
 
 $providerName = '';
+$clientId = '';
+$clientSecret = '';
 
-if (array_key_exists('provider', $_GET)) {
-    $providerName = $_GET['provider'];
+if (array_key_exists('provider', $_POST)) {
+    $providerName = $_POST['provider'];
+    $clientId = $_POST['clientId'];
+    $clientSecret = $_POST['clientSecret'];
     $_SESSION['provider'] = $providerName;
+    $_SESSION['clientId'] = $clientId;
+    $_SESSION['clientSecret'] = $clientSecret;
 } elseif (array_key_exists('provider', $_SESSION)) {
     $providerName = $_SESSION['provider'];
-}
-if (!in_array($providerName, ['Google', 'Microsoft', 'Yahoo'])) {
-    exit('Only Google, Microsoft and Yahoo OAuth2 providers are currently supported in this script.');
+    $clientId = $_SESSION['clientId'];
+    $clientSecret = $_SESSION['clientSecret'];
 }
 
-//These details are obtained by setting up an app in the Google developer console,
-//or whichever provider you're using.
-$clientId = 'RANDOMCHARS-----duv1n2.apps.googleusercontent.com';
-$clientSecret = 'RANDOMCHARS-----lGyjPcRtvP';
+//If you don't want to use the built-in form, set your client id and secret here
+//$clientId = 'RANDOMCHARS-----duv1n2.apps.googleusercontent.com';
+//$clientSecret = 'RANDOMCHARS-----lGyjPcRtvP';
 
 //If this automatic URL doesn't work, set it yourself manually to the URL of this script
 $redirectUri = (isset($_SERVER['HTTPS']) ? 'https://' : 'http://') . $_SERVER['HTTP_HOST'] . $_SERVER['PHP_SELF'];
diff --git a/vendor/phpmailer/phpmailer/language/phpmailer.lang-ch.php b/vendor/phpmailer/phpmailer/language/phpmailer.lang-ch.php
deleted file mode 100644
index 500c95267..000000000
--- a/vendor/phpmailer/phpmailer/language/phpmailer.lang-ch.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-
-/**
- * Chinese PHPMailer language file: refer to English translation for definitive list
- * @package PHPMailer
- * @author LiuXin <http://www.80x86.cn/blog/>
- */
-
-$PHPMAILER_LANG['authenticate']         = 'SMTP 错误：身份验证失败。';
-$PHPMAILER_LANG['connect_host']         = 'SMTP 错误: 不能连接SMTP主机。';
-$PHPMAILER_LANG['data_not_accepted']    = 'SMTP 错误: 数据不可接受。';
-//$PHPMAILER_LANG['empty_message']        = 'Message body empty';
-$PHPMAILER_LANG['encoding']             = '未知编码：';
-$PHPMAILER_LANG['execute']              = '不能执行: ';
-$PHPMAILER_LANG['file_access']          = '不能访问文件：';
-$PHPMAILER_LANG['file_open']            = '文件错误：不能打开文件：';
-$PHPMAILER_LANG['from_failed']          = '下面的发送地址邮件发送失败了： ';
-$PHPMAILER_LANG['instantiate']          = '不能实现mail方法。';
-//$PHPMAILER_LANG['invalid_address']      = 'Invalid address: ';
-$PHPMAILER_LANG['mailer_not_supported'] = ' 您所选择的发送邮件的方法并不支持。';
-$PHPMAILER_LANG['provide_address']      = '您必须提供至少一个 收信人的email地址。';
-$PHPMAILER_LANG['recipients_failed']    = 'SMTP 错误： 下面的 收件人失败了： ';
-//$PHPMAILER_LANG['signing']              = 'Signing Error: ';
-//$PHPMAILER_LANG['smtp_connect_failed']  = 'SMTP Connect() failed.';
-//$PHPMAILER_LANG['smtp_error']           = 'SMTP server error: ';
-//$PHPMAILER_LANG['variable_set']         = 'Cannot set or reset variable: ';
-//$PHPMAILER_LANG['extension_missing']    = 'Extension missing: ';
diff --git a/vendor/phpmailer/phpmailer/language/phpmailer.lang-mn.php b/vendor/phpmailer/phpmailer/language/phpmailer.lang-mn.php
new file mode 100644
index 000000000..04d262c72
--- /dev/null
+++ b/vendor/phpmailer/phpmailer/language/phpmailer.lang-mn.php
@@ -0,0 +1,27 @@
+<?php
+
+/**
+ * Mongolian PHPMailer language file: refer to English translation for definitive list
+ * @package PHPMailer
+ * @author @wispas
+ */
+
+$PHPMAILER_LANG['authenticate']         = 'Алдаа SMTP: Холбогдож чадсангүй.';
+$PHPMAILER_LANG['connect_host']         = 'Алдаа SMTP: SMTP- сервертэй холбогдож болохгүй байна.';
+$PHPMAILER_LANG['data_not_accepted']    = 'Алдаа SMTP: зөвшөөрөгдсөнгүй.';
+$PHPMAILER_LANG['encoding']             = 'Тодорхойгүй кодчилол: ';
+$PHPMAILER_LANG['execute']              = 'Коммандыг гүйцэтгэх боломжгүй байна: ';
+$PHPMAILER_LANG['file_access']          = 'Файлд хандах боломжгүй байна: ';
+$PHPMAILER_LANG['file_open']            = 'Файлын алдаа: файлыг нээх боломжгүй байна: ';
+$PHPMAILER_LANG['from_failed']          = 'Илгээгчийн хаяг буруу байна: ';
+$PHPMAILER_LANG['instantiate']          = 'Mail () функцийг ажиллуулах боломжгүй байна.';
+$PHPMAILER_LANG['provide_address']      = 'Хүлээн авагчийн имэйл хаягийг оруулна уу.';
+$PHPMAILER_LANG['mailer_not_supported'] = ' — мэйл серверийг дэмжсэнгүй.';
+$PHPMAILER_LANG['recipients_failed']    = 'Алдаа SMTP: ийм хаягийг илгээж чадсангүй: ';
+$PHPMAILER_LANG['empty_message']        = 'Хоосон мессэж';
+$PHPMAILER_LANG['invalid_address']      = 'И-Мэйл буруу форматтай тул илгээх боломжгүй: ';
+$PHPMAILER_LANG['signing']              = 'Гарын үсгийн алдаа: ';
+$PHPMAILER_LANG['smtp_connect_failed']  = 'SMTP сервертэй холбогдоход алдаа гарлаа';
+$PHPMAILER_LANG['smtp_error']           = 'SMTP серверийн алдаа: ';
+$PHPMAILER_LANG['variable_set']         = 'Хувьсагчийг тохируулах эсвэл дахин тохируулах боломжгүй байна: ';
+$PHPMAILER_LANG['extension_missing']    = 'Өргөтгөл байхгүй: ';
diff --git a/vendor/phpmailer/phpmailer/src/OAuth.php b/vendor/phpmailer/phpmailer/src/OAuth.php
index c93d0be1b..c1d5b7762 100644
--- a/vendor/phpmailer/phpmailer/src/OAuth.php
+++ b/vendor/phpmailer/phpmailer/src/OAuth.php
@@ -33,7 +33,7 @@ use League\OAuth2\Client\Token\AccessToken;
  *
  * @author  Marcus Bointon (Synchro/coolbru) <phpmailer@synchromedia.co.uk>
  */
-class OAuth
+class OAuth implements OAuthTokenProvider
 {
     /**
      * An instance of the League OAuth Client Provider.
diff --git a/vendor/phpmailer/phpmailer/src/OAuthTokenProvider.php b/vendor/phpmailer/phpmailer/src/OAuthTokenProvider.php
new file mode 100644
index 000000000..115550743
--- /dev/null
+++ b/vendor/phpmailer/phpmailer/src/OAuthTokenProvider.php
@@ -0,0 +1,44 @@
+<?php
+
+/**
+ * PHPMailer - PHP email creation and transport class.
+ * PHP Version 5.5.
+ *
+ * @see https://github.com/PHPMailer/PHPMailer/ The PHPMailer GitHub project
+ *
+ * @author    Marcus Bointon (Synchro/coolbru) <phpmailer@synchromedia.co.uk>
+ * @author    Jim Jagielski (jimjag) <jimjag@gmail.com>
+ * @author    Andy Prevost (codeworxtech) <codeworxtech@users.sourceforge.net>
+ * @author    Brent R. Matzelle (original founder)
+ * @copyright 2012 - 2020 Marcus Bointon
+ * @copyright 2010 - 2012 Jim Jagielski
+ * @copyright 2004 - 2009 Andy Prevost
+ * @license   http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License
+ * @note      This program is distributed in the hope that it will be useful - WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.
+ */
+
+namespace PHPMailer\PHPMailer;
+
+/**
+ * OAuthTokenProvider - OAuth2 token provider interface.
+ * Provides base64 encoded OAuth2 auth strings for SMTP authentication.
+ *
+ * @see     OAuth
+ * @see     SMTP::authenticate()
+ *
+ * @author  Peter Scopes (pdscopes)
+ * @author  Marcus Bointon (Synchro/coolbru) <phpmailer@synchromedia.co.uk>
+ */
+interface OAuthTokenProvider
+{
+    /**
+     * Generate a base64-encoded OAuth token ensuring that the access token has not expired.
+     * The string to be base 64 encoded should be in the form:
+     * "user=<user_email_address>\001auth=Bearer <access_token>\001\001"
+     *
+     * @return string
+     */
+    public function getOauth64();
+}
diff --git a/vendor/phpmailer/phpmailer/src/PHPMailer.php b/vendor/phpmailer/phpmailer/src/PHPMailer.php
index 19110df24..6590a0ef3 100644
--- a/vendor/phpmailer/phpmailer/src/PHPMailer.php
+++ b/vendor/phpmailer/phpmailer/src/PHPMailer.php
@@ -358,9 +358,9 @@ class PHPMailer
     public $AuthType = '';
 
     /**
-     * An instance of the PHPMailer OAuth class.
+     * An implementation of the PHPMailer OAuthTokenProvider interface.
      *
-     * @var OAuth
+     * @var OAuthTokenProvider
      */
     protected $oauth;
 
@@ -750,7 +750,7 @@ class PHPMailer
      *
      * @var string
      */
-    const VERSION = '6.5.4';
+    const VERSION = '6.6.3';
 
     /**
      * Error severity: message only, continue processing.
@@ -1066,8 +1066,8 @@ class PHPMailer
      * Addresses that have been added already return false, but do not throw exceptions.
      *
      * @param string $kind    One of 'to', 'cc', 'bcc', or 'ReplyTo'
-     * @param string $address The email address to send, resp. to reply to
-     * @param string $name
+     * @param string $address The email address
+     * @param string $name    An optional username associated with the address
      *
      * @throws Exception
      *
@@ -1075,9 +1075,11 @@ class PHPMailer
      */
     protected function addOrEnqueueAnAddress($kind, $address, $name)
     {
-        $address = trim($address);
-        $name = trim(preg_replace('/[\r\n]+/', '', $name)); //Strip breaks and trim
-        $pos = strrpos($address, '@');
+        $pos = false;
+        if ($address !== null) {
+            $address = trim($address);
+            $pos = strrpos($address, '@');
+        }
         if (false === $pos) {
             //At-sign is missing.
             $error_message = sprintf(
@@ -1094,8 +1096,14 @@ class PHPMailer
 
             return false;
         }
+        if ($name !== null) {
+            $name = trim(preg_replace('/[\r\n]+/', '', $name)); //Strip breaks and trim
+        } else {
+            $name = '';
+        }
         $params = [$kind, $address, $name];
         //Enqueue addresses with IDN until we know the PHPMailer::$CharSet.
+        //Domain is assumed to be whatever is after the last @ symbol in the address
         if (static::idnSupported() && $this->has8bitChars(substr($address, ++$pos))) {
             if ('Reply-To' !== $kind) {
                 if (!array_key_exists($address, $this->RecipientsQueue)) {
@@ -1547,17 +1555,17 @@ class PHPMailer
 
             //Validate From, Sender, and ConfirmReadingTo addresses
             foreach (['From', 'Sender', 'ConfirmReadingTo'] as $address_kind) {
-                $this->$address_kind = trim($this->$address_kind);
-                if (empty($this->$address_kind)) {
+                $this->{$address_kind} = trim($this->{$address_kind});
+                if (empty($this->{$address_kind})) {
                     continue;
                 }
-                $this->$address_kind = $this->punyencodeAddress($this->$address_kind);
-                if (!static::validateAddress($this->$address_kind)) {
+                $this->{$address_kind} = $this->punyencodeAddress($this->{$address_kind});
+                if (!static::validateAddress($this->{$address_kind})) {
                     $error_message = sprintf(
                         '%s (%s): %s',
                         $this->lang('invalid_address'),
                         $address_kind,
-                        $this->$address_kind
+                        $this->{$address_kind}
                     );
                     $this->setError($error_message);
                     $this->edebug($error_message);
@@ -1657,7 +1665,7 @@ class PHPMailer
                 default:
                     $sendMethod = $this->Mailer . 'Send';
                     if (method_exists($this, $sendMethod)) {
-                        return $this->$sendMethod($this->MIMEHeader, $this->MIMEBody);
+                        return $this->{$sendMethod}($this->MIMEHeader, $this->MIMEBody);
                     }
 
                     return $this->mailSend($this->MIMEHeader, $this->MIMEBody);
@@ -2161,7 +2169,8 @@ class PHPMailer
                     }
                     if ($tls) {
                         if (!$this->smtp->startTLS()) {
-                            throw new Exception($this->lang('connect_host'));
+                            $message = $this->getSmtpErrorMessage('connect_host');
+                            throw new Exception($message);
                         }
                         //We must resend EHLO after TLS negotiation
                         $this->smtp->hello($hello);
@@ -2192,6 +2201,11 @@ class PHPMailer
         if ($this->exceptions && null !== $lastexception) {
             throw $lastexception;
         }
+        if ($this->exceptions) {
+            // no exception was thrown, likely $this->smtp->connect() failed
+            $message = $this->getSmtpErrorMessage('connect_host');
+            throw new Exception($message);
+        }
 
         return false;
     }
@@ -3700,20 +3714,21 @@ class PHPMailer
      * These differ from 'regular' attachments in that they are intended to be
      * displayed inline with the message, not just attached for download.
      * This is used in HTML messages that embed the images
-     * the HTML refers to using the $cid value.
+     * the HTML refers to using the `$cid` value in `img` tags, for example `<img src="cid:mylogo">`.
      * Never use a user-supplied path to a file!
      *
      * @param string $path        Path to the attachment
      * @param string $cid         Content ID of the attachment; Use this to reference
      *                            the content when using an embedded image in HTML
-     * @param string $name        Overrides the attachment name
-     * @param string $encoding    File encoding (see $Encoding)
-     * @param string $type        File MIME type
-     * @param string $disposition Disposition to use
-     *
-     * @throws Exception
+     * @param string $name        Overrides the attachment filename
+     * @param string $encoding    File encoding (see $Encoding) defaults to `base64`
+     * @param string $type        File MIME type (by default mapped from the `$path` filename's extension)
+     * @param string $disposition Disposition to use: `inline` (default) or `attachment`
+     *                            (unlikely you want this – {@see `addAttachment()`} instead)
      *
      * @return bool True on successfully adding an attachment
+     * @throws Exception
+     *
      */
     public function addEmbeddedImage(
         $path,
@@ -4091,12 +4106,8 @@ class PHPMailer
             //Is it a valid IPv4 address?
             return filter_var($host, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4) !== false;
         }
-        if (filter_var('http://' . $host, FILTER_VALIDATE_URL) !== false) {
-            //Is it a syntactically valid hostname?
-            return true;
-        }
-
-        return false;
+        //Is it a syntactically valid hostname (when embeded in a URL)?
+        return filter_var('http://' . $host, FILTER_VALIDATE_URL) !== false;
     }
 
     /**
@@ -4127,6 +4138,26 @@ class PHPMailer
         return $key;
     }
 
+    /**
+     * Build an error message starting with a generic one and adding details if possible.
+     *
+     * @param string $base_key
+     * @return string
+     */
+    private function getSmtpErrorMessage($base_key)
+    {
+        $message = $this->lang($base_key);
+        $error = $this->smtp->getError();
+        if (!empty($error['error'])) {
+            $message .= ' ' . $error['error'];
+            if (!empty($error['detail'])) {
+                $message .= ' ' . $error['detail'];
+            }
+        }
+
+        return $message;
+    }
+
     /**
      * Check if an error occurred.
      *
@@ -4546,7 +4577,7 @@ class PHPMailer
     public function set($name, $value = '')
     {
         if (property_exists($this, $name)) {
-            $this->$name = $value;
+            $this->{$name} = $value;
 
             return true;
         }
@@ -5027,9 +5058,9 @@ class PHPMailer
     }
 
     /**
-     * Get the OAuth instance.
+     * Get the OAuthTokenProvider instance.
      *
-     * @return OAuth
+     * @return OAuthTokenProvider
      */
     public function getOAuth()
     {
@@ -5037,9 +5068,9 @@ class PHPMailer
     }
 
     /**
-     * Set an OAuth instance.
+     * Set an OAuthTokenProvider instance.
      */
-    public function setOAuth(OAuth $oauth)
+    public function setOAuth(OAuthTokenProvider $oauth)
     {
         $this->oauth = $oauth;
     }
diff --git a/vendor/phpmailer/phpmailer/src/POP3.php b/vendor/phpmailer/phpmailer/src/POP3.php
index 6ca3e3cca..a7cc39112 100644
--- a/vendor/phpmailer/phpmailer/src/POP3.php
+++ b/vendor/phpmailer/phpmailer/src/POP3.php
@@ -46,7 +46,7 @@ class POP3
      *
      * @var string
      */
-    const VERSION = '6.5.4';
+    const VERSION = '6.6.3';
 
     /**
      * Default POP3 port number.
diff --git a/vendor/phpmailer/phpmailer/src/SMTP.php b/vendor/phpmailer/phpmailer/src/SMTP.php
index 138177060..c439a888b 100644
--- a/vendor/phpmailer/phpmailer/src/SMTP.php
+++ b/vendor/phpmailer/phpmailer/src/SMTP.php
@@ -35,7 +35,7 @@ class SMTP
      *
      * @var string
      */
-    const VERSION = '6.5.4';
+    const VERSION = '6.6.3';
 
     /**
      * SMTP line break constant.
@@ -483,7 +483,7 @@ class SMTP
      * @param string $username The user name
      * @param string $password The password
      * @param string $authtype The auth type (CRAM-MD5, PLAIN, LOGIN, XOAUTH2)
-     * @param OAuth  $OAuth    An optional OAuth instance for XOAUTH2 authentication
+     * @param OAuthTokenProvider $OAuth An optional OAuthTokenProvider instance for XOAUTH2 authentication
      *
      * @return bool True if successfully authenticated
      */
@@ -1037,7 +1037,10 @@ class SMTP
             return false;
         }
 
-        $this->setError('');
+        //Don't clear the error store when using keepalive
+        if ($command !== 'RSET') {
+            $this->setError('');
+        }
 
         return true;
     }
diff --git a/vendor/stripe/stripe-php/.php-cs-fixer.php b/vendor/stripe/stripe-php/.php-cs-fixer.php
index d833758e2..da4f7bcdb 100644
--- a/vendor/stripe/stripe-php/.php-cs-fixer.php
+++ b/vendor/stripe/stripe-php/.php-cs-fixer.php
@@ -56,6 +56,10 @@ $config->setRules([
     // but we can feel free to remove it in a major version (or maybe in a minor if
     // we devote some effort into determining that it is safe)
     'no_null_property_initialization' => false,
+
+    // We have to support `@return void` to satisfy Symfony deprecations helper.
+    // See https://github.com/stripe/stripe-php/pull/1230
+    'phpdoc_no_empty_return' => false,
 ]);
 $config->setFinder($finder);
 return $config;
diff --git a/vendor/stripe/stripe-php/CHANGELOG.md b/vendor/stripe/stripe-php/CHANGELOG.md
index 82a6d696e..1e644d565 100644
--- a/vendor/stripe/stripe-php/CHANGELOG.md
+++ b/vendor/stripe/stripe-php/CHANGELOG.md
@@ -1,11 +1,105 @@
 # Changelog
 
+## 7.128.0 - 2022-05-05
+* [#1282](https://github.com/stripe/stripe-php/pull/1282) API Updates
+  * Add support for `default_price` on `Product`
+  * Add support for `instructions_email` on `Refund`
+  
+
+## 7.127.0 - 2022-05-05
+* [#1281](https://github.com/stripe/stripe-php/pull/1281) API Updates
+  * Add support for new resources `FinancialConnections.AccountOwner`, `FinancialConnections.AccountOwnership`, `FinancialConnections.Account`, and `FinancialConnections.Session`
+  
+* [#1278](https://github.com/stripe/stripe-php/pull/1278) Pin setup-php action version.
+* [#1277](https://github.com/stripe/stripe-php/pull/1277) API Updates
+  * Add support for `registered_address` on `Person`
+
+## 7.126.0 - 2022-05-03
+* [#1276](https://github.com/stripe/stripe-php/pull/1276) API Updates
+  * Add support for new resource `CashBalance`
+  * Change type of `BillingPortal.Configuration.application` from `$Application` to `deletable($Application)`
+  * Add support for `cash_balance` on `Customer`
+  * Add support for `application` on `Invoice`, `Quote`, `SubscriptionSchedule`, and `Subscription`
+  * Add support for new value `eu_oss_vat` on enum `TaxId.type`
+* [#1274](https://github.com/stripe/stripe-php/pull/1274) Fix PHPDoc on Discount for nullable properties
+* [#1272](https://github.com/stripe/stripe-php/pull/1272) Allow users to pass a custom IPRESOLVE cURL option.
+
+## 7.125.0 - 2022-04-21
+* [#1270](https://github.com/stripe/stripe-php/pull/1270) API Updates
+  * Add support for `expire` test helper method on resource `Refund`
+
+## 7.124.0 - 2022-04-18
+* [#1265](https://github.com/stripe/stripe-php/pull/1265) API Updates
+  * Add support for new resources `FundingInstructions` and `Terminal.Configuration`
+  * Add support for `create_funding_instructions` method on resource `Customer`
+  * Add support for `amount_details` on `PaymentIntent`
+  * Add support for `customer_balance` on `PaymentMethod`
+  * Add support for new value `customer_balance` on enum `PaymentMethod.type`
+  * Add support for `configuration_overrides` on `Terminal.Location`
+
+
+## 7.123.0 - 2022-04-13
+* [#1263](https://github.com/stripe/stripe-php/pull/1263) API Updates
+  * Add support for `increment_authorization` method on resource `PaymentIntent`
+* [#1262](https://github.com/stripe/stripe-php/pull/1262) Add support for updating the version of the repo
+* [#1230](https://github.com/stripe/stripe-php/pull/1230) Add PHPDoc return types
+* [#1242](https://github.com/stripe/stripe-php/pull/1242) Fix some PHPDoc in tests
+
+## 7.122.0 - 2022-04-08
+* [#1261](https://github.com/stripe/stripe-php/pull/1261) API Updates
+  * Add support for `apply_customer_balance` method on resource `PaymentIntent`
+* [#1259](https://github.com/stripe/stripe-php/pull/1259) API Updates
+  
+  * Add `payment_intent.partially_funded`, `terminal.reader.action_failed`, and `terminal.reader.action_succeeded` events.
+
+## 7.121.0 - 2022-03-30
+* [#1258](https://github.com/stripe/stripe-php/pull/1258) API Updates
+  * Add support for `cancel_action`, `process_payment_intent`, `process_setup_intent`, and `set_reader_display` methods on resource `Terminal.Reader`
+  * Add support for `action` on `Terminal.Reader`
+
+## 7.120.0 - 2022-03-29
+* [#1257](https://github.com/stripe/stripe-php/pull/1257) API Updates
+  * Add support for Search API
+    * Add support for `search` method on resources `Charge`, `Customer`, `Invoice`, `PaymentIntent`, `Price`, `Product`, and `Subscription`
+
+## 7.119.0 - 2022-03-25
+* [#1256](https://github.com/stripe/stripe-php/pull/1256) API Updates
+  * Add support for PayNow and US Bank Accounts Debits payments
+      * Add support for `paynow` and `us_bank_account` on `PaymentMethod`
+      * Add support for new values `paynow` and `us_bank_account` on enum `PaymentMethod.type`
+  * Add support for `failure_balance_transaction` on `Charge`
+
+## 7.118.0 - 2022-03-23
+* [#1255](https://github.com/stripe/stripe-php/pull/1255) API Updates
+  * Add support for `cancel` method on resource `Refund`
+  * Add support for new values `bg_uic`, `hu_tin`, and `si_tin` on enum `TaxId.type`
+  * Add  `test_helpers.test_clock.advancing`, `test_helpers.test_clock.created`, `test_helpers.test_clock.deleted`, `test_helpers.test_clock.internal_failure`, and `test_helpers.test_clock.ready` events.
+
+
+## 7.117.0 - 2022-03-18
+* [#1254](https://github.com/stripe/stripe-php/pull/1254) API Updates
+  * Add support for `status` on `Card`
+* [#1251](https://github.com/stripe/stripe-php/pull/1251) Add support for SearchResult objects.
+* [#1249](https://github.com/stripe/stripe-php/pull/1249) Add missing constant for payment_behavior
+
+## 7.116.0 - 2022-03-02
+* [#1248](https://github.com/stripe/stripe-php/pull/1248) API Updates
+  * Add support for `proration_details` on `InvoiceLineItem`
+
+
+## 7.115.0 - 2022-03-01
+* [#1245](https://github.com/stripe/stripe-php/pull/1245) [#1247](https://github.com/stripe/stripe-php/pull/1247) API Updates
+  * Add support for new resource `TestHelpers.TestClock`
+  * Add support for `test_clock` on `Customer`, `Invoice`, `InvoiceItem`, `Quote`, `Subscription`, and `SubscriptionSchedule`
+  * Add support for `next_action` on `Refund`
+  * Add support for `konbini` on `PaymentMethod`
+* [#1244](https://github.com/stripe/stripe-php/pull/1244) API Updates
+  * Add support for new values `bbpos_wisepad3` and `stripe_m2` on enum `Terminal.Reader.device_type`
+
 ## 7.114.0 - 2022-02-15
 * [#1243](https://github.com/stripe/stripe-php/pull/1243) Add test
 * [#1240](https://github.com/stripe/stripe-php/pull/1240) API Updates
   * Add support for `verify_microdeposits` method on resources `PaymentIntent` and `SetupIntent`
-  
-  
 * [#1241](https://github.com/stripe/stripe-php/pull/1241) Add generic parameter to \Stripe\Collection usages
 
 ## 7.113.0 - 2022-02-03
@@ -16,7 +110,7 @@
 * [#1235](https://github.com/stripe/stripe-php/pull/1235) API Updates
   * Add support for `phone_number_collection` on `PaymentLink`
   * Add support for new value `is_vat` on enum `TaxId.type`
-  
+
 
 ## 7.111.0 - 2022-01-20
 * [#1233](https://github.com/stripe/stripe-php/pull/1233) API Updates
diff --git a/vendor/stripe/stripe-php/Makefile b/vendor/stripe/stripe-php/Makefile
index f9c597580..886733875 100644
--- a/vendor/stripe/stripe-php/Makefile
+++ b/vendor/stripe/stripe-php/Makefile
@@ -29,3 +29,11 @@ phpstan: vendor
 phpstan-baseline: vendor/bin/phpstan
 	php -d memory_limit=512M vendor/bin/phpstan analyse lib tests --generate-baseline
 .PHONY: phpstan-baseline
+
+update-version:
+	@echo "$(VERSION)" > VERSION
+	@perl -pi -e 's|VERSION = '\''[.\d]+'\''|VERSION = '\''$(VERSION)'\''|' lib/Stripe.php
+.PHONY: update-version
+
+codegen-format: fmt
+.PHONY: codegen-format
diff --git a/vendor/stripe/stripe-php/VERSION b/vendor/stripe/stripe-php/VERSION
index 1fc959a1e..5a14c98b1 100644
--- a/vendor/stripe/stripe-php/VERSION
+++ b/vendor/stripe/stripe-php/VERSION
@@ -1 +1 @@
-7.114.0
+7.128.0
diff --git a/vendor/stripe/stripe-php/init.php b/vendor/stripe/stripe-php/init.php
index d4606acfb..e611aa5c6 100644
--- a/vendor/stripe/stripe-php/init.php
+++ b/vendor/stripe/stripe-php/init.php
@@ -54,6 +54,7 @@ require __DIR__ . '/lib/ApiOperations/Delete.php';
 require __DIR__ . '/lib/ApiOperations/NestedResource.php';
 require __DIR__ . '/lib/ApiOperations/Request.php';
 require __DIR__ . '/lib/ApiOperations/Retrieve.php';
+require __DIR__ . '/lib/ApiOperations/Search.php';
 require __DIR__ . '/lib/ApiOperations/Update.php';
 
 // Plumbing
@@ -89,6 +90,7 @@ require __DIR__ . '/lib/BitcoinReceiver.php';
 require __DIR__ . '/lib/BitcoinTransaction.php';
 require __DIR__ . '/lib/Capability.php';
 require __DIR__ . '/lib/Card.php';
+require __DIR__ . '/lib/CashBalance.php';
 require __DIR__ . '/lib/Charge.php';
 require __DIR__ . '/lib/Checkout/Session.php';
 require __DIR__ . '/lib/Collection.php';
@@ -106,6 +108,11 @@ require __DIR__ . '/lib/Event.php';
 require __DIR__ . '/lib/ExchangeRate.php';
 require __DIR__ . '/lib/File.php';
 require __DIR__ . '/lib/FileLink.php';
+require __DIR__ . '/lib/FinancialConnections/Account.php';
+require __DIR__ . '/lib/FinancialConnections/AccountOwner.php';
+require __DIR__ . '/lib/FinancialConnections/AccountOwnership.php';
+require __DIR__ . '/lib/FinancialConnections/Session.php';
+require __DIR__ . '/lib/FundingInstructions.php';
 require __DIR__ . '/lib/Identity/VerificationReport.php';
 require __DIR__ . '/lib/Identity/VerificationSession.php';
 require __DIR__ . '/lib/Invoice.php';
@@ -142,6 +149,7 @@ require __DIR__ . '/lib/Refund.php';
 require __DIR__ . '/lib/Reporting/ReportRun.php';
 require __DIR__ . '/lib/Reporting/ReportType.php';
 require __DIR__ . '/lib/Review.php';
+require __DIR__ . '/lib/SearchResult.php';
 require __DIR__ . '/lib/SetupAttempt.php';
 require __DIR__ . '/lib/SetupIntent.php';
 require __DIR__ . '/lib/ShippingRate.php';
@@ -155,9 +163,11 @@ require __DIR__ . '/lib/SubscriptionSchedule.php';
 require __DIR__ . '/lib/TaxCode.php';
 require __DIR__ . '/lib/TaxId.php';
 require __DIR__ . '/lib/TaxRate.php';
+require __DIR__ . '/lib/Terminal/Configuration.php';
 require __DIR__ . '/lib/Terminal/ConnectionToken.php';
 require __DIR__ . '/lib/Terminal/Location.php';
 require __DIR__ . '/lib/Terminal/Reader.php';
+require __DIR__ . '/lib/TestHelpers/TestClock.php';
 require __DIR__ . '/lib/ThreeDSecure.php';
 require __DIR__ . '/lib/Token.php';
 require __DIR__ . '/lib/Topup.php';
@@ -188,6 +198,8 @@ require __DIR__ . '/lib/Service/EventService.php';
 require __DIR__ . '/lib/Service/ExchangeRateService.php';
 require __DIR__ . '/lib/Service/FileService.php';
 require __DIR__ . '/lib/Service/FileLinkService.php';
+require __DIR__ . '/lib/Service/FinancialConnections/AccountService.php';
+require __DIR__ . '/lib/Service/FinancialConnections/SessionService.php';
 require __DIR__ . '/lib/Service/Identity/VerificationReportService.php';
 require __DIR__ . '/lib/Service/Identity/VerificationSessionService.php';
 require __DIR__ . '/lib/Service/InvoiceService.php';
@@ -227,9 +239,13 @@ require __DIR__ . '/lib/Service/SubscriptionItemService.php';
 require __DIR__ . '/lib/Service/SubscriptionScheduleService.php';
 require __DIR__ . '/lib/Service/TaxCodeService.php';
 require __DIR__ . '/lib/Service/TaxRateService.php';
+require __DIR__ . '/lib/Service/Terminal/ConfigurationService.php';
 require __DIR__ . '/lib/Service/Terminal/ConnectionTokenService.php';
 require __DIR__ . '/lib/Service/Terminal/LocationService.php';
 require __DIR__ . '/lib/Service/Terminal/ReaderService.php';
+require __DIR__ . '/lib/Service/TestHelpers/RefundService.php';
+require __DIR__ . '/lib/Service/TestHelpers/Terminal/ReaderService.php';
+require __DIR__ . '/lib/Service/TestHelpers/TestClockService.php';
 require __DIR__ . '/lib/Service/TokenService.php';
 require __DIR__ . '/lib/Service/TopupService.php';
 require __DIR__ . '/lib/Service/TransferService.php';
@@ -239,12 +255,14 @@ require __DIR__ . '/lib/Service/WebhookEndpointService.php';
 require __DIR__ . '/lib/Service/BillingPortal/BillingPortalServiceFactory.php';
 require __DIR__ . '/lib/Service/Checkout/CheckoutServiceFactory.php';
 require __DIR__ . '/lib/Service/CoreServiceFactory.php';
+require __DIR__ . '/lib/Service/FinancialConnections/FinancialConnectionsServiceFactory.php';
 require __DIR__ . '/lib/Service/Identity/IdentityServiceFactory.php';
 require __DIR__ . '/lib/Service/Issuing/IssuingServiceFactory.php';
 require __DIR__ . '/lib/Service/Radar/RadarServiceFactory.php';
 require __DIR__ . '/lib/Service/Reporting/ReportingServiceFactory.php';
 require __DIR__ . '/lib/Service/Sigma/SigmaServiceFactory.php';
 require __DIR__ . '/lib/Service/Terminal/TerminalServiceFactory.php';
+require __DIR__ . '/lib/Service/TestHelpers/TestHelpersServiceFactory.php';
 
 // OAuth
 require __DIR__ . '/lib/OAuth.php';
diff --git a/vendor/stripe/stripe-php/lib/Account.php b/vendor/stripe/stripe-php/lib/Account.php
index e5d846b0f..330824cbc 100644
--- a/vendor/stripe/stripe-php/lib/Account.php
+++ b/vendor/stripe/stripe-php/lib/Account.php
@@ -22,7 +22,7 @@ namespace Stripe;
  * @property \Stripe\StripeObject $company
  * @property \Stripe\StripeObject $controller
  * @property string $country The account's country.
- * @property int $created Time at which the object was created. Measured in seconds since the Unix epoch.
+ * @property int $created Time at which the account was connected. Measured in seconds since the Unix epoch.
  * @property string $default_currency Three-letter ISO currency code representing the default currency for the account. This must be a currency that <a href="https://stripe.com/docs/payouts">Stripe supports in the account's country</a>.
  * @property bool $details_submitted Whether account details have been submitted. Standard accounts cannot receive payouts before this is true.
  * @property null|string $email An email address associated with the account. You can treat this as metadata: it is not used for authentication or messaging account holders.
diff --git a/vendor/stripe/stripe-php/lib/ApiOperations/Search.php b/vendor/stripe/stripe-php/lib/ApiOperations/Search.php
new file mode 100644
index 000000000..09472ebaa
--- /dev/null
+++ b/vendor/stripe/stripe-php/lib/ApiOperations/Search.php
@@ -0,0 +1,37 @@
+<?php
+
+namespace Stripe\ApiOperations;
+
+/**
+ * Trait for searchable resources.
+ *
+ * This trait should only be applied to classes that derive from StripeObject.
+ */
+trait Search
+{
+    /**
+     * @param string $searchUrl
+     * @param null|array $params
+     * @param null|array|string $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\SearchResult of ApiResources
+     */
+    protected static function _searchResource($searchUrl, $params = null, $opts = null)
+    {
+        self::_validateParams($params);
+
+        list($response, $opts) = static::_staticRequest('get', $searchUrl, $params, $opts);
+        $obj = \Stripe\Util\Util::convertToStripeObject($response->json, $opts);
+        if (!($obj instanceof \Stripe\SearchResult)) {
+            throw new \Stripe\Exception\UnexpectedValueException(
+                'Expected type ' . \Stripe\SearchResult::class . ', got "' . \get_class($obj) . '" instead.'
+            );
+        }
+        $obj->setLastResponse($response);
+        $obj->setFilters($params);
+
+        return $obj;
+    }
+}
diff --git a/vendor/stripe/stripe-php/lib/BaseStripeClient.php b/vendor/stripe/stripe-php/lib/BaseStripeClient.php
index bfdfe8677..b0b2e7e57 100644
--- a/vendor/stripe/stripe-php/lib/BaseStripeClient.php
+++ b/vendor/stripe/stripe-php/lib/BaseStripeClient.php
@@ -182,6 +182,30 @@ class BaseStripeClient implements StripeClientInterface, StripeStreamingClientIn
         return $obj;
     }
 
+    /**
+     * Sends a request to Stripe's API.
+     *
+     * @param string $method the HTTP method
+     * @param string $path the path of the request
+     * @param array $params the parameters of the request
+     * @param array|\Stripe\Util\RequestOptions $opts the special modifiers of the request
+     *
+     * @return \Stripe\SearchResult of ApiResources
+     */
+    public function requestSearchResult($method, $path, $params, $opts)
+    {
+        $obj = $this->request($method, $path, $params, $opts);
+        if (!($obj instanceof \Stripe\SearchResult)) {
+            $received_class = \get_class($obj);
+            $msg = "Expected to receive `Stripe\\SearchResult` object from Stripe API. Instead received `{$received_class}`.";
+
+            throw new \Stripe\Exception\UnexpectedValueException($msg);
+        }
+        $obj->setFilters($params);
+
+        return $obj;
+    }
+
     /**
      * @param \Stripe\Util\RequestOptions $opts
      *
diff --git a/vendor/stripe/stripe-php/lib/BillingPortal/Configuration.php b/vendor/stripe/stripe-php/lib/BillingPortal/Configuration.php
index cb6007796..fd7393eaf 100644
--- a/vendor/stripe/stripe-php/lib/BillingPortal/Configuration.php
+++ b/vendor/stripe/stripe-php/lib/BillingPortal/Configuration.php
@@ -11,7 +11,7 @@ namespace Stripe\BillingPortal;
  * @property string $id Unique identifier for the object.
  * @property string $object String representing the object's type. Objects of the same type share the same value.
  * @property bool $active Whether the configuration is active and can be used to create portal sessions.
- * @property null|string $application ID of the Connect Application that created the configuration.
+ * @property null|string|\Stripe\StripeObject $application ID of the Connect Application that created the configuration.
  * @property \Stripe\StripeObject $business_profile
  * @property int $created Time at which the object was created. Measured in seconds since the Unix epoch.
  * @property null|string $default_return_url The default URL to redirect customers to when they click on the portal's link to return to your website. This can be <a href="https://stripe.com/docs/api/customer_portal/sessions/create#create_portal_session-return_url">overriden</a> when creating the session.
diff --git a/vendor/stripe/stripe-php/lib/Card.php b/vendor/stripe/stripe-php/lib/Card.php
index 7f757d641..ba0e6fed8 100644
--- a/vendor/stripe/stripe-php/lib/Card.php
+++ b/vendor/stripe/stripe-php/lib/Card.php
@@ -39,6 +39,7 @@ namespace Stripe;
  * @property null|\Stripe\StripeObject $metadata Set of <a href="https://stripe.com/docs/api/metadata">key-value pairs</a> that you can attach to an object. This can be useful for storing additional information about the object in a structured format.
  * @property null|string $name Cardholder name.
  * @property null|string|\Stripe\Recipient $recipient The recipient that this card belongs to. This attribute will not be in the card object if the card belongs to a customer or account instead.
+ * @property null|string $status For external accounts, possible values are <code>new</code> and <code>errored</code>. If a transfer fails, the status is set to <code>errored</code> and transfers are stopped until account details are updated.
  * @property null|string $tokenization_method If the card number is tokenized, this is the method that was used. Can be <code>android_pay</code> (includes Google Pay), <code>apple_pay</code>, <code>masterpass</code>, <code>visa_checkout</code>, or null.
  */
 class Card extends ApiResource
diff --git a/vendor/stripe/stripe-php/lib/CashBalance.php b/vendor/stripe/stripe-php/lib/CashBalance.php
new file mode 100644
index 000000000..c63f272f1
--- /dev/null
+++ b/vendor/stripe/stripe-php/lib/CashBalance.php
@@ -0,0 +1,66 @@
+<?php
+
+// File generated from our OpenAPI spec
+
+namespace Stripe;
+
+/**
+ * A customer's <code>Cash balance</code> represents real funds. Customers can add
+ * funds to their cash balance by sending a bank transfer. These funds can be used
+ * for payment and can eventually be paid out to your bank account.
+ *
+ * @property string $object String representing the object's type. Objects of the same type share the same value.
+ * @property null|\Stripe\StripeObject $available A hash of all cash balances available to this customer. You cannot delete a customer with any cash balances, even if the balance is 0.
+ * @property string $customer The ID of the customer whose cash balance this object represents.
+ * @property bool $livemode Has the value <code>true</code> if the object exists in live mode or the value <code>false</code> if the object exists in test mode.
+ * @property \Stripe\StripeObject $settings
+ */
+class CashBalance extends ApiResource
+{
+    const OBJECT_NAME = 'cash_balance';
+
+    /**
+     * @return string the API URL for this balance transaction
+     */
+    public function instanceUrl()
+    {
+        $customer = $this['customer'];
+        $customer = Util\Util::utf8($customer);
+
+        $base = Customer::classUrl();
+        $customerExtn = \urlencode($customer);
+
+        return "{$base}/{$customerExtn}/cash_balance";
+    }
+
+    /**
+     * @param array|string $_id
+     * @param null|array|string $_opts
+     *
+     * @throws \Stripe\Exception\BadMethodCallException
+     */
+    public static function retrieve($_id, $_opts = null)
+    {
+        $msg = 'Customer Cash Balance cannot be retrieved without a ' .
+               'customer ID. Retrieve a Customer Cash Balance using ' .
+               "`Customer::retrieveCashBalance('customer_id')`.";
+
+        throw new Exception\BadMethodCallException($msg);
+    }
+
+    /**
+     * @param string $_id
+     * @param null|array $_params
+     * @param null|array|string $_options
+     *
+     * @throws \Stripe\Exception\BadMethodCallException
+     */
+    public static function update($_id, $_params = null, $_options = null)
+    {
+        $msg = 'Customer Cash Balance cannot be updated without a ' .
+        'customer ID. Retrieve a Customer Cash Balance using ' .
+        "`Customer::updateCashBalance('customer_id')`.";
+
+        throw new Exception\BadMethodCallException($msg);
+    }
+}
diff --git a/vendor/stripe/stripe-php/lib/Charge.php b/vendor/stripe/stripe-php/lib/Charge.php
index 0737d20ad..e9ac3b4ac 100644
--- a/vendor/stripe/stripe-php/lib/Charge.php
+++ b/vendor/stripe/stripe-php/lib/Charge.php
@@ -32,6 +32,7 @@ namespace Stripe;
  * @property null|string|\Stripe\Account $destination ID of an existing, connected Stripe account to transfer funds to if <code>transfer_data</code> was specified in the charge request.
  * @property null|string|\Stripe\Dispute $dispute Details about the dispute if the charge has been disputed.
  * @property bool $disputed Whether the charge has been disputed.
+ * @property null|string|\Stripe\BalanceTransaction $failure_balance_transaction ID of the balance transaction that describes the reversal of the balance on your account due to payment failure.
  * @property null|string $failure_code Error code explaining reason for charge failure if available (see <a href="https://stripe.com/docs/api#errors">the errors section</a> for a list of codes).
  * @property null|string $failure_message Message to user further explaining reason for charge failure if available.
  * @property null|\Stripe\StripeObject $fraud_details Information on fraud assessments for the charge.
@@ -68,6 +69,7 @@ class Charge extends ApiResource
     use ApiOperations\All;
     use ApiOperations\Create;
     use ApiOperations\Retrieve;
+    use ApiOperations\Search;
     use ApiOperations\Update;
 
     const STATUS_FAILED = 'failed';
@@ -143,4 +145,19 @@ class Charge extends ApiResource
 
         return $this;
     }
+
+    /**
+     * @param null|array $params
+     * @param null|array|string $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\SearchResult<Charge> the charge search results
+     */
+    public static function search($params = null, $opts = null)
+    {
+        $url = '/v1/charges/search';
+
+        return self::_searchResource($url, $params, $opts);
+    }
 }
diff --git a/vendor/stripe/stripe-php/lib/Checkout/Session.php b/vendor/stripe/stripe-php/lib/Checkout/Session.php
index c3fbaae37..aa8b34011 100644
--- a/vendor/stripe/stripe-php/lib/Checkout/Session.php
+++ b/vendor/stripe/stripe-php/lib/Checkout/Session.php
@@ -64,7 +64,7 @@ namespace Stripe\Checkout;
  * @property string $success_url The URL the customer will be directed to after the payment or subscription creation is successful.
  * @property \Stripe\StripeObject $tax_id_collection
  * @property null|\Stripe\StripeObject $total_details Tax and discount details for the computed total amount.
- * @property null|string $url The URL to the Checkout Session.
+ * @property null|string $url The URL to the Checkout Session. Redirect customers to this URL to take them to Checkout. If you’re using <a href="https://stripe.com/docs/payments/checkout/custom-domains">Custom Domains</a>, the URL will use your subdomain. Otherwise, it’ll use <code>checkout.stripe.com.</code>
  */
 class Session extends \Stripe\ApiResource
 {
diff --git a/vendor/stripe/stripe-php/lib/Customer.php b/vendor/stripe/stripe-php/lib/Customer.php
index 6887e4479..813ede338 100644
--- a/vendor/stripe/stripe-php/lib/Customer.php
+++ b/vendor/stripe/stripe-php/lib/Customer.php
@@ -16,6 +16,7 @@ namespace Stripe;
  * @property string $object String representing the object's type. Objects of the same type share the same value.
  * @property null|\Stripe\StripeObject $address The customer's address.
  * @property int $balance Current balance, if any, being stored on the customer. If negative, the customer has credit to apply to their next invoice. If positive, the customer has an amount owed that will be added to their next invoice. The balance does not refer to any unpaid invoices; it solely takes into account amounts that have yet to be successfully applied to any invoice. This balance is only taken into account as invoices are finalized.
+ * @property null|\Stripe\CashBalance $cash_balance The current funds being held by Stripe on behalf of the customer. These funds can be applied towards payment intents with source &quot;cash_balance&quot;.The settings[reconciliation_mode] field describes whether these funds are applied to such payment intents manually or automatically.
  * @property int $created Time at which the object was created. Measured in seconds since the Unix epoch.
  * @property null|string $currency Three-letter <a href="https://stripe.com/docs/currencies">ISO code for the currency</a> the customer can be charged in for recurring billing purposes.
  * @property null|string|\Stripe\Account|\Stripe\AlipayAccount|\Stripe\BankAccount|\Stripe\BitcoinReceiver|\Stripe\Card|\Stripe\Source $default_source <p>ID of the default payment source for the customer.</p><p>If you are using payment methods created via the PaymentMethods API, see the <a href="https://stripe.com/docs/api/customers/object#customer_object-invoice_settings-default_payment_method">invoice_settings.default_payment_method</a> field instead.</p>
@@ -37,6 +38,7 @@ namespace Stripe;
  * @property \Stripe\StripeObject $tax
  * @property null|string $tax_exempt Describes the customer's tax exemption status. One of <code>none</code>, <code>exempt</code>, or <code>reverse</code>. When set to <code>reverse</code>, invoice and receipt PDFs include the text <strong>&quot;Reverse charge&quot;</strong>.
  * @property \Stripe\Collection<\Stripe\TaxId> $tax_ids The customer's tax IDs.
+ * @property null|string|\Stripe\TestHelpers\TestClock $test_clock ID of the test clock this customer belongs to.
  */
 class Customer extends ApiResource
 {
@@ -47,6 +49,7 @@ class Customer extends ApiResource
     use ApiOperations\Delete;
     use ApiOperations\NestedResource;
     use ApiOperations\Retrieve;
+    use ApiOperations\Search;
     use ApiOperations\Update;
 
     const TAX_EXEMPT_EXEMPT = 'exempt';
@@ -99,6 +102,52 @@ class Customer extends ApiResource
         return $obj;
     }
 
+    /**
+     * @param null|array $params
+     * @param null|array|string $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\SearchResult<Customer> the customer search results
+     */
+    public static function search($params = null, $opts = null)
+    {
+        $url = '/v1/customers/search';
+
+        return self::_searchResource($url, $params, $opts);
+    }
+
+    const PATH_CASH_BALANCE = '/cash_balance';
+
+    /**
+     * @param string $id the ID of the customer to which the cash balance belongs
+     * @param null|array $params
+     * @param null|array|string $opts
+     * @param mixed $cashBalanceId
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\cash_balance
+     */
+    public static function retrieveCashBalance($id, $cashBalanceId, $params = null, $opts = null)
+    {
+        return self::_retrieveNestedResource($id, static::PATH_CASH_BALANCE, $params, $opts);
+    }
+
+    /**
+     * @param string $id the ID of the customer to which the cash balance belongs
+     * @param null|array $params
+     * @param null|array|string $opts
+     * @param mixed $cashBalanceId
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\cash_balance
+     */
+    public static function updateCashBalance($id, $cashBalanceId, $params = null, $opts = null)
+    {
+        return self::_updateNestedResource($id, static::PATH_CASH_BALANCE, $params, $opts);
+    }
     const PATH_BALANCE_TRANSACTIONS = '/balance_transactions';
 
     /**
diff --git a/vendor/stripe/stripe-php/lib/Discount.php b/vendor/stripe/stripe-php/lib/Discount.php
index f32e3c578..dbc5d4bb4 100644
--- a/vendor/stripe/stripe-php/lib/Discount.php
+++ b/vendor/stripe/stripe-php/lib/Discount.php
@@ -5,17 +5,17 @@ namespace Stripe;
 /**
  * Class Discount.
  *
- * @property string $checkout_session The Checkout session that this coupon is applied to, if it is applied to a particular session in payment mode. Will not be present for subscription mode.
+ * @property null|string $checkout_session The Checkout session that this coupon is applied to, if it is applied to a particular session in payment mode. Will not be present for subscription mode.
  * @property \Stripe\Coupon $coupon Hash describing the coupon applied to create this discount.
  * @property string|\Stripe\Customer $customer The ID of the customer associated with this discount.
- * @property int $end If the coupon has a duration of repeating, the date that this discount will end. If the coupon has a duration of once or forever, this attribute will be null.
+ * @property null|int $end If the coupon has a duration of repeating, the date that this discount will end. If the coupon has a duration of once or forever, this attribute will be null.
  * @property string $id The ID of the discount object.
- * @property string $invoice The invoice that the discount’s coupon was applied to, if it was applied directly to a particular invoice.
- * @property string $invoice_item The invoice item id (or invoice line item id for invoice line items of type=‘subscription’) that the discount’s coupon was applied to, if it was applied directly to a particular invoice item or invoice line item.
+ * @property null|string $invoice The invoice that the discount’s coupon was applied to, if it was applied directly to a particular invoice.
+ * @property null|string $invoice_item The invoice item id (or invoice line item id for invoice line items of type=‘subscription’) that the discount’s coupon was applied to, if it was applied directly to a particular invoice item or invoice line item.
  * @property string $object String representing the object’s type. Objects of the same type share the same value.
- * @property string $promotion_code The promotion code applied to create this discount.
+ * @property null|string $promotion_code The promotion code applied to create this discount.
  * @property int $start Date that the coupon was applied.
- * @property string $subscription The subscription that this coupon is applied to, if it is applied to a particular subscription.
+ * @property null|string $subscription The subscription that this coupon is applied to, if it is applied to a particular subscription.
  */
 class Discount extends StripeObject
 {
diff --git a/vendor/stripe/stripe-php/lib/Event.php b/vendor/stripe/stripe-php/lib/Event.php
index ca394a19c..9bc59eee5 100644
--- a/vendor/stripe/stripe-php/lib/Event.php
+++ b/vendor/stripe/stripe-php/lib/Event.php
@@ -39,6 +39,9 @@ namespace Stripe;
  * href="https://stripe.com/docs/api#retrieve_event">Retrieve Event API</a> is
  * guaranteed only for 30 days.
  *
+ * This class includes constants for the possible string representations of
+ * event types. See https://stripe.com/docs/api#event_types for more details.
+ *
  * @property string $id Unique identifier for the object.
  * @property string $object String representing the object's type. Objects of the same type share the same value.
  * @property string $account The connected account that originated the event.
@@ -57,40 +60,37 @@ class Event extends ApiResource
     use ApiOperations\All;
     use ApiOperations\Retrieve;
 
-    /**
-     * Possible string representations of event types.
-     *
-     * @see https://stripe.com/docs/api#event_types
-     */
-    const ACCOUNT_UPDATED = 'account.updated';
     const ACCOUNT_APPLICATION_AUTHORIZED = 'account.application.authorized';
     const ACCOUNT_APPLICATION_DEAUTHORIZED = 'account.application.deauthorized';
     const ACCOUNT_EXTERNAL_ACCOUNT_CREATED = 'account.external_account.created';
     const ACCOUNT_EXTERNAL_ACCOUNT_DELETED = 'account.external_account.deleted';
     const ACCOUNT_EXTERNAL_ACCOUNT_UPDATED = 'account.external_account.updated';
+    const ACCOUNT_UPDATED = 'account.updated';
     const APPLICATION_FEE_CREATED = 'application_fee.created';
-    const APPLICATION_FEE_REFUNDED = 'application_fee.refunded';
     const APPLICATION_FEE_REFUND_UPDATED = 'application_fee.refund.updated';
+    const APPLICATION_FEE_REFUNDED = 'application_fee.refunded';
     const BALANCE_AVAILABLE = 'balance.available';
     const BILLING_PORTAL_CONFIGURATION_CREATED = 'billing_portal.configuration.created';
     const BILLING_PORTAL_CONFIGURATION_UPDATED = 'billing_portal.configuration.updated';
     const CAPABILITY_UPDATED = 'capability.updated';
+    const CASH_BALANCE_FUNDS_AVAILABLE = 'cash_balance.funds_available';
     const CHARGE_CAPTURED = 'charge.captured';
-    const CHARGE_EXPIRED = 'charge.expired';
-    const CHARGE_FAILED = 'charge.failed';
-    const CHARGE_PENDING = 'charge.pending';
-    const CHARGE_REFUNDED = 'charge.refunded';
-    const CHARGE_SUCCEEDED = 'charge.succeeded';
-    const CHARGE_UPDATED = 'charge.updated';
     const CHARGE_DISPUTE_CLOSED = 'charge.dispute.closed';
     const CHARGE_DISPUTE_CREATED = 'charge.dispute.created';
     const CHARGE_DISPUTE_FUNDS_REINSTATED = 'charge.dispute.funds_reinstated';
     const CHARGE_DISPUTE_FUNDS_WITHDRAWN = 'charge.dispute.funds_withdrawn';
     const CHARGE_DISPUTE_UPDATED = 'charge.dispute.updated';
+    const CHARGE_EXPIRED = 'charge.expired';
+    const CHARGE_FAILED = 'charge.failed';
+    const CHARGE_PENDING = 'charge.pending';
     const CHARGE_REFUND_UPDATED = 'charge.refund.updated';
+    const CHARGE_REFUNDED = 'charge.refunded';
+    const CHARGE_SUCCEEDED = 'charge.succeeded';
+    const CHARGE_UPDATED = 'charge.updated';
     const CHECKOUT_SESSION_ASYNC_PAYMENT_FAILED = 'checkout.session.async_payment_failed';
     const CHECKOUT_SESSION_ASYNC_PAYMENT_SUCCEEDED = 'checkout.session.async_payment_succeeded';
     const CHECKOUT_SESSION_COMPLETED = 'checkout.session.completed';
+    const CHECKOUT_SESSION_EXPIRED = 'checkout.session.expired';
     const COUPON_CREATED = 'coupon.created';
     const COUPON_DELETED = 'coupon.deleted';
     const COUPON_UPDATED = 'coupon.updated';
@@ -99,7 +99,6 @@ class Event extends ApiResource
     const CREDIT_NOTE_VOIDED = 'credit_note.voided';
     const CUSTOMER_CREATED = 'customer.created';
     const CUSTOMER_DELETED = 'customer.deleted';
-    const CUSTOMER_UPDATED = 'customer.updated';
     const CUSTOMER_DISCOUNT_CREATED = 'customer.discount.created';
     const CUSTOMER_DISCOUNT_DELETED = 'customer.discount.deleted';
     const CUSTOMER_DISCOUNT_UPDATED = 'customer.discount.updated';
@@ -116,6 +115,7 @@ class Event extends ApiResource
     const CUSTOMER_TAX_ID_CREATED = 'customer.tax_id.created';
     const CUSTOMER_TAX_ID_DELETED = 'customer.tax_id.deleted';
     const CUSTOMER_TAX_ID_UPDATED = 'customer.tax_id.updated';
+    const CUSTOMER_UPDATED = 'customer.updated';
     const FILE_CREATED = 'file.created';
     const IDENTITY_VERIFICATION_SESSION_CANCELED = 'identity.verification_session.canceled';
     const IDENTITY_VERIFICATION_SESSION_CREATED = 'identity.verification_session.created';
@@ -163,10 +163,13 @@ class Event extends ApiResource
     const PAYMENT_INTENT_AMOUNT_CAPTURABLE_UPDATED = 'payment_intent.amount_capturable_updated';
     const PAYMENT_INTENT_CANCELED = 'payment_intent.canceled';
     const PAYMENT_INTENT_CREATED = 'payment_intent.created';
+    const PAYMENT_INTENT_PARTIALLY_FUNDED = 'payment_intent.partially_funded';
     const PAYMENT_INTENT_PAYMENT_FAILED = 'payment_intent.payment_failed';
     const PAYMENT_INTENT_PROCESSING = 'payment_intent.processing';
     const PAYMENT_INTENT_REQUIRES_ACTION = 'payment_intent.requires_action';
     const PAYMENT_INTENT_SUCCEEDED = 'payment_intent.succeeded';
+    const PAYMENT_LINK_CREATED = 'payment_link.created';
+    const PAYMENT_LINK_UPDATED = 'payment_link.updated';
     const PAYMENT_METHOD_ATTACHED = 'payment_method.attached';
     const PAYMENT_METHOD_AUTOMATICALLY_UPDATED = 'payment_method.automatically_updated';
     const PAYMENT_METHOD_CARD_AUTOMATICALLY_UPDATED = 'payment_method.card_automatically_updated';
@@ -193,6 +196,10 @@ class Event extends ApiResource
     const PROMOTION_CODE_CREATED = 'promotion_code.created';
     const PROMOTION_CODE_DELETED = 'promotion_code.deleted';
     const PROMOTION_CODE_UPDATED = 'promotion_code.updated';
+    const QUOTE_ACCEPTED = 'quote.accepted';
+    const QUOTE_CANCELED = 'quote.canceled';
+    const QUOTE_CREATED = 'quote.created';
+    const QUOTE_FINALIZED = 'quote.finalized';
     const RADAR_EARLY_FRAUD_WARNING_CREATED = 'radar.early_fraud_warning.created';
     const RADAR_EARLY_FRAUD_WARNING_UPDATED = 'radar.early_fraud_warning.updated';
     const RECIPIENT_CREATED = 'recipient.created';
@@ -228,12 +235,21 @@ class Event extends ApiResource
     const SUBSCRIPTION_SCHEDULE_UPDATED = 'subscription_schedule.updated';
     const TAX_RATE_CREATED = 'tax_rate.created';
     const TAX_RATE_UPDATED = 'tax_rate.updated';
+    const TERMINAL_READER_ACTION_FAILED = 'terminal.reader.action_failed';
+    const TERMINAL_READER_ACTION_SUCCEEDED = 'terminal.reader.action_succeeded';
+    const TEST_HELPERS_TEST_CLOCK_ADVANCING = 'test_helpers.test_clock.advancing';
+    const TEST_HELPERS_TEST_CLOCK_CREATED = 'test_helpers.test_clock.created';
+    const TEST_HELPERS_TEST_CLOCK_DELETED = 'test_helpers.test_clock.deleted';
+    const TEST_HELPERS_TEST_CLOCK_INTERNAL_FAILURE = 'test_helpers.test_clock.internal_failure';
+    const TEST_HELPERS_TEST_CLOCK_READY = 'test_helpers.test_clock.ready';
     const TOPUP_CANCELED = 'topup.canceled';
     const TOPUP_CREATED = 'topup.created';
     const TOPUP_FAILED = 'topup.failed';
     const TOPUP_REVERSED = 'topup.reversed';
     const TOPUP_SUCCEEDED = 'topup.succeeded';
     const TRANSFER_CREATED = 'transfer.created';
+    const TRANSFER_FAILED = 'transfer.failed';
+    const TRANSFER_PAID = 'transfer.paid';
     const TRANSFER_REVERSED = 'transfer.reversed';
     const TRANSFER_UPDATED = 'transfer.updated';
 }
diff --git a/vendor/stripe/stripe-php/lib/FinancialConnections/Account.php b/vendor/stripe/stripe-php/lib/FinancialConnections/Account.php
new file mode 100644
index 000000000..f24ef43d9
--- /dev/null
+++ b/vendor/stripe/stripe-php/lib/FinancialConnections/Account.php
@@ -0,0 +1,84 @@
+<?php
+
+// File generated from our OpenAPI spec
+
+namespace Stripe\FinancialConnections;
+
+/**
+ * A Financial Connections Account represents an account that exists outside of
+ * Stripe, to which you have been granted some degree of access.
+ *
+ * @property string $id Unique identifier for the object.
+ * @property string $object String representing the object's type. Objects of the same type share the same value.
+ * @property null|\Stripe\StripeObject $account_holder The account holder that this account belongs to.
+ * @property null|\Stripe\StripeObject $balance The most recent information about the account's balance.
+ * @property null|\Stripe\StripeObject $balance_refresh The state of the most recent attempt to refresh the account balance.
+ * @property string $category The type of the account. Account category is further divided in <code>subcategory</code>.
+ * @property int $created Time at which the object was created. Measured in seconds since the Unix epoch.
+ * @property null|string $display_name A human-readable name that has been assigned to this account, either by the account holder or by the institution.
+ * @property string $institution_name The name of the institution that holds this account.
+ * @property null|string $last4 The last 4 digits of the account number. If present, this will be 4 numeric characters.
+ * @property bool $livemode Has the value <code>true</code> if the object exists in live mode or the value <code>false</code> if the object exists in test mode.
+ * @property null|string|\Stripe\FinancialConnections\AccountOwnership $ownership The most recent information about the account's owners.
+ * @property null|\Stripe\StripeObject $ownership_refresh The state of the most recent attempt to refresh the account owners.
+ * @property null|string[] $permissions The list of permissions granted by this account.
+ * @property string $status The status of the link to the account.
+ * @property string $subcategory <p>If <code>category</code> is <code>cash</code>, one of:</p><p>- <code>checking</code> - <code>savings</code> - <code>other</code></p><p>If <code>category</code> is <code>credit</code>, one of:</p><p>- <code>mortgage</code> - <code>line_of_credit</code> - <code>credit_card</code> - <code>other</code></p><p>If <code>category</code> is <code>investment</code> or <code>other</code>, this will be <code>other</code>.</p>
+ * @property string[] $supported_payment_method_types The <a href="https://stripe.com/docs/api/payment_methods/object#payment_method_object-type">PaymentMethod type</a>(s) that can be created from this account.
+ */
+class Account extends \Stripe\ApiResource
+{
+    const OBJECT_NAME = 'financial_connections.account';
+
+    use \Stripe\ApiOperations\Retrieve;
+
+    const CATEGORY_CASH = 'cash';
+    const CATEGORY_CREDIT = 'credit';
+    const CATEGORY_INVESTMENT = 'investment';
+    const CATEGORY_OTHER = 'other';
+
+    const STATUS_ACTIVE = 'active';
+    const STATUS_DISCONNECTED = 'disconnected';
+    const STATUS_INACTIVE = 'inactive';
+
+    const SUBCATEGORY_CHECKING = 'checking';
+    const SUBCATEGORY_CREDIT_CARD = 'credit_card';
+    const SUBCATEGORY_LINE_OF_CREDIT = 'line_of_credit';
+    const SUBCATEGORY_MORTGAGE = 'mortgage';
+    const SUBCATEGORY_OTHER = 'other';
+    const SUBCATEGORY_SAVINGS = 'savings';
+
+    /**
+     * @param null|array $params
+     * @param null|array|string $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\FinancialConnections\Account the disconnected account
+     */
+    public function disconnect($params = null, $opts = null)
+    {
+        $url = $this->instanceUrl() . '/disconnect';
+        list($response, $opts) = $this->_request('post', $url, $params, $opts);
+        $this->refreshFrom($response, $opts);
+
+        return $this;
+    }
+
+    /**
+     * @param null|array $params
+     * @param null|array|string $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\FinancialConnections\Account the refreshed account
+     */
+    public function refresh($params = null, $opts = null)
+    {
+        $url = $this->instanceUrl() . '/refresh';
+        list($response, $opts) = $this->_request('post', $url, $params, $opts);
+        $this->refreshFrom($response, $opts);
+
+        return $this;
+    }
+}
diff --git a/vendor/stripe/stripe-php/lib/FinancialConnections/AccountOwner.php b/vendor/stripe/stripe-php/lib/FinancialConnections/AccountOwner.php
new file mode 100644
index 000000000..53a7f1a4c
--- /dev/null
+++ b/vendor/stripe/stripe-php/lib/FinancialConnections/AccountOwner.php
@@ -0,0 +1,20 @@
+<?php
+
+// File generated from our OpenAPI spec
+
+namespace Stripe\FinancialConnections;
+
+/**
+ * @property string $id Unique identifier for the object.
+ * @property string $object String representing the object's type. Objects of the same type share the same value.
+ * @property null|string $email The email address of the owner.
+ * @property string $name The full name of the owner.
+ * @property string $ownership The ownership object that this owner belongs to.
+ * @property null|string $phone The raw phone number of the owner.
+ * @property null|string $raw_address The raw physical address of the owner.
+ * @property null|int $refreshed_at The timestamp of the refresh that updated this owner.
+ */
+class AccountOwner extends \Stripe\ApiResource
+{
+    const OBJECT_NAME = 'financial_connections.account_owner';
+}
diff --git a/vendor/stripe/stripe-php/lib/FinancialConnections/AccountOwnership.php b/vendor/stripe/stripe-php/lib/FinancialConnections/AccountOwnership.php
new file mode 100644
index 000000000..63ef45a83
--- /dev/null
+++ b/vendor/stripe/stripe-php/lib/FinancialConnections/AccountOwnership.php
@@ -0,0 +1,18 @@
+<?php
+
+// File generated from our OpenAPI spec
+
+namespace Stripe\FinancialConnections;
+
+/**
+ * Describes a snapshot of the owners of an account at a particular point in time.
+ *
+ * @property string $id Unique identifier for the object.
+ * @property string $object String representing the object's type. Objects of the same type share the same value.
+ * @property int $created Time at which the object was created. Measured in seconds since the Unix epoch.
+ * @property \Stripe\Collection<\Stripe\FinancialConnections\AccountOwner> $owners A paginated list of owners for this account.
+ */
+class AccountOwnership extends \Stripe\ApiResource
+{
+    const OBJECT_NAME = 'financial_connections.account_ownership';
+}
diff --git a/vendor/stripe/stripe-php/lib/FinancialConnections/Session.php b/vendor/stripe/stripe-php/lib/FinancialConnections/Session.php
new file mode 100644
index 000000000..8d55cd06e
--- /dev/null
+++ b/vendor/stripe/stripe-php/lib/FinancialConnections/Session.php
@@ -0,0 +1,27 @@
+<?php
+
+// File generated from our OpenAPI spec
+
+namespace Stripe\FinancialConnections;
+
+/**
+ * A Financial Connections Session is the secure way to programmatically launch the
+ * client-side Stripe.js modal that lets your users link their accounts.
+ *
+ * @property string $id Unique identifier for the object.
+ * @property string $object String representing the object's type. Objects of the same type share the same value.
+ * @property null|\Stripe\StripeObject $account_holder The account holder for whom accounts are collected in this session.
+ * @property \Stripe\Collection<\Stripe\FinancialConnections\Account> $accounts The accounts that were collected as part of this Session.
+ * @property string $client_secret A value that will be passed to the client to launch the authentication flow.
+ * @property \Stripe\StripeObject $filters
+ * @property bool $livemode Has the value <code>true</code> if the object exists in live mode or the value <code>false</code> if the object exists in test mode.
+ * @property string[] $permissions Permissions requested for accounts collected during this session.
+ * @property string $return_url For webview integrations only. Upon completing OAuth login in the native browser, the user will be redirected to this URL to return to your app.
+ */
+class Session extends \Stripe\ApiResource
+{
+    const OBJECT_NAME = 'financial_connections.session';
+
+    use \Stripe\ApiOperations\Create;
+    use \Stripe\ApiOperations\Retrieve;
+}
diff --git a/vendor/stripe/stripe-php/lib/FundingInstructions.php b/vendor/stripe/stripe-php/lib/FundingInstructions.php
new file mode 100644
index 000000000..af7999149
--- /dev/null
+++ b/vendor/stripe/stripe-php/lib/FundingInstructions.php
@@ -0,0 +1,28 @@
+<?php
+
+// File generated from our OpenAPI spec
+
+namespace Stripe;
+
+/**
+ * Each customer has a <a
+ * href="https://stripe.com/docs/api/customers/object#customer_object-balance"><code>balance</code></a>
+ * that is automatically applied to future invoices and payments using the
+ * <code>customer_balance</code> payment method. Customers can fund this balance by
+ * initiating a bank transfer to any account in the
+ * <code>financial_addresses</code> field. Related guide: <a
+ * href="https://stripe.com/docs/payments/customer-balance/funding-instructions">Customer
+ * Balance - Funding Instructions</a> to learn more.
+ *
+ * @property string $object String representing the object's type. Objects of the same type share the same value.
+ * @property \Stripe\StripeObject $bank_transfer
+ * @property string $currency Three-letter <a href="https://www.iso.org/iso-4217-currency-codes.html">ISO currency code</a>, in lowercase. Must be a <a href="https://stripe.com/docs/currencies">supported currency</a>.
+ * @property string $funding_type The <code>funding_type</code> of the returned instructions
+ * @property bool $livemode Has the value <code>true</code> if the object exists in live mode or the value <code>false</code> if the object exists in test mode.
+ */
+class FundingInstructions extends ApiResource
+{
+    const OBJECT_NAME = 'funding_instructions';
+
+    const FUNDING_TYPE_BANK_TRANSFER = 'bank_transfer';
+}
diff --git a/vendor/stripe/stripe-php/lib/HttpClient/CurlClient.php b/vendor/stripe/stripe-php/lib/HttpClient/CurlClient.php
index 1497bc3f4..fdf421c12 100644
--- a/vendor/stripe/stripe-php/lib/HttpClient/CurlClient.php
+++ b/vendor/stripe/stripe-php/lib/HttpClient/CurlClient.php
@@ -271,9 +271,14 @@ class CurlClient implements ClientInterface, StreamingClientInterface
             $opts[\CURLOPT_HTTP_VERSION] = \CURL_HTTP_VERSION_2TLS;
         }
 
-        // Stripe's API servers are only accessible over IPv4. Force IPv4 resolving to avoid
-        // potential issues (cf. https://github.com/stripe/stripe-php/issues/1045).
-        $opts[\CURLOPT_IPRESOLVE] = \CURL_IPRESOLVE_V4;
+        // If the user didn't explicitly specify a CURLOPT_IPRESOLVE option, we
+        // force IPv4 resolving as Stripe's API servers are only accessible over
+        // IPv4 (see. https://github.com/stripe/stripe-php/issues/1045).
+        // We let users specify a custom option in case they need to say proxy
+        // through an IPv6 proxy.
+        if (!isset($opts[\CURLOPT_IPRESOLVE])) {
+            $opts[\CURLOPT_IPRESOLVE] = \CURL_IPRESOLVE_V4;
+        }
 
         return [$opts, $absUrl];
     }
diff --git a/vendor/stripe/stripe-php/lib/Invoice.php b/vendor/stripe/stripe-php/lib/Invoice.php
index f5360a111..a67323623 100644
--- a/vendor/stripe/stripe-php/lib/Invoice.php
+++ b/vendor/stripe/stripe-php/lib/Invoice.php
@@ -49,6 +49,7 @@ namespace Stripe;
  * @property int $amount_due Final amount due at this time for this invoice. If the invoice's total is smaller than the minimum charge amount, for example, or if there is account credit that can be applied to the invoice, the <code>amount_due</code> may be 0. If there is a positive <code>starting_balance</code> for the invoice (the customer owes money), the <code>amount_due</code> will also take that into account. The charge that gets generated for the invoice will be for the amount specified in <code>amount_due</code>.
  * @property int $amount_paid The amount, in %s, that was paid.
  * @property int $amount_remaining The amount remaining, in %s, that is due.
+ * @property null|string|\Stripe\StripeObject $application ID of the Connect Application that created the invoice.
  * @property null|int $application_fee_amount The fee in %s that will be applied to the invoice and transferred to the application owner's Stripe account when the invoice is paid.
  * @property int $attempt_count Number of payment attempts made for this invoice, from the perspective of the payment retry schedule. Any payment attempt counts as the first attempt, and subsequently only automatic retries increment the attempt count. In other words, manual payment attempts after the first attempt do not affect the retry schedule.
  * @property bool $attempted Whether an attempt has been made to pay the invoice. An invoice is not attempted until 1 hour after the <code>invoice.created</code> webhook, for example, so you might not want to display that invoice as unpaid to your users.
@@ -104,6 +105,7 @@ namespace Stripe;
  * @property int $subscription_proration_date Only set for upcoming invoices that preview prorations. The time used to calculate prorations.
  * @property int $subtotal Total of all subscriptions, invoice items, and prorations on the invoice before any invoice level discount or tax is applied. Item discounts are already incorporated
  * @property null|int $tax The amount of tax on this invoice. This is the sum of all the tax amounts on this invoice.
+ * @property null|string|\Stripe\TestHelpers\TestClock $test_clock ID of the test clock this invoice belongs to.
  * @property \Stripe\StripeObject $threshold_reason
  * @property int $total Total after discounts and taxes.
  * @property null|\Stripe\StripeObject[] $total_discount_amounts The aggregate amounts calculated per discount across all line items.
@@ -118,6 +120,7 @@ class Invoice extends ApiResource
     use ApiOperations\Create;
     use ApiOperations\Delete;
     use ApiOperations\Retrieve;
+    use ApiOperations\Search;
     use ApiOperations\Update;
 
     const BILLING_CHARGE_AUTOMATICALLY = 'charge_automatically';
@@ -262,4 +265,19 @@ class Invoice extends ApiResource
 
         return $this;
     }
+
+    /**
+     * @param null|array $params
+     * @param null|array|string $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\SearchResult<Invoice> the invoice search results
+     */
+    public static function search($params = null, $opts = null)
+    {
+        $url = '/v1/invoices/search';
+
+        return self::_searchResource($url, $params, $opts);
+    }
 }
diff --git a/vendor/stripe/stripe-php/lib/InvoiceItem.php b/vendor/stripe/stripe-php/lib/InvoiceItem.php
index 6153bbf98..76eae0693 100644
--- a/vendor/stripe/stripe-php/lib/InvoiceItem.php
+++ b/vendor/stripe/stripe-php/lib/InvoiceItem.php
@@ -34,6 +34,7 @@ namespace Stripe;
  * @property null|string|\Stripe\Subscription $subscription The subscription that this invoice item has been created for, if any.
  * @property string $subscription_item The subscription item that this invoice item has been created for, if any.
  * @property null|\Stripe\TaxRate[] $tax_rates The tax rates which apply to the invoice item. When set, the <code>default_tax_rates</code> on the invoice do not apply to this invoice item.
+ * @property null|string|\Stripe\TestHelpers\TestClock $test_clock ID of the test clock this invoice item belongs to.
  * @property null|int $unit_amount Unit amount (in the <code>currency</code> specified) of the invoice item.
  * @property null|string $unit_amount_decimal Same as <code>unit_amount</code>, but contains a decimal value with at most 12 decimal places.
  */
diff --git a/vendor/stripe/stripe-php/lib/InvoiceLineItem.php b/vendor/stripe/stripe-php/lib/InvoiceLineItem.php
index e579afb6a..0a5331e67 100644
--- a/vendor/stripe/stripe-php/lib/InvoiceLineItem.php
+++ b/vendor/stripe/stripe-php/lib/InvoiceLineItem.php
@@ -20,6 +20,7 @@ namespace Stripe;
  * @property null|\Stripe\Plan $plan The plan of the subscription, if the line item is a subscription or a proration.
  * @property null|\Stripe\Price $price The price of the line item.
  * @property bool $proration Whether this is a proration.
+ * @property null|\Stripe\StripeObject $proration_details Additional details for proration line items
  * @property null|int $quantity The quantity of the subscription, if the line item is a subscription or a proration.
  * @property null|string $subscription The subscription that the invoice item pertains to, if any.
  * @property string $subscription_item The subscription item that generated this invoice item. Left empty if the line item is not an explicit result of a subscription.
diff --git a/vendor/stripe/stripe-php/lib/Order.php b/vendor/stripe/stripe-php/lib/Order.php
index fbbb90611..9b8400509 100644
--- a/vendor/stripe/stripe-php/lib/Order.php
+++ b/vendor/stripe/stripe-php/lib/Order.php
@@ -10,8 +10,8 @@ namespace Stripe;
  * create, retrieve, and pay individual orders, as well as list all orders. Orders
  * are identified by a unique, random ID.
  *
- * Related guide: <a href="https://stripe.com/docs/orders">Tax, Shipping, and
- * Inventory</a>.
+ * Related guide: <a href="https://stripe.com/docs/orders-legacy">Tax, Shipping,
+ * and Inventory</a>.
  *
  * @property string $id Unique identifier for the object.
  * @property string $object String representing the object's type. Objects of the same type share the same value.
diff --git a/vendor/stripe/stripe-php/lib/PaymentIntent.php b/vendor/stripe/stripe-php/lib/PaymentIntent.php
index ee6f4224a..b7d777abc 100644
--- a/vendor/stripe/stripe-php/lib/PaymentIntent.php
+++ b/vendor/stripe/stripe-php/lib/PaymentIntent.php
@@ -22,6 +22,7 @@ namespace Stripe;
  * @property string $object String representing the object's type. Objects of the same type share the same value.
  * @property int $amount Amount intended to be collected by this PaymentIntent. A positive integer representing how much to charge in the <a href="https://stripe.com/docs/currencies#zero-decimal">smallest currency unit</a> (e.g., 100 cents to charge $1.00 or 100 to charge ¥100, a zero-decimal currency). The minimum amount is $0.50 US or <a href="https://stripe.com/docs/currencies#minimum-and-maximum-charge-amounts">equivalent in charge currency</a>. The amount value supports up to eight digits (e.g., a value of 99999999 for a USD charge of $999,999.99).
  * @property int $amount_capturable Amount that can be captured from this PaymentIntent.
+ * @property \Stripe\StripeObject $amount_details
  * @property int $amount_received Amount that was collected by this PaymentIntent.
  * @property null|string|\Stripe\StripeObject $application ID of the Connect application that created the PaymentIntent.
  * @property null|int $application_fee_amount The amount of the application fee (if any) that will be requested to be applied to the payment and transferred to the application owner's Stripe account. The amount of the application fee collected will be capped at the total payment amount. For more information, see the PaymentIntents <a href="https://stripe.com/docs/payments/connected-accounts">use case for connected accounts</a>.
@@ -30,7 +31,7 @@ namespace Stripe;
  * @property null|string $cancellation_reason Reason for cancellation of this PaymentIntent, either user-provided (<code>duplicate</code>, <code>fraudulent</code>, <code>requested_by_customer</code>, or <code>abandoned</code>) or generated by Stripe internally (<code>failed_invoice</code>, <code>void_invoice</code>, or <code>automatic</code>).
  * @property string $capture_method Controls when the funds will be captured from the customer's account.
  * @property \Stripe\Collection<\Stripe\Charge> $charges Charges that were created by this PaymentIntent, if any.
- * @property null|string $client_secret <p>The client secret of this PaymentIntent. Used for client-side retrieval using a publishable key.</p><p>The client secret can be used to complete a payment from your frontend. It should not be stored, logged, embedded in URLs, or exposed to anyone other than the customer. Make sure that you have TLS enabled on any page that includes the client secret.</p><p>Refer to our docs to <a href="https://stripe.com/docs/payments/accept-a-payment?integration=elements">accept a payment</a> and learn about how <code>client_secret</code> should be handled.</p>
+ * @property null|string $client_secret <p>The client secret of this PaymentIntent. Used for client-side retrieval using a publishable key.</p><p>The client secret can be used to complete a payment from your frontend. It should not be stored, logged, or exposed to anyone other than the customer. Make sure that you have TLS enabled on any page that includes the client secret.</p><p>Refer to our docs to <a href="https://stripe.com/docs/payments/accept-a-payment?ui=elements">accept a payment</a> and learn about how <code>client_secret</code> should be handled.</p>
  * @property string $confirmation_method
  * @property int $created Time at which the object was created. Measured in seconds since the Unix epoch.
  * @property string $currency Three-letter <a href="https://www.iso.org/iso-4217-currency-codes.html">ISO currency code</a>, in lowercase. Must be a <a href="https://stripe.com/docs/currencies">supported currency</a>.
@@ -64,6 +65,7 @@ class PaymentIntent extends ApiResource
     use ApiOperations\All;
     use ApiOperations\Create;
     use ApiOperations\Retrieve;
+    use ApiOperations\Search;
     use ApiOperations\Update;
 
     const STATUS_CANCELED = 'canceled';
@@ -74,6 +76,23 @@ class PaymentIntent extends ApiResource
     const STATUS_REQUIRES_PAYMENT_METHOD = 'requires_payment_method';
     const STATUS_SUCCEEDED = 'succeeded';
 
+    /**
+     * @param null|array $params
+     * @param null|array|string $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\PaymentIntent the applied payment intent
+     */
+    public function applyCustomerBalance($params = null, $opts = null)
+    {
+        $url = $this->instanceUrl() . '/apply_customer_balance';
+        list($response, $opts) = $this->_request('post', $url, $params, $opts);
+        $this->refreshFrom($response, $opts);
+
+        return $this;
+    }
+
     /**
      * @param null|array $params
      * @param null|array|string $opts
@@ -125,6 +144,23 @@ class PaymentIntent extends ApiResource
         return $this;
     }
 
+    /**
+     * @param null|array $params
+     * @param null|array|string $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\PaymentIntent the incremented payment intent
+     */
+    public function incrementAuthorization($params = null, $opts = null)
+    {
+        $url = $this->instanceUrl() . '/increment_authorization';
+        list($response, $opts) = $this->_request('post', $url, $params, $opts);
+        $this->refreshFrom($response, $opts);
+
+        return $this;
+    }
+
     /**
      * @param null|array $params
      * @param null|array|string $opts
@@ -141,4 +177,19 @@ class PaymentIntent extends ApiResource
 
         return $this;
     }
+
+    /**
+     * @param null|array $params
+     * @param null|array|string $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\SearchResult<PaymentIntent> the payment intent search results
+     */
+    public static function search($params = null, $opts = null)
+    {
+        $url = '/v1/payment_intents/search';
+
+        return self::_searchResource($url, $params, $opts);
+    }
 }
diff --git a/vendor/stripe/stripe-php/lib/PaymentMethod.php b/vendor/stripe/stripe-php/lib/PaymentMethod.php
index b4ecd0556..e14e474e2 100644
--- a/vendor/stripe/stripe-php/lib/PaymentMethod.php
+++ b/vendor/stripe/stripe-php/lib/PaymentMethod.php
@@ -5,11 +5,11 @@
 namespace Stripe;
 
 /**
- * PaymentMethod objects represent your customer's payment instruments. They can be
- * used with <a
+ * PaymentMethod objects represent your customer's payment instruments. You can use
+ * them with <a
  * href="https://stripe.com/docs/payments/payment-intents">PaymentIntents</a> to
- * collect payments or saved to Customer objects to store instrument details for
- * future payments.
+ * collect payments or save them to Customer objects to store instrument details
+ * for future payments.
  *
  * Related guides: <a
  * href="https://stripe.com/docs/payments/payment-methods">Payment Methods</a> and
@@ -30,6 +30,7 @@ namespace Stripe;
  * @property \Stripe\StripeObject $card_present
  * @property int $created Time at which the object was created. Measured in seconds since the Unix epoch.
  * @property null|string|\Stripe\Customer $customer The ID of the Customer to which this PaymentMethod is saved. This will not be set when the PaymentMethod has not been saved to a Customer.
+ * @property \Stripe\StripeObject $customer_balance
  * @property \Stripe\StripeObject $eps
  * @property \Stripe\StripeObject $fpx
  * @property \Stripe\StripeObject $giropay
@@ -37,13 +38,16 @@ namespace Stripe;
  * @property \Stripe\StripeObject $ideal
  * @property \Stripe\StripeObject $interac_present
  * @property \Stripe\StripeObject $klarna
+ * @property \Stripe\StripeObject $konbini
  * @property bool $livemode Has the value <code>true</code> if the object exists in live mode or the value <code>false</code> if the object exists in test mode.
  * @property null|\Stripe\StripeObject $metadata Set of <a href="https://stripe.com/docs/api/metadata">key-value pairs</a> that you can attach to an object. This can be useful for storing additional information about the object in a structured format.
  * @property \Stripe\StripeObject $oxxo
  * @property \Stripe\StripeObject $p24
+ * @property \Stripe\StripeObject $paynow
  * @property \Stripe\StripeObject $sepa_debit
  * @property \Stripe\StripeObject $sofort
  * @property string $type The type of the PaymentMethod. An additional hash is included on the PaymentMethod with a name matching this value. It contains additional information specific to the PaymentMethod type.
+ * @property \Stripe\StripeObject $us_bank_account
  * @property \Stripe\StripeObject $wechat_pay
  */
 class PaymentMethod extends ApiResource
diff --git a/vendor/stripe/stripe-php/lib/Person.php b/vendor/stripe/stripe-php/lib/Person.php
index a1df01398..b1398c4e4 100644
--- a/vendor/stripe/stripe-php/lib/Person.php
+++ b/vendor/stripe/stripe-php/lib/Person.php
@@ -43,6 +43,7 @@ namespace Stripe;
  * @property null|string $nationality The country where the person is a national.
  * @property null|string $phone The person's phone number.
  * @property string $political_exposure Indicates if the person or any of their representatives, family members, or other closely related persons, declares that they hold or have held an important public job or function, in any jurisdiction.
+ * @property \Stripe\StripeObject $registered_address
  * @property \Stripe\StripeObject $relationship
  * @property null|\Stripe\StripeObject $requirements Information about the requirements for this person, including what information needs to be collected, and by when.
  * @property bool $ssn_last_4_provided Whether the last four digits of the person's Social Security number have been provided (U.S. only).
diff --git a/vendor/stripe/stripe-php/lib/Price.php b/vendor/stripe/stripe-php/lib/Price.php
index f2f31b20d..3d2e147d1 100644
--- a/vendor/stripe/stripe-php/lib/Price.php
+++ b/vendor/stripe/stripe-php/lib/Price.php
@@ -50,6 +50,7 @@ class Price extends ApiResource
     use ApiOperations\All;
     use ApiOperations\Create;
     use ApiOperations\Retrieve;
+    use ApiOperations\Search;
     use ApiOperations\Update;
 
     const BILLING_SCHEME_PER_UNIT = 'per_unit';
@@ -64,4 +65,19 @@ class Price extends ApiResource
 
     const TYPE_ONE_TIME = 'one_time';
     const TYPE_RECURRING = 'recurring';
+
+    /**
+     * @param null|array $params
+     * @param null|array|string $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\SearchResult<Price> the price search results
+     */
+    public static function search($params = null, $opts = null)
+    {
+        $url = '/v1/prices/search';
+
+        return self::_searchResource($url, $params, $opts);
+    }
 }
diff --git a/vendor/stripe/stripe-php/lib/Product.php b/vendor/stripe/stripe-php/lib/Product.php
index 5ea23eab8..d3d21634c 100644
--- a/vendor/stripe/stripe-php/lib/Product.php
+++ b/vendor/stripe/stripe-php/lib/Product.php
@@ -27,15 +27,16 @@ namespace Stripe;
  * @property null|string $caption A short one-line description of the product, meant to be displayable to the customer. Only applicable to products of <code>type=good</code>.
  * @property int $created Time at which the object was created. Measured in seconds since the Unix epoch.
  * @property string[] $deactivate_on An array of connect application identifiers that cannot purchase this product. Only applicable to products of <code>type=good</code>.
+ * @property null|string|\Stripe\Price $default_price The ID of the <a href="https://stripe.com/docs/api/prices">Price</a> object that is the default price for this product.
  * @property null|string $description The product's description, meant to be displayable to the customer. Use this field to optionally store a long form explanation of the product being sold for your own rendering purposes.
  * @property string[] $images A list of up to 8 URLs of images for this product, meant to be displayable to the customer.
  * @property bool $livemode Has the value <code>true</code> if the object exists in live mode or the value <code>false</code> if the object exists in test mode.
  * @property \Stripe\StripeObject $metadata Set of <a href="https://stripe.com/docs/api/metadata">key-value pairs</a> that you can attach to an object. This can be useful for storing additional information about the object in a structured format.
- * @property string $name The product's name, meant to be displayable to the customer. Whenever this product is sold via a subscription, name will show up on associated invoice line item descriptions.
+ * @property string $name The product's name, meant to be displayable to the customer.
  * @property null|\Stripe\StripeObject $package_dimensions The dimensions of this product for shipping purposes.
  * @property null|bool $shippable Whether this product is shipped (i.e., physical goods).
  * @property null|string $statement_descriptor Extra information about a product which will appear on your customer's credit card statement. In the case that multiple products are billed at once, the first statement descriptor will be used.
- * @property null|string|\Stripe\TaxCode $tax_code A <a href="https://stripe.com/docs/tax/tax-codes">tax code</a> ID.
+ * @property null|string|\Stripe\TaxCode $tax_code A <a href="https://stripe.com/docs/tax/tax-categories">tax code</a> ID.
  * @property string $type The type of the product. The product is either of type <code>good</code>, which is eligible for use with Orders and SKUs, or <code>service</code>, which is eligible for use with Subscriptions and Plans.
  * @property null|string $unit_label A label that represents units of this product in Stripe and on customers’ receipts and invoices. When set, this will be included in associated invoice line item descriptions.
  * @property int $updated Time at which the object was last updated. Measured in seconds since the Unix epoch.
@@ -49,8 +50,24 @@ class Product extends ApiResource
     use ApiOperations\Create;
     use ApiOperations\Delete;
     use ApiOperations\Retrieve;
+    use ApiOperations\Search;
     use ApiOperations\Update;
 
     const TYPE_GOOD = 'good';
     const TYPE_SERVICE = 'service';
+
+    /**
+     * @param null|array $params
+     * @param null|array|string $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\SearchResult<Product> the product search results
+     */
+    public static function search($params = null, $opts = null)
+    {
+        $url = '/v1/products/search';
+
+        return self::_searchResource($url, $params, $opts);
+    }
 }
diff --git a/vendor/stripe/stripe-php/lib/Quote.php b/vendor/stripe/stripe-php/lib/Quote.php
index fd6b4eee0..b3fcb3493 100644
--- a/vendor/stripe/stripe-php/lib/Quote.php
+++ b/vendor/stripe/stripe-php/lib/Quote.php
@@ -13,6 +13,7 @@ namespace Stripe;
  * @property string $object String representing the object's type. Objects of the same type share the same value.
  * @property int $amount_subtotal Total before any discounts or taxes are applied.
  * @property int $amount_total Total after discounts and taxes are applied.
+ * @property null|string|\Stripe\StripeObject $application ID of the Connect Application that created the quote.
  * @property null|int $application_fee_amount The amount of the application fee (if any) that will be requested to be applied to the payment and transferred to the application owner's Stripe account. Only applicable if there are no line items with recurring prices on the quote.
  * @property null|float $application_fee_percent A non-negative decimal between 0 and 100, with at most two decimal places. This represents the percentage of the subscription invoice subtotal that will be transferred to the application owner's Stripe account. Only applicable if there are line items with recurring prices on the quote.
  * @property \Stripe\StripeObject $automatic_tax
@@ -40,6 +41,7 @@ namespace Stripe;
  * @property null|string|\Stripe\Subscription $subscription The subscription that was created or updated from this quote.
  * @property \Stripe\StripeObject $subscription_data
  * @property null|string|\Stripe\SubscriptionSchedule $subscription_schedule The subscription schedule that was created or updated from this quote.
+ * @property null|string|\Stripe\TestHelpers\TestClock $test_clock ID of the test clock this quote belongs to.
  * @property \Stripe\StripeObject $total_details
  * @property null|\Stripe\StripeObject $transfer_data The account (if any) the payments will be attributed to for tax reporting, and where funds from each payment will be transferred to for each of the invoices.
  */
diff --git a/vendor/stripe/stripe-php/lib/Refund.php b/vendor/stripe/stripe-php/lib/Refund.php
index ddff61658..4c640119f 100644
--- a/vendor/stripe/stripe-php/lib/Refund.php
+++ b/vendor/stripe/stripe-php/lib/Refund.php
@@ -21,7 +21,9 @@ namespace Stripe;
  * @property string $description An arbitrary string attached to the object. Often useful for displaying to users. (Available on non-card refunds only)
  * @property string|\Stripe\BalanceTransaction $failure_balance_transaction If the refund failed, this balance transaction describes the adjustment made on your account balance that reverses the initial balance transaction.
  * @property string $failure_reason If the refund failed, the reason for refund failure if known. Possible values are <code>lost_or_stolen_card</code>, <code>expired_or_canceled_card</code>, or <code>unknown</code>.
+ * @property string $instructions_email Email to which refund instructions, if required, are sent to.
  * @property null|\Stripe\StripeObject $metadata Set of <a href="https://stripe.com/docs/api/metadata">key-value pairs</a> that you can attach to an object. This can be useful for storing additional information about the object in a structured format.
+ * @property \Stripe\StripeObject $next_action
  * @property null|string|\Stripe\PaymentIntent $payment_intent ID of the PaymentIntent that was refunded.
  * @property null|string $reason Reason for the refund, either user-provided (<code>duplicate</code>, <code>fraudulent</code>, or <code>requested_by_customer</code>) or generated by Stripe internally (<code>expired_uncaptured_charge</code>).
  * @property null|string $receipt_number This is the transaction number that appears on email receipts sent for this refund.
@@ -56,4 +58,21 @@ class Refund extends ApiResource
      * @deprecated use FAILURE_REASON_EXPIRED_OR_CANCELED_CARD instead
      */
     const FAILURE_REASON = 'expired_or_canceled_card';
+
+    /**
+     * @param null|array $params
+     * @param null|array|string $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Refund the canceled refund
+     */
+    public function cancel($params = null, $opts = null)
+    {
+        $url = $this->instanceUrl() . '/cancel';
+        list($response, $opts) = $this->_request('post', $url, $params, $opts);
+        $this->refreshFrom($response, $opts);
+
+        return $this;
+    }
 }
diff --git a/vendor/stripe/stripe-php/lib/SKU.php b/vendor/stripe/stripe-php/lib/SKU.php
index b418c6c5d..09d6c85e5 100644
--- a/vendor/stripe/stripe-php/lib/SKU.php
+++ b/vendor/stripe/stripe-php/lib/SKU.php
@@ -14,9 +14,6 @@ namespace Stripe;
  *
  * Can also be used to manage inventory.
  *
- * Related guide: <a href="https://stripe.com/docs/orders">Tax, Shipping, and
- * Inventory</a>.
- *
  * @property string $id Unique identifier for the object.
  * @property string $object String representing the object's type. Objects of the same type share the same value.
  * @property bool $active Whether the SKU is available for purchase.
diff --git a/vendor/stripe/stripe-php/lib/SearchResult.php b/vendor/stripe/stripe-php/lib/SearchResult.php
new file mode 100644
index 000000000..f42769d9c
--- /dev/null
+++ b/vendor/stripe/stripe-php/lib/SearchResult.php
@@ -0,0 +1,234 @@
+<?php
+
+namespace Stripe;
+
+/**
+ * Search results for an API resource.
+ *
+ * This behaves similarly to <code>Collection</code> in that they both wrap
+ * around a list of objects and provide pagination. However the
+ * <code>SearchResult</code> object paginates by relying on a
+ * <code>next_page</code> token included in the response rather than using
+ * object IDs and a <code>starting_before</code>/<code>ending_after</code>
+ * parameter. Thus, <code>SearchResult</code> only supports forwards pagination.
+ *
+ * The {@see $total_count} property is only available when
+ * the `expand` parameter contains `total_count`.
+ *
+ * @template TStripeObject of StripeObject
+ * @template-implements \IteratorAggregate<TStripeObject>
+ *
+ * @property string $object
+ * @property string $url
+ * @property string $next_page
+ * @property int $total_count
+ * @property bool $has_more
+ * @property TStripeObject[] $data
+ */
+class SearchResult extends StripeObject implements \Countable, \IteratorAggregate
+{
+    const OBJECT_NAME = 'search_result';
+
+    use ApiOperations\Request;
+
+    /** @var array */
+    protected $filters = [];
+
+    /**
+     * @return string the base URL for the given class
+     */
+    public static function baseUrl()
+    {
+        return Stripe::$apiBase;
+    }
+
+    /**
+     * Returns the filters.
+     *
+     * @return array the filters
+     */
+    public function getFilters()
+    {
+        return $this->filters;
+    }
+
+    /**
+     * Sets the filters, removing paging options.
+     *
+     * @param array $filters the filters
+     */
+    public function setFilters($filters)
+    {
+        $this->filters = $filters;
+    }
+
+    #[\ReturnTypeWillChange]
+    public function offsetGet($k)
+    {
+        if (\is_string($k)) {
+            return parent::offsetGet($k);
+        }
+        $msg = "You tried to access the {$k} index, but SearchResult " .
+                   'types only support string keys. (HINT: Search calls ' .
+                   'return an object with a `data` (which is the data ' .
+                   "array). You likely want to call ->data[{$k}])";
+
+        throw new Exception\InvalidArgumentException($msg);
+    }
+
+    /**
+     * @param null|array $params
+     * @param null|array|string $opts
+     *
+     * @throws Exception\ApiErrorException
+     *
+     * @return SearchResult<TStripeObject>
+     */
+    public function all($params = null, $opts = null)
+    {
+        self::_validateParams($params);
+        list($url, $params) = $this->extractPathAndUpdateParams($params);
+
+        list($response, $opts) = $this->_request('get', $url, $params, $opts);
+        $obj = Util\Util::convertToStripeObject($response, $opts);
+        if (!($obj instanceof \Stripe\SearchResult)) {
+            throw new \Stripe\Exception\UnexpectedValueException(
+                'Expected type ' . \Stripe\SearchResult::class . ', got "' . \get_class($obj) . '" instead.'
+            );
+        }
+        $obj->setFilters($params);
+
+        return $obj;
+    }
+
+    /**
+     * @return int the number of objects in the current page
+     */
+    #[\ReturnTypeWillChange]
+    public function count()
+    {
+        return \count($this->data);
+    }
+
+    /**
+     * @return \ArrayIterator an iterator that can be used to iterate
+     *    across objects in the current page
+     */
+    #[\ReturnTypeWillChange]
+    public function getIterator()
+    {
+        return new \ArrayIterator($this->data);
+    }
+
+    /**
+     * @return \Generator|TStripeObject[] A generator that can be used to
+     *    iterate across all objects across all pages. As page boundaries are
+     *    encountered, the next page will be fetched automatically for
+     *    continued iteration.
+     */
+    public function autoPagingIterator()
+    {
+        $page = $this;
+
+        while (true) {
+            foreach ($page as $item) {
+                yield $item;
+            }
+            $page = $page->nextPage();
+
+            if ($page->isEmpty()) {
+                break;
+            }
+        }
+    }
+
+    /**
+     * Returns an empty set of search results. This is returned from
+     * {@see nextPage()} when we know that there isn't a next page in order to
+     * replicate the behavior of the API when it attempts to return a page
+     * beyond the last.
+     *
+     * @param null|array|string $opts
+     *
+     * @return SearchResult
+     */
+    public static function emptySearchResult($opts = null)
+    {
+        return SearchResult::constructFrom(['data' => []], $opts);
+    }
+
+    /**
+     * Returns true if the page object contains no element.
+     *
+     * @return bool
+     */
+    public function isEmpty()
+    {
+        return empty($this->data);
+    }
+
+    /**
+     * Fetches the next page in the resource list (if there is one).
+     *
+     * This method will try to respect the limit of the current page. If none
+     * was given, the default limit will be fetched again.
+     *
+     * @param null|array $params
+     * @param null|array|string $opts
+     *
+     * @return SearchResult<TStripeObject>
+     */
+    public function nextPage($params = null, $opts = null)
+    {
+        if (!$this->has_more) {
+            return static::emptySearchResult($opts);
+        }
+
+        $params = \array_merge(
+            $this->filters ?: [],
+            ['page' => $this->next_page],
+            $params ?: []
+        );
+
+        return $this->all($params, $opts);
+    }
+
+    /**
+     * Gets the first item from the current page. Returns `null` if the current page is empty.
+     *
+     * @return null|TStripeObject
+     */
+    public function first()
+    {
+        return \count($this->data) > 0 ? $this->data[0] : null;
+    }
+
+    /**
+     * Gets the last item from the current page. Returns `null` if the current page is empty.
+     *
+     * @return null|TStripeObject
+     */
+    public function last()
+    {
+        return \count($this->data) > 0 ? $this->data[\count($this->data) - 1] : null;
+    }
+
+    private function extractPathAndUpdateParams($params)
+    {
+        $url = \parse_url($this->url);
+
+        if (!isset($url['path'])) {
+            throw new Exception\UnexpectedValueException("Could not parse list url into parts: {$url}");
+        }
+
+        if (isset($url['query'])) {
+            // If the URL contains a query param, parse it out into $params so they
+            // don't interact weirdly with each other.
+            $query = [];
+            \parse_str($url['query'], $query);
+            $params = \array_merge($params ?: [], $query);
+        }
+
+        return [$url['path'], $params];
+    }
+}
diff --git a/vendor/stripe/stripe-php/lib/Service/AbstractService.php b/vendor/stripe/stripe-php/lib/Service/AbstractService.php
index 12071c827..145af6759 100644
--- a/vendor/stripe/stripe-php/lib/Service/AbstractService.php
+++ b/vendor/stripe/stripe-php/lib/Service/AbstractService.php
@@ -85,6 +85,11 @@ abstract class AbstractService
         return $this->getClient()->requestCollection($method, $path, static::formatParams($params), $opts);
     }
 
+    protected function requestSearchResult($method, $path, $params, $opts)
+    {
+        return $this->getClient()->requestSearchResult($method, $path, static::formatParams($params), $opts);
+    }
+
     protected function buildPath($basePath, ...$ids)
     {
         foreach ($ids as $id) {
diff --git a/vendor/stripe/stripe-php/lib/Service/ChargeService.php b/vendor/stripe/stripe-php/lib/Service/ChargeService.php
index 568254589..0bde02792 100644
--- a/vendor/stripe/stripe-php/lib/Service/ChargeService.php
+++ b/vendor/stripe/stripe-php/lib/Service/ChargeService.php
@@ -83,6 +83,26 @@ class ChargeService extends \Stripe\Service\AbstractService
         return $this->request('get', $this->buildPath('/v1/charges/%s', $id), $params, $opts);
     }
 
+    /**
+     * Search for charges you’ve previously created using Stripe’s <a
+     * href="/docs/search#search-query-language">Search Query Language</a>. Don’t use
+     * search in read-after-write flows where strict consistency is necessary. Under
+     * normal operating conditions, data is searchable in less than a minute.
+     * Occasionally, propagation of new or updated data can be up to an hour behind
+     * during outages. Search functionality is not available to merchants in India.
+     *
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\SearchResult<\Stripe\Charge>
+     */
+    public function search($params = null, $opts = null)
+    {
+        return $this->requestSearchResult('get', '/v1/charges/search', $params, $opts);
+    }
+
     /**
      * Updates the specified charge by setting the values of the parameters passed. Any
      * parameters not provided will be left unchanged.
diff --git a/vendor/stripe/stripe-php/lib/Service/CoreServiceFactory.php b/vendor/stripe/stripe-php/lib/Service/CoreServiceFactory.php
index edaadd3fa..76f82c3c3 100644
--- a/vendor/stripe/stripe-php/lib/Service/CoreServiceFactory.php
+++ b/vendor/stripe/stripe-php/lib/Service/CoreServiceFactory.php
@@ -26,6 +26,7 @@ namespace Stripe\Service;
  * @property ExchangeRateService $exchangeRates
  * @property FileLinkService $fileLinks
  * @property FileService $files
+ * @property FinancialConnections\FinancialConnectionsServiceFactory $financialConnections
  * @property Identity\IdentityServiceFactory $identity
  * @property InvoiceItemService $invoiceItems
  * @property InvoiceService $invoices
@@ -59,6 +60,7 @@ namespace Stripe\Service;
  * @property TaxCodeService $taxCodes
  * @property TaxRateService $taxRates
  * @property Terminal\TerminalServiceFactory $terminal
+ * @property TestHelpers\TestHelpersServiceFactory $testHelpers
  * @property TokenService $tokens
  * @property TopupService $topups
  * @property TransferService $transfers
@@ -89,6 +91,7 @@ class CoreServiceFactory extends \Stripe\Service\AbstractServiceFactory
         'exchangeRates' => ExchangeRateService::class,
         'fileLinks' => FileLinkService::class,
         'files' => FileService::class,
+        'financialConnections' => FinancialConnections\FinancialConnectionsServiceFactory::class,
         'identity' => Identity\IdentityServiceFactory::class,
         'invoiceItems' => InvoiceItemService::class,
         'invoices' => InvoiceService::class,
@@ -122,6 +125,7 @@ class CoreServiceFactory extends \Stripe\Service\AbstractServiceFactory
         'taxCodes' => TaxCodeService::class,
         'taxRates' => TaxRateService::class,
         'terminal' => Terminal\TerminalServiceFactory::class,
+        'testHelpers' => TestHelpers\TestHelpersServiceFactory::class,
         'tokens' => TokenService::class,
         'topups' => TopupService::class,
         'transfers' => TransferService::class,
diff --git a/vendor/stripe/stripe-php/lib/Service/CustomerService.php b/vendor/stripe/stripe-php/lib/Service/CustomerService.php
index fbe3a3d6e..fe4163b83 100644
--- a/vendor/stripe/stripe-php/lib/Service/CustomerService.php
+++ b/vendor/stripe/stripe-php/lib/Service/CustomerService.php
@@ -119,6 +119,26 @@ class CustomerService extends \Stripe\Service\AbstractService
         return $this->request('post', $this->buildPath('/v1/customers/%s/balance_transactions', $parentId), $params, $opts);
     }
 
+    /**
+     * Retrieve funding instructions for a customer cash balance. If funding
+     * instructions do not yet exist for the customer, new funding instructions will be
+     * created. If funding instructions have already been created for a given customer,
+     * the same funding instructions will be retrieved. In other words, we will return
+     * the same funding instructions each time.
+     *
+     * @param string $id
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Customer
+     */
+    public function createFundingInstructions($id, $params = null, $opts = null)
+    {
+        return $this->request('post', $this->buildPath('/v1/customers/%s/funding_instructions', $id), $params, $opts);
+    }
+
     /**
      * When you create a new credit card, you must specify a customer or recipient on
      * which to create it.
@@ -256,6 +276,22 @@ class CustomerService extends \Stripe\Service\AbstractService
         return $this->request('get', $this->buildPath('/v1/customers/%s/balance_transactions/%s', $parentId, $id), $params, $opts);
     }
 
+    /**
+     * Retrieves a customer’s cash balance.
+     *
+     * @param string $parentId
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\cash_balance
+     */
+    public function retrieveCashBalance($parentId, $params = null, $opts = null)
+    {
+        return $this->request('get', $this->buildPath('/v1/customers/%s/cash_balance', $parentId), $params, $opts);
+    }
+
     /**
      * Retrieve a specified source for a given customer.
      *
@@ -290,6 +326,26 @@ class CustomerService extends \Stripe\Service\AbstractService
         return $this->request('get', $this->buildPath('/v1/customers/%s/tax_ids/%s', $parentId, $id), $params, $opts);
     }
 
+    /**
+     * Search for customers you’ve previously created using Stripe’s <a
+     * href="/docs/search#search-query-language">Search Query Language</a>. Don’t use
+     * search in read-after-write flows where strict consistency is necessary. Under
+     * normal operating conditions, data is searchable in less than a minute.
+     * Occasionally, propagation of new or updated data can be up to an hour behind
+     * during outages. Search functionality is not available to merchants in India.
+     *
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\SearchResult<\Stripe\Customer>
+     */
+    public function search($params = null, $opts = null)
+    {
+        return $this->requestSearchResult('get', '/v1/customers/search', $params, $opts);
+    }
+
     /**
      * Updates the specified customer by setting the values of the parameters passed.
      * Any parameters not provided will be left unchanged. For example, if you pass the
@@ -336,6 +392,22 @@ class CustomerService extends \Stripe\Service\AbstractService
         return $this->request('post', $this->buildPath('/v1/customers/%s/balance_transactions/%s', $parentId, $id), $params, $opts);
     }
 
+    /**
+     * Updates a customer’s cash balance.
+     *
+     * @param string $parentId
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\cash_balance
+     */
+    public function updateCashBalance($parentId, $params = null, $opts = null)
+    {
+        return $this->request('post', $this->buildPath('/v1/customers/%s/cash_balance', $parentId), $params, $opts);
+    }
+
     /**
      * @param string $parentId
      * @param string $id
diff --git a/vendor/stripe/stripe-php/lib/Service/FinancialConnections/AccountService.php b/vendor/stripe/stripe-php/lib/Service/FinancialConnections/AccountService.php
new file mode 100644
index 000000000..1c96b1244
--- /dev/null
+++ b/vendor/stripe/stripe-php/lib/Service/FinancialConnections/AccountService.php
@@ -0,0 +1,58 @@
+<?php
+
+// File generated from our OpenAPI spec
+
+namespace Stripe\Service\FinancialConnections;
+
+class AccountService extends \Stripe\Service\AbstractService
+{
+    /**
+     * Disables your access to a Financial Connections <code>Account</code>. You will
+     * no longer be able to access data associated with the account (e.g. balances,
+     * transactions).
+     *
+     * @param string $id
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\FinancialConnections\Account
+     */
+    public function disconnect($id, $params = null, $opts = null)
+    {
+        return $this->request('post', $this->buildPath('/v1/financial_connections/accounts/%s/disconnect', $id), $params, $opts);
+    }
+
+    /**
+     * Refreshes the data associated with a Financial Connections <code>Account</code>.
+     *
+     * @param string $id
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\FinancialConnections\Account
+     */
+    public function refresh($id, $params = null, $opts = null)
+    {
+        return $this->request('post', $this->buildPath('/v1/financial_connections/accounts/%s/refresh', $id), $params, $opts);
+    }
+
+    /**
+     * Retrieves the details of an Financial Connections <code>Account</code>.
+     *
+     * @param string $id
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\FinancialConnections\Account
+     */
+    public function retrieve($id, $params = null, $opts = null)
+    {
+        return $this->request('get', $this->buildPath('/v1/financial_connections/accounts/%s', $id), $params, $opts);
+    }
+}
diff --git a/vendor/stripe/stripe-php/lib/Service/FinancialConnections/FinancialConnectionsServiceFactory.php b/vendor/stripe/stripe-php/lib/Service/FinancialConnections/FinancialConnectionsServiceFactory.php
new file mode 100644
index 000000000..7dd826341
--- /dev/null
+++ b/vendor/stripe/stripe-php/lib/Service/FinancialConnections/FinancialConnectionsServiceFactory.php
@@ -0,0 +1,27 @@
+<?php
+
+// File generated from our OpenAPI spec
+
+namespace Stripe\Service\FinancialConnections;
+
+/**
+ * Service factory class for API resources in the FinancialConnections namespace.
+ *
+ * @property AccountService $accounts
+ * @property SessionService $sessions
+ */
+class FinancialConnectionsServiceFactory extends \Stripe\Service\AbstractServiceFactory
+{
+    /**
+     * @var array<string, string>
+     */
+    private static $classMap = [
+        'accounts' => AccountService::class,
+        'sessions' => SessionService::class,
+    ];
+
+    protected function getServiceClass($name)
+    {
+        return \array_key_exists($name, self::$classMap) ? self::$classMap[$name] : null;
+    }
+}
diff --git a/vendor/stripe/stripe-php/lib/Service/FinancialConnections/SessionService.php b/vendor/stripe/stripe-php/lib/Service/FinancialConnections/SessionService.php
new file mode 100644
index 000000000..eab589cda
--- /dev/null
+++ b/vendor/stripe/stripe-php/lib/Service/FinancialConnections/SessionService.php
@@ -0,0 +1,41 @@
+<?php
+
+// File generated from our OpenAPI spec
+
+namespace Stripe\Service\FinancialConnections;
+
+class SessionService extends \Stripe\Service\AbstractService
+{
+    /**
+     * To launch the Financial Connections authorization flow, create a
+     * <code>Session</code>. The session’s <code>client_secret</code> can be used to
+     * launch the flow using Stripe.js.
+     *
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\FinancialConnections\Session
+     */
+    public function create($params = null, $opts = null)
+    {
+        return $this->request('post', '/v1/financial_connections/sessions', $params, $opts);
+    }
+
+    /**
+     * Retrieves the details of a Financial Connections <code>Session</code>.
+     *
+     * @param string $id
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\FinancialConnections\Session
+     */
+    public function retrieve($id, $params = null, $opts = null)
+    {
+        return $this->request('get', $this->buildPath('/v1/financial_connections/sessions/%s', $id), $params, $opts);
+    }
+}
diff --git a/vendor/stripe/stripe-php/lib/Service/InvoiceService.php b/vendor/stripe/stripe-php/lib/Service/InvoiceService.php
index 73c1a8fe2..5cb9091d0 100644
--- a/vendor/stripe/stripe-php/lib/Service/InvoiceService.php
+++ b/vendor/stripe/stripe-php/lib/Service/InvoiceService.php
@@ -152,6 +152,26 @@ class InvoiceService extends \Stripe\Service\AbstractService
         return $this->request('get', $this->buildPath('/v1/invoices/%s', $id), $params, $opts);
     }
 
+    /**
+     * Search for invoices you’ve previously created using Stripe’s <a
+     * href="/docs/search#search-query-language">Search Query Language</a>. Don’t use
+     * search in read-after-write flows where strict consistency is necessary. Under
+     * normal operating conditions, data is searchable in less than a minute.
+     * Occasionally, propagation of new or updated data can be up to an hour behind
+     * during outages. Search functionality is not available to merchants in India.
+     *
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\SearchResult<\Stripe\Invoice>
+     */
+    public function search($params = null, $opts = null)
+    {
+        return $this->requestSearchResult('get', '/v1/invoices/search', $params, $opts);
+    }
+
     /**
      * Stripe will automatically send invoices to customers according to your <a
      * href="https://dashboard.stripe.com/account/billing/automatic">subscriptions
diff --git a/vendor/stripe/stripe-php/lib/Service/PaymentIntentService.php b/vendor/stripe/stripe-php/lib/Service/PaymentIntentService.php
index 3bfe708df..ab8d3a814 100644
--- a/vendor/stripe/stripe-php/lib/Service/PaymentIntentService.php
+++ b/vendor/stripe/stripe-php/lib/Service/PaymentIntentService.php
@@ -21,6 +21,26 @@ class PaymentIntentService extends \Stripe\Service\AbstractService
         return $this->requestCollection('get', '/v1/payment_intents', $params, $opts);
     }
 
+    /**
+     * Manually reconcile the remaining amount for a customer_balance PaymentIntent.
+     *
+     * This can be used when the cash balance for <a
+     * href="docs/payments/customer-balance/reconciliation#cash-manual-reconciliation">a
+     * customer in manual reconciliation mode</a> received funds.
+     *
+     * @param string $id
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\PaymentIntent
+     */
+    public function applyCustomerBalance($id, $params = null, $opts = null)
+    {
+        return $this->request('post', $this->buildPath('/v1/payment_intents/%s/apply_customer_balance', $id), $params, $opts);
+    }
+
     /**
      * A PaymentIntent object can be canceled when it is in one of these statuses:
      * <code>requires_payment_method</code>, <code>requires_capture</code>,
@@ -32,6 +52,10 @@ class PaymentIntentService extends \Stripe\Service\AbstractService
      * <code>status=’requires_capture’</code>, the remaining
      * <code>amount_capturable</code> will automatically be refunded.
      *
+     * You cannot cancel the PaymentIntent for a Checkout Session. <a
+     * href="/docs/api/checkout/sessions/expire">Expire the Checkout Session</a>
+     * instead
+     *
      * @param string $id
      * @param null|array $params
      * @param null|array|\Stripe\Util\RequestOptions $opts
@@ -135,6 +159,47 @@ class PaymentIntentService extends \Stripe\Service\AbstractService
         return $this->request('post', '/v1/payment_intents', $params, $opts);
     }
 
+    /**
+     * Perform an incremental authorization on an eligible <a
+     * href="/docs/api/payment_intents/object">PaymentIntent</a>. To be eligible, the
+     * PaymentIntent’s status must be <code>requires_capture</code> and <a
+     * href="/docs/api/charges/object#charge_object-payment_method_details-card_present-incremental_authorization_supported">incremental_authorization_supported</a>
+     * must be <code>true</code>.
+     *
+     * Incremental authorizations attempt to increase the authorized amount on your
+     * customer’s card to the new, higher <code>amount</code> provided. As with the
+     * initial authorization, incremental authorizations may be declined. A single
+     * PaymentIntent can call this endpoint multiple times to further increase the
+     * authorized amount.
+     *
+     * If the incremental authorization succeeds, the PaymentIntent object is returned
+     * with the updated <a
+     * href="/docs/api/payment_intents/object#payment_intent_object-amount">amount</a>.
+     * If the incremental authorization fails, a <a
+     * href="/docs/error-codes#card-declined">card_declined</a> error is returned, and
+     * no fields on the PaymentIntent or Charge are updated. The PaymentIntent object
+     * remains capturable for the previously authorized amount.
+     *
+     * Each PaymentIntent can have a maximum of 10 incremental authorization attempts,
+     * including declines. Once captured, a PaymentIntent can no longer be incremented.
+     *
+     * Learn more about <a
+     * href="/docs/terminal/features/incremental-authorizations">incremental
+     * authorizations</a>.
+     *
+     * @param string $id
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\PaymentIntent
+     */
+    public function incrementAuthorization($id, $params = null, $opts = null)
+    {
+        return $this->request('post', $this->buildPath('/v1/payment_intents/%s/increment_authorization', $id), $params, $opts);
+    }
+
     /**
      * Retrieves the details of a PaymentIntent that has previously been created.
      *
@@ -158,6 +223,26 @@ class PaymentIntentService extends \Stripe\Service\AbstractService
         return $this->request('get', $this->buildPath('/v1/payment_intents/%s', $id), $params, $opts);
     }
 
+    /**
+     * Search for PaymentIntents you’ve previously created using Stripe’s <a
+     * href="/docs/search#search-query-language">Search Query Language</a>. Don’t use
+     * search in read-after-write flows where strict consistency is necessary. Under
+     * normal operating conditions, data is searchable in less than a minute.
+     * Occasionally, propagation of new or updated data can be up to an hour behind
+     * during outages. Search functionality is not available to merchants in India.
+     *
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\SearchResult<\Stripe\PaymentIntent>
+     */
+    public function search($params = null, $opts = null)
+    {
+        return $this->requestSearchResult('get', '/v1/payment_intents/search', $params, $opts);
+    }
+
     /**
      * Updates properties on a PaymentIntent object without confirming.
      *
diff --git a/vendor/stripe/stripe-php/lib/Service/PaymentMethodService.php b/vendor/stripe/stripe-php/lib/Service/PaymentMethodService.php
index 33ba21179..1ddd282bf 100644
--- a/vendor/stripe/stripe-php/lib/Service/PaymentMethodService.php
+++ b/vendor/stripe/stripe-php/lib/Service/PaymentMethodService.php
@@ -79,7 +79,8 @@ class PaymentMethodService extends \Stripe\Service\AbstractService
     }
 
     /**
-     * Detaches a PaymentMethod object from a Customer.
+     * Detaches a PaymentMethod object from a Customer. After a PaymentMethod is
+     * detached, it can no longer be used for a payment or re-attached to a Customer.
      *
      * @param string $id
      * @param null|array $params
diff --git a/vendor/stripe/stripe-php/lib/Service/PriceService.php b/vendor/stripe/stripe-php/lib/Service/PriceService.php
index e1c850c52..ef2b938d4 100644
--- a/vendor/stripe/stripe-php/lib/Service/PriceService.php
+++ b/vendor/stripe/stripe-php/lib/Service/PriceService.php
@@ -53,6 +53,26 @@ class PriceService extends \Stripe\Service\AbstractService
         return $this->request('get', $this->buildPath('/v1/prices/%s', $id), $params, $opts);
     }
 
+    /**
+     * Search for prices you’ve previously created using Stripe’s <a
+     * href="/docs/search#search-query-language">Search Query Language</a>. Don’t use
+     * search in read-after-write flows where strict consistency is necessary. Under
+     * normal operating conditions, data is searchable in less than a minute.
+     * Occasionally, propagation of new or updated data can be up to an hour behind
+     * during outages. Search functionality is not available to merchants in India.
+     *
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\SearchResult<\Stripe\Price>
+     */
+    public function search($params = null, $opts = null)
+    {
+        return $this->requestSearchResult('get', '/v1/prices/search', $params, $opts);
+    }
+
     /**
      * Updates the specified price by setting the values of the parameters passed. Any
      * parameters not provided are left unchanged.
diff --git a/vendor/stripe/stripe-php/lib/Service/ProductService.php b/vendor/stripe/stripe-php/lib/Service/ProductService.php
index 0e2eae7a9..5eb6d82ce 100644
--- a/vendor/stripe/stripe-php/lib/Service/ProductService.php
+++ b/vendor/stripe/stripe-php/lib/Service/ProductService.php
@@ -73,6 +73,26 @@ class ProductService extends \Stripe\Service\AbstractService
         return $this->request('get', $this->buildPath('/v1/products/%s', $id), $params, $opts);
     }
 
+    /**
+     * Search for products you’ve previously created using Stripe’s <a
+     * href="/docs/search#search-query-language">Search Query Language</a>. Don’t use
+     * search in read-after-write flows where strict consistency is necessary. Under
+     * normal operating conditions, data is searchable in less than a minute.
+     * Occasionally, propagation of new or updated data can be up to an hour behind
+     * during outages. Search functionality is not available to merchants in India.
+     *
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\SearchResult<\Stripe\Product>
+     */
+    public function search($params = null, $opts = null)
+    {
+        return $this->requestSearchResult('get', '/v1/products/search', $params, $opts);
+    }
+
     /**
      * Updates the specific product by setting the values of the parameters passed. Any
      * parameters not provided will be left unchanged.
diff --git a/vendor/stripe/stripe-php/lib/Service/RefundService.php b/vendor/stripe/stripe-php/lib/Service/RefundService.php
index cfbef54c5..772c0f6e3 100644
--- a/vendor/stripe/stripe-php/lib/Service/RefundService.php
+++ b/vendor/stripe/stripe-php/lib/Service/RefundService.php
@@ -24,6 +24,25 @@ class RefundService extends \Stripe\Service\AbstractService
         return $this->requestCollection('get', '/v1/refunds', $params, $opts);
     }
 
+    /**
+     * Cancels a refund with a status of <code>requires_action</code>.
+     *
+     * Refunds in other states cannot be canceled, and only refunds for payment methods
+     * that require customer action will enter the <code>requires_action</code> state.
+     *
+     * @param string $id
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Refund
+     */
+    public function cancel($id, $params = null, $opts = null)
+    {
+        return $this->request('post', $this->buildPath('/v1/refunds/%s/cancel', $id), $params, $opts);
+    }
+
     /**
      * Create a refund.
      *
diff --git a/vendor/stripe/stripe-php/lib/Service/SubscriptionService.php b/vendor/stripe/stripe-php/lib/Service/SubscriptionService.php
index 8369e9975..f81310c11 100644
--- a/vendor/stripe/stripe-php/lib/Service/SubscriptionService.php
+++ b/vendor/stripe/stripe-php/lib/Service/SubscriptionService.php
@@ -58,6 +58,17 @@ class SubscriptionService extends \Stripe\Service\AbstractService
      * Creates a new subscription on an existing customer. Each customer can have up to
      * 500 active or scheduled subscriptions.
      *
+     * When you create a subscription with
+     * <code>collection_method=charge_automatically</code>, the first invoice is
+     * finalized as part of the request. The <code>payment_behavior</code> parameter
+     * determines the exact behavior of the initial payment.
+     *
+     * To start subscriptions where the first invoice always begins in a
+     * <code>draft</code> status, use <a
+     * href="/docs/billing/subscriptions/subscription-schedules#managing">subscription
+     * schedules</a> instead. Schedules provide the flexibility to model more complex
+     * billing configurations that change over time.
+     *
      * @param null|array $params
      * @param null|array|\Stripe\Util\RequestOptions $opts
      *
@@ -102,6 +113,26 @@ class SubscriptionService extends \Stripe\Service\AbstractService
         return $this->request('get', $this->buildPath('/v1/subscriptions/%s', $id), $params, $opts);
     }
 
+    /**
+     * Search for subscriptions you’ve previously created using Stripe’s <a
+     * href="/docs/search#search-query-language">Search Query Language</a>. Don’t use
+     * search in read-after-write flows where strict consistency is necessary. Under
+     * normal operating conditions, data is searchable in less than a minute.
+     * Occasionally, propagation of new or updated data can be up to an hour behind
+     * during outages. Search functionality is not available to merchants in India.
+     *
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\SearchResult<\Stripe\Subscription>
+     */
+    public function search($params = null, $opts = null)
+    {
+        return $this->requestSearchResult('get', '/v1/subscriptions/search', $params, $opts);
+    }
+
     /**
      * Updates an existing subscription on a customer to match the specified
      * parameters. When changing plans or quantities, we will optionally prorate the
diff --git a/vendor/stripe/stripe-php/lib/Service/TaxCodeService.php b/vendor/stripe/stripe-php/lib/Service/TaxCodeService.php
index 1e5bbfeb4..fd167a101 100644
--- a/vendor/stripe/stripe-php/lib/Service/TaxCodeService.php
+++ b/vendor/stripe/stripe-php/lib/Service/TaxCodeService.php
@@ -7,7 +7,7 @@ namespace Stripe\Service;
 class TaxCodeService extends \Stripe\Service\AbstractService
 {
     /**
-     * A list of <a href="https://stripe.com/docs/tax/tax-codes">all tax codes
+     * A list of <a href="https://stripe.com/docs/tax/tax-categories">all tax codes
      * available</a> to add to Products in order to allow specific tax calculations.
      *
      * @param null|array $params
diff --git a/vendor/stripe/stripe-php/lib/Service/Terminal/ConfigurationService.php b/vendor/stripe/stripe-php/lib/Service/Terminal/ConfigurationService.php
new file mode 100644
index 000000000..97c7c2758
--- /dev/null
+++ b/vendor/stripe/stripe-php/lib/Service/Terminal/ConfigurationService.php
@@ -0,0 +1,86 @@
+<?php
+
+// File generated from our OpenAPI spec
+
+namespace Stripe\Service\Terminal;
+
+class ConfigurationService extends \Stripe\Service\AbstractService
+{
+    /**
+     * Returns a list of <code>Configuration</code> objects.
+     *
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Collection<\Stripe\Terminal\Configuration>
+     */
+    public function all($params = null, $opts = null)
+    {
+        return $this->requestCollection('get', '/v1/terminal/configurations', $params, $opts);
+    }
+
+    /**
+     * Creates a new <code>Configuration</code> object.
+     *
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Terminal\Configuration
+     */
+    public function create($params = null, $opts = null)
+    {
+        return $this->request('post', '/v1/terminal/configurations', $params, $opts);
+    }
+
+    /**
+     * Deletes a <code>Configuration</code> object.
+     *
+     * @param string $id
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Terminal\Configuration
+     */
+    public function delete($id, $params = null, $opts = null)
+    {
+        return $this->request('delete', $this->buildPath('/v1/terminal/configurations/%s', $id), $params, $opts);
+    }
+
+    /**
+     * Retrieves a <code>Configuration</code> object.
+     *
+     * @param string $id
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Terminal\Configuration
+     */
+    public function retrieve($id, $params = null, $opts = null)
+    {
+        return $this->request('get', $this->buildPath('/v1/terminal/configurations/%s', $id), $params, $opts);
+    }
+
+    /**
+     * Updates a new <code>Configuration</code> object.
+     *
+     * @param string $id
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Terminal\Configuration
+     */
+    public function update($id, $params = null, $opts = null)
+    {
+        return $this->request('post', $this->buildPath('/v1/terminal/configurations/%s', $id), $params, $opts);
+    }
+}
diff --git a/vendor/stripe/stripe-php/lib/Service/Terminal/ReaderService.php b/vendor/stripe/stripe-php/lib/Service/Terminal/ReaderService.php
index 413bc8715..ae8555950 100644
--- a/vendor/stripe/stripe-php/lib/Service/Terminal/ReaderService.php
+++ b/vendor/stripe/stripe-php/lib/Service/Terminal/ReaderService.php
@@ -21,6 +21,22 @@ class ReaderService extends \Stripe\Service\AbstractService
         return $this->requestCollection('get', '/v1/terminal/readers', $params, $opts);
     }
 
+    /**
+     * Cancels the current reader action.
+     *
+     * @param string $id
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Terminal\Reader
+     */
+    public function cancelAction($id, $params = null, $opts = null)
+    {
+        return $this->request('post', $this->buildPath('/v1/terminal/readers/%s/cancel_action', $id), $params, $opts);
+    }
+
     /**
      * Creates a new <code>Reader</code> object.
      *
@@ -52,6 +68,38 @@ class ReaderService extends \Stripe\Service\AbstractService
         return $this->request('delete', $this->buildPath('/v1/terminal/readers/%s', $id), $params, $opts);
     }
 
+    /**
+     * Initiates a payment flow on a Reader.
+     *
+     * @param string $id
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Terminal\Reader
+     */
+    public function processPaymentIntent($id, $params = null, $opts = null)
+    {
+        return $this->request('post', $this->buildPath('/v1/terminal/readers/%s/process_payment_intent', $id), $params, $opts);
+    }
+
+    /**
+     * Initiates a setup intent flow on a Reader.
+     *
+     * @param string $id
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Terminal\Reader
+     */
+    public function processSetupIntent($id, $params = null, $opts = null)
+    {
+        return $this->request('post', $this->buildPath('/v1/terminal/readers/%s/process_setup_intent', $id), $params, $opts);
+    }
+
     /**
      * Retrieves a <code>Reader</code> object.
      *
@@ -68,6 +116,22 @@ class ReaderService extends \Stripe\Service\AbstractService
         return $this->request('get', $this->buildPath('/v1/terminal/readers/%s', $id), $params, $opts);
     }
 
+    /**
+     * Sets reader display to show cart details.
+     *
+     * @param string $id
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Terminal\Reader
+     */
+    public function setReaderDisplay($id, $params = null, $opts = null)
+    {
+        return $this->request('post', $this->buildPath('/v1/terminal/readers/%s/set_reader_display', $id), $params, $opts);
+    }
+
     /**
      * Updates a <code>Reader</code> object by setting the values of the parameters
      * passed. Any parameters not provided will be left unchanged.
diff --git a/vendor/stripe/stripe-php/lib/Service/Terminal/TerminalServiceFactory.php b/vendor/stripe/stripe-php/lib/Service/Terminal/TerminalServiceFactory.php
index c70ac873b..f095124c0 100644
--- a/vendor/stripe/stripe-php/lib/Service/Terminal/TerminalServiceFactory.php
+++ b/vendor/stripe/stripe-php/lib/Service/Terminal/TerminalServiceFactory.php
@@ -7,6 +7,7 @@ namespace Stripe\Service\Terminal;
 /**
  * Service factory class for API resources in the Terminal namespace.
  *
+ * @property ConfigurationService $configurations
  * @property ConnectionTokenService $connectionTokens
  * @property LocationService $locations
  * @property ReaderService $readers
@@ -17,6 +18,7 @@ class TerminalServiceFactory extends \Stripe\Service\AbstractServiceFactory
      * @var array<string, string>
      */
     private static $classMap = [
+        'configurations' => ConfigurationService::class,
         'connectionTokens' => ConnectionTokenService::class,
         'locations' => LocationService::class,
         'readers' => ReaderService::class,
diff --git a/vendor/stripe/stripe-php/lib/Service/TestHelpers/RefundService.php b/vendor/stripe/stripe-php/lib/Service/TestHelpers/RefundService.php
new file mode 100644
index 000000000..de0e4d10b
--- /dev/null
+++ b/vendor/stripe/stripe-php/lib/Service/TestHelpers/RefundService.php
@@ -0,0 +1,24 @@
+<?php
+
+// File generated from our OpenAPI spec
+
+namespace Stripe\Service\TestHelpers;
+
+class RefundService extends \Stripe\Service\AbstractService
+{
+    /**
+     * Expire a refund with a status of <code>requires_action</code>.
+     *
+     * @param string $id
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Refund
+     */
+    public function expire($id, $params = null, $opts = null)
+    {
+        return $this->request('post', $this->buildPath('/v1/test_helpers/refunds/%s/expire', $id), $params, $opts);
+    }
+}
diff --git a/vendor/stripe/stripe-php/lib/Service/TestHelpers/Terminal/ReaderService.php b/vendor/stripe/stripe-php/lib/Service/TestHelpers/Terminal/ReaderService.php
new file mode 100644
index 000000000..2eb4de496
--- /dev/null
+++ b/vendor/stripe/stripe-php/lib/Service/TestHelpers/Terminal/ReaderService.php
@@ -0,0 +1,25 @@
+<?php
+
+// File generated from our OpenAPI spec
+
+namespace Stripe\Service\TestHelpers\Terminal;
+
+class ReaderService extends \Stripe\Service\AbstractService
+{
+    /**
+     * Presents a payment method on a simulated reader. Can be used to simulate
+     * accepting a payment, saving a card or refunding a transaction.
+     *
+     * @param string $id
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Terminal\Reader
+     */
+    public function presentPaymentMethod($id, $params = null, $opts = null)
+    {
+        return $this->request('post', $this->buildPath('/v1/test_helpers/terminal/readers/%s/present_payment_method', $id), $params, $opts);
+    }
+}
diff --git a/vendor/stripe/stripe-php/lib/Service/TestHelpers/Terminal/TerminalServiceFactory.php b/vendor/stripe/stripe-php/lib/Service/TestHelpers/Terminal/TerminalServiceFactory.php
new file mode 100644
index 000000000..153ebe0df
--- /dev/null
+++ b/vendor/stripe/stripe-php/lib/Service/TestHelpers/Terminal/TerminalServiceFactory.php
@@ -0,0 +1,25 @@
+<?php
+
+// File generated from our OpenAPI spec
+
+namespace Stripe\Service\TestHelpers\Terminal;
+
+/**
+ * Service factory class for API resources in the Terminal namespace.
+ *
+ * @property ReaderService $readers
+ */
+class TerminalServiceFactory extends \Stripe\Service\AbstractServiceFactory
+{
+    /**
+     * @var array<string, string>
+     */
+    private static $classMap = [
+        'readers' => ReaderService::class,
+    ];
+
+    protected function getServiceClass($name)
+    {
+        return \array_key_exists($name, self::$classMap) ? self::$classMap[$name] : null;
+    }
+}
diff --git a/vendor/stripe/stripe-php/lib/Service/TestHelpers/TestClockService.php b/vendor/stripe/stripe-php/lib/Service/TestHelpers/TestClockService.php
new file mode 100644
index 000000000..a4eee8c3e
--- /dev/null
+++ b/vendor/stripe/stripe-php/lib/Service/TestHelpers/TestClockService.php
@@ -0,0 +1,87 @@
+<?php
+
+// File generated from our OpenAPI spec
+
+namespace Stripe\Service\TestHelpers;
+
+class TestClockService extends \Stripe\Service\AbstractService
+{
+    /**
+     * Starts advancing a test clock to a specified time in the future. Advancement is
+     * done when status changes to <code>Ready</code>.
+     *
+     * @param string $id
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\TestHelpers\TestClock
+     */
+    public function advance($id, $params = null, $opts = null)
+    {
+        return $this->request('post', $this->buildPath('/v1/test_helpers/test_clocks/%s/advance', $id), $params, $opts);
+    }
+
+    /**
+     * Returns a list of your test clocks.
+     *
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Collection<\Stripe\TestHelpers\TestClock>
+     */
+    public function all($params = null, $opts = null)
+    {
+        return $this->requestCollection('get', '/v1/test_helpers/test_clocks', $params, $opts);
+    }
+
+    /**
+     * Creates a new test clock that can be attached to new customers and quotes.
+     *
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\TestHelpers\TestClock
+     */
+    public function create($params = null, $opts = null)
+    {
+        return $this->request('post', '/v1/test_helpers/test_clocks', $params, $opts);
+    }
+
+    /**
+     * Deletes a test clock.
+     *
+     * @param string $id
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\TestHelpers\TestClock
+     */
+    public function delete($id, $params = null, $opts = null)
+    {
+        return $this->request('delete', $this->buildPath('/v1/test_helpers/test_clocks/%s', $id), $params, $opts);
+    }
+
+    /**
+     * Retrieves a test clock.
+     *
+     * @param string $id
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\TestHelpers\TestClock
+     */
+    public function retrieve($id, $params = null, $opts = null)
+    {
+        return $this->request('get', $this->buildPath('/v1/test_helpers/test_clocks/%s', $id), $params, $opts);
+    }
+}
diff --git a/vendor/stripe/stripe-php/lib/Service/TestHelpers/TestHelpersServiceFactory.php b/vendor/stripe/stripe-php/lib/Service/TestHelpers/TestHelpersServiceFactory.php
new file mode 100644
index 000000000..aaf827514
--- /dev/null
+++ b/vendor/stripe/stripe-php/lib/Service/TestHelpers/TestHelpersServiceFactory.php
@@ -0,0 +1,29 @@
+<?php
+
+// File generated from our OpenAPI spec
+
+namespace Stripe\Service\TestHelpers;
+
+/**
+ * Service factory class for API resources in the TestHelpers namespace.
+ *
+ * @property RefundService $refunds
+ * @property Terminal\TerminalServiceFactory $terminal
+ * @property TestClockService $testClocks
+ */
+class TestHelpersServiceFactory extends \Stripe\Service\AbstractServiceFactory
+{
+    /**
+     * @var array<string, string>
+     */
+    private static $classMap = [
+        'refunds' => RefundService::class,
+        'terminal' => Terminal\TerminalServiceFactory::class,
+        'testClocks' => TestClockService::class,
+    ];
+
+    protected function getServiceClass($name)
+    {
+        return \array_key_exists($name, self::$classMap) ? self::$classMap[$name] : null;
+    }
+}
diff --git a/vendor/stripe/stripe-php/lib/SetupIntent.php b/vendor/stripe/stripe-php/lib/SetupIntent.php
index 13ba54193..9a47a1fa4 100644
--- a/vendor/stripe/stripe-php/lib/SetupIntent.php
+++ b/vendor/stripe/stripe-php/lib/SetupIntent.php
@@ -44,7 +44,7 @@ namespace Stripe;
  * @property string $object String representing the object's type. Objects of the same type share the same value.
  * @property null|string|\Stripe\StripeObject $application ID of the Connect application that created the SetupIntent.
  * @property null|string $cancellation_reason Reason for cancellation of this SetupIntent, one of <code>abandoned</code>, <code>requested_by_customer</code>, or <code>duplicate</code>.
- * @property null|string $client_secret <p>The client secret of this SetupIntent. Used for client-side retrieval using a publishable key.</p><p>The client secret can be used to complete payment setup from your frontend. It should not be stored, logged, embedded in URLs, or exposed to anyone other than the customer. Make sure that you have TLS enabled on any page that includes the client secret.</p>
+ * @property null|string $client_secret <p>The client secret of this SetupIntent. Used for client-side retrieval using a publishable key.</p><p>The client secret can be used to complete payment setup from your frontend. It should not be stored, logged, or exposed to anyone other than the customer. Make sure that you have TLS enabled on any page that includes the client secret.</p>
  * @property int $created Time at which the object was created. Measured in seconds since the Unix epoch.
  * @property null|string|\Stripe\Customer $customer <p>ID of the Customer this SetupIntent belongs to, if one exists.</p><p>If present, the SetupIntent's payment method will be attached to the Customer on successful setup. Payment methods attached to other Customers cannot be used with this SetupIntent.</p>
  * @property null|string $description An arbitrary string attached to the object. Often useful for displaying to users.
diff --git a/vendor/stripe/stripe-php/lib/ShippingRate.php b/vendor/stripe/stripe-php/lib/ShippingRate.php
index 9091b688c..e63daf1a7 100644
--- a/vendor/stripe/stripe-php/lib/ShippingRate.php
+++ b/vendor/stripe/stripe-php/lib/ShippingRate.php
@@ -20,7 +20,7 @@ namespace Stripe;
  * @property bool $livemode Has the value <code>true</code> if the object exists in live mode or the value <code>false</code> if the object exists in test mode.
  * @property \Stripe\StripeObject $metadata Set of <a href="https://stripe.com/docs/api/metadata">key-value pairs</a> that you can attach to an object. This can be useful for storing additional information about the object in a structured format.
  * @property null|string $tax_behavior Specifies whether the rate is considered inclusive of taxes or exclusive of taxes. One of <code>inclusive</code>, <code>exclusive</code>, or <code>unspecified</code>.
- * @property null|string|\Stripe\TaxCode $tax_code A <a href="https://stripe.com/docs/tax/tax-codes">tax code</a> ID. The Shipping tax code is <code>txcd_92010001</code>.
+ * @property null|string|\Stripe\TaxCode $tax_code A <a href="https://stripe.com/docs/tax/tax-categories">tax code</a> ID. The Shipping tax code is <code>txcd_92010001</code>.
  * @property string $type The type of calculation to use on the shipping rate. Can only be <code>fixed_amount</code> for now.
  */
 class ShippingRate extends ApiResource
diff --git a/vendor/stripe/stripe-php/lib/Stripe.php b/vendor/stripe/stripe-php/lib/Stripe.php
index 9eed6295d..b39271b80 100644
--- a/vendor/stripe/stripe-php/lib/Stripe.php
+++ b/vendor/stripe/stripe-php/lib/Stripe.php
@@ -58,7 +58,7 @@ class Stripe
     /** @var float Initial delay between retries, in seconds */
     private static $initialNetworkRetryDelay = 0.5;
 
-    const VERSION = '7.114.0';
+    const VERSION = '7.128.0';
 
     /**
      * @return string the API key used for requests
diff --git a/vendor/stripe/stripe-php/lib/StripeClient.php b/vendor/stripe/stripe-php/lib/StripeClient.php
index 89b4c6be6..27c58cac4 100644
--- a/vendor/stripe/stripe-php/lib/StripeClient.php
+++ b/vendor/stripe/stripe-php/lib/StripeClient.php
@@ -26,6 +26,7 @@ namespace Stripe;
  * @property \Stripe\Service\ExchangeRateService $exchangeRates
  * @property \Stripe\Service\FileLinkService $fileLinks
  * @property \Stripe\Service\FileService $files
+ * @property \Stripe\Service\FinancialConnections\FinancialConnectionsServiceFactory $financialConnections
  * @property \Stripe\Service\Identity\IdentityServiceFactory $identity
  * @property \Stripe\Service\InvoiceItemService $invoiceItems
  * @property \Stripe\Service\InvoiceService $invoices
@@ -59,6 +60,7 @@ namespace Stripe;
  * @property \Stripe\Service\TaxCodeService $taxCodes
  * @property \Stripe\Service\TaxRateService $taxRates
  * @property \Stripe\Service\Terminal\TerminalServiceFactory $terminal
+ * @property \Stripe\Service\TestHelpers\TestHelpersServiceFactory $testHelpers
  * @property \Stripe\Service\TokenService $tokens
  * @property \Stripe\Service\TopupService $topups
  * @property \Stripe\Service\TransferService $transfers
diff --git a/vendor/stripe/stripe-php/lib/StripeObject.php b/vendor/stripe/stripe-php/lib/StripeObject.php
index 9482a0e97..8e9eb93c1 100644
--- a/vendor/stripe/stripe-php/lib/StripeObject.php
+++ b/vendor/stripe/stripe-php/lib/StripeObject.php
@@ -218,7 +218,9 @@ class StripeObject implements \ArrayAccess, \Countable, \JsonSerializable
         return \array_key_exists($k, $this->_values) ? $this->_values[$k] : null;
     }
 
-    // Countable method
+    /**
+     * @return int
+     */
     #[\ReturnTypeWillChange]
     public function count()
     {
@@ -424,6 +426,9 @@ class StripeObject implements \ArrayAccess, \Countable, \JsonSerializable
         }
     }
 
+    /**
+     * @return mixed
+     */
     #[\ReturnTypeWillChange]
     public function jsonSerialize()
     {
diff --git a/vendor/stripe/stripe-php/lib/Subscription.php b/vendor/stripe/stripe-php/lib/Subscription.php
index 1b91e384d..7a02c2295 100644
--- a/vendor/stripe/stripe-php/lib/Subscription.php
+++ b/vendor/stripe/stripe-php/lib/Subscription.php
@@ -13,6 +13,7 @@ namespace Stripe;
  *
  * @property string $id Unique identifier for the object.
  * @property string $object String representing the object's type. Objects of the same type share the same value.
+ * @property null|string|\Stripe\StripeObject $application ID of the Connect Application that created the subscription.
  * @property null|float $application_fee_percent A non-negative decimal between 0 and 100, with at most two decimal places. This represents the percentage of the subscription invoice subtotal that will be transferred to the application owner's Stripe account.
  * @property \Stripe\StripeObject $automatic_tax
  * @property int $billing_cycle_anchor Determines the date of the first full invoice, and, for plans with <code>month</code> or <code>year</code> intervals, the day of the month for subsequent invoices.
@@ -44,6 +45,7 @@ namespace Stripe;
  * @property null|string|\Stripe\SubscriptionSchedule $schedule The schedule attached to the subscription
  * @property int $start_date Date when the subscription was first created. The date might differ from the <code>created</code> date due to backdating.
  * @property string $status <p>Possible values are <code>incomplete</code>, <code>incomplete_expired</code>, <code>trialing</code>, <code>active</code>, <code>past_due</code>, <code>canceled</code>, or <code>unpaid</code>.</p><p>For <code>collection_method=charge_automatically</code> a subscription moves into <code>incomplete</code> if the initial payment attempt fails. A subscription in this state can only have metadata and default_source updated. Once the first invoice is paid, the subscription moves into an <code>active</code> state. If the first invoice is not paid within 23 hours, the subscription transitions to <code>incomplete_expired</code>. This is a terminal state, the open invoice will be voided and no further invoices will be generated.</p><p>A subscription that is currently in a trial period is <code>trialing</code> and moves to <code>active</code> when the trial period is over.</p><p>If subscription <code>collection_method=charge_automatically</code> it becomes <code>past_due</code> when payment to renew it fails and <code>canceled</code> or <code>unpaid</code> (depending on your subscriptions settings) when Stripe has exhausted all payment retry attempts.</p><p>If subscription <code>collection_method=send_invoice</code> it becomes <code>past_due</code> when its invoice is not paid by the due date, and <code>canceled</code> or <code>unpaid</code> if it is still not paid by an additional deadline after that. Note that when a subscription has a status of <code>unpaid</code>, no subsequent invoices will be attempted (invoices will be created, but then immediately automatically closed). After receiving updated payment information from a customer, you may choose to reopen and pay their closed invoices.</p>
+ * @property null|string|\Stripe\TestHelpers\TestClock $test_clock ID of the test clock this subscription belongs to.
  * @property null|int $trial_end If the subscription has a trial, the end of that trial.
  * @property null|int $trial_start If the subscription has a trial, the beginning of that trial.
  */
@@ -54,9 +56,11 @@ class Subscription extends ApiResource
     use ApiOperations\All;
     use ApiOperations\Create;
     use ApiOperations\Retrieve;
+    use ApiOperations\Search;
     use ApiOperations\Update;
 
     const PAYMENT_BEHAVIOR_ALLOW_INCOMPLETE = 'allow_incomplete';
+    const PAYMENT_BEHAVIOR_DEFAULT_INCOMPLETE = 'default_incomplete';
     const PAYMENT_BEHAVIOR_ERROR_IF_INCOMPLETE = 'error_if_incomplete';
     const PAYMENT_BEHAVIOR_PENDING_IF_INCOMPLETE = 'pending_if_incomplete';
 
@@ -117,4 +121,19 @@ class Subscription extends ApiResource
 
         return $this;
     }
+
+    /**
+     * @param null|array $params
+     * @param null|array|string $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\SearchResult<Subscription> the subscription search results
+     */
+    public static function search($params = null, $opts = null)
+    {
+        $url = '/v1/subscriptions/search';
+
+        return self::_searchResource($url, $params, $opts);
+    }
 }
diff --git a/vendor/stripe/stripe-php/lib/SubscriptionSchedule.php b/vendor/stripe/stripe-php/lib/SubscriptionSchedule.php
index d10ea12a3..c1d4ce02f 100644
--- a/vendor/stripe/stripe-php/lib/SubscriptionSchedule.php
+++ b/vendor/stripe/stripe-php/lib/SubscriptionSchedule.php
@@ -14,6 +14,7 @@ namespace Stripe;
  *
  * @property string $id Unique identifier for the object.
  * @property string $object String representing the object's type. Objects of the same type share the same value.
+ * @property null|string|\Stripe\StripeObject $application ID of the Connect Application that created the schedule.
  * @property null|int $canceled_at Time at which the subscription schedule was canceled. Measured in seconds since the Unix epoch.
  * @property null|int $completed_at Time at which the subscription schedule was completed. Measured in seconds since the Unix epoch.
  * @property int $created Time at which the object was created. Measured in seconds since the Unix epoch.
@@ -28,6 +29,7 @@ namespace Stripe;
  * @property null|string $released_subscription ID of the subscription once managed by the subscription schedule (if it is released).
  * @property string $status The present status of the subscription schedule. Possible values are <code>not_started</code>, <code>active</code>, <code>completed</code>, <code>released</code>, and <code>canceled</code>. You can read more about the different states in our <a href="https://stripe.com/docs/billing/subscriptions/subscription-schedules">behavior guide</a>.
  * @property null|string|\Stripe\Subscription $subscription ID of the subscription managed by the subscription schedule.
+ * @property null|string|\Stripe\TestHelpers\TestClock $test_clock ID of the test clock this subscription schedule belongs to.
  */
 class SubscriptionSchedule extends ApiResource
 {
diff --git a/vendor/stripe/stripe-php/lib/TaxCode.php b/vendor/stripe/stripe-php/lib/TaxCode.php
index bfdbf03ac..0dfc49e8a 100644
--- a/vendor/stripe/stripe-php/lib/TaxCode.php
+++ b/vendor/stripe/stripe-php/lib/TaxCode.php
@@ -5,8 +5,8 @@
 namespace Stripe;
 
 /**
- * <a href="https://stripe.com/docs/tax/tax-codes">Tax codes</a> classify goods and
- * services for tax purposes.
+ * <a href="https://stripe.com/docs/tax/tax-categories">Tax codes</a> classify
+ * goods and services for tax purposes.
  *
  * @property string $id Unique identifier for the object.
  * @property string $object String representing the object's type. Objects of the same type share the same value.
diff --git a/vendor/stripe/stripe-php/lib/TaxId.php b/vendor/stripe/stripe-php/lib/TaxId.php
index b9ab44ac2..f8e869339 100644
--- a/vendor/stripe/stripe-php/lib/TaxId.php
+++ b/vendor/stripe/stripe-php/lib/TaxId.php
@@ -18,7 +18,7 @@ namespace Stripe;
  * @property int $created Time at which the object was created. Measured in seconds since the Unix epoch.
  * @property null|string|\Stripe\Customer $customer ID of the customer.
  * @property bool $livemode Has the value <code>true</code> if the object exists in live mode or the value <code>false</code> if the object exists in test mode.
- * @property string $type Type of the tax ID, one of <code>ae_trn</code>, <code>au_abn</code>, <code>au_arn</code>, <code>br_cnpj</code>, <code>br_cpf</code>, <code>ca_bn</code>, <code>ca_gst_hst</code>, <code>ca_pst_bc</code>, <code>ca_pst_mb</code>, <code>ca_pst_sk</code>, <code>ca_qst</code>, <code>ch_vat</code>, <code>cl_tin</code>, <code>es_cif</code>, <code>eu_vat</code>, <code>gb_vat</code>, <code>ge_vat</code>, <code>hk_br</code>, <code>id_npwp</code>, <code>il_vat</code>, <code>in_gst</code>, <code>is_vat</code>, <code>jp_cn</code>, <code>jp_rn</code>, <code>kr_brn</code>, <code>li_uid</code>, <code>mx_rfc</code>, <code>my_frp</code>, <code>my_itn</code>, <code>my_sst</code>, <code>no_vat</code>, <code>nz_gst</code>, <code>ru_inn</code>, <code>ru_kpp</code>, <code>sa_vat</code>, <code>sg_gst</code>, <code>sg_uen</code>, <code>th_vat</code>, <code>tw_vat</code>, <code>ua_vat</code>, <code>us_ein</code>, or <code>za_vat</code>. Note that some legacy tax IDs have type <code>unknown</code>
+ * @property string $type Type of the tax ID, one of <code>ae_trn</code>, <code>au_abn</code>, <code>au_arn</code>, <code>bg_uic</code>, <code>br_cnpj</code>, <code>br_cpf</code>, <code>ca_bn</code>, <code>ca_gst_hst</code>, <code>ca_pst_bc</code>, <code>ca_pst_mb</code>, <code>ca_pst_sk</code>, <code>ca_qst</code>, <code>ch_vat</code>, <code>cl_tin</code>, <code>es_cif</code>, <code>eu_oss_vat</code>, <code>eu_vat</code>, <code>gb_vat</code>, <code>ge_vat</code>, <code>hk_br</code>, <code>hu_tin</code>, <code>id_npwp</code>, <code>il_vat</code>, <code>in_gst</code>, <code>is_vat</code>, <code>jp_cn</code>, <code>jp_rn</code>, <code>kr_brn</code>, <code>li_uid</code>, <code>mx_rfc</code>, <code>my_frp</code>, <code>my_itn</code>, <code>my_sst</code>, <code>no_vat</code>, <code>nz_gst</code>, <code>ru_inn</code>, <code>ru_kpp</code>, <code>sa_vat</code>, <code>sg_gst</code>, <code>sg_uen</code>, <code>si_tin</code>, <code>th_vat</code>, <code>tw_vat</code>, <code>ua_vat</code>, <code>us_ein</code>, or <code>za_vat</code>. Note that some legacy tax IDs have type <code>unknown</code>
  * @property string $value Value of the tax ID.
  * @property null|\Stripe\StripeObject $verification Tax ID verification information.
  */
@@ -31,6 +31,7 @@ class TaxId extends ApiResource
     const TYPE_AE_TRN = 'ae_trn';
     const TYPE_AU_ABN = 'au_abn';
     const TYPE_AU_ARN = 'au_arn';
+    const TYPE_BG_UIC = 'bg_uic';
     const TYPE_BR_CNPJ = 'br_cnpj';
     const TYPE_BR_CPF = 'br_cpf';
     const TYPE_CA_BN = 'ca_bn';
@@ -42,10 +43,12 @@ class TaxId extends ApiResource
     const TYPE_CH_VAT = 'ch_vat';
     const TYPE_CL_TIN = 'cl_tin';
     const TYPE_ES_CIF = 'es_cif';
+    const TYPE_EU_OSS_VAT = 'eu_oss_vat';
     const TYPE_EU_VAT = 'eu_vat';
     const TYPE_GB_VAT = 'gb_vat';
     const TYPE_GE_VAT = 'ge_vat';
     const TYPE_HK_BR = 'hk_br';
+    const TYPE_HU_TIN = 'hu_tin';
     const TYPE_ID_NPWP = 'id_npwp';
     const TYPE_IL_VAT = 'il_vat';
     const TYPE_IN_GST = 'in_gst';
@@ -65,6 +68,7 @@ class TaxId extends ApiResource
     const TYPE_SA_VAT = 'sa_vat';
     const TYPE_SG_GST = 'sg_gst';
     const TYPE_SG_UEN = 'sg_uen';
+    const TYPE_SI_TIN = 'si_tin';
     const TYPE_TH_VAT = 'th_vat';
     const TYPE_TW_VAT = 'tw_vat';
     const TYPE_UA_VAT = 'ua_vat';
diff --git a/vendor/stripe/stripe-php/lib/Terminal/Configuration.php b/vendor/stripe/stripe-php/lib/Terminal/Configuration.php
new file mode 100644
index 000000000..f34831f74
--- /dev/null
+++ b/vendor/stripe/stripe-php/lib/Terminal/Configuration.php
@@ -0,0 +1,28 @@
+<?php
+
+// File generated from our OpenAPI spec
+
+namespace Stripe\Terminal;
+
+/**
+ * A Configurations object represents how features should be configured for
+ * terminal readers.
+ *
+ * @property string $id Unique identifier for the object.
+ * @property string $object String representing the object's type. Objects of the same type share the same value.
+ * @property \Stripe\StripeObject $bbpos_wisepos_e
+ * @property null|bool $is_account_default Whether this Configuration is the default for your account
+ * @property bool $livemode Has the value <code>true</code> if the object exists in live mode or the value <code>false</code> if the object exists in test mode.
+ * @property \Stripe\StripeObject $tipping
+ * @property \Stripe\StripeObject $verifone_p400
+ */
+class Configuration extends \Stripe\ApiResource
+{
+    const OBJECT_NAME = 'terminal.configuration';
+
+    use \Stripe\ApiOperations\All;
+    use \Stripe\ApiOperations\Create;
+    use \Stripe\ApiOperations\Delete;
+    use \Stripe\ApiOperations\Retrieve;
+    use \Stripe\ApiOperations\Update;
+}
diff --git a/vendor/stripe/stripe-php/lib/Terminal/Location.php b/vendor/stripe/stripe-php/lib/Terminal/Location.php
index 21a2c6352..11c625d86 100644
--- a/vendor/stripe/stripe-php/lib/Terminal/Location.php
+++ b/vendor/stripe/stripe-php/lib/Terminal/Location.php
@@ -13,6 +13,7 @@ namespace Stripe\Terminal;
  * @property string $id Unique identifier for the object.
  * @property string $object String representing the object's type. Objects of the same type share the same value.
  * @property \Stripe\StripeObject $address
+ * @property string $configuration_overrides The ID of a configuration that will be used to customize all readers in this location.
  * @property string $display_name The display name of the location.
  * @property bool $livemode Has the value <code>true</code> if the object exists in live mode or the value <code>false</code> if the object exists in test mode.
  * @property \Stripe\StripeObject $metadata Set of <a href="https://stripe.com/docs/api/metadata">key-value pairs</a> that you can attach to an object. This can be useful for storing additional information about the object in a structured format.
diff --git a/vendor/stripe/stripe-php/lib/Terminal/Reader.php b/vendor/stripe/stripe-php/lib/Terminal/Reader.php
index 28edf434d..d7a3d36e5 100644
--- a/vendor/stripe/stripe-php/lib/Terminal/Reader.php
+++ b/vendor/stripe/stripe-php/lib/Terminal/Reader.php
@@ -13,8 +13,9 @@ namespace Stripe\Terminal;
  *
  * @property string $id Unique identifier for the object.
  * @property string $object String representing the object's type. Objects of the same type share the same value.
+ * @property null|\Stripe\StripeObject $action The most recent action performed by the reader.
  * @property null|string $device_sw_version The current software version of the reader.
- * @property string $device_type Type of reader, one of <code>bbpos_chipper2x</code>, <code>bbpos_wisepos_e</code>, or <code>verifone_P400</code>.
+ * @property string $device_type Type of reader, one of <code>bbpos_wisepad3</code>, <code>stripe_m2</code>, <code>bbpos_chipper2x</code>, <code>bbpos_wisepos_e</code>, or <code>verifone_P400</code>.
  * @property null|string $ip_address The local IP address of the reader.
  * @property string $label Custom label given to the reader for easier identification.
  * @property bool $livemode Has the value <code>true</code> if the object exists in live mode or the value <code>false</code> if the object exists in test mode.
@@ -32,4 +33,72 @@ class Reader extends \Stripe\ApiResource
     use \Stripe\ApiOperations\Delete;
     use \Stripe\ApiOperations\Retrieve;
     use \Stripe\ApiOperations\Update;
+
+    /**
+     * @param null|array $params
+     * @param null|array|string $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Terminal\Reader the canceled reader
+     */
+    public function cancelAction($params = null, $opts = null)
+    {
+        $url = $this->instanceUrl() . '/cancel_action';
+        list($response, $opts) = $this->_request('post', $url, $params, $opts);
+        $this->refreshFrom($response, $opts);
+
+        return $this;
+    }
+
+    /**
+     * @param null|array $params
+     * @param null|array|string $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Terminal\Reader the processed reader
+     */
+    public function processPaymentIntent($params = null, $opts = null)
+    {
+        $url = $this->instanceUrl() . '/process_payment_intent';
+        list($response, $opts) = $this->_request('post', $url, $params, $opts);
+        $this->refreshFrom($response, $opts);
+
+        return $this;
+    }
+
+    /**
+     * @param null|array $params
+     * @param null|array|string $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Terminal\Reader the processed reader
+     */
+    public function processSetupIntent($params = null, $opts = null)
+    {
+        $url = $this->instanceUrl() . '/process_setup_intent';
+        list($response, $opts) = $this->_request('post', $url, $params, $opts);
+        $this->refreshFrom($response, $opts);
+
+        return $this;
+    }
+
+    /**
+     * @param null|array $params
+     * @param null|array|string $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Terminal\Reader the seted reader
+     */
+    public function setReaderDisplay($params = null, $opts = null)
+    {
+        $url = $this->instanceUrl() . '/set_reader_display';
+        list($response, $opts) = $this->_request('post', $url, $params, $opts);
+        $this->refreshFrom($response, $opts);
+
+        return $this;
+    }
 }
diff --git a/vendor/stripe/stripe-php/lib/TestHelpers/TestClock.php b/vendor/stripe/stripe-php/lib/TestHelpers/TestClock.php
new file mode 100644
index 000000000..01d36ea05
--- /dev/null
+++ b/vendor/stripe/stripe-php/lib/TestHelpers/TestClock.php
@@ -0,0 +1,53 @@
+<?php
+
+// File generated from our OpenAPI spec
+
+namespace Stripe\TestHelpers;
+
+/**
+ * A test clock enables deterministic control over objects in testmode. With a test
+ * clock, you can create objects at a frozen time in the past or future, and
+ * advance to a specific future time to observe webhooks and state changes. After
+ * the clock advances, you can either validate the current state of your scenario
+ * (and test your assumptions), change the current state of your scenario (and test
+ * more complex scenarios), or keep advancing forward in time.
+ *
+ * @property string $id Unique identifier for the object.
+ * @property string $object String representing the object's type. Objects of the same type share the same value.
+ * @property int $created Time at which the object was created. Measured in seconds since the Unix epoch.
+ * @property int $deletes_after Time at which this clock is scheduled to auto delete.
+ * @property int $frozen_time Time at which all objects belonging to this clock are frozen.
+ * @property bool $livemode Has the value <code>true</code> if the object exists in live mode or the value <code>false</code> if the object exists in test mode.
+ * @property null|string $name The custom name supplied at creation.
+ * @property string $status The status of the Test Clock.
+ */
+class TestClock extends \Stripe\ApiResource
+{
+    const OBJECT_NAME = 'test_helpers.test_clock';
+
+    use \Stripe\ApiOperations\All;
+    use \Stripe\ApiOperations\Create;
+    use \Stripe\ApiOperations\Delete;
+    use \Stripe\ApiOperations\Retrieve;
+
+    const STATUS_ADVANCING = 'advancing';
+    const STATUS_INTERNAL_FAILURE = 'internal_failure';
+    const STATUS_READY = 'ready';
+
+    /**
+     * @param null|array $params
+     * @param null|array|string $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\TestHelpers\TestClock the advanced test clock
+     */
+    public function advance($params = null, $opts = null)
+    {
+        $url = $this->instanceUrl() . '/advance';
+        list($response, $opts) = $this->_request('post', $url, $params, $opts);
+        $this->refreshFrom($response, $opts);
+
+        return $this;
+    }
+}
diff --git a/vendor/stripe/stripe-php/lib/Util/CaseInsensitiveArray.php b/vendor/stripe/stripe-php/lib/Util/CaseInsensitiveArray.php
index 9f11dc69e..b6696cd29 100644
--- a/vendor/stripe/stripe-php/lib/Util/CaseInsensitiveArray.php
+++ b/vendor/stripe/stripe-php/lib/Util/CaseInsensitiveArray.php
@@ -27,12 +27,18 @@ class CaseInsensitiveArray implements \ArrayAccess, \Countable, \IteratorAggrega
         return \count($this->container);
     }
 
+    /**
+     * @return \ArrayIterator
+     */
     #[\ReturnTypeWillChange]
     public function getIterator()
     {
         return new \ArrayIterator($this->container);
     }
 
+    /**
+     * @return void
+     */
     #[\ReturnTypeWillChange]
     public function offsetSet($offset, $value)
     {
@@ -44,6 +50,9 @@ class CaseInsensitiveArray implements \ArrayAccess, \Countable, \IteratorAggrega
         }
     }
 
+    /**
+     * @return bool
+     */
     #[\ReturnTypeWillChange]
     public function offsetExists($offset)
     {
@@ -52,6 +61,9 @@ class CaseInsensitiveArray implements \ArrayAccess, \Countable, \IteratorAggrega
         return isset($this->container[$offset]);
     }
 
+    /**
+     * @return void
+     */
     #[\ReturnTypeWillChange]
     public function offsetUnset($offset)
     {
@@ -59,6 +71,9 @@ class CaseInsensitiveArray implements \ArrayAccess, \Countable, \IteratorAggrega
         unset($this->container[$offset]);
     }
 
+    /**
+     * @return mixed
+     */
     #[\ReturnTypeWillChange]
     public function offsetGet($offset)
     {
diff --git a/vendor/stripe/stripe-php/lib/Util/ObjectTypes.php b/vendor/stripe/stripe-php/lib/Util/ObjectTypes.php
index 4546cff06..715c5bd85 100644
--- a/vendor/stripe/stripe-php/lib/Util/ObjectTypes.php
+++ b/vendor/stripe/stripe-php/lib/Util/ObjectTypes.php
@@ -25,6 +25,7 @@ class ObjectTypes
         \Stripe\BitcoinTransaction::OBJECT_NAME => \Stripe\BitcoinTransaction::class,
         \Stripe\Capability::OBJECT_NAME => \Stripe\Capability::class,
         \Stripe\Card::OBJECT_NAME => \Stripe\Card::class,
+        \Stripe\CashBalance::OBJECT_NAME => \Stripe\CashBalance::class,
         \Stripe\Charge::OBJECT_NAME => \Stripe\Charge::class,
         \Stripe\Checkout\Session::OBJECT_NAME => \Stripe\Checkout\Session::class,
         \Stripe\Collection::OBJECT_NAME => \Stripe\Collection::class,
@@ -42,6 +43,11 @@ class ObjectTypes
         \Stripe\File::OBJECT_NAME => \Stripe\File::class,
         \Stripe\File::OBJECT_NAME_ALT => \Stripe\File::class,
         \Stripe\FileLink::OBJECT_NAME => \Stripe\FileLink::class,
+        \Stripe\FinancialConnections\Account::OBJECT_NAME => \Stripe\FinancialConnections\Account::class,
+        \Stripe\FinancialConnections\AccountOwner::OBJECT_NAME => \Stripe\FinancialConnections\AccountOwner::class,
+        \Stripe\FinancialConnections\AccountOwnership::OBJECT_NAME => \Stripe\FinancialConnections\AccountOwnership::class,
+        \Stripe\FinancialConnections\Session::OBJECT_NAME => \Stripe\FinancialConnections\Session::class,
+        \Stripe\FundingInstructions::OBJECT_NAME => \Stripe\FundingInstructions::class,
         \Stripe\Identity\VerificationReport::OBJECT_NAME => \Stripe\Identity\VerificationReport::class,
         \Stripe\Identity\VerificationSession::OBJECT_NAME => \Stripe\Identity\VerificationSession::class,
         \Stripe\Invoice::OBJECT_NAME => \Stripe\Invoice::class,
@@ -78,6 +84,7 @@ class ObjectTypes
         \Stripe\Reporting\ReportRun::OBJECT_NAME => \Stripe\Reporting\ReportRun::class,
         \Stripe\Reporting\ReportType::OBJECT_NAME => \Stripe\Reporting\ReportType::class,
         \Stripe\Review::OBJECT_NAME => \Stripe\Review::class,
+        \Stripe\SearchResult::OBJECT_NAME => \Stripe\SearchResult::class,
         \Stripe\SetupAttempt::OBJECT_NAME => \Stripe\SetupAttempt::class,
         \Stripe\SetupIntent::OBJECT_NAME => \Stripe\SetupIntent::class,
         \Stripe\ShippingRate::OBJECT_NAME => \Stripe\ShippingRate::class,
@@ -91,9 +98,11 @@ class ObjectTypes
         \Stripe\TaxCode::OBJECT_NAME => \Stripe\TaxCode::class,
         \Stripe\TaxId::OBJECT_NAME => \Stripe\TaxId::class,
         \Stripe\TaxRate::OBJECT_NAME => \Stripe\TaxRate::class,
+        \Stripe\Terminal\Configuration::OBJECT_NAME => \Stripe\Terminal\Configuration::class,
         \Stripe\Terminal\ConnectionToken::OBJECT_NAME => \Stripe\Terminal\ConnectionToken::class,
         \Stripe\Terminal\Location::OBJECT_NAME => \Stripe\Terminal\Location::class,
         \Stripe\Terminal\Reader::OBJECT_NAME => \Stripe\Terminal\Reader::class,
+        \Stripe\TestHelpers\TestClock::OBJECT_NAME => \Stripe\TestHelpers\TestClock::class,
         \Stripe\ThreeDSecure::OBJECT_NAME => \Stripe\ThreeDSecure::class,
         \Stripe\Token::OBJECT_NAME => \Stripe\Token::class,
         \Stripe\Topup::OBJECT_NAME => \Stripe\Topup::class,
diff --git a/vendor/stripe/stripe-php/lib/Util/Set.php b/vendor/stripe/stripe-php/lib/Util/Set.php
index c39d813ca..aaa811d5a 100644
--- a/vendor/stripe/stripe-php/lib/Util/Set.php
+++ b/vendor/stripe/stripe-php/lib/Util/Set.php
@@ -37,6 +37,9 @@ class Set implements IteratorAggregate
         return \array_keys($this->_elts);
     }
 
+    /**
+     * @return ArrayIterator
+     */
     #[\ReturnTypeWillChange]
     public function getIterator()
     {
diff --git a/vendor/symfony/polyfill-intl-idn/README.md b/vendor/symfony/polyfill-intl-idn/README.md
index 2e75f2e52..cae551705 100644
--- a/vendor/symfony/polyfill-intl-idn/README.md
+++ b/vendor/symfony/polyfill-intl-idn/README.md
@@ -4,7 +4,7 @@ Symfony Polyfill / Intl: Idn
 This component provides [`idn_to_ascii`](https://php.net/idn-to-ascii) and [`idn_to_utf8`](https://php.net/idn-to-utf8) functions to users who run php versions without the [Intl](https://php.net/intl) extension.
 
 More information can be found in the
-[main Polyfill README](https://github.com/symfony/polyfill/blob/master/README.md).
+[main Polyfill README](https://github.com/symfony/polyfill/blob/main/README.md).
 
 License
 =======
diff --git a/vendor/symfony/polyfill-intl-idn/composer.json b/vendor/symfony/polyfill-intl-idn/composer.json
index c5a2a462a..71030a2ed 100644
--- a/vendor/symfony/polyfill-intl-idn/composer.json
+++ b/vendor/symfony/polyfill-intl-idn/composer.json
@@ -34,7 +34,7 @@
     "minimum-stability": "dev",
     "extra": {
         "branch-alias": {
-            "dev-main": "1.23-dev"
+            "dev-main": "1.26-dev"
         },
         "thanks": {
             "name": "symfony/polyfill",
diff --git a/vendor/symfony/polyfill-intl-normalizer/README.md b/vendor/symfony/polyfill-intl-normalizer/README.md
index 15060c5f1..b9b762e85 100644
--- a/vendor/symfony/polyfill-intl-normalizer/README.md
+++ b/vendor/symfony/polyfill-intl-normalizer/README.md
@@ -6,7 +6,7 @@ This component provides a fallback implementation for the
 by the [Intl](https://php.net/intl) extension.
 
 More information can be found in the
-[main Polyfill README](https://github.com/symfony/polyfill/blob/master/README.md).
+[main Polyfill README](https://github.com/symfony/polyfill/blob/main/README.md).
 
 License
 =======
diff --git a/vendor/symfony/polyfill-intl-normalizer/composer.json b/vendor/symfony/polyfill-intl-normalizer/composer.json
index 393edf701..eb452bfd4 100644
--- a/vendor/symfony/polyfill-intl-normalizer/composer.json
+++ b/vendor/symfony/polyfill-intl-normalizer/composer.json
@@ -29,7 +29,7 @@
     "minimum-stability": "dev",
     "extra": {
         "branch-alias": {
-            "dev-main": "1.23-dev"
+            "dev-main": "1.26-dev"
         },
         "thanks": {
             "name": "symfony/polyfill",
diff --git a/vendor/symfony/polyfill-php72/README.md b/vendor/symfony/polyfill-php72/README.md
index 59dec8a23..ed1905055 100644
--- a/vendor/symfony/polyfill-php72/README.md
+++ b/vendor/symfony/polyfill-php72/README.md
@@ -6,6 +6,12 @@ This component provides functions added to PHP 7.2 core:
 - [`spl_object_id`](https://php.net/spl_object_id)
 - [`stream_isatty`](https://php.net/stream_isatty)
 
+And also functions added to PHP 7.2 mbstring:
+
+- [`mb_ord`](https://php.net/mb_ord)
+- [`mb_chr`](https://php.net/mb_chr)
+- [`mb_scrub`](https://php.net/mb_scrub)
+
 On Windows only:
 
 - [`sapi_windows_vt100_support`](https://php.net/sapi_windows_vt100_support)
@@ -16,11 +22,12 @@ Moved to core since 7.2 (was in the optional XML extension earlier):
 - [`utf8_decode`](https://php.net/utf8_decode)
 
 Also, it provides constants added to PHP 7.2:
+
 - [`PHP_FLOAT_*`](https://php.net/reserved.constants#constant.php-float-dig)
 - [`PHP_OS_FAMILY`](https://php.net/reserved.constants#constant.php-os-family)
 
 More information can be found in the
-[main Polyfill README](https://github.com/symfony/polyfill/blob/master/README.md).
+[main Polyfill README](https://github.com/symfony/polyfill/blob/main/README.md).
 
 License
 =======
diff --git a/vendor/symfony/polyfill-php72/composer.json b/vendor/symfony/polyfill-php72/composer.json
index c96c84477..4eac690e0 100644
--- a/vendor/symfony/polyfill-php72/composer.json
+++ b/vendor/symfony/polyfill-php72/composer.json
@@ -25,7 +25,7 @@
     "minimum-stability": "dev",
     "extra": {
         "branch-alias": {
-            "dev-main": "1.23-dev"
+            "dev-main": "1.26-dev"
         },
         "thanks": {
             "name": "symfony/polyfill",

From 487433f59666b539118320e6c1342645a146ed88 Mon Sep 17 00:00:00 2001
From: pero1203 <peter.hrvatin@gmail.com>
Date: Wed, 13 Jul 2022 10:48:10 +0200
Subject: [PATCH 059/110] Search imen anket - dodano se searcha tudi po lepem
 linku

---
 admin/survey/classes/class.SurveyList.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/admin/survey/classes/class.SurveyList.php b/admin/survey/classes/class.SurveyList.php
index fb37c0fe3..a673cfd44 100644
--- a/admin/survey/classes/class.SurveyList.php
+++ b/admin/survey/classes/class.SurveyList.php
@@ -1881,6 +1881,11 @@ class SurveyList {
 			$stringSurveyList .= "LEFT OUTER JOIN srv_spremenljivka AS ss ON ss.gru_id = sg.id ";
 			$stringSurveyList .= "LEFT OUTER JOIN srv_vrednost AS sv ON sv.spr_id = ss.id ";
 		}
+
+        // Ce iscemo po imenu ankete moramo dodat se tabele srv_nice_links za lepe linke
+		if($this->isSearch == 1 && $this->searchSettings['stype'] == '0'){
+			$stringSurveyList .= "LEFT OUTER JOIN srv_nice_links AS nl ON sa.id = nl.ank_id ";
+		}
 		
 		$stringSurveyList .= "WHERE sa.backup='0' AND sa.id>0 AND active >= '0' AND invisible = '0' ";
 		
@@ -2550,7 +2555,7 @@ class SurveyList {
         }
 		// Search po naslovu
 		else{
-            $result = " AND (LOWER(sa.naslov) LIKE LOWER('".$search_text."') OR LOWER(sa.akronim) LIKE LOWER('".$search_text."'))";
+            $result = " AND (LOWER(sa.naslov) LIKE LOWER('".$search_text."') OR LOWER(sa.akronim) LIKE LOWER('".$search_text."') OR LOWER(nl.link) LIKE LOWER('".$search_text."'))";
         }
 		
 		// Search po statusu (aktivne, neaktivne)

From cb40b856407957b5d2232c7faf477ec289729ad5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nejc=20Kova=C4=8D?= <nejc.kouko@gmail.com>
Date: Thu, 14 Jul 2022 08:48:14 +0200
Subject: [PATCH 060/110] login/register background color

---
 frontend/simple/css/style.css                    | 6 +++---
 resources/sass/frontend_simple/basic/colors.scss | 2 +-
 resources/sass/frontend_simple/modules/main.scss | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/frontend/simple/css/style.css b/frontend/simple/css/style.css
index 8ce29a160..c89e3cac8 100644
--- a/frontend/simple/css/style.css
+++ b/frontend/simple/css/style.css
@@ -158,10 +158,10 @@ header nav span.menu_item a {
 header nav span.menu_item a:hover {
   color: #1e88e5;
 }
-#main {
-  background-color: #F5F5F5;
+body.landing_page #main {
+  background-color: #F8F8F8;
 }
-#main .main_content {
+body.landing_page #main .main_content {
   max-width: 1400px;
   min-height: 769px;
   margin: 0 auto;
diff --git a/resources/sass/frontend_simple/basic/colors.scss b/resources/sass/frontend_simple/basic/colors.scss
index b63f875df..d32135a26 100644
--- a/resources/sass/frontend_simple/basic/colors.scss
+++ b/resources/sass/frontend_simple/basic/colors.scss
@@ -10,7 +10,7 @@ $border_color: #646464;
 
 $color_background: #ffffff;
 $color_background_dark: #f7f7f7;
-$color_background_grey: #F5F5F5;
+$color_background_grey: #F8F8F8;
 $color_background_very_dark: #e6e6e6;
 
 $color_border: #cccccc;
\ No newline at end of file
diff --git a/resources/sass/frontend_simple/modules/main.scss b/resources/sass/frontend_simple/modules/main.scss
index a1b63f156..abac6e1e9 100644
--- a/resources/sass/frontend_simple/modules/main.scss
+++ b/resources/sass/frontend_simple/modules/main.scss
@@ -1,4 +1,4 @@
-#main{
+body.landing_page  #main{
     background-color: $color_background_grey;
 
     .main_content{

From 5a7df08f665b86fb6c84a1bac868c243898e68e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nejc=20Kova=C4=8D?= <nejc.kouko@gmail.com>
Date: Thu, 14 Jul 2022 10:35:37 +0200
Subject: [PATCH 061/110] GDPR spremenjen text za potrditev

---
 lang/1.php | 2 +-
 lang/2.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lang/1.php b/lang/1.php
index f529985c7..e7046ce63 100644
--- a/lang/1.php
+++ b/lang/1.php
@@ -8293,7 +8293,7 @@ $lang = array (
 	'srv_gdpr_drupal_q1_answer6' 	=> '<b>Preklic</b> privolitve v obdelavo osebnih podatkov v določeni anketi',
 	'srv_gdpr_drupal_q2_note' 		=> 'Prosimo, čim bolj natančno opišite, na osnovi katerih podatkov lahko identificiramo vaš vnos v anketi (npr. email, ime, komentar, specifične kombinacije odgovorov) in za kateri podatek oziroma podatke želite oddati zahtevek za izbris, spremembo ali vpogled. ',
 	'srv_gdpr_drupal_check' 		=> 'Želim, da me avtor obvesti o izvedeni zahtevi na zgoraj navedeni elektronski naslov.',
-	'srv_gdpr_drupal_end' 			=> 'S klikom na Potrdi bo vaša zahteva poslana avtorju raziskave.',
+	'srv_gdpr_drupal_end' 			=> 'S klikom na "POTRDI" bo vaša zahteva poslana avtorju raziskave.',
 	'users_gdpr_title' 		=> 'GDPR soglasje',
 	'users_gdpr1'			=> 'Da',
 	'users_gdpr0'			=> 'Ne',
diff --git a/lang/2.php b/lang/2.php
index bc05bac20..92fc0e255 100644
--- a/lang/2.php
+++ b/lang/2.php
@@ -8192,7 +8192,7 @@ GDPR introduction preview",
 	'srv_gdpr_drupal_q1_answer6' => '<b>Withdrawal</b> of consent of processing of personal data in a specific survey',
 	'srv_gdpr_drupal_q2_note' => 'Please describe as accurately as possible, on the basis of which data can we identify your survey entry (e.g., email, name, comment, specific combination of answers), and for which data you want to file a request for deletion, change or insight.',
 	'srv_gdpr_drupal_check' => 'Želim, da me avtor obvesti o izvedeni zahtevi na zgoraj navedeni elektronski naslov.',
-	'srv_gdpr_drupal_end' => 'By clicking Submit, your request will be sent to the author of the survey.',
+	'srv_gdpr_drupal_end' => 'By clicking "SUBMIT", your request will be sent to the author of the survey.',
 	'srv_gdpr_notification_title' 		=> "Dear user of 1KA tool,",   
 	'srv_gdpr_notification_title_aai' 		=> "Dear user of 1KA.ARNES.SI tool,",   
 	'srv_gdpr_notification_text1' 		=> "As part of the development process of 1KA tool, we continually improve existing functionalities and develop new ones. We believe that new functionalities are interesting to you and you want to be informed about them, also about our annual event, the Web Survey Day.",                    

From 2248c1613b42a545e0f56b0f89f9fe01585d6649 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nejc=20Kova=C4=8D?= <nejc.kouko@gmail.com>
Date: Thu, 14 Jul 2022 12:10:30 +0200
Subject: [PATCH 062/110] GDPR popravki

---
 frontend/simple/css/style.css                    | 8 ++++++--
 resources/sass/frontend_simple/basic/basic.scss  | 3 ++-
 resources/sass/frontend_simple/basic/colors.scss | 1 +
 resources/sass/frontend_simple/basic/fonts.scss  | 1 +
 resources/sass/frontend_simple/basic/mobile.scss | 2 +-
 resources/sass/frontend_simple/modules/GDPR.scss | 5 ++++-
 6 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/frontend/simple/css/style.css b/frontend/simple/css/style.css
index c89e3cac8..9359781df 100644
--- a/frontend/simple/css/style.css
+++ b/frontend/simple/css/style.css
@@ -103,8 +103,9 @@ input[type=email] {
   box-sizing: border-box;
   height: 55px;
   padding: 8px 18px;
-  font-size: 17px;
+  font-size: 16px;
   color: #333;
+  font-family: "Source Sans Pro";
   background-color: white;
   border: 1px solid #cccccc;
 }
@@ -848,7 +849,7 @@ body #main .main_content input[type=password] {
 body #main .main_content input[type=button] {
     display: block;
     width: 100%;
-    margin: 20px auto !important;
+    margin: 20px 0px !important;
   }
   body #main .main_content .have_account {
     display: block;
@@ -1262,6 +1263,7 @@ iframe {
 
 body.gdpr {
   line-height: 20px;
+  color: #343434;
 }
 
 .gdpr #main .main_content {
@@ -1316,6 +1318,7 @@ body.gdpr .input_field div.label label {
   padding: 0px;
   padding-left: 8px;
   margin: 0px;
+  font-family: "Source Sans Pro";
 }
 
 body .gdpr form p:first-of-type {
@@ -1366,6 +1369,7 @@ form p:nth-of-type(2) {
 form .opis {
   font-weight: 600;
   margin: 0px 0px 4px 0px;
+  line-height: normal;
 }
 
 #gdpr-note {
diff --git a/resources/sass/frontend_simple/basic/basic.scss b/resources/sass/frontend_simple/basic/basic.scss
index d3bfd5ec7..710dfcbfd 100644
--- a/resources/sass/frontend_simple/basic/basic.scss
+++ b/resources/sass/frontend_simple/basic/basic.scss
@@ -91,8 +91,9 @@ input[type="email"]{
     height: 55px;
     padding: 8px 18px;
 
-    font-size: 17px;
+    font-size: 16px;
     color: $color_text_dark;
+    font-family: $SansPro_font;
 
     background-color: white;
     border: 1px solid $color_border;
diff --git a/resources/sass/frontend_simple/basic/colors.scss b/resources/sass/frontend_simple/basic/colors.scss
index d32135a26..41ad0c0c0 100644
--- a/resources/sass/frontend_simple/basic/colors.scss
+++ b/resources/sass/frontend_simple/basic/colors.scss
@@ -5,6 +5,7 @@ $color_blue: #1e88e5;
 $color_text: #535050;
 $color_text_light: #979797;
 $color_text_dark: #333;
+$color_text_black: #343434;
 
 $border_color: #646464;
 
diff --git a/resources/sass/frontend_simple/basic/fonts.scss b/resources/sass/frontend_simple/basic/fonts.scss
index cf76cdeb2..cc15f9def 100644
--- a/resources/sass/frontend_simple/basic/fonts.scss
+++ b/resources/sass/frontend_simple/basic/fonts.scss
@@ -5,6 +5,7 @@
 
 
 $font: 'Montserrat', sans-serif;
+$SansPro_font: "Source Sans Pro";
 
 
 .thin{
diff --git a/resources/sass/frontend_simple/basic/mobile.scss b/resources/sass/frontend_simple/basic/mobile.scss
index 09d922d01..79e4d297e 100644
--- a/resources/sass/frontend_simple/basic/mobile.scss
+++ b/resources/sass/frontend_simple/basic/mobile.scss
@@ -186,7 +186,7 @@
                 input[type="button"]{
                     display: block;
                     width: 100%;
-                    margin: 20px auto !important;
+                    margin: 20px 0px !important;
                 }
 
                 .have_account{
diff --git a/resources/sass/frontend_simple/modules/GDPR.scss b/resources/sass/frontend_simple/modules/GDPR.scss
index a6175e517..c675bfe72 100644
--- a/resources/sass/frontend_simple/modules/GDPR.scss
+++ b/resources/sass/frontend_simple/modules/GDPR.scss
@@ -6,6 +6,7 @@
 
 body.gdpr {
     line-height: 20px;
+    color: $color_text_black;
 }
 
 .gdpr #main .main_content {
@@ -69,6 +70,7 @@ body.gdpr .input_field div.label label {
     padding: 0px;
     padding-left: 8px;
     margin: 0px;
+    font-family: $SansPro_font;
 }
 
 body .gdpr form p:first-of-type{
@@ -123,8 +125,9 @@ form p:nth-of-type(2){
 }
 form .opis {
     font-weight: 600;
-
+    
     margin: 0px 0px 4px 0px;
+    line-height: normal;
 }
 
 #gdpr-note {

From 5f6b0218485ff5f2796081ab0e1c976fa0f342d8 Mon Sep 17 00:00:00 2001
From: tejagerjovic <teja.gerjovic@fdv.uni-lj.si>
Date: Thu, 14 Jul 2022 12:25:55 +0200
Subject: [PATCH 063/110] Napredne nastavitve v sredino vsebine - v2

---
 admin/survey/Branching.php                    | 112 +-----------------
 public/css/admin_new.css                      |   6 +-
 .../survey_edit/top_center_settings.scss      |   6 +-
 3 files changed, 7 insertions(+), 117 deletions(-)

diff --git a/admin/survey/Branching.php b/admin/survey/Branching.php
index 14802b853..40a03b9e7 100644
--- a/admin/survey/Branching.php
+++ b/admin/survey/Branching.php
@@ -323,20 +323,6 @@ class Branching {
 		$this->survey_type = SurveyInfo::getInstance()->getSurveyColumn("survey_type");
 		$hierarhija = SurveyInfo::getInstance()->checkSurveyModule('hierarhija');
 
-		// Toolbox napredne nastavitve (prestevilci, dodaj prelome, debug...)
-		if($this->survey_type > 1 && !SurveyInfo::getInstance()->checkSurveyModule('hierarhija') ){
-		
-			echo '<div id="toolbox_advanced_settings" class="toolbox">';
-
-			echo '<div class="toolbox_item"><span class="item_icon faicon wheel_32"></span> <span class="item_text">'.$lang['srv_advanced_settings_title'].'</span></div>';
-
-			$this->toolbox_add_advanced_settings();
-
-			echo '</div>';
-
-            echo '<div class="toolbox_border"></div>';
-		}
-
 
 		echo '<div id="toolbox_basic" class="toolbox '.($this->survey_type==1?' forma':'').($hierarhija ? ' toolbox-hierarhija' : '').'">';
 
@@ -596,97 +582,6 @@ class Branching {
 		echo '</div>';
     }
 
-	/**
-    * prikaze popup z vsemi tipi vprasanj
-    *
-    */
-    function toolbox_add_advanced_settings() {
-		global $lang;
-		global $admin_type;
-		global $site_url;
-		global $global_user_id;
-
-
-        $row = SurveyInfo::getInstance()->getSurveyRow();
-
-    	# preverimo ali imamo ife. Če so, izpisujemo vse ikonce
-		$sql_query = sisplet_query("SELECT count(*) AS if_count FROM srv_branching WHERE element_if > 0 AND ank_id = '".$this->anketa."'");
-		$row_query = mysqli_fetch_array($sql_query);
-		$has_if = (int)$row_query['if_count'] > 0 ? true : false;
-
-		# ali prikazujemo vse ikonice ali samo "simpl" ikonice
-		$sql_query_fv = sisplet_query("SELECT count(*) AS full_view FROM srv_user_setting_for_survey WHERE sid='".$this->anketa."' AND uid='".$global_user_id."' AND what='display_full_toolbox' AND value='1'");
-		$row_query_fv = mysqli_fetch_array($sql_query_fv);
-		$full_view = (int)$row_query_fv['full_view'] == 1 ? true : false;
-		$full_view = true;
-
-
-		echo '<div id="toolbox_advanced_settings_holder" class="toolbox_expand">';
-
-		echo '<div class="toolbox_expand_title"><span class="faicon wheel_32"></span>'.$lang['srv_advanced_settings_title'].'</div>';
-
-    
-        echo '<div class="toolbox_expand_segment">';
-
-		// Razsiri / skrci
-		if($this->survey_type > 1){
-			if($this->expanded) {
-				echo '<p class="segment_option">';
-				echo '<a href="index.php?anketa='.$this->anketa.'&a=branching&change_mode=1&what=expanded&value=0" title="'.$lang['srv_expanded_0'].'">';
-				echo '<span class="faicon compress"></span>';
-				echo $lang['srv_expand_0'];
-				echo '</a>';
-				echo '</p>';
-			}
-			else {
-				echo '<p class="segment_option">';
-				echo '<a href="index.php?anketa='.$this->anketa.'&a=branching&change_mode=1&what=expanded&value=1" title="'.$lang['srv_expanded_1'].'">';
-				echo '<span class="faicon expand"></span>';
-				echo $lang['srv_expand_1'];
-				echo '</a>';
-				echo '</p>';
-			}
-		}
-
-		/*if ($has_if == true) {
-			echo '<p class="segment_option">';
-			echo '<a href="#" onClick="expandCollapseAllPlusMinus(\'expand\'); return false;"><span class="faicon plus_square" title="'.$lang['srv_expand'].'"></span>'.$lang['srv_expand'].'</a>'."\n";
-			echo '<a href="#" onClick="expandCollapseAllPlusMinus(\'collapse\'); return false;"><span class="faicon minus_square" title="'.$lang['srv_collapse'].'"></span>'.$lang['srv_collapse'].'</a>'."\n";
-			echo '</p>';
-		}*/
-
-		# find & replace
-		if ($row['locked'] == 0) {
-			echo '<p class="segment_option">';
-			echo '<a href="#" onclick="find_replace(); return false;" title="'.$lang['srv_find_replace_words'].'" ><span class="faicon replace"></span>'.$lang['srv_find_replace_words'].'</a>';
-			echo '</p>';
-		}
-
-		if ($row['locked'] == 0 && $full_view == true) {
-			echo '<p class="segment_option">';
-			echo '<a href="#" onclick="javascript:pagebreak_all(); return false;" title="'.$lang['srv_pagebreak_all'].'"><span class="faicon paragraph"></span>'.$lang['srv_pagebreak_all'].'</a> '."\n";
-			echo '</p>';
-		}
-
-		# Hrošč je viden samo če imamo ife in razširjen pogled
-		if ($row['locked'] == 0 && $full_view == true) { // if ($row['flat'] == 0)
-			echo '<p class="segment_option">';
-			echo '<a href="#" onclick="javascript:check_pogoji(); return false;" title="'.$lang['srv_check_pogoji'].'"><span class="faicon bug"></span>'.$lang['srv_check_pogoji'].'</a> '."\n";
-			echo '</p>';
-		}
-
-		if ($row['locked'] == 0 && $full_view == true) {
-			echo '<p class="segment_option">';
-			echo '<a href="#" onclick="prestevilci(); return false;"><span class="faicon hashtag" title="'.$lang['srv_grupe_recount_branching'].'"></span>'.$lang['srv_grupe_recount_branching'].'</a>' . Help :: display('srv_grupe_recount_branching')  ."\n";
-			echo '</p>';
-		}
-		
-		echo '</div>';
-
-
-		echo '</div>';
-    }
-
     /**
      * preview
      *
@@ -1835,20 +1730,19 @@ class Branching {
 		}
 		echo '</div>';
 
-		// Klik izven razprith nastavitev - zapremo okno
-        /**echo '<script>
+		//Klik izven razprith nastavitev - zapremo okno
+        echo '<script>
             $(document).mouseup(function(e){
                 var container = $("#top_napredne_dropdown");
             
 				if (!container.is(e.target) && container.has(e.target).length === 0){
                     $("#top_napredne_dropdown").addClass("displayNone");
-					$("#top_napredne_gumb").removeClass("border_blue");
 					$("#top_napredne_gumb").removeClass("border_blue");
 					$("#top_napredne_icon").addClass("fa-angle-down");
 					$("#top_napredne_icon").removeClass("fa-angle-up");
                 }
             });
-        </script>';**/
+        </script>';
 
 		echo '</div>';
 
diff --git a/public/css/admin_new.css b/public/css/admin_new.css
index 91f812133..000108396 100644
--- a/public/css/admin_new.css
+++ b/public/css/admin_new.css
@@ -20464,8 +20464,6 @@ img.mapster_el {
   display: flex;
   flex-direction: row;
   margin-bottom: 20px;
-  padding-bottom: 22px;
-  border-bottom: 1px solid #D3D3D3;
   width: 100%;
   justify-content: space-between;
 }
@@ -20508,7 +20506,7 @@ img.mapster_el {
   position: absolute;
   z-index: 99;
   width: auto;
-  padding-bottom: 8px;
+  padding: 8px 16px;
   background: #FFFFFF;
   border: 1px solid #E5E5E5;
   box-shadow: 0px 0px 7px rgba(0, 0, 0, 0.15);
@@ -20519,7 +20517,7 @@ img.mapster_el {
 .top_center_settings .right_settings #top_napredne_holder #top_napredne_dropdown .segment_option {
   cursor: pointer;
   white-space: nowrap;
-  padding: 5px 16px 5px 16px;
+  padding: 5px 0;
   font-size: 14px;
   line-height: 18px;
   transition: 0.2s;
diff --git a/resources/sass/admin_new/pages/survey_edit/top_center_settings.scss b/resources/sass/admin_new/pages/survey_edit/top_center_settings.scss
index 6b32feeda..506c0392b 100644
--- a/resources/sass/admin_new/pages/survey_edit/top_center_settings.scss
+++ b/resources/sass/admin_new/pages/survey_edit/top_center_settings.scss
@@ -2,8 +2,6 @@
     display: flex;
     flex-direction: row;
     margin-bottom: 20px;
-    padding-bottom: 22px;
-    border-bottom: 1px solid $dark-gray2;
     width: 100%;
 
     justify-content: space-between;
@@ -49,7 +47,7 @@
                 z-index: 99;
 
                 width: auto;
-                padding-bottom: 8px;
+                padding: 8px 16px;
                 background: $white;
                 border: 1px solid $gray;
                 
@@ -62,7 +60,7 @@
                     cursor: pointer;
                     white-space: nowrap;
         
-                    padding: 5px 16px 5px 16px;
+                    padding: 5px 0;
         
                     font-size: 14px;
                     line-height: 18px;

From ab3ae9273b9cd47f1603bca33519e7c57e69816c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nejc=20Kova=C4=8D?= <nejc.kouko@gmail.com>
Date: Thu, 14 Jul 2022 13:05:28 +0200
Subject: [PATCH 064/110] LOGIN/REGISTER FORM - nepravilen mail,geslo popravki
 bugov (test)

---
 frontend/simple/css/style.css                 | 148 ++++++++++++++
 .../sass/frontend_simple/basic/popravki.scss  | 180 +++++++++++++++++-
 2 files changed, 327 insertions(+), 1 deletion(-)

diff --git a/frontend/simple/css/style.css b/frontend/simple/css/style.css
index 9359781df..d3eb4e551 100644
--- a/frontend/simple/css/style.css
+++ b/frontend/simple/css/style.css
@@ -1256,6 +1256,154 @@ iframe {
   width: unset;
 }
 
+body.login_noEmail #main {
+  background-image: none;
+}
+
+body.login_noEmail #main .main_content {
+  padding-top: 70px;
+}
+
+body.login_noEmail #main .app_subtitle {
+  text-shadow: unset;
+  color: #333333;
+  font-weight: 400;
+  line-height: 26px;
+  font-size: 18px;
+  margin-top: 25px;
+  margin-bottom: 24px;
+}
+
+body.login_noEmail #main .landing_page_window {
+  max-width: 400px;
+  border: 1px solid #C4C4C4;
+}
+
+body.landing_page #main .landing_page_window .tabs .tab,
+body.register #main .landing_page_window .tabs .tab,
+body.login #main .landing_page_window .tabs .tab,
+body.login_noEmail #main .landing_page_window .tabs .tab {
+  background-color: #F8F8F8;
+  color: #888888;
+  font-size: 16px;
+  font-weight: 600;
+  background-color: unset;
+  color: #777777;
+  height: 39px;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
+
+body.login_noEmail #main .landing_page_window .tabs .tab.active {
+  background-color: #ffffff;
+  color: #1e88e5;
+}
+
+body.login_noEmail #main .landing_page_window #login_holder .login_form {
+  text-align: left;
+}
+
+body.login_noEmail #main .landing_page_window #login_holder .login_form label:first-of-type {
+  margin-top: 0px;
+}
+
+body.login_noEmail #main .landing_page_window #login_holder .login_form .lostpass {
+  position: unset;
+}
+
+body.landing_page #main .landing_page_window .error_holder, body.register #main .landing_page_window .error_holder, body.login #main .landing_page_window .error_holder, body.login_noEmail #main .landing_page_window .error_holder {
+  margin-top: 16px;
+}
+
+body.login_noEmail #main .landing_page_window input[type=submit] {
+  width: 100%;
+  max-width: 100%;
+  margin: 16px 0px;
+}
+
+body.landing_page #main .landing_page_window #registration_holder,
+body.register #main .landing_page_window #registration_holder,
+body.login #main .landing_page_window #registration_holder,
+body.login_noEmail #main .landing_page_window #registration_holder {
+  text-align: left;
+}
+
+body.login_noEmail #main .landing_page_window label:first-of-type {
+  margin-top: 0px;
+}
+
+body.login #main {
+  background-image: none;
+}
+
+body.login #main .main_content {
+  padding-top: 70px;
+}
+
+body.login #main .app_subtitle {
+  text-shadow: unset;
+  color: #333333;
+  font-weight: 400;
+  line-height: 26px;
+  font-size: 18px;
+  margin-top: 25px;
+  margin-bottom: 24px;
+}
+
+body.login #main .landing_page_window {
+  max-width: 400px;
+  border: 1px solid #C4C4C4;
+}
+
+body.login #main .landing_page_window .tabs .tab {
+  background-color: #F8F8F8;
+  color: #888888;
+  font-size: 16px;
+  font-weight: 600;
+  background-color: unset;
+  color: #777777;
+  height: 39px;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
+
+body.login #main .landing_page_window .tabs .tab.active {
+  background-color: #ffffff;
+  color: #1e88e5;
+}
+
+body.login #main .landing_page_window #login_holder .login_form {
+  text-align: left;
+}
+
+body.login #main .landing_page_window #login_holder .login_form label:first-of-type {
+  margin-top: 0px;
+}
+
+body.login #main .landing_page_window #login_holder .login_form .lostpass {
+  position: unset;
+}
+
+body.login #main .landing_page_window .error_holder {
+  margin-top: 16px;
+}
+
+body.login #main .landing_page_window input[type=submit] {
+  width: 100%;
+  max-width: 100%;
+  margin: 16px 0px;
+}
+
+body.login #main .landing_page_window #registration_holder {
+  text-align: left;
+}
+
+body.login #main .landing_page_window label:first-of-type {
+  margin-top: 0px;
+}
+
 /* GDPR ZAHTEVEK -------------------------------------- */
 #main {
   background-color: #FFFFFF;
diff --git a/resources/sass/frontend_simple/basic/popravki.scss b/resources/sass/frontend_simple/basic/popravki.scss
index 589ec6633..c8757de02 100644
--- a/resources/sass/frontend_simple/basic/popravki.scss
+++ b/resources/sass/frontend_simple/basic/popravki.scss
@@ -292,4 +292,182 @@ iframe {
 .rc-anchor-normal .rc-anchor-checkbox-label{
     max-width: 152px;
     width: unset;
-}
\ No newline at end of file
+}
+
+
+
+//------------- POPRAVKI ( napačno geslo, elektronski naslov etc.)--------------------------
+
+
+// napačen EMAIL------------
+
+body.login_noEmail #main{
+    background-image: none;
+}
+
+body.login_noEmail #main .main_content{
+    padding-top: 70px;
+}
+
+body.login_noEmail #main .app_subtitle {
+    text-shadow: unset;
+    color: #333333;
+    
+    font-weight: 400;
+    line-height: 26px;
+    font-size: 18px;
+    
+    margin-top: 25px;
+    margin-bottom: 24px;
+}
+
+body.login_noEmail #main .landing_page_window{
+    max-width: 400px;
+    border: 1px solid #C4C4C4;
+}
+
+body.landing_page #main .landing_page_window .tabs .tab,
+body.register #main .landing_page_window .tabs .tab,
+body.login #main .landing_page_window .tabs .tab,
+body.login_noEmail #main .landing_page_window .tabs .tab {
+    background-color: $color_background_grey;
+    color: #888888;
+
+    font-size: 16px;
+    font-weight: 600;
+    background-color: unset;
+    color: #777777;
+    height: 39px;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+
+
+}
+body.login_noEmail #main .landing_page_window .tabs .tab.active{
+    background-color: $color_background;
+    color: $color_blue;
+}
+
+body.login_noEmail #main .landing_page_window #login_holder .login_form {
+    text-align: left;
+}
+
+body.login_noEmail #main .landing_page_window #login_holder .login_form label:first-of-type{
+    margin-top: 0px;
+}
+
+body.login_noEmail #main .landing_page_window #login_holder .login_form .lostpass {
+    position: unset;
+}
+
+body.landing_page #main .landing_page_window .error_holder, body.register #main .landing_page_window .error_holder, body.login #main .landing_page_window .error_holder, body.login_noEmail #main .landing_page_window .error_holder {
+    margin-top: 16px;
+}
+
+body.login_noEmail #main .landing_page_window input[type=submit]{
+    width: 100%;
+    max-width: 100%;
+
+    margin: 16px 0px;
+
+}
+
+// napačen EMAIL - registracija 
+
+body.landing_page #main .landing_page_window #registration_holder, 
+body.register #main .landing_page_window #registration_holder, 
+body.login #main .landing_page_window #registration_holder, 
+body.login_noEmail #main .landing_page_window #registration_holder {
+    text-align: left;
+}
+
+body.login_noEmail #main .landing_page_window label:first-of-type {
+    margin-top: 0px;
+}
+
+
+// NAPAČNO GESLO -------------------------------------
+
+body.login #main{
+    background-image: none;
+}
+
+body.login #main .main_content{
+    padding-top: 70px;
+}
+
+body.login #main .app_subtitle {
+    text-shadow: unset;
+    color: #333333;
+    
+    font-weight: 400;
+    line-height: 26px;
+    font-size: 18px;
+    
+    margin-top: 25px;
+    margin-bottom: 24px;
+}
+
+body.login #main .landing_page_window{
+    max-width: 400px;
+    border: 1px solid #C4C4C4;
+}
+
+body.login #main .landing_page_window .tabs .tab {
+    background-color: $color_background_grey;
+    color: #888888;
+
+    font-size: 16px;
+    font-weight: 600;
+    background-color: unset;
+    color: #777777;
+    height: 39px;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+
+
+}
+body.login #main .landing_page_window .tabs .tab.active{
+    background-color: $color_background;
+    color: $color_blue;
+}
+
+body.login #main .landing_page_window #login_holder .login_form {
+    text-align: left;
+}
+
+body.login #main .landing_page_window #login_holder .login_form label:first-of-type{
+    margin-top: 0px;
+}
+
+body.login #main .landing_page_window #login_holder .login_form .lostpass {
+    position: unset;
+}
+
+
+body.login #main .landing_page_window .error_holder {
+    margin-top: 16px;
+}
+
+body.login #main .landing_page_window input[type=submit]{
+    width: 100%;
+    max-width: 100%;
+
+    margin: 16px 0px;
+
+}
+
+// napačno geslo - registracija 
+
+body.login #main .landing_page_window #registration_holder {
+    text-align: left;
+}
+
+body.login #main .landing_page_window label:first-of-type {
+    margin-top: 0px;
+}
+
+
+//-------------------------------------
\ No newline at end of file

From 55a70a308dc5941a9a3b57b4f2bf7c5b5011b20d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nejc=20Kova=C4=8D?= <nejc.kouko@gmail.com>
Date: Thu, 14 Jul 2022 13:19:41 +0200
Subject: [PATCH 065/110] LOGIN/REGISTER FORM - nepravilna registracija
 popravki bugov

---
 frontend/simple/css/style.css                 | 71 ++++++++++++++++
 .../sass/frontend_simple/basic/popravki.scss  | 85 ++++++++++++++++++-
 2 files changed, 155 insertions(+), 1 deletion(-)

diff --git a/frontend/simple/css/style.css b/frontend/simple/css/style.css
index d3eb4e551..8307a3f7b 100644
--- a/frontend/simple/css/style.css
+++ b/frontend/simple/css/style.css
@@ -1404,6 +1404,77 @@ body.login #main .landing_page_window label:first-of-type {
   margin-top: 0px;
 }
 
+body.register #main {
+  background-image: none;
+}
+
+body.register #main .main_content {
+  padding-top: 70px;
+}
+
+body.register #main .app_subtitle {
+  text-shadow: unset;
+  color: #333333;
+  font-weight: 400;
+  line-height: 26px;
+  font-size: 18px;
+  margin-top: 25px;
+  margin-bottom: 24px;
+}
+
+body.register #main .landing_page_window {
+  max-width: 400px;
+  border: 1px solid #C4C4C4;
+}
+
+body.register #main .landing_page_window .tabs .tab {
+  background-color: #F8F8F8;
+  color: #888888;
+  font-size: 16px;
+  font-weight: 600;
+  background-color: unset;
+  color: #777777;
+  height: 39px;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
+
+body.register #main .landing_page_window .tabs .tab.active {
+  background-color: #ffffff;
+  color: #1e88e5;
+}
+
+body.register #main .landing_page_window #login_holder .login_form {
+  text-align: left;
+}
+
+body.register #main .landing_page_window #login_holder .login_form label:first-of-type {
+  margin-top: 0px;
+}
+
+body.register #main .landing_page_window #login_holder .login_form .lostpass {
+  position: unset;
+}
+
+body.register #main .landing_page_window .error_holder {
+  margin-top: 0px;
+}
+
+body.register #main .landing_page_window input[type=submit] {
+  width: 100%;
+  max-width: 100%;
+  margin: 16px 0px;
+}
+
+body.register #main .landing_page_window #registration_holder {
+  text-align: left;
+}
+
+body.register #main .landing_page_window label:first-of-type {
+  margin-top: 0px;
+}
+
 /* GDPR ZAHTEVEK -------------------------------------- */
 #main {
   background-color: #FFFFFF;
diff --git a/resources/sass/frontend_simple/basic/popravki.scss b/resources/sass/frontend_simple/basic/popravki.scss
index c8757de02..a8624fd86 100644
--- a/resources/sass/frontend_simple/basic/popravki.scss
+++ b/resources/sass/frontend_simple/basic/popravki.scss
@@ -470,4 +470,87 @@ body.login #main .landing_page_window label:first-of-type {
 }
 
 
-//-------------------------------------
\ No newline at end of file
+// REGISTER ----------------------
+
+body.register #main{
+    background-image: none;
+}
+
+body.register  #main .main_content{
+    padding-top: 70px;
+}
+
+body.register #main .app_subtitle {
+    text-shadow: unset;
+    color: #333333;
+    
+    font-weight: 400;
+    line-height: 26px;
+    font-size: 18px;
+    
+    margin-top: 25px;
+    margin-bottom: 24px;
+}
+
+
+body.register #main .landing_page_window{
+    max-width: 400px;
+    border: 1px solid #C4C4C4;
+}
+
+body.register #main .landing_page_window .tabs .tab {
+    background-color: $color_background_grey;
+    color: #888888;
+
+    font-size: 16px;
+    font-weight: 600;
+    background-color: unset;
+    color: #777777;
+    height: 39px;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+
+
+}
+body.register #main .landing_page_window .tabs .tab.active{
+    background-color: $color_background;
+    color: $color_blue;
+}
+
+body.register #main .landing_page_window #login_holder .login_form {
+    text-align: left;
+}
+
+body.register #main .landing_page_window #login_holder .login_form label:first-of-type{
+    margin-top: 0px;
+}
+
+body.register #main .landing_page_window #login_holder .login_form .lostpass {
+    position: unset;
+}
+
+
+body.register #main .landing_page_window .error_holder {
+    margin-top: 0px;
+}
+
+body.register #main .landing_page_window input[type=submit]{
+    width: 100%;
+    max-width: 100%;
+
+    margin: 16px 0px;
+
+}
+
+// napačno geslo - registracija 
+
+body.register #main .landing_page_window #registration_holder {
+    text-align: left;
+}
+
+body.register #main .landing_page_window label:first-of-type {
+    margin-top: 0px;
+}
+
+// -----------------------------------------
\ No newline at end of file

From df63462290580b6e46f35f8927b423ad0b201773 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nejc=20Kova=C4=8D?= <nejc.kouko@gmail.com>
Date: Thu, 14 Jul 2022 14:41:48 +0200
Subject: [PATCH 066/110] GDPR input field font / velikost pisave

---
 frontend/simple/css/style.css                    | 3 +++
 resources/sass/frontend_simple/modules/GDPR.scss | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/frontend/simple/css/style.css b/frontend/simple/css/style.css
index 8307a3f7b..46b97cf4d 100644
--- a/frontend/simple/css/style.css
+++ b/frontend/simple/css/style.css
@@ -1538,6 +1538,7 @@ body.gdpr .input_field div.label label {
   padding-left: 8px;
   margin: 0px;
   font-family: "Source Sans Pro";
+  font-size: 16px;
 }
 
 body .gdpr form p:first-of-type {
@@ -1597,6 +1598,8 @@ form .opis {
   margin: 0px;
   width: 100%;
   border-radius: 0px;
+  font-size: 16px;
+  font-family: "Source Sans Pro";
 }
 
 .register_holder p:last-of-type {
diff --git a/resources/sass/frontend_simple/modules/GDPR.scss b/resources/sass/frontend_simple/modules/GDPR.scss
index c675bfe72..12b68d7cc 100644
--- a/resources/sass/frontend_simple/modules/GDPR.scss
+++ b/resources/sass/frontend_simple/modules/GDPR.scss
@@ -71,6 +71,7 @@ body.gdpr .input_field div.label label {
     padding-left: 8px;
     margin: 0px;
     font-family: $SansPro_font;
+    font-size: 16px;
 }
 
 body .gdpr form p:first-of-type{
@@ -137,6 +138,8 @@ form .opis {
     width: 100%;
 
     border-radius: 0px;
+    font-size: 16px;
+    font-family: $SansPro_font;
 
 }
 

From 771b51c649f8716323a27fa1151aec08b2340402 Mon Sep 17 00:00:00 2001
From: tejagerjovic <teja.gerjovic@fdv.uni-lj.si>
Date: Thu, 14 Jul 2022 15:07:24 +0200
Subject: [PATCH 067/110] Napredne nastavitve v sredino vsebine - v3 - arhiv
 popup

---
 admin/survey/Branching.php                    |  2 +-
 admin/survey/SurveyAdminAjax.php              | 26 +++++++++++++++++++
 admin/survey/script/script.js                 |  9 +++++++
 lang/1.php                                    |  1 +
 lang/2.php                                    |  1 +
 public/css/admin_new.css                      |  4 +--
 .../survey_edit/top_center_settings.scss      |  4 +--
 7 files changed, 42 insertions(+), 5 deletions(-)

diff --git a/admin/survey/Branching.php b/admin/survey/Branching.php
index 40a03b9e7..0d7756a6a 100644
--- a/admin/survey/Branching.php
+++ b/admin/survey/Branching.php
@@ -1675,7 +1675,7 @@ class Branching {
 		
 		echo '<div class="left_settings">';
 		// Arhiviraj - ENKLIK ARHIV
-		echo '<div class="button" onclick="create_archive_survey(\'' . $this->anketa .'\'); return false;">';
+		echo '<div class="button" onclick="oneClickArchive();">';
 		echo '<span class="faicon arhiv blue"></span>';
 		echo $lang['srv_analiza_arhiviraj'];
 		echo '</div>';
diff --git a/admin/survey/SurveyAdminAjax.php b/admin/survey/SurveyAdminAjax.php
index 7dfc9cce5..4b343c4cc 100644
--- a/admin/survey/SurveyAdminAjax.php
+++ b/admin/survey/SurveyAdminAjax.php
@@ -7238,6 +7238,32 @@ class SurveyAdminAjax {
 		}
 		echo '</div>';
 	}
+
+	// Enklikarhiv popup
+	private function ajax_oneClickArchive(){
+	    global $lang;
+
+		$anketa = $_POST['anketa'];
+		
+		echo '<h2>'.$lang['srv_analiza_arhiviraj'].'</h2>';
+		echo '<div class="popup_close"><a href="#" onClick="popupClose(); return false;">✕</a></div>';
+		
+		
+		echo '<div class="popup_content">';
+		echo '<p class="bottom16">'.$lang['srv_questionnaire_archives_text_popup'].'</p>';
+
+		echo '<div class="setting_holder">';
+		echo $lang['srv_questionnaire_archives_note'].':';
+		echo '<input class="large w400" name="intro_opomba" id="intro_opomba" type="text"/>';
+		echo '</div>';
+		
+		echo '</div>';
+
+		echo '<div class="button_holder">';
+        echo '<button class="medium white-blue" onClick="popupClose(); return false;">'.$lang['edit1338'].'</button>';
+        echo '<button class="medium blue" onclick="create_archive_survey(\'' . $this->anketa .'\'); return false;">'.$lang['srv_backup_button'].'</button>';
+        echo '</div>';
+	}
 }
 
 ?>
\ No newline at end of file
diff --git a/admin/survey/script/script.js b/admin/survey/script/script.js
index 9187c562a..65faa9537 100644
--- a/admin/survey/script/script.js
+++ b/admin/survey/script/script.js
@@ -5629,4 +5629,13 @@ function toggleSurveyTopSettings() {
 	$("#top_napredne_icon").toggleClass("fa-angle-up");
 	$("#top_napredne_gumb").toggleClass("border_blue");
 	$("#top_napredne_dropdown").toggleClass("displayNone");
+}
+
+//Vprašalnik - enklikarhiv gumb
+function oneClickArchive(){
+	
+    $('#fade').fadeTo('slow', 1);
+	$('#general_popup').addClass('PopUpNarrow');
+	$('#general_popup').html('').fadeIn('slow');
+	$("#general_popup").load('ajax.php?a=oneClickArchive', {anketa: srv_meta_anketa_id});
 }
\ No newline at end of file
diff --git a/lang/1.php b/lang/1.php
index e7046ce63..7623396df 100644
--- a/lang/1.php
+++ b/lang/1.php
@@ -4226,6 +4226,7 @@ $lang = array (
 	"srv_archival_version_q"			=>	"Arhivske verzije vpra&#353;alnika",
 	"srv_questionnaire_archives"		=>	"Arhivi vprašalnika",
 	"srv_questionnaire_archives_text"		=>	"Pred spreminjanjem vprašalnika lahko obstoječo verzijo vprašalnika shranite tako, da izdelate arhivsko verzijo. Arhiv se izdela brez podatkov respondentov. S klikom na 'Izdelaj arhivsko verzijo vprašalnika' se v spodnjem seznamu generira arhivska verzija vprašalnika. Vsako arhivsko verzijo vprašalnika lahko aktivirate. Z aktivacijo se arhivska verzija avtomatsko ustvari kot nova anketa.",
+	"srv_questionnaire_archives_text_popup"		=>	"Pred spreminjanjem vprašalnika lahko obstoječo verzijo vprašalnika shranite tako, da izdelate arhivsko verzijo. Arhiv se izdela brez podatkov respondentov. S klikom na 'Izdelaj arhivsko verzijo vprašalnika' se generira arhivska verzija vprašalnika. Vsako arhivsko verzijo vprašalnika lahko aktivirate v zavihku 'UREJANJE' - 'Arhiv'. Z aktivacijo se arhivska verzija avtomatsko ustvari kot nova anketa.",
 	"srv_questionnaire_archives_note"		=>	"Opomba k arhivski verziji",
 	"srv_questionnaire_archives_date"		=>	"Datum arhiviranja",
 	"srv_questionnaire_archives_by"		=>	"Arhiviral/-a",
diff --git a/lang/2.php b/lang/2.php
index 92fc0e255..0a92bc3b2 100644
--- a/lang/2.php
+++ b/lang/2.php
@@ -4205,6 +4205,7 @@ $lang = array (
 	"srv_archival_version_q"			=>	"Questionnaire archive",
 	"srv_questionnaire_archives"		=>	"Questionnaire archive",
 	"srv_questionnaire_archives_text"		=>	"Before modifying the questionnaire, you can save the existing version of the questionnaire by creating an archive version. The archive is created without the respondents' data. Clicking on 'Create archive version of questionnaire' will generate an archive version of the questionnaire in the list below. Each archive version of the questionnaire can be activated. When activated, the archive version is automatically created as a new survey.",
+	"srv_questionnaire_archives_text_popup"		=>	"Before modifying the questionnaire, you can save the existing version of the questionnaire by creating an archive version. The archive is created without the respondents' data. Clicking on 'Create archive version of questionnaire' will generate an archive version of the questionnaire. Each archive version of the questionnaire can be activated from the 'EDIT' - 'Archive' tab. When activated, the archive version is automatically created as a new survey.",
 	"srv_questionnaire_archives_note"		=>	"Archive version note",
 	"srv_questionnaire_archives_date"		=>	"Archive date",
 	"srv_questionnaire_archives_by"		=>	"Archived by",
diff --git a/public/css/admin_new.css b/public/css/admin_new.css
index 000108396..f22d6bae7 100644
--- a/public/css/admin_new.css
+++ b/public/css/admin_new.css
@@ -20506,7 +20506,7 @@ img.mapster_el {
   position: absolute;
   z-index: 99;
   width: auto;
-  padding: 8px 16px;
+  padding: 8px 0;
   background: #FFFFFF;
   border: 1px solid #E5E5E5;
   box-shadow: 0px 0px 7px rgba(0, 0, 0, 0.15);
@@ -20517,7 +20517,7 @@ img.mapster_el {
 .top_center_settings .right_settings #top_napredne_holder #top_napredne_dropdown .segment_option {
   cursor: pointer;
   white-space: nowrap;
-  padding: 5px 0;
+  padding: 5px 16px;
   font-size: 14px;
   line-height: 18px;
   transition: 0.2s;
diff --git a/resources/sass/admin_new/pages/survey_edit/top_center_settings.scss b/resources/sass/admin_new/pages/survey_edit/top_center_settings.scss
index 506c0392b..119d50834 100644
--- a/resources/sass/admin_new/pages/survey_edit/top_center_settings.scss
+++ b/resources/sass/admin_new/pages/survey_edit/top_center_settings.scss
@@ -47,7 +47,7 @@
                 z-index: 99;
 
                 width: auto;
-                padding: 8px 16px;
+                padding: 8px 0;
                 background: $white;
                 border: 1px solid $gray;
                 
@@ -60,7 +60,7 @@
                     cursor: pointer;
                     white-space: nowrap;
         
-                    padding: 5px 0;
+                    padding: 5px 16px;
         
                     font-size: 14px;
                     line-height: 18px;

From 743e02bd68467ecf0d5ddbb65389f8339936c5ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nejc=20Kova=C4=8D?= <nejc.kouko@gmail.com>
Date: Thu, 14 Jul 2022 15:16:13 +0200
Subject: [PATCH 068/110] Introduction page  prelom

---
 public/css/admin_new.css                      | 70 ++-----------------
 .../pages/survey_edit/branching.scss          |  3 +-
 2 files changed, 6 insertions(+), 67 deletions(-)

diff --git a/public/css/admin_new.css b/public/css/admin_new.css
index 000108396..4e15488bd 100644
--- a/public/css/admin_new.css
+++ b/public/css/admin_new.css
@@ -13411,7 +13411,7 @@ div.drop_setting_transition {
 #branching ul li .pb_new .pb_page {
   display: flex;
   align-items: center;
-  width: 140px;
+  width: 200px;
   font-size: 16px;
   font-weight: 600;
   line-height: 16px;
@@ -28991,15 +28991,15 @@ iframe#ifmcontentstoprint {
 }
 
 .rsdl_bck1 {
-  background-color: #fae2e2 !important;
+  background-color: rgb(250, 226, 226) !important;
 }
 
 .rsdl_bck2 {
-  background-color: #ff9d9d !important;
+  background-color: rgb(255, 157, 157) !important;
 }
 
 .rsdl_bck3 {
-  background-color: #f84242 !important;
+  background-color: rgb(248, 66, 66) !important;
 }
 
 .rsdl_bck4 {
@@ -32428,24 +32428,19 @@ table.dataTable td:not(:first-of-type), table.dataTable th:not(:first-of-type) {
   #quick_comments_link.newCss {
     display: none;
   }
-
   #firstNavigation ol.right-side {
     display: none;
   }
-
   div.status_advanced {
     flex-direction: column;
   }
-
   div.status_advanced_box {
     width: 100%;
     box-sizing: border-box;
   }
-
   a.status_advanced_link {
     width: 95%;
   }
-
   .content_div_normalmode {
     overflow-x: auto;
   }
@@ -32513,7 +32508,6 @@ body #main_holder #main .wide {
     width: 100%;
     margin: 0;
   }
-
   fieldset {
     width: 100% !important;
     box-sizing: border-box !important;
@@ -32543,44 +32537,36 @@ fieldset textarea {
   fieldset .setting {
     height: auto !important;
   }
-
   .setting_horizontal_wrapper {
     flex-direction: column !important;
   }
-
   #vnosi_paginacija div select {
     display: inline-block;
     width: fit-content;
     margin: 0 5px;
     text-align: center;
   }
-
   div.breadcrumbs {
     display: block;
     padding: 15px;
     color: #1e88e5;
     font-weight: 600;
   }
-
   button.small, submit.small {
     min-width: auto;
     padding: 5px 16px;
   }
-
   button.medium, submit.medium {
     min-width: auto;
     padding: 10px 24px;
   }
-
   button.large, submit.large {
     min-width: auto;
     padding: 12px 32px;
   }
-
   .top_note {
     padding: 8px 16px;
   }
-
   header {
     /* Mobile meni */
     /* Mobile meni - NASTAVITVE V UREJANJU ANKETE*/
@@ -32836,7 +32822,6 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
   header .mobile_settings .mobile_settings_content a .setting_text {
     width: auto;
   }
-
   footer#srv_footer {
     display: flex;
     flex-direction: column;
@@ -32858,7 +32843,6 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
     padding: 0;
     border: 0;
   }
-
   /* Popup za vprasajcke */
   .qtip {
     position: fixed !important;
@@ -32869,7 +32853,6 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
     left: 10% !important;
     box-shadow: 0 0 15px 15px rgba(0, 0, 0, 0.34) !important;
   }
-
   .divPopUp {
     width: calc(100% - 32px) !important;
     max-width: calc(100% - 32px) !important;
@@ -32880,12 +32863,10 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
     width: calc(100% - 32px) !important;
     max-width: calc(100% - 32px) !important;
   }
-
   /* Vse povezano s paketi in placili */
   .dt-buttons {
     display: none;
   }
-
   #main #moje_ankete_edit #anketa_edit {
     padding: 0 !important;
   }
@@ -32963,7 +32944,6 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
   #main #moje_ankete_edit fieldset div.setting {
     margin-bottom: 10px;
   }
-
   #new_anketa_div {
     display: flex;
     flex-direction: column;
@@ -33047,7 +33027,6 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
     border: 1px solid #c8e3f8 !important;
     border-radius: 1px;
   }
-
   .dashboard_top_settings {
     flex-direction: column;
   }
@@ -33060,19 +33039,16 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
     margin-left: 0;
     margin-right: 16px;
   }
-
   .dashboard_boxes {
     flex-direction: column;
   }
   .dashboard_boxes .dashboard_box {
     margin: 0 0 32px 0;
   }
-
   .locked .add-variable-mobile,
 .spremenljivka_content .add-variable {
     display: none !important;
   }
-
   #branching {
     width: 100%;
     margin: 0;
@@ -33177,11 +33153,9 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
     margin: 0;
     padding: 0 12px;
   }
-
   .toolbox_holder {
     display: none;
   }
-
   .mobile_add_question {
     display: block;
     position: fixed;
@@ -33201,7 +33175,6 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
     line-height: 15px;
     font-weight: 600;
   }
-
   .mobile_add_question_popup {
     z-index: 9999;
     position: fixed;
@@ -33255,7 +33228,6 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
     font-size: 14px;
     font-weight: 500;
   }
-
   #vprasanje_float_editing .vprasanje_edit_holder {
     position: fixed;
     z-index: 99999;
@@ -33308,7 +33280,6 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
     margin-left: 0 !important;
     text-align: center;
   }
-
   #main #anketa #globalSetingsList {
     max-width: 100% !important;
     width: 100% !important;
@@ -33321,7 +33292,6 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
 #main #anketa #globalSetingsList fieldset span.charalimit#anketa_note_chars {
     width: 100%;
   }
-
   /* NASTAVITVE in ARHIVI */
   /* OBLIKA */
   #main #anketa #anketa_edit.page_tema #div_theme_group_holder {
@@ -33337,18 +33307,15 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
     width: 100%;
     height: auto;
   }
-
   #theme-editor {
     width: 100% !important;
     float: none !important;
   }
-
   #theme-preview {
     width: 100% !important;
     float: none !important;
     margin-top: 80px !important;
   }
-
   /* ARHIVI */
   #main #anketa #anketa_edit.page_arhivi {
     flex-direction: column-reverse;
@@ -33366,7 +33333,6 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
   #main #anketa #anketa_edit.page_arhivi #div_archive_content fieldset input {
     width: 100% !important;
   }
-
   div.page_tema .theme_list {
     flex-wrap: wrap;
   }
@@ -33393,7 +33359,6 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
   div.page_tema div#theme_grid_holder div.div_theme_group div.theme_label .theme_label_options .button {
     margin-right: 8px;
   }
-
   .page_theme-editor #theme-preview {
     display: none;
   }
@@ -33401,7 +33366,6 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
     width: 100% !important;
     flex-wrap: wrap;
   }
-
   #srv_diagnostic br {
     display: none;
   }
@@ -33422,7 +33386,6 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
 #srv_diagnostic #srv_diagnostic_results_right table td + td {
     width: auto !important;
   }
-
   .subpage_testnipodatki {
     line-height: 20px;
   }
@@ -33436,7 +33399,6 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
   .subpage_testnipodatki form label input {
     vertical-align: bottom;
   }
-
   .lastnosti_wrapper {
     flex-direction: column !important;
   }
@@ -33444,7 +33406,6 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
 .lastnosti_wrapper .lastnosti_right {
     width: 100% !important;
   }
-
   .page_vabila #vabila .button_holder {
     flex-direction: column;
     align-items: flex-start;
@@ -33469,7 +33430,6 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
   .page_vabila #vabila .more_block {
     width: 100%;
   }
-
   .page_invitations #inv_top_navi {
     flex-direction: column;
     align-items: flex-start;
@@ -33537,7 +33497,6 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
   .page_invitations .button_holder button {
     margin-bottom: 8px;
   }
-
   #vabila > table,
 table.invitations_settings,
 #inv_msg_preview table,
@@ -33621,7 +33580,6 @@ table.invitations_settings p label input[type=password],
     width: 100% !important;
     box-sizing: border-box;
   }
-
   #surveyInvitationSetting,
 #surveyInvitationSettingServer {
     min-width: 100% !important;
@@ -33629,7 +33587,6 @@ table.invitations_settings p label input[type=password],
     margin: 10px 0 !important;
     box-sizing: border-box !important;
   }
-
   #inv_top_navi {
     display: flex;
     flex-direction: column;
@@ -33668,7 +33625,6 @@ table.invitations_settings p label input[type=password],
   #inv_top_navi > #inv_step_nav.yellow .inv_step_space {
     display: none;
   }
-
   #inv_recipients_profiles_holder,
 #inv_import_list_container,
 #inv_messages_profiles_holder,
@@ -33689,7 +33645,6 @@ table.invitations_settings p label input[type=password],
 #inv_select_mail_preview textarea {
     width: 100%;
   }
-
   #inv_msg_preview table th {
     height: auto !important;
     width: 100% !important;
@@ -33701,7 +33656,6 @@ table.invitations_settings p label input[type=password],
     width: 100%;
     box-sizing: border-box;
   }
-
   .addthis_toolbox {
     line-height: 24px;
   }
@@ -33716,11 +33670,9 @@ table.invitations_settings p label input[type=password],
   .addthis_toolbox .addthis_separator {
     font-size: 16px;
   }
-
   #inv_field_container ul li {
     width: 45%;
   }
-
   /* grafika ko ni podatkov */
   div.no_data_alert img {
     width: 100%;
@@ -33732,7 +33684,6 @@ table.invitations_settings p label input[type=password],
     flex-direction: column;
     align-items: center;
   }
-
   .page_data .data_table_top_holder {
     flex-direction: column;
     align-items: flex-start;
@@ -33803,11 +33754,9 @@ table.invitations_settings p label input[type=password],
     width: 100%;
     margin-bottom: 16px;
   }
-
   body.data_fullscreen #analiza_data {
     top: 68px;
   }
-
   .subpage_append .anketa_edit_main,
 .subpage_merge .anketa_edit_main,
 .subpage_calculation .anketa_edit_main,
@@ -33848,7 +33797,6 @@ table.invitations_settings p label input[type=password],
     clear: both;
     margin: 40px 0 0 0 !important;
   }
-
   .subpage_quick_edit #quick_edit_top_line {
     flex-direction: column-reverse;
   }
@@ -33868,7 +33816,6 @@ table.invitations_settings p label input[type=password],
   .subpage_quick_edit .quick_edit_container .quick_edit_bottom_line {
     justify-content: center;
   }
-
   .analysis_bottom_settings {
     flex-wrap: wrap;
   }
@@ -33878,16 +33825,13 @@ table.invitations_settings p label input[type=password],
     margin: 0 0 16px 0 !important;
     border: 0;
   }
-
   .div_analiza_icons,
 .div_analiza_scale {
     opacity: 1 !important;
   }
-
   .analysis_icons_holder {
     display: none;
   }
-
   .chart_holder {
     width: 100%;
     box-sizing: border-box;
@@ -33910,7 +33854,6 @@ table.invitations_settings p label input[type=password],
     display: block;
     clear: both;
   }
-
   table.analysis_reports {
     border-spacing: 0px;
   }
@@ -33927,14 +33870,12 @@ table.analysis_reports > tbody > tr > td {
   table.analysis_reports fieldset {
     margin-bottom: 0 !important;
   }
-
   .reports_holder {
     flex-direction: column;
   }
   .reports_holder fieldset {
     width: 100%;
   }
-
   .noSurvey_sequence {
     padding: 0;
   }
@@ -33956,13 +33897,11 @@ table.analysis_reports > tbody > tr > td {
   .noSurvey_sequence .buttons_holder a .button {
     margin: 10px 30px;
   }
-
   #table-horizontal-scroll-wrapper1-userchanges {
     display: table;
     table-layout: fixed;
     width: 100%;
   }
-
   #table-horizontal-scroll-wrapper2-userchanges {
     display: table-cell;
     overflow-x: auto;
@@ -33973,7 +33912,6 @@ table.analysis_reports > tbody > tr > td {
     border-collapse: collapse;
     white-space: nowrap;
   }
-
   .page_arhivi .anketa_edit_left,
 .page_tracking .anketa_edit_left,
 .subpage_anal_arch .anketa_edit_left,
diff --git a/resources/sass/admin_new/pages/survey_edit/branching.scss b/resources/sass/admin_new/pages/survey_edit/branching.scss
index 23bac3d32..6f54aa99d 100644
--- a/resources/sass/admin_new/pages/survey_edit/branching.scss
+++ b/resources/sass/admin_new/pages/survey_edit/branching.scss
@@ -118,13 +118,14 @@ $branching_main_size_small: calc(100% - 525px);
                     display: flex;
                     align-items: center;
 
-                    width: 140px;
+                    width: 200px;
 
                     font-size: 16px;
                     font-weight: 600;
                     line-height: 16px;
 
                     color: #A9A9A9;
+
                 }
 
                 .pb_page_hover{

From 48d62a2da1677e6e7be2588ef0ad3fdf9f07673c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nejc=20Kova=C4=8D?= <nejc.kouko@gmail.com>
Date: Thu, 14 Jul 2022 15:17:30 +0200
Subject: [PATCH 069/110] Revert "Introduction page  prelom"

This reverts commit 743e02bd68467ecf0d5ddbb65389f8339936c5ba.
---
 public/css/admin_new.css                      | 70 +++++++++++++++++--
 .../pages/survey_edit/branching.scss          |  3 +-
 2 files changed, 67 insertions(+), 6 deletions(-)

diff --git a/public/css/admin_new.css b/public/css/admin_new.css
index 4e15488bd..000108396 100644
--- a/public/css/admin_new.css
+++ b/public/css/admin_new.css
@@ -13411,7 +13411,7 @@ div.drop_setting_transition {
 #branching ul li .pb_new .pb_page {
   display: flex;
   align-items: center;
-  width: 200px;
+  width: 140px;
   font-size: 16px;
   font-weight: 600;
   line-height: 16px;
@@ -28991,15 +28991,15 @@ iframe#ifmcontentstoprint {
 }
 
 .rsdl_bck1 {
-  background-color: rgb(250, 226, 226) !important;
+  background-color: #fae2e2 !important;
 }
 
 .rsdl_bck2 {
-  background-color: rgb(255, 157, 157) !important;
+  background-color: #ff9d9d !important;
 }
 
 .rsdl_bck3 {
-  background-color: rgb(248, 66, 66) !important;
+  background-color: #f84242 !important;
 }
 
 .rsdl_bck4 {
@@ -32428,19 +32428,24 @@ table.dataTable td:not(:first-of-type), table.dataTable th:not(:first-of-type) {
   #quick_comments_link.newCss {
     display: none;
   }
+
   #firstNavigation ol.right-side {
     display: none;
   }
+
   div.status_advanced {
     flex-direction: column;
   }
+
   div.status_advanced_box {
     width: 100%;
     box-sizing: border-box;
   }
+
   a.status_advanced_link {
     width: 95%;
   }
+
   .content_div_normalmode {
     overflow-x: auto;
   }
@@ -32508,6 +32513,7 @@ body #main_holder #main .wide {
     width: 100%;
     margin: 0;
   }
+
   fieldset {
     width: 100% !important;
     box-sizing: border-box !important;
@@ -32537,36 +32543,44 @@ fieldset textarea {
   fieldset .setting {
     height: auto !important;
   }
+
   .setting_horizontal_wrapper {
     flex-direction: column !important;
   }
+
   #vnosi_paginacija div select {
     display: inline-block;
     width: fit-content;
     margin: 0 5px;
     text-align: center;
   }
+
   div.breadcrumbs {
     display: block;
     padding: 15px;
     color: #1e88e5;
     font-weight: 600;
   }
+
   button.small, submit.small {
     min-width: auto;
     padding: 5px 16px;
   }
+
   button.medium, submit.medium {
     min-width: auto;
     padding: 10px 24px;
   }
+
   button.large, submit.large {
     min-width: auto;
     padding: 12px 32px;
   }
+
   .top_note {
     padding: 8px 16px;
   }
+
   header {
     /* Mobile meni */
     /* Mobile meni - NASTAVITVE V UREJANJU ANKETE*/
@@ -32822,6 +32836,7 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
   header .mobile_settings .mobile_settings_content a .setting_text {
     width: auto;
   }
+
   footer#srv_footer {
     display: flex;
     flex-direction: column;
@@ -32843,6 +32858,7 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
     padding: 0;
     border: 0;
   }
+
   /* Popup za vprasajcke */
   .qtip {
     position: fixed !important;
@@ -32853,6 +32869,7 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
     left: 10% !important;
     box-shadow: 0 0 15px 15px rgba(0, 0, 0, 0.34) !important;
   }
+
   .divPopUp {
     width: calc(100% - 32px) !important;
     max-width: calc(100% - 32px) !important;
@@ -32863,10 +32880,12 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
     width: calc(100% - 32px) !important;
     max-width: calc(100% - 32px) !important;
   }
+
   /* Vse povezano s paketi in placili */
   .dt-buttons {
     display: none;
   }
+
   #main #moje_ankete_edit #anketa_edit {
     padding: 0 !important;
   }
@@ -32944,6 +32963,7 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
   #main #moje_ankete_edit fieldset div.setting {
     margin-bottom: 10px;
   }
+
   #new_anketa_div {
     display: flex;
     flex-direction: column;
@@ -33027,6 +33047,7 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
     border: 1px solid #c8e3f8 !important;
     border-radius: 1px;
   }
+
   .dashboard_top_settings {
     flex-direction: column;
   }
@@ -33039,16 +33060,19 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
     margin-left: 0;
     margin-right: 16px;
   }
+
   .dashboard_boxes {
     flex-direction: column;
   }
   .dashboard_boxes .dashboard_box {
     margin: 0 0 32px 0;
   }
+
   .locked .add-variable-mobile,
 .spremenljivka_content .add-variable {
     display: none !important;
   }
+
   #branching {
     width: 100%;
     margin: 0;
@@ -33153,9 +33177,11 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
     margin: 0;
     padding: 0 12px;
   }
+
   .toolbox_holder {
     display: none;
   }
+
   .mobile_add_question {
     display: block;
     position: fixed;
@@ -33175,6 +33201,7 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
     line-height: 15px;
     font-weight: 600;
   }
+
   .mobile_add_question_popup {
     z-index: 9999;
     position: fixed;
@@ -33228,6 +33255,7 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
     font-size: 14px;
     font-weight: 500;
   }
+
   #vprasanje_float_editing .vprasanje_edit_holder {
     position: fixed;
     z-index: 99999;
@@ -33280,6 +33308,7 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
     margin-left: 0 !important;
     text-align: center;
   }
+
   #main #anketa #globalSetingsList {
     max-width: 100% !important;
     width: 100% !important;
@@ -33292,6 +33321,7 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
 #main #anketa #globalSetingsList fieldset span.charalimit#anketa_note_chars {
     width: 100%;
   }
+
   /* NASTAVITVE in ARHIVI */
   /* OBLIKA */
   #main #anketa #anketa_edit.page_tema #div_theme_group_holder {
@@ -33307,15 +33337,18 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
     width: 100%;
     height: auto;
   }
+
   #theme-editor {
     width: 100% !important;
     float: none !important;
   }
+
   #theme-preview {
     width: 100% !important;
     float: none !important;
     margin-top: 80px !important;
   }
+
   /* ARHIVI */
   #main #anketa #anketa_edit.page_arhivi {
     flex-direction: column-reverse;
@@ -33333,6 +33366,7 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
   #main #anketa #anketa_edit.page_arhivi #div_archive_content fieldset input {
     width: 100% !important;
   }
+
   div.page_tema .theme_list {
     flex-wrap: wrap;
   }
@@ -33359,6 +33393,7 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
   div.page_tema div#theme_grid_holder div.div_theme_group div.theme_label .theme_label_options .button {
     margin-right: 8px;
   }
+
   .page_theme-editor #theme-preview {
     display: none;
   }
@@ -33366,6 +33401,7 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
     width: 100% !important;
     flex-wrap: wrap;
   }
+
   #srv_diagnostic br {
     display: none;
   }
@@ -33386,6 +33422,7 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
 #srv_diagnostic #srv_diagnostic_results_right table td + td {
     width: auto !important;
   }
+
   .subpage_testnipodatki {
     line-height: 20px;
   }
@@ -33399,6 +33436,7 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
   .subpage_testnipodatki form label input {
     vertical-align: bottom;
   }
+
   .lastnosti_wrapper {
     flex-direction: column !important;
   }
@@ -33406,6 +33444,7 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
 .lastnosti_wrapper .lastnosti_right {
     width: 100% !important;
   }
+
   .page_vabila #vabila .button_holder {
     flex-direction: column;
     align-items: flex-start;
@@ -33430,6 +33469,7 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
   .page_vabila #vabila .more_block {
     width: 100%;
   }
+
   .page_invitations #inv_top_navi {
     flex-direction: column;
     align-items: flex-start;
@@ -33497,6 +33537,7 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
   .page_invitations .button_holder button {
     margin-bottom: 8px;
   }
+
   #vabila > table,
 table.invitations_settings,
 #inv_msg_preview table,
@@ -33580,6 +33621,7 @@ table.invitations_settings p label input[type=password],
     width: 100% !important;
     box-sizing: border-box;
   }
+
   #surveyInvitationSetting,
 #surveyInvitationSettingServer {
     min-width: 100% !important;
@@ -33587,6 +33629,7 @@ table.invitations_settings p label input[type=password],
     margin: 10px 0 !important;
     box-sizing: border-box !important;
   }
+
   #inv_top_navi {
     display: flex;
     flex-direction: column;
@@ -33625,6 +33668,7 @@ table.invitations_settings p label input[type=password],
   #inv_top_navi > #inv_step_nav.yellow .inv_step_space {
     display: none;
   }
+
   #inv_recipients_profiles_holder,
 #inv_import_list_container,
 #inv_messages_profiles_holder,
@@ -33645,6 +33689,7 @@ table.invitations_settings p label input[type=password],
 #inv_select_mail_preview textarea {
     width: 100%;
   }
+
   #inv_msg_preview table th {
     height: auto !important;
     width: 100% !important;
@@ -33656,6 +33701,7 @@ table.invitations_settings p label input[type=password],
     width: 100%;
     box-sizing: border-box;
   }
+
   .addthis_toolbox {
     line-height: 24px;
   }
@@ -33670,9 +33716,11 @@ table.invitations_settings p label input[type=password],
   .addthis_toolbox .addthis_separator {
     font-size: 16px;
   }
+
   #inv_field_container ul li {
     width: 45%;
   }
+
   /* grafika ko ni podatkov */
   div.no_data_alert img {
     width: 100%;
@@ -33684,6 +33732,7 @@ table.invitations_settings p label input[type=password],
     flex-direction: column;
     align-items: center;
   }
+
   .page_data .data_table_top_holder {
     flex-direction: column;
     align-items: flex-start;
@@ -33754,9 +33803,11 @@ table.invitations_settings p label input[type=password],
     width: 100%;
     margin-bottom: 16px;
   }
+
   body.data_fullscreen #analiza_data {
     top: 68px;
   }
+
   .subpage_append .anketa_edit_main,
 .subpage_merge .anketa_edit_main,
 .subpage_calculation .anketa_edit_main,
@@ -33797,6 +33848,7 @@ table.invitations_settings p label input[type=password],
     clear: both;
     margin: 40px 0 0 0 !important;
   }
+
   .subpage_quick_edit #quick_edit_top_line {
     flex-direction: column-reverse;
   }
@@ -33816,6 +33868,7 @@ table.invitations_settings p label input[type=password],
   .subpage_quick_edit .quick_edit_container .quick_edit_bottom_line {
     justify-content: center;
   }
+
   .analysis_bottom_settings {
     flex-wrap: wrap;
   }
@@ -33825,13 +33878,16 @@ table.invitations_settings p label input[type=password],
     margin: 0 0 16px 0 !important;
     border: 0;
   }
+
   .div_analiza_icons,
 .div_analiza_scale {
     opacity: 1 !important;
   }
+
   .analysis_icons_holder {
     display: none;
   }
+
   .chart_holder {
     width: 100%;
     box-sizing: border-box;
@@ -33854,6 +33910,7 @@ table.invitations_settings p label input[type=password],
     display: block;
     clear: both;
   }
+
   table.analysis_reports {
     border-spacing: 0px;
   }
@@ -33870,12 +33927,14 @@ table.analysis_reports > tbody > tr > td {
   table.analysis_reports fieldset {
     margin-bottom: 0 !important;
   }
+
   .reports_holder {
     flex-direction: column;
   }
   .reports_holder fieldset {
     width: 100%;
   }
+
   .noSurvey_sequence {
     padding: 0;
   }
@@ -33897,11 +33956,13 @@ table.analysis_reports > tbody > tr > td {
   .noSurvey_sequence .buttons_holder a .button {
     margin: 10px 30px;
   }
+
   #table-horizontal-scroll-wrapper1-userchanges {
     display: table;
     table-layout: fixed;
     width: 100%;
   }
+
   #table-horizontal-scroll-wrapper2-userchanges {
     display: table-cell;
     overflow-x: auto;
@@ -33912,6 +33973,7 @@ table.analysis_reports > tbody > tr > td {
     border-collapse: collapse;
     white-space: nowrap;
   }
+
   .page_arhivi .anketa_edit_left,
 .page_tracking .anketa_edit_left,
 .subpage_anal_arch .anketa_edit_left,
diff --git a/resources/sass/admin_new/pages/survey_edit/branching.scss b/resources/sass/admin_new/pages/survey_edit/branching.scss
index 6f54aa99d..23bac3d32 100644
--- a/resources/sass/admin_new/pages/survey_edit/branching.scss
+++ b/resources/sass/admin_new/pages/survey_edit/branching.scss
@@ -118,14 +118,13 @@ $branching_main_size_small: calc(100% - 525px);
                     display: flex;
                     align-items: center;
 
-                    width: 200px;
+                    width: 140px;
 
                     font-size: 16px;
                     font-weight: 600;
                     line-height: 16px;
 
                     color: #A9A9A9;
-
                 }
 
                 .pb_page_hover{

From 7cfcaae37494b386d031cf90d18003c180187140 Mon Sep 17 00:00:00 2001
From: tejagerjovic <teja.gerjovic@fdv.uni-lj.si>
Date: Fri, 15 Jul 2022 02:57:24 +0200
Subject: [PATCH 070/110] =?UTF-8?q?Napredne=20nastavitve=20v=20sredino=20v?=
 =?UTF-8?q?sebine=20-=20KON=C4=8CANO,=20ok=20za=20Arnes=20update?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/css/admin_new.css                                         | 1 -
 .../sass/admin_new/pages/survey_edit/top_center_settings.scss    | 1 -
 2 files changed, 2 deletions(-)

diff --git a/public/css/admin_new.css b/public/css/admin_new.css
index f22d6bae7..9307e3486 100644
--- a/public/css/admin_new.css
+++ b/public/css/admin_new.css
@@ -20511,7 +20511,6 @@ img.mapster_el {
   border: 1px solid #E5E5E5;
   box-shadow: 0px 0px 7px rgba(0, 0, 0, 0.15);
   top: 32px;
-  width: 300px;
 }
 .top_center_settings .left_settings #top_napredne_holder #top_napredne_dropdown .segment_option,
 .top_center_settings .right_settings #top_napredne_holder #top_napredne_dropdown .segment_option {
diff --git a/resources/sass/admin_new/pages/survey_edit/top_center_settings.scss b/resources/sass/admin_new/pages/survey_edit/top_center_settings.scss
index 119d50834..176f28d60 100644
--- a/resources/sass/admin_new/pages/survey_edit/top_center_settings.scss
+++ b/resources/sass/admin_new/pages/survey_edit/top_center_settings.scss
@@ -54,7 +54,6 @@
                 box-shadow: 0px 0px 7px rgba(0, 0, 0, 0.15);
 
                 top: 32px;
-                width: 300px;
 
                 .segment_option{
                     cursor: pointer;

From 1887600739325dea2ab5ed3cdd3b19da84f20945 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nejc=20Kova=C4=8D?= <nejc.kouko@gmail.com>
Date: Fri, 15 Jul 2022 10:04:15 +0200
Subject: [PATCH 071/110] Introduction page

---
 public/css/admin_new.css                      | 70 ++-----------------
 .../pages/survey_edit/branching.scss          |  2 +-
 2 files changed, 5 insertions(+), 67 deletions(-)

diff --git a/public/css/admin_new.css b/public/css/admin_new.css
index 9307e3486..9410992c1 100644
--- a/public/css/admin_new.css
+++ b/public/css/admin_new.css
@@ -13411,7 +13411,7 @@ div.drop_setting_transition {
 #branching ul li .pb_new .pb_page {
   display: flex;
   align-items: center;
-  width: 140px;
+  width: 200px;
   font-size: 16px;
   font-weight: 600;
   line-height: 16px;
@@ -28990,15 +28990,15 @@ iframe#ifmcontentstoprint {
 }
 
 .rsdl_bck1 {
-  background-color: #fae2e2 !important;
+  background-color: rgb(250, 226, 226) !important;
 }
 
 .rsdl_bck2 {
-  background-color: #ff9d9d !important;
+  background-color: rgb(255, 157, 157) !important;
 }
 
 .rsdl_bck3 {
-  background-color: #f84242 !important;
+  background-color: rgb(248, 66, 66) !important;
 }
 
 .rsdl_bck4 {
@@ -32427,24 +32427,19 @@ table.dataTable td:not(:first-of-type), table.dataTable th:not(:first-of-type) {
   #quick_comments_link.newCss {
     display: none;
   }
-
   #firstNavigation ol.right-side {
     display: none;
   }
-
   div.status_advanced {
     flex-direction: column;
   }
-
   div.status_advanced_box {
     width: 100%;
     box-sizing: border-box;
   }
-
   a.status_advanced_link {
     width: 95%;
   }
-
   .content_div_normalmode {
     overflow-x: auto;
   }
@@ -32512,7 +32507,6 @@ body #main_holder #main .wide {
     width: 100%;
     margin: 0;
   }
-
   fieldset {
     width: 100% !important;
     box-sizing: border-box !important;
@@ -32542,44 +32536,36 @@ fieldset textarea {
   fieldset .setting {
     height: auto !important;
   }
-
   .setting_horizontal_wrapper {
     flex-direction: column !important;
   }
-
   #vnosi_paginacija div select {
     display: inline-block;
     width: fit-content;
     margin: 0 5px;
     text-align: center;
   }
-
   div.breadcrumbs {
     display: block;
     padding: 15px;
     color: #1e88e5;
     font-weight: 600;
   }
-
   button.small, submit.small {
     min-width: auto;
     padding: 5px 16px;
   }
-
   button.medium, submit.medium {
     min-width: auto;
     padding: 10px 24px;
   }
-
   button.large, submit.large {
     min-width: auto;
     padding: 12px 32px;
   }
-
   .top_note {
     padding: 8px 16px;
   }
-
   header {
     /* Mobile meni */
     /* Mobile meni - NASTAVITVE V UREJANJU ANKETE*/
@@ -32835,7 +32821,6 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
   header .mobile_settings .mobile_settings_content a .setting_text {
     width: auto;
   }
-
   footer#srv_footer {
     display: flex;
     flex-direction: column;
@@ -32857,7 +32842,6 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
     padding: 0;
     border: 0;
   }
-
   /* Popup za vprasajcke */
   .qtip {
     position: fixed !important;
@@ -32868,7 +32852,6 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
     left: 10% !important;
     box-shadow: 0 0 15px 15px rgba(0, 0, 0, 0.34) !important;
   }
-
   .divPopUp {
     width: calc(100% - 32px) !important;
     max-width: calc(100% - 32px) !important;
@@ -32879,12 +32862,10 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
     width: calc(100% - 32px) !important;
     max-width: calc(100% - 32px) !important;
   }
-
   /* Vse povezano s paketi in placili */
   .dt-buttons {
     display: none;
   }
-
   #main #moje_ankete_edit #anketa_edit {
     padding: 0 !important;
   }
@@ -32962,7 +32943,6 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
   #main #moje_ankete_edit fieldset div.setting {
     margin-bottom: 10px;
   }
-
   #new_anketa_div {
     display: flex;
     flex-direction: column;
@@ -33046,7 +33026,6 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
     border: 1px solid #c8e3f8 !important;
     border-radius: 1px;
   }
-
   .dashboard_top_settings {
     flex-direction: column;
   }
@@ -33059,19 +33038,16 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
     margin-left: 0;
     margin-right: 16px;
   }
-
   .dashboard_boxes {
     flex-direction: column;
   }
   .dashboard_boxes .dashboard_box {
     margin: 0 0 32px 0;
   }
-
   .locked .add-variable-mobile,
 .spremenljivka_content .add-variable {
     display: none !important;
   }
-
   #branching {
     width: 100%;
     margin: 0;
@@ -33176,11 +33152,9 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
     margin: 0;
     padding: 0 12px;
   }
-
   .toolbox_holder {
     display: none;
   }
-
   .mobile_add_question {
     display: block;
     position: fixed;
@@ -33200,7 +33174,6 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
     line-height: 15px;
     font-weight: 600;
   }
-
   .mobile_add_question_popup {
     z-index: 9999;
     position: fixed;
@@ -33254,7 +33227,6 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
     font-size: 14px;
     font-weight: 500;
   }
-
   #vprasanje_float_editing .vprasanje_edit_holder {
     position: fixed;
     z-index: 99999;
@@ -33307,7 +33279,6 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
     margin-left: 0 !important;
     text-align: center;
   }
-
   #main #anketa #globalSetingsList {
     max-width: 100% !important;
     width: 100% !important;
@@ -33320,7 +33291,6 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
 #main #anketa #globalSetingsList fieldset span.charalimit#anketa_note_chars {
     width: 100%;
   }
-
   /* NASTAVITVE in ARHIVI */
   /* OBLIKA */
   #main #anketa #anketa_edit.page_tema #div_theme_group_holder {
@@ -33336,18 +33306,15 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
     width: 100%;
     height: auto;
   }
-
   #theme-editor {
     width: 100% !important;
     float: none !important;
   }
-
   #theme-preview {
     width: 100% !important;
     float: none !important;
     margin-top: 80px !important;
   }
-
   /* ARHIVI */
   #main #anketa #anketa_edit.page_arhivi {
     flex-direction: column-reverse;
@@ -33365,7 +33332,6 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
   #main #anketa #anketa_edit.page_arhivi #div_archive_content fieldset input {
     width: 100% !important;
   }
-
   div.page_tema .theme_list {
     flex-wrap: wrap;
   }
@@ -33392,7 +33358,6 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
   div.page_tema div#theme_grid_holder div.div_theme_group div.theme_label .theme_label_options .button {
     margin-right: 8px;
   }
-
   .page_theme-editor #theme-preview {
     display: none;
   }
@@ -33400,7 +33365,6 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
     width: 100% !important;
     flex-wrap: wrap;
   }
-
   #srv_diagnostic br {
     display: none;
   }
@@ -33421,7 +33385,6 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
 #srv_diagnostic #srv_diagnostic_results_right table td + td {
     width: auto !important;
   }
-
   .subpage_testnipodatki {
     line-height: 20px;
   }
@@ -33435,7 +33398,6 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
   .subpage_testnipodatki form label input {
     vertical-align: bottom;
   }
-
   .lastnosti_wrapper {
     flex-direction: column !important;
   }
@@ -33443,7 +33405,6 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
 .lastnosti_wrapper .lastnosti_right {
     width: 100% !important;
   }
-
   .page_vabila #vabila .button_holder {
     flex-direction: column;
     align-items: flex-start;
@@ -33468,7 +33429,6 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
   .page_vabila #vabila .more_block {
     width: 100%;
   }
-
   .page_invitations #inv_top_navi {
     flex-direction: column;
     align-items: flex-start;
@@ -33536,7 +33496,6 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
   .page_invitations .button_holder button {
     margin-bottom: 8px;
   }
-
   #vabila > table,
 table.invitations_settings,
 #inv_msg_preview table,
@@ -33620,7 +33579,6 @@ table.invitations_settings p label input[type=password],
     width: 100% !important;
     box-sizing: border-box;
   }
-
   #surveyInvitationSetting,
 #surveyInvitationSettingServer {
     min-width: 100% !important;
@@ -33628,7 +33586,6 @@ table.invitations_settings p label input[type=password],
     margin: 10px 0 !important;
     box-sizing: border-box !important;
   }
-
   #inv_top_navi {
     display: flex;
     flex-direction: column;
@@ -33667,7 +33624,6 @@ table.invitations_settings p label input[type=password],
   #inv_top_navi > #inv_step_nav.yellow .inv_step_space {
     display: none;
   }
-
   #inv_recipients_profiles_holder,
 #inv_import_list_container,
 #inv_messages_profiles_holder,
@@ -33688,7 +33644,6 @@ table.invitations_settings p label input[type=password],
 #inv_select_mail_preview textarea {
     width: 100%;
   }
-
   #inv_msg_preview table th {
     height: auto !important;
     width: 100% !important;
@@ -33700,7 +33655,6 @@ table.invitations_settings p label input[type=password],
     width: 100%;
     box-sizing: border-box;
   }
-
   .addthis_toolbox {
     line-height: 24px;
   }
@@ -33715,11 +33669,9 @@ table.invitations_settings p label input[type=password],
   .addthis_toolbox .addthis_separator {
     font-size: 16px;
   }
-
   #inv_field_container ul li {
     width: 45%;
   }
-
   /* grafika ko ni podatkov */
   div.no_data_alert img {
     width: 100%;
@@ -33731,7 +33683,6 @@ table.invitations_settings p label input[type=password],
     flex-direction: column;
     align-items: center;
   }
-
   .page_data .data_table_top_holder {
     flex-direction: column;
     align-items: flex-start;
@@ -33802,11 +33753,9 @@ table.invitations_settings p label input[type=password],
     width: 100%;
     margin-bottom: 16px;
   }
-
   body.data_fullscreen #analiza_data {
     top: 68px;
   }
-
   .subpage_append .anketa_edit_main,
 .subpage_merge .anketa_edit_main,
 .subpage_calculation .anketa_edit_main,
@@ -33847,7 +33796,6 @@ table.invitations_settings p label input[type=password],
     clear: both;
     margin: 40px 0 0 0 !important;
   }
-
   .subpage_quick_edit #quick_edit_top_line {
     flex-direction: column-reverse;
   }
@@ -33867,7 +33815,6 @@ table.invitations_settings p label input[type=password],
   .subpage_quick_edit .quick_edit_container .quick_edit_bottom_line {
     justify-content: center;
   }
-
   .analysis_bottom_settings {
     flex-wrap: wrap;
   }
@@ -33877,16 +33824,13 @@ table.invitations_settings p label input[type=password],
     margin: 0 0 16px 0 !important;
     border: 0;
   }
-
   .div_analiza_icons,
 .div_analiza_scale {
     opacity: 1 !important;
   }
-
   .analysis_icons_holder {
     display: none;
   }
-
   .chart_holder {
     width: 100%;
     box-sizing: border-box;
@@ -33909,7 +33853,6 @@ table.invitations_settings p label input[type=password],
     display: block;
     clear: both;
   }
-
   table.analysis_reports {
     border-spacing: 0px;
   }
@@ -33926,14 +33869,12 @@ table.analysis_reports > tbody > tr > td {
   table.analysis_reports fieldset {
     margin-bottom: 0 !important;
   }
-
   .reports_holder {
     flex-direction: column;
   }
   .reports_holder fieldset {
     width: 100%;
   }
-
   .noSurvey_sequence {
     padding: 0;
   }
@@ -33955,13 +33896,11 @@ table.analysis_reports > tbody > tr > td {
   .noSurvey_sequence .buttons_holder a .button {
     margin: 10px 30px;
   }
-
   #table-horizontal-scroll-wrapper1-userchanges {
     display: table;
     table-layout: fixed;
     width: 100%;
   }
-
   #table-horizontal-scroll-wrapper2-userchanges {
     display: table-cell;
     overflow-x: auto;
@@ -33972,7 +33911,6 @@ table.analysis_reports > tbody > tr > td {
     border-collapse: collapse;
     white-space: nowrap;
   }
-
   .page_arhivi .anketa_edit_left,
 .page_tracking .anketa_edit_left,
 .subpage_anal_arch .anketa_edit_left,
diff --git a/resources/sass/admin_new/pages/survey_edit/branching.scss b/resources/sass/admin_new/pages/survey_edit/branching.scss
index 23bac3d32..040d8beca 100644
--- a/resources/sass/admin_new/pages/survey_edit/branching.scss
+++ b/resources/sass/admin_new/pages/survey_edit/branching.scss
@@ -118,7 +118,7 @@ $branching_main_size_small: calc(100% - 525px);
                     display: flex;
                     align-items: center;
 
-                    width: 140px;
+                    width: 200px;
 
                     font-size: 16px;
                     font-weight: 600;

From 9886482dd153b17658e66def59e02bfb95e19b2a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nejc=20Kova=C4=8D?= <nejc.kouko@gmail.com>
Date: Fri, 15 Jul 2022 13:22:12 +0200
Subject: [PATCH 072/110] LOGIN/REGISTER FORM errors popravki

---
 frontend/simple/css/style.css                 | 48 +++++++++++++++----
 .../sass/frontend_simple/basic/fonts.scss     |  2 +-
 .../sass/frontend_simple/basic/popravki.scss  | 39 ++++++++++++++-
 .../sass/frontend_simple/modules/GDPR.scss    |  1 -
 4 files changed, 79 insertions(+), 11 deletions(-)

diff --git a/frontend/simple/css/style.css b/frontend/simple/css/style.css
index 46b97cf4d..6364f2a60 100644
--- a/frontend/simple/css/style.css
+++ b/frontend/simple/css/style.css
@@ -105,7 +105,7 @@ input[type=email] {
   padding: 8px 18px;
   font-size: 16px;
   color: #333;
-  font-family: "Source Sans Pro";
+  font-family: "Source Sans Pro", "sans-serif";
   background-color: white;
   border: 1px solid #cccccc;
 }
@@ -1013,7 +1013,7 @@ header {
   max-width: 1160px;
   width: 95%;
   margin: auto;
-  font-family: "Source Sans Pro";
+  font-family: "Source Sans Pro", "sans-serif";
 }
 
 header nav {
@@ -1141,7 +1141,7 @@ body.landing_page #main .landing_page_window input[type=submit] {
   font-weight: 700;
   padding: 12.5px 0px;
   line-height: 20px;
-  font-family: "Source Sans Pro";
+  font-family: "Source Sans Pro", "sans-serif";
 }
 
 body.landing_page #main .landing_page_window #login_holder .login_form .lostpass {
@@ -1203,7 +1203,7 @@ footer .footer_content {
 }
 
 footer .footer_content h2 {
-  font-family: "Source Sans Pro";
+  font-family: "Source Sans Pro", "sans-serif";
   color: #1e88e5;
   text-transform: uppercase;
   font-size: 18px;
@@ -1239,7 +1239,7 @@ footer .footer_content .col a {
   font-weight: 400;
   font-size: 18px;
   line-height: 26px;
-  font-family: "Source Sans Pro";
+  font-family: "Source Sans Pro", "sans-serif";
 }
 
 footer .footer_content .col3 .social_logo_flex a:first-of-type {
@@ -1258,6 +1258,7 @@ iframe {
 
 body.login_noEmail #main {
   background-image: none;
+  background-color: #F8F8F8;
 }
 
 body.login_noEmail #main .main_content {
@@ -1310,6 +1311,15 @@ body.login_noEmail #main .landing_page_window #login_holder .login_form label:fi
 
 body.login_noEmail #main .landing_page_window #login_holder .login_form .lostpass {
   position: unset;
+  text-align: left;
+  text-decoration-line: underline;
+  text-decoration-color: #1e88e5;
+  font-weight: 400;
+  font-size: 16px;
+  line-height: 20px;
+}
+body.login_noEmail #main .landing_page_window #login_holder .login_form .lostpass a {
+  font-weight: 400;
 }
 
 body.landing_page #main .landing_page_window .error_holder, body.register #main .landing_page_window .error_holder, body.login #main .landing_page_window .error_holder, body.login_noEmail #main .landing_page_window .error_holder {
@@ -1320,6 +1330,7 @@ body.login_noEmail #main .landing_page_window input[type=submit] {
   width: 100%;
   max-width: 100%;
   margin: 16px 0px;
+  font-family: "Source Sans Pro", "sans-serif";
 }
 
 body.landing_page #main .landing_page_window #registration_holder,
@@ -1335,6 +1346,7 @@ body.login_noEmail #main .landing_page_window label:first-of-type {
 
 body.login #main {
   background-image: none;
+  background-color: #F8F8F8;
 }
 
 body.login #main .main_content {
@@ -1384,6 +1396,15 @@ body.login #main .landing_page_window #login_holder .login_form label:first-of-t
 
 body.login #main .landing_page_window #login_holder .login_form .lostpass {
   position: unset;
+  text-align: left;
+  text-decoration-line: underline;
+  text-decoration-color: #1e88e5;
+  font-weight: 400;
+  font-size: 16px;
+  line-height: 20px;
+}
+body.login #main .landing_page_window #login_holder .login_form .lostpass a {
+  font-weight: 400;
 }
 
 body.login #main .landing_page_window .error_holder {
@@ -1394,6 +1415,7 @@ body.login #main .landing_page_window input[type=submit] {
   width: 100%;
   max-width: 100%;
   margin: 16px 0px;
+  font-family: "Source Sans Pro", "sans-serif";
 }
 
 body.login #main .landing_page_window #registration_holder {
@@ -1406,6 +1428,7 @@ body.login #main .landing_page_window label:first-of-type {
 
 body.register #main {
   background-image: none;
+  background-color: #F8F8F8;
 }
 
 body.register #main .main_content {
@@ -1455,6 +1478,15 @@ body.register #main .landing_page_window #login_holder .login_form label:first-o
 
 body.register #main .landing_page_window #login_holder .login_form .lostpass {
   position: unset;
+  text-align: left;
+  text-decoration-line: underline;
+  text-decoration-color: #1e88e5;
+  font-weight: 400;
+  font-size: 16px;
+  line-height: 20px;
+}
+body.register #main .landing_page_window #login_holder .login_form .lostpass a {
+  font-weight: 400;
 }
 
 body.register #main .landing_page_window .error_holder {
@@ -1465,6 +1497,7 @@ body.register #main .landing_page_window input[type=submit] {
   width: 100%;
   max-width: 100%;
   margin: 16px 0px;
+  font-family: "Source Sans Pro", "sans-serif";
 }
 
 body.register #main .landing_page_window #registration_holder {
@@ -1537,7 +1570,7 @@ body.gdpr .input_field div.label label {
   padding: 0px;
   padding-left: 8px;
   margin: 0px;
-  font-family: "Source Sans Pro";
+  font-family: "Source Sans Pro", "sans-serif";
   font-size: 16px;
 }
 
@@ -1593,13 +1626,12 @@ form .opis {
 }
 
 #gdpr-note {
-  padding: 0px;
   padding-left: 8px;
   margin: 0px;
   width: 100%;
   border-radius: 0px;
   font-size: 16px;
-  font-family: "Source Sans Pro";
+  font-family: "Source Sans Pro", "sans-serif";
 }
 
 .register_holder p:last-of-type {
diff --git a/resources/sass/frontend_simple/basic/fonts.scss b/resources/sass/frontend_simple/basic/fonts.scss
index cc15f9def..b1c2f8e8c 100644
--- a/resources/sass/frontend_simple/basic/fonts.scss
+++ b/resources/sass/frontend_simple/basic/fonts.scss
@@ -5,7 +5,7 @@
 
 
 $font: 'Montserrat', sans-serif;
-$SansPro_font: "Source Sans Pro";
+$SansPro_font: "Source Sans Pro", "sans-serif";
 
 
 .thin{
diff --git a/resources/sass/frontend_simple/basic/popravki.scss b/resources/sass/frontend_simple/basic/popravki.scss
index a8624fd86..34f0d7b80 100644
--- a/resources/sass/frontend_simple/basic/popravki.scss
+++ b/resources/sass/frontend_simple/basic/popravki.scss
@@ -1,4 +1,4 @@
-$SansPro_font: "Source Sans Pro";
+$SansPro_font: "Source Sans Pro", "sans-serif";
 $max_sirina: (1160px);
 $black: #333333;
 $light_blue: #4ca0ea;
@@ -303,6 +303,7 @@ iframe {
 
 body.login_noEmail #main{
     background-image: none;
+    background-color: $color_background_grey;
 }
 
 body.login_noEmail #main .main_content{
@@ -359,6 +360,17 @@ body.login_noEmail #main .landing_page_window #login_holder .login_form label:fi
 
 body.login_noEmail #main .landing_page_window #login_holder .login_form .lostpass {
     position: unset;
+    text-align: left;
+    text-decoration-line: underline;
+    text-decoration-color: $blue;
+    font-weight: 400;
+    font-size: 16px;
+    line-height: 20px;
+
+    a {
+        font-weight: 400;
+    }
+
 }
 
 body.landing_page #main .landing_page_window .error_holder, body.register #main .landing_page_window .error_holder, body.login #main .landing_page_window .error_holder, body.login_noEmail #main .landing_page_window .error_holder {
@@ -370,6 +382,7 @@ body.login_noEmail #main .landing_page_window input[type=submit]{
     max-width: 100%;
 
     margin: 16px 0px;
+    font-family: $SansPro_font;
 
 }
 
@@ -391,6 +404,7 @@ body.login_noEmail #main .landing_page_window label:first-of-type {
 
 body.login #main{
     background-image: none;
+    background-color: $color_background_grey;
 }
 
 body.login #main .main_content{
@@ -444,6 +458,16 @@ body.login #main .landing_page_window #login_holder .login_form label:first-of-t
 
 body.login #main .landing_page_window #login_holder .login_form .lostpass {
     position: unset;
+    text-align: left;
+    text-decoration-line: underline;
+    text-decoration-color: $blue;
+    font-weight: 400;
+    font-size: 16px;
+    line-height: 20px;
+
+    a {
+        font-weight: 400;
+    }
 }
 
 
@@ -456,6 +480,7 @@ body.login #main .landing_page_window input[type=submit]{
     max-width: 100%;
 
     margin: 16px 0px;
+    font-family: $SansPro_font;
 
 }
 
@@ -474,6 +499,7 @@ body.login #main .landing_page_window label:first-of-type {
 
 body.register #main{
     background-image: none;
+    background-color: $color_background_grey;
 }
 
 body.register  #main .main_content{
@@ -528,6 +554,16 @@ body.register #main .landing_page_window #login_holder .login_form label:first-o
 
 body.register #main .landing_page_window #login_holder .login_form .lostpass {
     position: unset;
+    text-align: left;
+    text-decoration-line: underline;
+    text-decoration-color: $blue;
+    font-weight: 400;
+    font-size: 16px;
+    line-height: 20px;
+
+    a {
+        font-weight: 400;
+    }
 }
 
 
@@ -540,6 +576,7 @@ body.register #main .landing_page_window input[type=submit]{
     max-width: 100%;
 
     margin: 16px 0px;
+    font-family: $SansPro_font;
 
 }
 
diff --git a/resources/sass/frontend_simple/modules/GDPR.scss b/resources/sass/frontend_simple/modules/GDPR.scss
index 12b68d7cc..4ccb5158a 100644
--- a/resources/sass/frontend_simple/modules/GDPR.scss
+++ b/resources/sass/frontend_simple/modules/GDPR.scss
@@ -132,7 +132,6 @@ form .opis {
 }
 
 #gdpr-note {
-    padding: 0px;
     padding-left: 8px;
     margin: 0px;
     width: 100%;

From 12eaf296c482a0b9675eb0f68f5ef09816f21166 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nejc=20Kova=C4=8D?= <nejc.kouko@gmail.com>
Date: Fri, 15 Jul 2022 15:16:06 +0200
Subject: [PATCH 073/110] login/rregister form popravljen padding ob errorjih,
 tab background-colot

---
 frontend/simple/css/style.css                      | 12 +++---------
 resources/sass/frontend_simple/basic/popravki.scss | 12 ++++--------
 2 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/frontend/simple/css/style.css b/frontend/simple/css/style.css
index 6364f2a60..9b9f082f8 100644
--- a/frontend/simple/css/style.css
+++ b/frontend/simple/css/style.css
@@ -1088,18 +1088,14 @@ body.landing_page #main .landing_page_window #login_holder .login_form {
 body.landing_page #main .landing_page_window .tabs .tab {
   font-size: 16px;
   font-weight: 600;
-  background-color: unset;
   color: #777777;
+  background-color: #F8F8F8;
   height: 39px;
   display: flex;
   justify-content: center;
   align-items: center;
 }
 
-body.landing_page #main .landing_page_window .tabs .tab {
-  background-color: #F8F8F8;
-}
-
 body.landing_page #main .landing_page_window .tabs .tab.active {
   color: #1E88E5;
   background-color: #FFFFFF;
@@ -1263,6 +1259,7 @@ body.login_noEmail #main {
 
 body.login_noEmail #main .main_content {
   padding-top: 70px;
+  min-height: 772px;
 }
 
 body.login_noEmail #main .app_subtitle {
@@ -1288,7 +1285,6 @@ body.login_noEmail #main .landing_page_window .tabs .tab {
   color: #888888;
   font-size: 16px;
   font-weight: 600;
-  background-color: unset;
   color: #777777;
   height: 39px;
   display: flex;
@@ -1351,6 +1347,7 @@ body.login #main {
 
 body.login #main .main_content {
   padding-top: 70px;
+  min-height: 772px;
 }
 
 body.login #main .app_subtitle {
@@ -1370,10 +1367,8 @@ body.login #main .landing_page_window {
 
 body.login #main .landing_page_window .tabs .tab {
   background-color: #F8F8F8;
-  color: #888888;
   font-size: 16px;
   font-weight: 600;
-  background-color: unset;
   color: #777777;
   height: 39px;
   display: flex;
@@ -1455,7 +1450,6 @@ body.register #main .landing_page_window .tabs .tab {
   color: #888888;
   font-size: 16px;
   font-weight: 600;
-  background-color: unset;
   color: #777777;
   height: 39px;
   display: flex;
diff --git a/resources/sass/frontend_simple/basic/popravki.scss b/resources/sass/frontend_simple/basic/popravki.scss
index 34f0d7b80..17cb62295 100644
--- a/resources/sass/frontend_simple/basic/popravki.scss
+++ b/resources/sass/frontend_simple/basic/popravki.scss
@@ -106,8 +106,8 @@ body.landing_page #main .landing_page_window .tabs .tab {
     font-size: 16px;
     font-weight: 600;
     
-    background-color: unset;
     color: #777777;
+    background-color: #F8F8F8;
     
     height: 39px;
         
@@ -115,9 +115,7 @@ body.landing_page #main .landing_page_window .tabs .tab {
     justify-content: center;
     align-items: center;
 }
-body.landing_page #main .landing_page_window .tabs .tab{
-    background-color: #F8F8F8;
-}
+
   
 body.landing_page #main .landing_page_window .tabs .tab.active {
     color: #1E88E5;
@@ -308,6 +306,7 @@ body.login_noEmail #main{
 
 body.login_noEmail #main .main_content{
     padding-top: 70px;
+    min-height: 772px;
 }
 
 body.login_noEmail #main .app_subtitle {
@@ -336,7 +335,6 @@ body.login_noEmail #main .landing_page_window .tabs .tab {
 
     font-size: 16px;
     font-weight: 600;
-    background-color: unset;
     color: #777777;
     height: 39px;
     display: flex;
@@ -409,6 +407,7 @@ body.login #main{
 
 body.login #main .main_content{
     padding-top: 70px;
+    min-height: 772px;
 }
 
 body.login #main .app_subtitle {
@@ -430,11 +429,9 @@ body.login #main .landing_page_window{
 
 body.login #main .landing_page_window .tabs .tab {
     background-color: $color_background_grey;
-    color: #888888;
 
     font-size: 16px;
     font-weight: 600;
-    background-color: unset;
     color: #777777;
     height: 39px;
     display: flex;
@@ -530,7 +527,6 @@ body.register #main .landing_page_window .tabs .tab {
 
     font-size: 16px;
     font-weight: 600;
-    background-color: unset;
     color: #777777;
     height: 39px;
     display: flex;

From 6d66d81788bf254c4e3d90052ccd65dbcd4daf06 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nejc=20Kova=C4=8D?= <nejc.kouko@gmail.com>
Date: Fri, 15 Jul 2022 15:20:21 +0200
Subject: [PATCH 074/110] login/rregister form popravljen padding ob errorjih,
 tab background-colot

---
 frontend/simple/css/style.css                      | 4 ++--
 resources/sass/frontend_simple/basic/popravki.scss | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/frontend/simple/css/style.css b/frontend/simple/css/style.css
index 9b9f082f8..5e94e7783 100644
--- a/frontend/simple/css/style.css
+++ b/frontend/simple/css/style.css
@@ -1259,7 +1259,7 @@ body.login_noEmail #main {
 
 body.login_noEmail #main .main_content {
   padding-top: 70px;
-  min-height: 772px;
+  min-height: 769px;
 }
 
 body.login_noEmail #main .app_subtitle {
@@ -1347,7 +1347,7 @@ body.login #main {
 
 body.login #main .main_content {
   padding-top: 70px;
-  min-height: 772px;
+  min-height: 769px;
 }
 
 body.login #main .app_subtitle {
diff --git a/resources/sass/frontend_simple/basic/popravki.scss b/resources/sass/frontend_simple/basic/popravki.scss
index 17cb62295..3084ec914 100644
--- a/resources/sass/frontend_simple/basic/popravki.scss
+++ b/resources/sass/frontend_simple/basic/popravki.scss
@@ -306,7 +306,7 @@ body.login_noEmail #main{
 
 body.login_noEmail #main .main_content{
     padding-top: 70px;
-    min-height: 772px;
+    min-height: 769px;
 }
 
 body.login_noEmail #main .app_subtitle {
@@ -407,7 +407,7 @@ body.login #main{
 
 body.login #main .main_content{
     padding-top: 70px;
-    min-height: 772px;
+    min-height: 769px;
 }
 
 body.login #main .app_subtitle {

From 48a35f6aa2a9bbfb993f1c8b44d0302a28caa393 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nejc=20Kova=C4=8D?= <nejc.kouko@gmail.com>
Date: Fri, 15 Jul 2022 15:23:14 +0200
Subject: [PATCH 075/110] register form - register error popravljen padding

---
 frontend/simple/css/style.css                      | 1 +
 resources/sass/frontend_simple/basic/popravki.scss | 1 +
 2 files changed, 2 insertions(+)

diff --git a/frontend/simple/css/style.css b/frontend/simple/css/style.css
index 5e94e7783..effe39f11 100644
--- a/frontend/simple/css/style.css
+++ b/frontend/simple/css/style.css
@@ -1428,6 +1428,7 @@ body.register #main {
 
 body.register #main .main_content {
   padding-top: 70px;
+  min-height: 769px;
 }
 
 body.register #main .app_subtitle {
diff --git a/resources/sass/frontend_simple/basic/popravki.scss b/resources/sass/frontend_simple/basic/popravki.scss
index 3084ec914..3e0c7a509 100644
--- a/resources/sass/frontend_simple/basic/popravki.scss
+++ b/resources/sass/frontend_simple/basic/popravki.scss
@@ -501,6 +501,7 @@ body.register #main{
 
 body.register  #main .main_content{
     padding-top: 70px;
+    min-height: 769px;
 }
 
 body.register #main .app_subtitle {

From dbba06f2fbbc4a9f98b014fc008ed5eef318118d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nejc=20Kova=C4=8D?= <nejc.kouko@gmail.com>
Date: Fri, 15 Jul 2022 15:32:40 +0200
Subject: [PATCH 076/110] register form popravljena velikost  pisave label ob
 errorju

---
 frontend/simple/css/style.css                            | 2 +-
 resources/sass/frontend_simple/modules/landing_page.scss | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/simple/css/style.css b/frontend/simple/css/style.css
index effe39f11..433c72ab7 100644
--- a/frontend/simple/css/style.css
+++ b/frontend/simple/css/style.css
@@ -442,7 +442,7 @@ body.register #main .landing_page_window label,
 body.login #main .landing_page_window label,
 body.login_noEmail #main .landing_page_window label {
   margin: 15px 0 5px 0;
-  font-size: 17px;
+  font-size: 16px;
   font-weight: 600;
 }
 body.landing_page #main .landing_page_window .subtitle,
diff --git a/resources/sass/frontend_simple/modules/landing_page.scss b/resources/sass/frontend_simple/modules/landing_page.scss
index bae3b092b..86c557c40 100644
--- a/resources/sass/frontend_simple/modules/landing_page.scss
+++ b/resources/sass/frontend_simple/modules/landing_page.scss
@@ -141,7 +141,7 @@ body.login_noEmail{
             label{
                 margin: 15px 0 5px 0;
 
-                font-size: 17px;
+                font-size: 16px;
                 font-weight: 600;
             }
 

From 4a6711cd60a50f3d5615d5c8aebc19178286b018 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nejc=20Kova=C4=8D?= <nejc.kouko@gmail.com>
Date: Sun, 17 Jul 2022 18:17:10 +0200
Subject: [PATCH 077/110] Objava - pregled

---
 admin/survey/SurveyAdminAjax.php              | 14 ++++++-
 admin/survey/SurveyAdminSettings.php          | 15 +++++++
 lang/1.php                                    |  4 +-
 lang/2.php                                    |  4 +-
 public/css/admin_new.css                      | 18 ++++++++-
 .../sass/admin_new/mobile/pages/publish.scss  |  2 +-
 .../pages/survey_objava/pregled.scss          | 39 +++++++++++++++++++
 7 files changed, 89 insertions(+), 7 deletions(-)

diff --git a/admin/survey/SurveyAdminAjax.php b/admin/survey/SurveyAdminAjax.php
index 4b343c4cc..6b680b65a 100644
--- a/admin/survey/SurveyAdminAjax.php
+++ b/admin/survey/SurveyAdminAjax.php
@@ -6941,7 +6941,19 @@ class SurveyAdminAjax {
 							echo '<a href="'.$link.'?anketa='.$this->anketa.'&a=prevajanje&lang_id='.$key.'" target="_blank">'.$val.'</a>';
 						}
 						echo '</p>';
-					}		
+					}
+					
+					# Prevod
+
+					echo '<p> <span>Prevod: </span>';
+					echo '<span><a href="#">Belarussian</a>, </span>';
+					echo '<span><a href="#">Bulgarian</a></span>';
+
+					echo '</p>';
+
+
+
+
 					#piškotki
 					echo '<p><span>'.$lang['srv_cookie'].':</span> <a href="'.$base_url.'&a='.A_COOKIE.'&f=vabila_settings" title="'.$lang['srv_cookie'].'"><span class="qs_data as_link">'.$lang['srv_cookie_'.$row['cookie']].'</span></a></p>';
 					echo '<p><span>'.$lang['srv_cookie_return'].':</span> <a href="'.$base_url.'&a='.A_COOKIE.'&f=vabila_settings" title="'.$lang['srv_cookie_return'].'"><span class="qs_data as_link">'.($row['cookie_return'] == 0 ? $lang['srv_cookie_return_start'] : $lang['srv_cookie_return_middle']).'</span></a></p>';
diff --git a/admin/survey/SurveyAdminSettings.php b/admin/survey/SurveyAdminSettings.php
index aff2d3ef7..5fd1ee2c6 100644
--- a/admin/survey/SurveyAdminSettings.php
+++ b/admin/survey/SurveyAdminSettings.php
@@ -2923,6 +2923,21 @@ class SurveyAdminSettings {
 		$link1 = $site_url.'a/'.$row['hash'];
 		echo '<div class="grouplang">';
 		echo '<a href="'.$link1.'" target="_blank">'.$link1.'</a>'.(count($lang_array) > 0 ? '&nbsp- '.$base_lang_resp : '');
+		echo '<div class= "lang_span">- English </div>';
+		echo '<span class="faicon blue copy" onclick="CopyToClipboard(\''.$link1.'\'); actionNotePopup(\'link_copied\', \'success\'); return false;" title="'.$lang['srv_publication_survey_copylink'].'"></span>';
+		echo '</div>';
+
+		$link1 = $site_url.'a/'.$row['hash'];
+		echo '<div class="grouplang">';
+		echo '<a href="'.$link1.'" target="_blank">'.$link1.'</a>'.(count($lang_array) > 0 ? '&nbsp- '.$base_lang_resp : '');
+		echo '<div class= "lang_span">- Slovenščina </div>';
+		echo '<span class="faicon blue copy" onclick="CopyToClipboard(\''.$link1.'\'); actionNotePopup(\'link_copied\', \'success\'); return false;" title="'.$lang['srv_publication_survey_copylink'].'"></span>';
+		echo '</div>';
+
+		$link1 = $site_url.'a/'.$row['hash'];
+		echo '<div class="grouplang">';
+		echo '<a href="'.$link1.'" target="_blank">'.$link1.'</a>'.(count($lang_array) > 0 ? '&nbsp- '.$base_lang_resp : '');
+		echo '<div class= "lang_span">- Italian </div>';
 		echo '<span class="faicon blue copy" onclick="CopyToClipboard(\''.$link1.'\'); actionNotePopup(\'link_copied\', \'success\'); return false;" title="'.$lang['srv_publication_survey_copylink'].'"></span>';
 		echo '</div>';
 
diff --git a/lang/1.php b/lang/1.php
index 7623396df..9f68c68dd 100644
--- a/lang/1.php
+++ b/lang/1.php
@@ -1915,8 +1915,8 @@ $lang = array (
 	"srv_anketa_href_text"			=>	"Delite povezavo do ankete na vaši spletni strani.",
 	"srv_anketa_href_count"			=>	"HTML koda s števcem ogledov",
 	"srv_anketa_href_count_text"	=>	"Delite povezavo do ankete na vaši spletni strani in beležite število ogledov povezave na anketo. ",
-	"srv_anketa_href_friends"		=>	"QR koda",
-	"srv_anketa_href_friends_text"	=>	"Delite povezavo do ankete s QR kodo.",
+	"srv_anketa_href_friends"		=>	"Delite s prijatelji",
+	"srv_anketa_href_friends_text"	=>	"Delite povezavo do ankete s prijatelji na družbenih medijih (Facebook, Twitter, Linkedin, itd.)",
 	"srv_anketa_href_ijs"			=>	"iFrame - JavaScript verzija",
 	"srv_anketa_href_ijs_text"		=>	"Vdelajte anketo na vašo spletno stran, da lahko respondenti anketo rešujejo na vaši strani.",
 	"srv_anketa_href_ijs_text2"		=>	"Tu lahko skopirate kodo vaše ankete (Javascript verzija) in jo vdelate v vašo spletno stran.",
diff --git a/lang/2.php b/lang/2.php
index 0a92bc3b2..2f711cde6 100644
--- a/lang/2.php
+++ b/lang/2.php
@@ -1908,8 +1908,8 @@ $lang = array (
 	"srv_anketa_href_text"			=>	"Share the link to the survey on your website.",
 	"srv_anketa_href_count"			=>	"HTML code with view counter",
 	"srv_anketa_href_count_text"	=>	"Share the link to the survey on your website and keep track of the number of views of the survey link. ",
-	"srv_anketa_href_friends"		=>	"QR code",
-	"srv_anketa_href_friends_text"	=>	"Share the link to the survey with a QR code.",
+	"srv_anketa_href_friends"		=>	"Share with friends",
+	"srv_anketa_href_friends_text"	=>	"Share the survey link with friends on social media (Facebook, Twitter, Linkedin etc.) ",
 	"srv_anketa_href_ijs"			=>	"iFrame - JavaScript version",
 	"srv_anketa_href_ijs_text"		=>	"Embed the survey on your website so that respondents can complete the survey on your website.",
 	"srv_anketa_href_ijs_text2"		=>	"You can copy the code of your survey (Javascript version) and embed it into your own website.",
diff --git a/public/css/admin_new.css b/public/css/admin_new.css
index 9410992c1..3ad9e8245 100644
--- a/public/css/admin_new.css
+++ b/public/css/admin_new.css
@@ -24504,6 +24504,8 @@ div#vabila div.button_holder .copy_survey_url_holder button {
 }
 div#vabila div.button_holder #nice_url_button {
   margin: 0 0 0 32px;
+  background-color: #FFC700;
+  border: 1px #FFC700 solid;
 }
 div#vabila div.button_holder #nice_url_holder {
   display: flex;
@@ -24644,6 +24646,20 @@ div#general_popup div.popup_content.publish.settings div#publish_settings_more {
   display: none;
 }
 
+@media screen and (max-width: 1300px) {
+  #vabila .copy_survey_url_holder .input_box {
+    width: 300px;
+  }
+  #vabila .button_holder {
+    display: unset;
+  }
+  #vabila .button_holder #nice_url_button {
+    margin: 16px 0px !important;
+  }
+  #vabila .button_holder #nice_url_holder {
+    margin: 16px 0px !important;
+  }
+}
 .page_invitations .invitations_holder.half-half {
   display: flex;
 }
@@ -33413,7 +33429,7 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
     width: 100%;
   }
   .page_vabila #vabila .button_holder .copy_survey_url_holder .input_box {
-    width: auto;
+    max-width: 300px;
   }
   .page_vabila #vabila .button_holder #nice_url_button {
     margin: 16px 0 0 0;
diff --git a/resources/sass/admin_new/mobile/pages/publish.scss b/resources/sass/admin_new/mobile/pages/publish.scss
index be52f7d43..135d9f4cf 100644
--- a/resources/sass/admin_new/mobile/pages/publish.scss
+++ b/resources/sass/admin_new/mobile/pages/publish.scss
@@ -10,7 +10,7 @@
 
             // Url ankete in kopiranje url-ja
             .input_box {
-                width: auto;
+                max-width: 300px;
             }  
         }   
         
diff --git a/resources/sass/admin_new/pages/survey_objava/pregled.scss b/resources/sass/admin_new/pages/survey_objava/pregled.scss
index 222d989fc..d48d8bcc4 100644
--- a/resources/sass/admin_new/pages/survey_objava/pregled.scss
+++ b/resources/sass/admin_new/pages/survey_objava/pregled.scss
@@ -124,6 +124,8 @@ div#vabila {
         // Nice URL - gumb
         #nice_url_button{
             margin: 0 0 0 32px;
+            background-color: #FFC700;
+            border: 1px #FFC700 solid;
         }
 
         // Nice URL - dodajanje
@@ -320,3 +322,40 @@ div#general_popup {
         }
     }
 }
+
+
+@media screen and (max-width: 1300px){
+
+    #vabila{
+
+        .copy_survey_url_holder{
+
+            .input_box{
+                width: 300px;
+            }
+        }
+
+
+        .button_holder {
+            display: unset;
+
+            #nice_url_button {
+                margin: 16px 0px !important;
+            }
+
+
+            #nice_url_holder {
+                margin: 16px 0px !important;
+            }
+
+
+
+        }
+
+
+
+   } 
+    
+
+    
+}
\ No newline at end of file

From 1d1ff8eb46094194a7e61a7a566f54da005fd1cd Mon Sep 17 00:00:00 2001
From: tejagerjovic <teja.gerjovic@fdv.uni-lj.si>
Date: Mon, 18 Jul 2022 10:08:31 +0200
Subject: [PATCH 078/110] Napredne nastavitve v sredino vsebine - dodana opcija
 odpri vse / zapri vse

---
 admin/survey/Branching.php | 57 ++++++++++----------------------------
 1 file changed, 14 insertions(+), 43 deletions(-)

diff --git a/admin/survey/Branching.php b/admin/survey/Branching.php
index 0d7756a6a..0108e9e76 100644
--- a/admin/survey/Branching.php
+++ b/admin/survey/Branching.php
@@ -215,49 +215,6 @@ class Branching {
 		$full_view = (int)$row_query_fv['full_view'] == 1 ? true : false;
 		$full_view = true;
 
-		echo '<div class="floatLeft">';
-		# skrčen / razširjen
-		if ($this->expanded) {
-			echo '<span title="'.$lang['srv_expanded_1'].'"><a href="index.php?anketa='.$this->anketa.'&a=branching&change_mode=1&what=expanded&value=0"><span class="faicon expanded"></span>'.$lang['srv_expanded_0_short'].'</a></span> ';
-			$sqle = sisplet_query("SELECT count(*) AS c FROM srv_branching WHERE ank_id='$this->anketa'");
-			$rowe = mysqli_fetch_array($sqle);
-			if ($rowe['c'] > 15 && !isset($_COOKIE['expanded']))
-				echo '<span class="expanded-tooltip top">'.$lang['srv_expaned_text'].' <a href="#" onclick="$(this).closest(\'.expanded-tooltip\').hide(); var d = new Date(); d.setDate(d.getDate()+30); document.cookie=\'expanded=1;expires=\'+d.toUTCString(); return false;" class="close">'.$lang['srv_zapri'].'</a><span class="arrow"></span></span>';
-		} else {
-			echo '<span title="'.$lang['srv_expanded_0'].'"><a href="index.php?anketa='.$this->anketa.'&a=branching&change_mode=1&what=expanded&value=1"><span class="faicon compress"></span>'.$lang['srv_expanded_0_short'].'</a></span> ';
-		}
-		echo Help::display('srv_branching_expanded');
-
-		echo '</div>';
-
-
-		echo '<div class="floatRight">';
-
-		# find & replace
-		if ($row['locked'] == 0) {
-			echo '<a href="#" onclick="find_replace(); return false;" title="'.$lang['srv_find_replace'].'" ><span class="faicon replace"></span></a>';
-		}
-
-		if ($row['locked'] == 0 && $full_view == true) {
-			echo '<a href="#" onclick="javascript:pagebreak_all(); return false;" title="'.$lang['srv_pagebreak_all'].'"><span class="faicon paragraph"></span></a> '."\n";
-		}
-
-		# Hrošč je viden samo če imamo ife in razširjen pogled
-		if ($row['locked'] == 0 && $full_view == true) { // if ($row['flat'] == 0)
-			echo '<a href="#" onclick="check_pogoji(); return false;" title="'.$lang['srv_check_pogoji'].'"><span class="faicon bug"></span></a> '."\n";
-		}
-
-		if ($row['locked'] == 0 && $full_view == true) {
-			echo '<a href="#" onclick="prestevilci(); return false;"><span class="faicon hashtag" title="'.$lang['srv_grupe_recount_branching'].'"></span></a>' . Help :: display('srv_grupe_recount_branching')  ."\n";
-		}
-
-		if ($has_if == true && $full_view == true || ($has_if == true && $this->expanded == false)) {
-			echo '<a href="#" onClick="expandCollapseAllPlusMinus(\'expand\'); return false;"><span class="faicon plus_square" title="'.$lang['srv_expand'].'"></span></a>'."\n";
-			echo '<a href="#" onClick="expandCollapseAllPlusMinus(\'collapse\'); return false;"><span class="faicon minus_square" title="'.$lang['srv_collapse'].'"></span></a>'."\n";
-		}
-
-		echo '</div>';
-
 		// prikaz blokov kot zavihke
 		echo '<div class="blockSwitch">';
 		$sql = sisplet_query("SELECT i.* FROM srv_if i, srv_branching b WHERE i.tab='1' AND i.tip='1' AND i.id=b.element_if AND b.ank_id='$this->anketa' ORDER BY b.parent, b.vrstni_red");
@@ -1703,6 +1660,17 @@ class Branching {
 		echo '</div>';
 		
 		echo '<div id="top_napredne_dropdown" class="displayNone">';
+
+		#odpri vse - zapri vse
+		if ($has_if == true && $full_view == true || ($has_if == true && $this->expanded == false)) {
+			echo '<p class="segment_option">';
+			echo '<a href="#" onClick="expandCollapseAllPlusMinus(\'expand\'); toggleSurveyTopSettings(); return false;"><span class="faicon plus_square" title="'.$lang['srv_expand'].'"></span>'.$lang['srv_expand'].'</a>'."\n";
+			echo '</p>';
+			echo '<p class="segment_option">';
+			echo '<a href="#" onClick="expandCollapseAllPlusMinus(\'collapse\'); toggleSurveyTopSettings(); return false;"><span class="faicon minus_square" title="'.$lang['srv_collapse'].'"></span>'.$lang['srv_collapse'].'</a>'."\n";
+			echo '</p>';
+		}
+
 		# find & replace
 		if ($row['locked'] == 0) {
 			echo '<p class="segment_option">';
@@ -1710,6 +1678,7 @@ class Branching {
 			echo '</p>';
 		}
 
+		#prelom strani
 		if ($row['locked'] == 0 && $full_view == true) {
 			echo '<p class="segment_option">';
 			echo '<a href="#" onclick="javascript:pagebreak_all(); toggleSurveyTopSettings(); return false;" title="'.$lang['srv_pagebreak_all'].'"><span class="faicon paragraph"></span>'.$lang['srv_pagebreak_all'].'</a> '."\n";
@@ -1723,11 +1692,13 @@ class Branching {
 			echo '</p>';
 		}
 
+		#prestevilci
 		if ($row['locked'] == 0 && $full_view == true) {
 			echo '<p class="segment_option">';
 			echo '<a href="#" onclick="prestevilci(); toggleSurveyTopSettings(); return false;"><span class="faicon hashtag" title="'.$lang['srv_grupe_recount_branching'].'"></span>'.$lang['srv_grupe_recount_branching'].'</a>' . Help :: display('srv_grupe_recount_branching')  ."\n";
 			echo '</p>';
 		}
+
 		echo '</div>';
 
 		//Klik izven razprith nastavitev - zapremo okno

From a00123a37b5e49ea9238de89151c8c6eca071a35 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nejc=20Kova=C4=8D?= <nejc.kouko@gmail.com>
Date: Mon, 18 Jul 2022 10:50:41 +0200
Subject: [PATCH 079/110] Objava - pregled

---
 admin/survey/SurveyAdminSettings.php          |  1 +
 public/css/admin_new.css                      | 33 +++++++-
 public/img/icons/lock_yellow.svg              |  6 ++
 .../pages/survey_objava/pregled.scss          | 82 ++++++++++++++++++-
 4 files changed, 119 insertions(+), 3 deletions(-)
 create mode 100644 public/img/icons/lock_yellow.svg

diff --git a/admin/survey/SurveyAdminSettings.php b/admin/survey/SurveyAdminSettings.php
index 5fd1ee2c6..c97d9b0f4 100644
--- a/admin/survey/SurveyAdminSettings.php
+++ b/admin/survey/SurveyAdminSettings.php
@@ -2797,6 +2797,7 @@ class SurveyAdminSettings {
 			echo '<div class="more_title">';
 			echo '<div class="more_title_icon"><span class="faicon inv_sent_1 empty"></span></div>';
 			echo $lang['srv_publication_invitations'];
+			echo '<img class= "mail_yellow" src="/public\img\icons\lock_yellow.svg">';
 			echo '</div>';
 			echo $lang['srv_publication_invitations_text'];
 		echo '</div>';
diff --git a/public/css/admin_new.css b/public/css/admin_new.css
index 3ad9e8245..eed51eb39 100644
--- a/public/css/admin_new.css
+++ b/public/css/admin_new.css
@@ -24596,11 +24596,20 @@ div#vabila div.more div.more_block div.more_title div.more_title_icon span.fa-1
   bottom: 1px;
   right: 1px;
 }
+div#vabila div.more div.more_block div.more_title .mail_yellow {
+  margin-left: 32px;
+}
 div#vabila div.more div.more_block div.more_title a.help {
   color: inherit;
   text-decoration: none;
   margin-left: 5px;
 }
+div#vabila div.more div.more_block:first-of-type .more_title {
+  color: #FFC700;
+}
+div#vabila div.more div.more_block:first-of-type span.faicon.empty {
+  color: #FFC700;
+}
 
 div#general_popup div.popup_content.publish {
   max-width: 600px;
@@ -24646,7 +24655,7 @@ div#general_popup div.popup_content.publish.settings div#publish_settings_more {
   display: none;
 }
 
-@media screen and (max-width: 1300px) {
+@media screen and (max-width: 1025px) {
   #vabila .copy_survey_url_holder .input_box {
     width: 300px;
   }
@@ -24658,6 +24667,28 @@ div#general_popup div.popup_content.publish.settings div#publish_settings_more {
   }
   #vabila .button_holder #nice_url_holder {
     margin: 16px 0px !important;
+    flex-direction: row;
+  }
+}
+@media screen and (max-width: 850px) {
+  .page_vabila #vabila .button_holder #nice_url_holder {
+    flex-direction: row !important;
+  }
+  .page_vabila #vabila .button_holder #nice_url_holder .buttons {
+    margin: 0px !important;
+  }
+}
+@media screen and (max-width: 725px) {
+  h2 {
+    font-size: 20px !important;
+  }
+}
+@media screen and (max-width: 500px) {
+  .page_vabila #vabila .button_holder #nice_url_holder {
+    flex-direction: column !important;
+  }
+  .page_vabila #vabila .button_holder #nice_url_holder .buttons {
+    margin: 0px !important;
   }
 }
 .page_invitations .invitations_holder.half-half {
diff --git a/public/img/icons/lock_yellow.svg b/public/img/icons/lock_yellow.svg
new file mode 100644
index 000000000..c623e3512
--- /dev/null
+++ b/public/img/icons/lock_yellow.svg
@@ -0,0 +1,6 @@
+<svg width="13" height="14" viewBox="0 0 13 14" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M11.76 6.16H10.57V2.24C10.57 1.00275 9.56725 0 8.33 0H3.99C2.75275 0 1.75 1.00275 1.75 2.24V6.16H0.56C0.25025 6.16 0 6.41025 0 6.72V13.44C0 13.7498 0.25025 14 0.56 14H11.76C12.0697 14 12.32 13.7498 12.32 13.44V6.72C12.32 6.41025 12.0697 6.16 11.76 6.16ZM6.65 10.3075V11.235C6.65 11.312 6.587 11.375 6.51 11.375H5.81C5.733 11.375 5.67 11.312 5.67 11.235V10.3075C5.52554 10.2038 5.41772 10.0569 5.36205 9.88802C5.30638 9.71912 5.30574 9.53692 5.36022 9.36764C5.41469 9.19835 5.52148 9.05072 5.6652 8.94599C5.80892 8.84126 5.98217 8.78483 6.16 8.78483C6.33783 8.78483 6.51108 8.84126 6.6548 8.94599C6.79852 9.05072 6.90531 9.19835 6.95978 9.36764C7.01426 9.53692 7.01362 9.71912 6.95795 9.88802C6.90228 10.0569 6.79446 10.2038 6.65 10.3075ZM9.31 6.16H3.01V2.24C3.01 1.69925 3.44925 1.26 3.99 1.26H8.33C8.87075 1.26 9.31 1.69925 9.31 2.24V6.16Z" fill="#FFC700"/>
+</svg>
+
+
+
diff --git a/resources/sass/admin_new/pages/survey_objava/pregled.scss b/resources/sass/admin_new/pages/survey_objava/pregled.scss
index d48d8bcc4..b5c3d08fa 100644
--- a/resources/sass/admin_new/pages/survey_objava/pregled.scss
+++ b/resources/sass/admin_new/pages/survey_objava/pregled.scss
@@ -246,6 +246,10 @@ div#vabila {
                     }
                 }
 
+                .mail_yellow{
+                    margin-left: 32px;
+                }
+
                 a.help {
                     color: inherit;
                     text-decoration: none;
@@ -255,6 +259,16 @@ div#vabila {
             }
 
         }
+
+        div.more_block:first-of-type{
+            .more_title{
+                color: #FFC700;
+            }
+
+            span.faicon.empty{
+                color: #FFC700;
+            }
+        }
     }
 
 }
@@ -324,7 +338,7 @@ div#general_popup {
 }
 
 
-@media screen and (max-width: 1300px){
+@media screen and (max-width: 1025px){
 
     #vabila{
 
@@ -346,6 +360,9 @@ div#general_popup {
 
             #nice_url_holder {
                 margin: 16px 0px !important;
+                flex-direction: row;
+
+
             }
 
 
@@ -355,7 +372,68 @@ div#general_popup {
 
 
    } 
+        
+}
+
+@media screen and (max-width: 850px) {
+    .page_vabila{
+
+        #vabila{
+
+            .button_holder{
+    
+                #nice_url_holder {
+
+                    flex-direction: row !important;
+
+                    .buttons{
+                        margin: 0px !important;
+                    }
+
+                }
+
+
+        
+            }
+    
+       } 
+
+    }
     
 
+}
+
+@media screen and (max-width: 725px) {
+
+    h2 {
+        font-size: 20px !important ;
+    }
+}
+
+@media screen and (max-width: 500px) {
+    .page_vabila{
+
+        #vabila{
+
+            .button_holder{
     
-}
\ No newline at end of file
+                #nice_url_holder {
+
+                    flex-direction: column !important;
+
+                    .buttons{
+                        margin: 0px !important;
+                    }
+
+                }
+
+
+        
+            }
+    
+       } 
+
+    }
+    
+
+}

From f354c1eba74b0a6df9187094e41884df698a14f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nejc=20Kova=C4=8D?= <nejc.kouko@gmail.com>
Date: Mon, 18 Jul 2022 11:08:46 +0200
Subject: [PATCH 080/110] Objava - pregled

---
 public/css/admin_new.css                      | 11 +++++++
 .../pages/survey_objava/pregled.scss          | 33 +++++++++++++++++--
 2 files changed, 42 insertions(+), 2 deletions(-)

diff --git a/public/css/admin_new.css b/public/css/admin_new.css
index eed51eb39..853cdfce7 100644
--- a/public/css/admin_new.css
+++ b/public/css/admin_new.css
@@ -24655,6 +24655,11 @@ div#general_popup div.popup_content.publish.settings div#publish_settings_more {
   display: none;
 }
 
+@media screen and (max-width: 1130px) {
+  .more_block {
+    width: 40% !important;
+  }
+}
 @media screen and (max-width: 1025px) {
   #vabila .copy_survey_url_holder .input_box {
     width: 300px;
@@ -24683,6 +24688,12 @@ div#general_popup div.popup_content.publish.settings div#publish_settings_more {
     font-size: 20px !important;
   }
 }
+@media screen and (max-width: 540px) {
+  .page_vabila #vabila .more .more_block {
+    width: unset !important;
+    width: 100% !important;
+  }
+}
 @media screen and (max-width: 500px) {
   .page_vabila #vabila .button_holder #nice_url_holder {
     flex-direction: column !important;
diff --git a/resources/sass/admin_new/pages/survey_objava/pregled.scss b/resources/sass/admin_new/pages/survey_objava/pregled.scss
index b5c3d08fa..568c24018 100644
--- a/resources/sass/admin_new/pages/survey_objava/pregled.scss
+++ b/resources/sass/admin_new/pages/survey_objava/pregled.scss
@@ -338,6 +338,15 @@ div#general_popup {
 }
 
 
+@media screen and (max-width: 1130px){
+
+    .more_block{
+        width: 40% !important;
+    }
+}
+
+
+
 @media screen and (max-width: 1025px){
 
     #vabila{
@@ -410,6 +419,27 @@ div#general_popup {
     }
 }
 
+@media screen and (max-width: 540px) {
+    .page_vabila{
+
+        #vabila{
+
+
+            .more{
+
+                .more_block{
+                    width: unset !important;
+                    width: 100% !important;
+                }
+            }
+
+    
+       } 
+
+    }
+}
+
+
 @media screen and (max-width: 500px) {
     .page_vabila{
 
@@ -429,8 +459,7 @@ div#general_popup {
 
 
         
-            }
-    
+            }   
        } 
 
     }

From 9372f5f0a29d86b99660047c22df02ee0734f2ee Mon Sep 17 00:00:00 2001
From: pero1203 <peter.hrvatin@gmail.com>
Date: Mon, 18 Jul 2022 11:51:52 +0200
Subject: [PATCH 081/110] Redesign - popravek sirine texta "stran 1"... pri
 urejanju

---
 frontend/simple/css/style.css                 |   21 +-
 public/css/admin_new.css                      | 2965 +++++++++--------
 .../pages/survey_edit/branching.scss          |    7 +-
 .../survey_edit/branching_collapsed.scss      |    1 +
 4 files changed, 1540 insertions(+), 1454 deletions(-)

diff --git a/frontend/simple/css/style.css b/frontend/simple/css/style.css
index 433c72ab7..5ba03cda1 100644
--- a/frontend/simple/css/style.css
+++ b/frontend/simple/css/style.css
@@ -3,7 +3,8 @@
     Created on : 28.3.2020
     Author     : Peter Hrvatin
 */
-/* BARVE */ /* FONTI */
+/* BARVE */
+/* FONTI */
 @import url("https://fonts.googleapis.com/css?family=Montserrat:300,400,400i,600,700&amp;subset=latin-ext");
 @import url("https://fonts.googleapis.com/css2?family=Source+Sans+Pro:wght@300;400;600;700&display=swap");
 .thin {
@@ -723,13 +724,16 @@ body.reset_password_activate div.label {
   #main .main_content {
     min-height: unset;
   }
+
   /* --------------HAMBURGER---------------------------------- */
   .nav-desktop {
     display: none;
   }
+
   .mobile {
     display: block;
   }
+
   #nav-icon3 {
     width: 38px;
     height: 20px;
@@ -773,35 +777,42 @@ body.reset_password_activate div.label {
   #nav-icon3 span:nth-child(4) {
     top: 18px;
   }
+
   #nav-icon3.open span:nth-child(1) {
     top: 9px;
     width: 0%;
     left: 50%;
   }
+
   #nav-icon3.open span:nth-child(2) {
     -webkit-transform: rotate(45deg);
     -moz-transform: rotate(45deg);
     -o-transform: rotate(45deg);
     transform: rotate(45deg);
   }
+
   #nav-icon3.open span:nth-child(3) {
     -webkit-transform: rotate(-45deg);
     -moz-transform: rotate(-45deg);
     -o-transform: rotate(-45deg);
     transform: rotate(-45deg);
   }
+
   #nav-icon3.open span:nth-child(4) {
     top: 9px;
     width: 0%;
     left: 50%;
   }
+
   #links {
     display: none;
   }
+
   /*  */
   .aai a {
     color: #333333;
   }
+
   #links.open {
     position: absolute;
     top: 72px;
@@ -811,8 +822,9 @@ body.reset_password_activate div.label {
     align-items: center;
     width: 100%;
     height: 100vh;
-    background-color: rgb(255, 255, 255);
+    background-color: white;
   }
+
   #links .menu_item {
     font-size: 30px;
     margin-top: 30px;
@@ -824,6 +836,7 @@ body.reset_password_activate div.label {
   #links .menu_item a:hover {
     color: #1E88E5;
   }
+
   body #main .main_content {
     padding: 10px 20px 40px 20px;
   }
@@ -865,6 +878,7 @@ body #main .main_content input[type=button] {
     margin: 0;
     width: 100%;
   }
+
   body.landing_page,
 body.login,
 body.register,
@@ -951,6 +965,7 @@ body.login_noEmail #content.aai #main .main_content .app_subtitle {
     width: 100%;
     box-sizing: border-box;
   }
+
   footer {
     padding: 0 20px;
   }
@@ -981,6 +996,7 @@ body.login_noEmail #content.aai #main .main_content .app_subtitle {
   footer .footer_content .logo_holder img {
     margin: 20px auto 30px auto;
   }
+
   .cookie_notice {
     flex-direction: column;
   }
@@ -988,6 +1004,7 @@ body.login_noEmail #content.aai #main .main_content .app_subtitle {
     margin: 0 0 20px 0;
     text-align: center;
   }
+
   body #main .main_content .register_holder h1 {
     font-size: 50px;
     font-weight: 300;
diff --git a/public/css/admin_new.css b/public/css/admin_new.css
index 853cdfce7..f8436a52a 100644
--- a/public/css/admin_new.css
+++ b/public/css/admin_new.css
@@ -214,4767 +214,4767 @@
 /* Font Awesome uses the Unicode Private Use Area (PUA) to ensure screen
 readers do not read off random characters that represent icons */
 .fa-500px:before {
-  content: "\f26e";
+  content: "";
 }
 
 .fa-accessible-icon:before {
-  content: "\f368";
+  content: "";
 }
 
 .fa-accusoft:before {
-  content: "\f369";
+  content: "";
 }
 
 .fa-ad:before {
-  content: "\f641";
+  content: "";
 }
 
 .fa-address-book:before {
-  content: "\f2b9";
+  content: "";
 }
 
 .fa-address-card:before {
-  content: "\f2bb";
+  content: "";
 }
 
 .fa-adjust:before {
-  content: "\f042";
+  content: "";
 }
 
 .fa-adn:before {
-  content: "\f170";
+  content: "";
 }
 
 .fa-adversal:before {
-  content: "\f36a";
+  content: "";
 }
 
 .fa-affiliatetheme:before {
-  content: "\f36b";
+  content: "";
 }
 
 .fa-air-freshener:before {
-  content: "\f5d0";
+  content: "";
 }
 
 .fa-algolia:before {
-  content: "\f36c";
+  content: "";
 }
 
 .fa-align-center:before {
-  content: "\f037";
+  content: "";
 }
 
 .fa-align-justify:before {
-  content: "\f039";
+  content: "";
 }
 
 .fa-align-left:before {
-  content: "\f036";
+  content: "";
 }
 
 .fa-align-right:before {
-  content: "\f038";
+  content: "";
 }
 
 .fa-alipay:before {
-  content: "\f642";
+  content: "";
 }
 
 .fa-allergies:before {
-  content: "\f461";
+  content: "";
 }
 
 .fa-amazon:before {
-  content: "\f270";
+  content: "";
 }
 
 .fa-amazon-pay:before {
-  content: "\f42c";
+  content: "";
 }
 
 .fa-ambulance:before {
-  content: "\f0f9";
+  content: "";
 }
 
 .fa-american-sign-language-interpreting:before {
-  content: "\f2a3";
+  content: "";
 }
 
 .fa-amilia:before {
-  content: "\f36d";
+  content: "";
 }
 
 .fa-anchor:before {
-  content: "\f13d";
+  content: "";
 }
 
 .fa-android:before {
-  content: "\f17b";
+  content: "";
 }
 
 .fa-angellist:before {
-  content: "\f209";
+  content: "";
 }
 
 .fa-angle-double-down:before {
-  content: "\f103";
+  content: "";
 }
 
 .fa-angle-double-left:before {
-  content: "\f100";
+  content: "";
 }
 
 .fa-angle-double-right:before {
-  content: "\f101";
+  content: "";
 }
 
 .fa-angle-double-up:before {
-  content: "\f102";
+  content: "";
 }
 
 .fa-angle-down:before {
-  content: "\f107";
+  content: "";
 }
 
 .fa-angle-left:before {
-  content: "\f104";
+  content: "";
 }
 
 .fa-angle-right:before {
-  content: "\f105";
+  content: "";
 }
 
 .fa-angle-up:before {
-  content: "\f106";
+  content: "";
 }
 
 .fa-angry:before {
-  content: "\f556";
+  content: "";
 }
 
 .fa-angrycreative:before {
-  content: "\f36e";
+  content: "";
 }
 
 .fa-angular:before {
-  content: "\f420";
+  content: "";
 }
 
 .fa-ankh:before {
-  content: "\f644";
+  content: "";
 }
 
 .fa-app-store:before {
-  content: "\f36f";
+  content: "";
 }
 
 .fa-app-store-ios:before {
-  content: "\f370";
+  content: "";
 }
 
 .fa-apper:before {
-  content: "\f371";
+  content: "";
 }
 
 .fa-apple:before {
-  content: "\f179";
+  content: "";
 }
 
 .fa-apple-alt:before {
-  content: "\f5d1";
+  content: "";
 }
 
 .fa-apple-pay:before {
-  content: "\f415";
+  content: "";
 }
 
 .fa-archive:before {
-  content: "\f187";
+  content: "";
 }
 
 .fa-archway:before {
-  content: "\f557";
+  content: "";
 }
 
 .fa-arrow-alt-circle-down:before {
-  content: "\f358";
+  content: "";
 }
 
 .fa-arrow-alt-circle-left:before {
-  content: "\f359";
+  content: "";
 }
 
 .fa-arrow-alt-circle-right:before {
-  content: "\f35a";
+  content: "";
 }
 
 .fa-arrow-alt-circle-up:before {
-  content: "\f35b";
+  content: "";
 }
 
 .fa-arrow-circle-down:before {
-  content: "\f0ab";
+  content: "";
 }
 
 .fa-arrow-circle-left:before {
-  content: "\f0a8";
+  content: "";
 }
 
 .fa-arrow-circle-right:before {
-  content: "\f0a9";
+  content: "";
 }
 
 .fa-arrow-circle-up:before {
-  content: "\f0aa";
+  content: "";
 }
 
 .fa-arrow-down:before {
-  content: "\f063";
+  content: "";
 }
 
 .fa-arrow-left:before {
-  content: "\f060";
+  content: "";
 }
 
 .fa-arrow-right:before {
-  content: "\f061";
+  content: "";
 }
 
 .fa-arrow-up:before {
-  content: "\f062";
+  content: "";
 }
 
 .fa-arrows-alt:before {
-  content: "\f0b2";
+  content: "";
 }
 
 .fa-arrows-alt-h:before {
-  content: "\f337";
+  content: "";
 }
 
 .fa-arrows-alt-v:before {
-  content: "\f338";
+  content: "";
 }
 
 .fa-assistive-listening-systems:before {
-  content: "\f2a2";
+  content: "";
 }
 
 .fa-asterisk:before {
-  content: "\f069";
+  content: "";
 }
 
 .fa-asymmetrik:before {
-  content: "\f372";
+  content: "";
 }
 
 .fa-at:before {
-  content: "\f1fa";
+  content: "";
 }
 
 .fa-atlas:before {
-  content: "\f558";
+  content: "";
 }
 
 .fa-atom:before {
-  content: "\f5d2";
+  content: "";
 }
 
 .fa-audible:before {
-  content: "\f373";
+  content: "";
 }
 
 .fa-audio-description:before {
-  content: "\f29e";
+  content: "";
 }
 
 .fa-autoprefixer:before {
-  content: "\f41c";
+  content: "";
 }
 
 .fa-avianex:before {
-  content: "\f374";
+  content: "";
 }
 
 .fa-aviato:before {
-  content: "\f421";
+  content: "";
 }
 
 .fa-award:before {
-  content: "\f559";
+  content: "";
 }
 
 .fa-aws:before {
-  content: "\f375";
+  content: "";
 }
 
 .fa-backspace:before {
-  content: "\f55a";
+  content: "";
 }
 
 .fa-backward:before {
-  content: "\f04a";
+  content: "";
 }
 
 .fa-balance-scale:before {
-  content: "\f24e";
+  content: "";
 }
 
 .fa-ban:before {
-  content: "\f05e";
+  content: "";
 }
 
 .fa-band-aid:before {
-  content: "\f462";
+  content: "";
 }
 
 .fa-bandcamp:before {
-  content: "\f2d5";
+  content: "";
 }
 
 .fa-barcode:before {
-  content: "\f02a";
+  content: "";
 }
 
 .fa-bars:before {
-  content: "\f0c9";
+  content: "";
 }
 
 .fa-baseball-ball:before {
-  content: "\f433";
+  content: "";
 }
 
 .fa-basketball-ball:before {
-  content: "\f434";
+  content: "";
 }
 
 .fa-bath:before {
-  content: "\f2cd";
+  content: "";
 }
 
 .fa-battery-empty:before {
-  content: "\f244";
+  content: "";
 }
 
 .fa-battery-full:before {
-  content: "\f240";
+  content: "";
 }
 
 .fa-battery-half:before {
-  content: "\f242";
+  content: "";
 }
 
 .fa-battery-quarter:before {
-  content: "\f243";
+  content: "";
 }
 
 .fa-battery-three-quarters:before {
-  content: "\f241";
+  content: "";
 }
 
 .fa-bed:before {
-  content: "\f236";
+  content: "";
 }
 
 .fa-beer:before {
-  content: "\f0fc";
+  content: "";
 }
 
 .fa-behance:before {
-  content: "\f1b4";
+  content: "";
 }
 
 .fa-behance-square:before {
-  content: "\f1b5";
+  content: "";
 }
 
 .fa-bell:before {
-  content: "\f0f3";
+  content: "";
 }
 
 .fa-bell-slash:before {
-  content: "\f1f6";
+  content: "";
 }
 
 .fa-bezier-curve:before {
-  content: "\f55b";
+  content: "";
 }
 
 .fa-bible:before {
-  content: "\f647";
+  content: "";
 }
 
 .fa-bicycle:before {
-  content: "\f206";
+  content: "";
 }
 
 .fa-bimobject:before {
-  content: "\f378";
+  content: "";
 }
 
 .fa-binoculars:before {
-  content: "\f1e5";
+  content: "";
 }
 
 .fa-birthday-cake:before {
-  content: "\f1fd";
+  content: "";
 }
 
 .fa-bitbucket:before {
-  content: "\f171";
+  content: "";
 }
 
 .fa-bitcoin:before {
-  content: "\f379";
+  content: "";
 }
 
 .fa-bity:before {
-  content: "\f37a";
+  content: "";
 }
 
 .fa-black-tie:before {
-  content: "\f27e";
+  content: "";
 }
 
 .fa-blackberry:before {
-  content: "\f37b";
+  content: "";
 }
 
 .fa-blender:before {
-  content: "\f517";
+  content: "";
 }
 
 .fa-blind:before {
-  content: "\f29d";
+  content: "";
 }
 
 .fa-blogger:before {
-  content: "\f37c";
+  content: "";
 }
 
 .fa-blogger-b:before {
-  content: "\f37d";
+  content: "";
 }
 
 .fa-bluetooth:before {
-  content: "\f293";
+  content: "";
 }
 
 .fa-bluetooth-b:before {
-  content: "\f294";
+  content: "";
 }
 
 .fa-bold:before {
-  content: "\f032";
+  content: "";
 }
 
 .fa-bolt:before {
-  content: "\f0e7";
+  content: "";
 }
 
 .fa-bomb:before {
-  content: "\f1e2";
+  content: "";
 }
 
 .fa-bone:before {
-  content: "\f5d7";
+  content: "";
 }
 
 .fa-bong:before {
-  content: "\f55c";
+  content: "";
 }
 
 .fa-book:before {
-  content: "\f02d";
+  content: "";
 }
 
 .fa-book-open:before {
-  content: "\f518";
+  content: "";
 }
 
 .fa-book-reader:before {
-  content: "\f5da";
+  content: "";
 }
 
 .fa-bookmark:before {
-  content: "\f02e";
+  content: "";
 }
 
 .fa-bowling-ball:before {
-  content: "\f436";
+  content: "";
 }
 
 .fa-box:before {
-  content: "\f466";
+  content: "";
 }
 
 .fa-box-open:before {
-  content: "\f49e";
+  content: "";
 }
 
 .fa-boxes:before {
-  content: "\f468";
+  content: "";
 }
 
 .fa-braille:before {
-  content: "\f2a1";
+  content: "";
 }
 
 .fa-brain:before {
-  content: "\f5dc";
+  content: "";
 }
 
 .fa-briefcase:before {
-  content: "\f0b1";
+  content: "";
 }
 
 .fa-briefcase-medical:before {
-  content: "\f469";
+  content: "";
 }
 
 .fa-broadcast-tower:before {
-  content: "\f519";
+  content: "";
 }
 
 .fa-broom:before {
-  content: "\f51a";
+  content: "";
 }
 
 .fa-brush:before {
-  content: "\f55d";
+  content: "";
 }
 
 .fa-btc:before {
-  content: "\f15a";
+  content: "";
 }
 
 .fa-bug:before {
-  content: "\f188";
+  content: "";
 }
 
 .fa-building:before {
-  content: "\f1ad";
+  content: "";
 }
 
 .fa-bullhorn:before {
-  content: "\f0a1";
+  content: "";
 }
 
 .fa-bullseye:before {
-  content: "\f140";
+  content: "";
 }
 
 .fa-burn:before {
-  content: "\f46a";
+  content: "";
 }
 
 .fa-buromobelexperte:before {
-  content: "\f37f";
+  content: "";
 }
 
 .fa-bus:before {
-  content: "\f207";
+  content: "";
 }
 
 .fa-bus-alt:before {
-  content: "\f55e";
+  content: "";
 }
 
 .fa-business-time:before {
-  content: "\f64a";
+  content: "";
 }
 
 .fa-buysellads:before {
-  content: "\f20d";
+  content: "";
 }
 
 .fa-calculator:before {
-  content: "\f1ec";
+  content: "";
 }
 
 .fa-calendar:before {
-  content: "\f133";
+  content: "";
 }
 
 .fa-calendar-alt:before {
-  content: "\f073";
+  content: "";
 }
 
 .fa-calendar-check:before {
-  content: "\f274";
+  content: "";
 }
 
 .fa-calendar-minus:before {
-  content: "\f272";
+  content: "";
 }
 
 .fa-calendar-plus:before {
-  content: "\f271";
+  content: "";
 }
 
 .fa-calendar-times:before {
-  content: "\f273";
+  content: "";
 }
 
 .fa-camera:before {
-  content: "\f030";
+  content: "";
 }
 
 .fa-camera-retro:before {
-  content: "\f083";
+  content: "";
 }
 
 .fa-cannabis:before {
-  content: "\f55f";
+  content: "";
 }
 
 .fa-capsules:before {
-  content: "\f46b";
+  content: "";
 }
 
 .fa-car:before {
-  content: "\f1b9";
+  content: "";
 }
 
 .fa-car-alt:before {
-  content: "\f5de";
+  content: "";
 }
 
 .fa-car-battery:before {
-  content: "\f5df";
+  content: "";
 }
 
 .fa-car-crash:before {
-  content: "\f5e1";
+  content: "";
 }
 
 .fa-car-side:before {
-  content: "\f5e4";
+  content: "";
 }
 
 .fa-caret-down:before {
-  content: "\f0d7";
+  content: "";
 }
 
 .fa-caret-left:before {
-  content: "\f0d9";
+  content: "";
 }
 
 .fa-caret-right:before {
-  content: "\f0da";
+  content: "";
 }
 
 .fa-caret-square-down:before {
-  content: "\f150";
+  content: "";
 }
 
 .fa-caret-square-left:before {
-  content: "\f191";
+  content: "";
 }
 
 .fa-caret-square-right:before {
-  content: "\f152";
+  content: "";
 }
 
 .fa-caret-square-up:before {
-  content: "\f151";
+  content: "";
 }
 
 .fa-caret-up:before {
-  content: "\f0d8";
+  content: "";
 }
 
 .fa-cart-arrow-down:before {
-  content: "\f218";
+  content: "";
 }
 
 .fa-cart-plus:before {
-  content: "\f217";
+  content: "";
 }
 
 .fa-cc-amazon-pay:before {
-  content: "\f42d";
+  content: "";
 }
 
 .fa-cc-amex:before {
-  content: "\f1f3";
+  content: "";
 }
 
 .fa-cc-apple-pay:before {
-  content: "\f416";
+  content: "";
 }
 
 .fa-cc-diners-club:before {
-  content: "\f24c";
+  content: "";
 }
 
 .fa-cc-discover:before {
-  content: "\f1f2";
+  content: "";
 }
 
 .fa-cc-jcb:before {
-  content: "\f24b";
+  content: "";
 }
 
 .fa-cc-mastercard:before {
-  content: "\f1f1";
+  content: "";
 }
 
 .fa-cc-paypal:before {
-  content: "\f1f4";
+  content: "";
 }
 
 .fa-cc-stripe:before {
-  content: "\f1f5";
+  content: "";
 }
 
 .fa-cc-visa:before {
-  content: "\f1f0";
+  content: "";
 }
 
 .fa-centercode:before {
-  content: "\f380";
+  content: "";
 }
 
 .fa-certificate:before {
-  content: "\f0a3";
+  content: "";
 }
 
 .fa-chalkboard:before {
-  content: "\f51b";
+  content: "";
 }
 
 .fa-chalkboard-teacher:before {
-  content: "\f51c";
+  content: "";
 }
 
 .fa-charging-station:before {
-  content: "\f5e7";
+  content: "";
 }
 
 .fa-chart-area:before {
-  content: "\f1fe";
+  content: "";
 }
 
 .fa-chart-bar:before {
-  content: "\f080";
+  content: "";
 }
 
 .fa-chart-line:before {
-  content: "\f201";
+  content: "";
 }
 
 .fa-chart-pie:before {
-  content: "\f200";
+  content: "";
 }
 
 .fa-check:before {
-  content: "\f00c";
+  content: "";
 }
 
 .fa-check-circle:before {
-  content: "\f058";
+  content: "";
 }
 
 .fa-check-double:before {
-  content: "\f560";
+  content: "";
 }
 
 .fa-check-square:before {
-  content: "\f14a";
+  content: "";
 }
 
 .fa-chess:before {
-  content: "\f439";
+  content: "";
 }
 
 .fa-chess-bishop:before {
-  content: "\f43a";
+  content: "";
 }
 
 .fa-chess-board:before {
-  content: "\f43c";
+  content: "";
 }
 
 .fa-chess-king:before {
-  content: "\f43f";
+  content: "";
 }
 
 .fa-chess-knight:before {
-  content: "\f441";
+  content: "";
 }
 
 .fa-chess-pawn:before {
-  content: "\f443";
+  content: "";
 }
 
 .fa-chess-queen:before {
-  content: "\f445";
+  content: "";
 }
 
 .fa-chess-rook:before {
-  content: "\f447";
+  content: "";
 }
 
 .fa-chevron-circle-down:before {
-  content: "\f13a";
+  content: "";
 }
 
 .fa-chevron-circle-left:before {
-  content: "\f137";
+  content: "";
 }
 
 .fa-chevron-circle-right:before {
-  content: "\f138";
+  content: "";
 }
 
 .fa-chevron-circle-up:before {
-  content: "\f139";
+  content: "";
 }
 
 .fa-chevron-down:before {
-  content: "\f078";
+  content: "";
 }
 
 .fa-chevron-left:before {
-  content: "\f053";
+  content: "";
 }
 
 .fa-chevron-right:before {
-  content: "\f054";
+  content: "";
 }
 
 .fa-chevron-up:before {
-  content: "\f077";
+  content: "";
 }
 
 .fa-child:before {
-  content: "\f1ae";
+  content: "";
 }
 
 .fa-chrome:before {
-  content: "\f268";
+  content: "";
 }
 
 .fa-church:before {
-  content: "\f51d";
+  content: "";
 }
 
 .fa-circle:before {
-  content: "\f111";
+  content: "";
 }
 
 .fa-circle-notch:before {
-  content: "\f1ce";
+  content: "";
 }
 
 .fa-city:before {
-  content: "\f64f";
+  content: "";
 }
 
 .fa-clipboard:before {
-  content: "\f328";
+  content: "";
 }
 
 .fa-clipboard-check:before {
-  content: "\f46c";
+  content: "";
 }
 
 .fa-clipboard-list:before {
-  content: "\f46d";
+  content: "";
 }
 
 .fa-clock:before {
-  content: "\f017";
+  content: "";
 }
 
 .fa-clone:before {
-  content: "\f24d";
+  content: "";
 }
 
 .fa-closed-captioning:before {
-  content: "\f20a";
+  content: "";
 }
 
 .fa-cloud:before {
-  content: "\f0c2";
+  content: "";
 }
 
 .fa-cloud-download-alt:before {
-  content: "\f381";
+  content: "";
 }
 
 .fa-cloud-upload-alt:before {
-  content: "\f382";
+  content: "";
 }
 
 .fa-cloudscale:before {
-  content: "\f383";
+  content: "";
 }
 
 .fa-cloudsmith:before {
-  content: "\f384";
+  content: "";
 }
 
 .fa-cloudversify:before {
-  content: "\f385";
+  content: "";
 }
 
 .fa-cocktail:before {
-  content: "\f561";
+  content: "";
 }
 
 .fa-code:before {
-  content: "\f121";
+  content: "";
 }
 
 .fa-code-branch:before {
-  content: "\f126";
+  content: "";
 }
 
 .fa-codepen:before {
-  content: "\f1cb";
+  content: "";
 }
 
 .fa-codiepie:before {
-  content: "\f284";
+  content: "";
 }
 
 .fa-coffee:before {
-  content: "\f0f4";
+  content: "";
 }
 
 .fa-cog:before {
-  content: "\f013";
+  content: "";
 }
 
 .fa-cogs:before {
-  content: "\f085";
+  content: "";
 }
 
 .fa-coins:before {
-  content: "\f51e";
+  content: "";
 }
 
 .fa-columns:before {
-  content: "\f0db";
+  content: "";
 }
 
 .fa-comment:before {
-  content: "\f075";
+  content: "";
 }
 
 .fa-comment-alt:before {
-  content: "\f27a";
+  content: "";
 }
 
 .fa-comment-dollar:before {
-  content: "\f651";
+  content: "";
 }
 
 .fa-comment-dots:before {
-  content: "\f4ad";
+  content: "";
 }
 
 .fa-comment-slash:before {
-  content: "\f4b3";
+  content: "";
 }
 
 .fa-comments:before {
-  content: "\f086";
+  content: "";
 }
 
 .fa-comments-dollar:before {
-  content: "\f653";
+  content: "";
 }
 
 .fa-compact-disc:before {
-  content: "\f51f";
+  content: "";
 }
 
 .fa-compass:before {
-  content: "\f14e";
+  content: "";
 }
 
 .fa-compress:before {
-  content: "\f066";
+  content: "";
 }
 
 .fa-concierge-bell:before {
-  content: "\f562";
+  content: "";
 }
 
 .fa-connectdevelop:before {
-  content: "\f20e";
+  content: "";
 }
 
 .fa-contao:before {
-  content: "\f26d";
+  content: "";
 }
 
 .fa-cookie:before {
-  content: "\f563";
+  content: "";
 }
 
 .fa-cookie-bite:before {
-  content: "\f564";
+  content: "";
 }
 
 .fa-copy:before {
-  content: "\f0c5";
+  content: "";
 }
 
 .fa-copyright:before {
-  content: "\f1f9";
+  content: "";
 }
 
 .fa-couch:before {
-  content: "\f4b8";
+  content: "";
 }
 
 .fa-cpanel:before {
-  content: "\f388";
+  content: "";
 }
 
 .fa-creative-commons:before {
-  content: "\f25e";
+  content: "";
 }
 
 .fa-creative-commons-by:before {
-  content: "\f4e7";
+  content: "";
 }
 
 .fa-creative-commons-nc:before {
-  content: "\f4e8";
+  content: "";
 }
 
 .fa-creative-commons-nc-eu:before {
-  content: "\f4e9";
+  content: "";
 }
 
 .fa-creative-commons-nc-jp:before {
-  content: "\f4ea";
+  content: "";
 }
 
 .fa-creative-commons-nd:before {
-  content: "\f4eb";
+  content: "";
 }
 
 .fa-creative-commons-pd:before {
-  content: "\f4ec";
+  content: "";
 }
 
 .fa-creative-commons-pd-alt:before {
-  content: "\f4ed";
+  content: "";
 }
 
 .fa-creative-commons-remix:before {
-  content: "\f4ee";
+  content: "";
 }
 
 .fa-creative-commons-sa:before {
-  content: "\f4ef";
+  content: "";
 }
 
 .fa-creative-commons-sampling:before {
-  content: "\f4f0";
+  content: "";
 }
 
 .fa-creative-commons-sampling-plus:before {
-  content: "\f4f1";
+  content: "";
 }
 
 .fa-creative-commons-share:before {
-  content: "\f4f2";
+  content: "";
 }
 
 .fa-credit-card:before {
-  content: "\f09d";
+  content: "";
 }
 
 .fa-crop:before {
-  content: "\f125";
+  content: "";
 }
 
 .fa-crop-alt:before {
-  content: "\f565";
+  content: "";
 }
 
 .fa-cross:before {
-  content: "\f654";
+  content: "";
 }
 
 .fa-crosshairs:before {
-  content: "\f05b";
+  content: "";
 }
 
 .fa-crow:before {
-  content: "\f520";
+  content: "";
 }
 
 .fa-crown:before {
-  content: "\f521";
+  content: "";
 }
 
 .fa-css3:before {
-  content: "\f13c";
+  content: "";
 }
 
 .fa-css3-alt:before {
-  content: "\f38b";
+  content: "";
 }
 
 .fa-cube:before {
-  content: "\f1b2";
+  content: "";
 }
 
 .fa-cubes:before {
-  content: "\f1b3";
+  content: "";
 }
 
 .fa-cut:before {
-  content: "\f0c4";
+  content: "";
 }
 
 .fa-cuttlefish:before {
-  content: "\f38c";
+  content: "";
 }
 
 .fa-d-and-d:before {
-  content: "\f38d";
+  content: "";
 }
 
 .fa-dashcube:before {
-  content: "\f210";
+  content: "";
 }
 
 .fa-database:before {
-  content: "\f1c0";
+  content: "";
 }
 
 .fa-deaf:before {
-  content: "\f2a4";
+  content: "";
 }
 
 .fa-delicious:before {
-  content: "\f1a5";
+  content: "";
 }
 
 .fa-deploydog:before {
-  content: "\f38e";
+  content: "";
 }
 
 .fa-deskpro:before {
-  content: "\f38f";
+  content: "";
 }
 
 .fa-desktop:before {
-  content: "\f108";
+  content: "";
 }
 
 .fa-deviantart:before {
-  content: "\f1bd";
+  content: "";
 }
 
 .fa-dharmachakra:before {
-  content: "\f655";
+  content: "";
 }
 
 .fa-diagnoses:before {
-  content: "\f470";
+  content: "";
 }
 
 .fa-dice:before {
-  content: "\f522";
+  content: "";
 }
 
 .fa-dice-five:before {
-  content: "\f523";
+  content: "";
 }
 
 .fa-dice-four:before {
-  content: "\f524";
+  content: "";
 }
 
 .fa-dice-one:before {
-  content: "\f525";
+  content: "";
 }
 
 .fa-dice-six:before {
-  content: "\f526";
+  content: "";
 }
 
 .fa-dice-three:before {
-  content: "\f527";
+  content: "";
 }
 
 .fa-dice-two:before {
-  content: "\f528";
+  content: "";
 }
 
 .fa-digg:before {
-  content: "\f1a6";
+  content: "";
 }
 
 .fa-digital-ocean:before {
-  content: "\f391";
+  content: "";
 }
 
 .fa-digital-tachograph:before {
-  content: "\f566";
+  content: "";
 }
 
 .fa-directions:before {
-  content: "\f5eb";
+  content: "";
 }
 
 .fa-discord:before {
-  content: "\f392";
+  content: "";
 }
 
 .fa-discourse:before {
-  content: "\f393";
+  content: "";
 }
 
 .fa-divide:before {
-  content: "\f529";
+  content: "";
 }
 
 .fa-dizzy:before {
-  content: "\f567";
+  content: "";
 }
 
 .fa-dna:before {
-  content: "\f471";
+  content: "";
 }
 
 .fa-dochub:before {
-  content: "\f394";
+  content: "";
 }
 
 .fa-docker:before {
-  content: "\f395";
+  content: "";
 }
 
 .fa-dollar-sign:before {
-  content: "\f155";
+  content: "";
 }
 
 .fa-dolly:before {
-  content: "\f472";
+  content: "";
 }
 
 .fa-dolly-flatbed:before {
-  content: "\f474";
+  content: "";
 }
 
 .fa-donate:before {
-  content: "\f4b9";
+  content: "";
 }
 
 .fa-door-closed:before {
-  content: "\f52a";
+  content: "";
 }
 
 .fa-door-open:before {
-  content: "\f52b";
+  content: "";
 }
 
 .fa-dot-circle:before {
-  content: "\f192";
+  content: "";
 }
 
 .fa-dove:before {
-  content: "\f4ba";
+  content: "";
 }
 
 .fa-download:before {
-  content: "\f019";
+  content: "";
 }
 
 .fa-draft2digital:before {
-  content: "\f396";
+  content: "";
 }
 
 .fa-drafting-compass:before {
-  content: "\f568";
+  content: "";
 }
 
 .fa-draw-polygon:before {
-  content: "\f5ee";
+  content: "";
 }
 
 .fa-dribbble:before {
-  content: "\f17d";
+  content: "";
 }
 
 .fa-dribbble-square:before {
-  content: "\f397";
+  content: "";
 }
 
 .fa-dropbox:before {
-  content: "\f16b";
+  content: "";
 }
 
 .fa-drum:before {
-  content: "\f569";
+  content: "";
 }
 
 .fa-drum-steelpan:before {
-  content: "\f56a";
+  content: "";
 }
 
 .fa-drupal:before {
-  content: "\f1a9";
+  content: "";
 }
 
 .fa-dumbbell:before {
-  content: "\f44b";
+  content: "";
 }
 
 .fa-dyalog:before {
-  content: "\f399";
+  content: "";
 }
 
 .fa-earlybirds:before {
-  content: "\f39a";
+  content: "";
 }
 
 .fa-ebay:before {
-  content: "\f4f4";
+  content: "";
 }
 
 .fa-edge:before {
-  content: "\f282";
+  content: "";
 }
 
 .fa-edit:before {
-  content: "\f044";
+  content: "";
 }
 
 .fa-eject:before {
-  content: "\f052";
+  content: "";
 }
 
 .fa-elementor:before {
-  content: "\f430";
+  content: "";
 }
 
 .fa-ellipsis-h:before {
-  content: "\f141";
+  content: "";
 }
 
 .fa-ellipsis-v:before {
-  content: "\f142";
+  content: "";
 }
 
 .fa-ello:before {
-  content: "\f5f1";
+  content: "";
 }
 
 .fa-ember:before {
-  content: "\f423";
+  content: "";
 }
 
 .fa-empire:before {
-  content: "\f1d1";
+  content: "";
 }
 
 .fa-envelope:before {
-  content: "\f0e0";
+  content: "";
 }
 
 .fa-envelope-open:before {
-  content: "\f2b6";
+  content: "";
 }
 
 .fa-envelope-open-text:before {
-  content: "\f658";
+  content: "";
 }
 
 .fa-envelope-square:before {
-  content: "\f199";
+  content: "";
 }
 
 .fa-envira:before {
-  content: "\f299";
+  content: "";
 }
 
 .fa-equals:before {
-  content: "\f52c";
+  content: "";
 }
 
 .fa-eraser:before {
-  content: "\f12d";
+  content: "";
 }
 
 .fa-erlang:before {
-  content: "\f39d";
+  content: "";
 }
 
 .fa-ethereum:before {
-  content: "\f42e";
+  content: "";
 }
 
 .fa-etsy:before {
-  content: "\f2d7";
+  content: "";
 }
 
 .fa-euro-sign:before {
-  content: "\f153";
+  content: "";
 }
 
 .fa-exchange-alt:before {
-  content: "\f362";
+  content: "";
 }
 
 .fa-exclamation:before {
-  content: "\f12a";
+  content: "";
 }
 
 .fa-exclamation-circle:before {
-  content: "\f06a";
+  content: "";
 }
 
 .fa-exclamation-triangle:before {
-  content: "\f071";
+  content: "";
 }
 
 .fa-expand:before {
-  content: "\f065";
+  content: "";
 }
 
 .fa-expand-arrows-alt:before {
-  content: "\f31e";
+  content: "";
 }
 
 .fa-expeditedssl:before {
-  content: "\f23e";
+  content: "";
 }
 
 .fa-external-link-alt:before {
-  content: "\f35d";
+  content: "";
 }
 
 .fa-external-link-square-alt:before {
-  content: "\f360";
+  content: "";
 }
 
 .fa-eye:before {
-  content: "\f06e";
+  content: "";
 }
 
 .fa-eye-dropper:before {
-  content: "\f1fb";
+  content: "";
 }
 
 .fa-eye-slash:before {
-  content: "\f070";
+  content: "";
 }
 
 .fa-facebook:before {
-  content: "\f09a";
+  content: "";
 }
 
 .fa-facebook-f:before {
-  content: "\f39e";
+  content: "";
 }
 
 .fa-facebook-messenger:before {
-  content: "\f39f";
+  content: "";
 }
 
 .fa-facebook-square:before {
-  content: "\f082";
+  content: "";
 }
 
 .fa-fast-backward:before {
-  content: "\f049";
+  content: "";
 }
 
 .fa-fast-forward:before {
-  content: "\f050";
+  content: "";
 }
 
 .fa-fax:before {
-  content: "\f1ac";
+  content: "";
 }
 
 .fa-feather:before {
-  content: "\f52d";
+  content: "";
 }
 
 .fa-feather-alt:before {
-  content: "\f56b";
+  content: "";
 }
 
 .fa-female:before {
-  content: "\f182";
+  content: "";
 }
 
 .fa-fighter-jet:before {
-  content: "\f0fb";
+  content: "";
 }
 
 .fa-file:before {
-  content: "\f15b";
+  content: "";
 }
 
 .fa-file-alt:before {
-  content: "\f15c";
+  content: "";
 }
 
 .fa-file-archive:before {
-  content: "\f1c6";
+  content: "";
 }
 
 .fa-file-audio:before {
-  content: "\f1c7";
+  content: "";
 }
 
 .fa-file-code:before {
-  content: "\f1c9";
+  content: "";
 }
 
 .fa-file-contract:before {
-  content: "\f56c";
+  content: "";
 }
 
 .fa-file-download:before {
-  content: "\f56d";
+  content: "";
 }
 
 .fa-file-excel:before {
-  content: "\f1c3";
+  content: "";
 }
 
 .fa-file-export:before {
-  content: "\f56e";
+  content: "";
 }
 
 .fa-file-image:before {
-  content: "\f1c5";
+  content: "";
 }
 
 .fa-file-import:before {
-  content: "\f56f";
+  content: "";
 }
 
 .fa-file-invoice:before {
-  content: "\f570";
+  content: "";
 }
 
 .fa-file-invoice-dollar:before {
-  content: "\f571";
+  content: "";
 }
 
 .fa-file-medical:before {
-  content: "\f477";
+  content: "";
 }
 
 .fa-file-medical-alt:before {
-  content: "\f478";
+  content: "";
 }
 
 .fa-file-pdf:before {
-  content: "\f1c1";
+  content: "";
 }
 
 .fa-file-powerpoint:before {
-  content: "\f1c4";
+  content: "";
 }
 
 .fa-file-prescription:before {
-  content: "\f572";
+  content: "";
 }
 
 .fa-file-signature:before {
-  content: "\f573";
+  content: "";
 }
 
 .fa-file-upload:before {
-  content: "\f574";
+  content: "";
 }
 
 .fa-file-video:before {
-  content: "\f1c8";
+  content: "";
 }
 
 .fa-file-word:before {
-  content: "\f1c2";
+  content: "";
 }
 
 .fa-fill:before {
-  content: "\f575";
+  content: "";
 }
 
 .fa-fill-drip:before {
-  content: "\f576";
+  content: "";
 }
 
 .fa-film:before {
-  content: "\f008";
+  content: "";
 }
 
 .fa-filter:before {
-  content: "\f0b0";
+  content: "";
 }
 
 .fa-fingerprint:before {
-  content: "\f577";
+  content: "";
 }
 
 .fa-fire:before {
-  content: "\f06d";
+  content: "";
 }
 
 .fa-fire-extinguisher:before {
-  content: "\f134";
+  content: "";
 }
 
 .fa-firefox:before {
-  content: "\f269";
+  content: "";
 }
 
 .fa-first-aid:before {
-  content: "\f479";
+  content: "";
 }
 
 .fa-first-order:before {
-  content: "\f2b0";
+  content: "";
 }
 
 .fa-first-order-alt:before {
-  content: "\f50a";
+  content: "";
 }
 
 .fa-firstdraft:before {
-  content: "\f3a1";
+  content: "";
 }
 
 .fa-fish:before {
-  content: "\f578";
+  content: "";
 }
 
 .fa-flag:before {
-  content: "\f024";
+  content: "";
 }
 
 .fa-flag-checkered:before {
-  content: "\f11e";
+  content: "";
 }
 
 .fa-flask:before {
-  content: "\f0c3";
+  content: "";
 }
 
 .fa-flickr:before {
-  content: "\f16e";
+  content: "";
 }
 
 .fa-flipboard:before {
-  content: "\f44d";
+  content: "";
 }
 
 .fa-flushed:before {
-  content: "\f579";
+  content: "";
 }
 
 .fa-fly:before {
-  content: "\f417";
+  content: "";
 }
 
 .fa-folder:before {
-  content: "\f07b";
+  content: "";
 }
 
 .fa-folder-minus:before {
-  content: "\f65d";
+  content: "";
 }
 
 .fa-folder-open:before {
-  content: "\f07c";
+  content: "";
 }
 
 .fa-folder-plus:before {
-  content: "\f65e";
+  content: "";
 }
 
 .fa-font:before {
-  content: "\f031";
+  content: "";
 }
 
 .fa-font-awesome:before {
-  content: "\f2b4";
+  content: "";
 }
 
 .fa-font-awesome-alt:before {
-  content: "\f35c";
+  content: "";
 }
 
 .fa-font-awesome-flag:before {
-  content: "\f425";
+  content: "";
 }
 
 .fa-font-awesome-logo-full:before {
-  content: "\f4e6";
+  content: "";
 }
 
 .fa-fonticons:before {
-  content: "\f280";
+  content: "";
 }
 
 .fa-fonticons-fi:before {
-  content: "\f3a2";
+  content: "";
 }
 
 .fa-football-ball:before {
-  content: "\f44e";
+  content: "";
 }
 
 .fa-fort-awesome:before {
-  content: "\f286";
+  content: "";
 }
 
 .fa-fort-awesome-alt:before {
-  content: "\f3a3";
+  content: "";
 }
 
 .fa-forumbee:before {
-  content: "\f211";
+  content: "";
 }
 
 .fa-forward:before {
-  content: "\f04e";
+  content: "";
 }
 
 .fa-foursquare:before {
-  content: "\f180";
+  content: "";
 }
 
 .fa-free-code-camp:before {
-  content: "\f2c5";
+  content: "";
 }
 
 .fa-freebsd:before {
-  content: "\f3a4";
+  content: "";
 }
 
 .fa-frog:before {
-  content: "\f52e";
+  content: "";
 }
 
 .fa-frown:before {
-  content: "\f119";
+  content: "";
 }
 
 .fa-frown-open:before {
-  content: "\f57a";
+  content: "";
 }
 
 .fa-fulcrum:before {
-  content: "\f50b";
+  content: "";
 }
 
 .fa-funnel-dollar:before {
-  content: "\f662";
+  content: "";
 }
 
 .fa-futbol:before {
-  content: "\f1e3";
+  content: "";
 }
 
 .fa-galactic-republic:before {
-  content: "\f50c";
+  content: "";
 }
 
 .fa-galactic-senate:before {
-  content: "\f50d";
+  content: "";
 }
 
 .fa-gamepad:before {
-  content: "\f11b";
+  content: "";
 }
 
 .fa-gas-pump:before {
-  content: "\f52f";
+  content: "";
 }
 
 .fa-gavel:before {
-  content: "\f0e3";
+  content: "";
 }
 
 .fa-gem:before {
-  content: "\f3a5";
+  content: "";
 }
 
 .fa-genderless:before {
-  content: "\f22d";
+  content: "";
 }
 
 .fa-get-pocket:before {
-  content: "\f265";
+  content: "";
 }
 
 .fa-gg:before {
-  content: "\f260";
+  content: "";
 }
 
 .fa-gg-circle:before {
-  content: "\f261";
+  content: "";
 }
 
 .fa-gift:before {
-  content: "\f06b";
+  content: "";
 }
 
 .fa-git:before {
-  content: "\f1d3";
+  content: "";
 }
 
 .fa-git-square:before {
-  content: "\f1d2";
+  content: "";
 }
 
 .fa-github:before {
-  content: "\f09b";
+  content: "";
 }
 
 .fa-github-alt:before {
-  content: "\f113";
+  content: "";
 }
 
 .fa-github-square:before {
-  content: "\f092";
+  content: "";
 }
 
 .fa-gitkraken:before {
-  content: "\f3a6";
+  content: "";
 }
 
 .fa-gitlab:before {
-  content: "\f296";
+  content: "";
 }
 
 .fa-gitter:before {
-  content: "\f426";
+  content: "";
 }
 
 .fa-glass-martini:before {
-  content: "\f000";
+  content: "";
 }
 
 .fa-glass-martini-alt:before {
-  content: "\f57b";
+  content: "";
 }
 
 .fa-glasses:before {
-  content: "\f530";
+  content: "";
 }
 
 .fa-glide:before {
-  content: "\f2a5";
+  content: "";
 }
 
 .fa-glide-g:before {
-  content: "\f2a6";
+  content: "";
 }
 
 .fa-globe:before {
-  content: "\f0ac";
+  content: "";
 }
 
 .fa-globe-africa:before {
-  content: "\f57c";
+  content: "";
 }
 
 .fa-globe-americas:before {
-  content: "\f57d";
+  content: "";
 }
 
 .fa-globe-asia:before {
-  content: "\f57e";
+  content: "";
 }
 
 .fa-gofore:before {
-  content: "\f3a7";
+  content: "";
 }
 
 .fa-golf-ball:before {
-  content: "\f450";
+  content: "";
 }
 
 .fa-goodreads:before {
-  content: "\f3a8";
+  content: "";
 }
 
 .fa-goodreads-g:before {
-  content: "\f3a9";
+  content: "";
 }
 
 .fa-google:before {
-  content: "\f1a0";
+  content: "";
 }
 
 .fa-google-drive:before {
-  content: "\f3aa";
+  content: "";
 }
 
 .fa-google-play:before {
-  content: "\f3ab";
+  content: "";
 }
 
 .fa-google-plus:before {
-  content: "\f2b3";
+  content: "";
 }
 
 .fa-google-plus-g:before {
-  content: "\f0d5";
+  content: "";
 }
 
 .fa-google-plus-square:before {
-  content: "\f0d4";
+  content: "";
 }
 
 .fa-google-wallet:before {
-  content: "\f1ee";
+  content: "";
 }
 
 .fa-gopuram:before {
-  content: "\f664";
+  content: "";
 }
 
 .fa-graduation-cap:before {
-  content: "\f19d";
+  content: "";
 }
 
 .fa-gratipay:before {
-  content: "\f184";
+  content: "";
 }
 
 .fa-grav:before {
-  content: "\f2d6";
+  content: "";
 }
 
 .fa-greater-than:before {
-  content: "\f531";
+  content: "";
 }
 
 .fa-greater-than-equal:before {
-  content: "\f532";
+  content: "";
 }
 
 .fa-grimace:before {
-  content: "\f57f";
+  content: "";
 }
 
 .fa-grin:before {
-  content: "\f580";
+  content: "";
 }
 
 .fa-grin-alt:before {
-  content: "\f581";
+  content: "";
 }
 
 .fa-grin-beam:before {
-  content: "\f582";
+  content: "";
 }
 
 .fa-grin-beam-sweat:before {
-  content: "\f583";
+  content: "";
 }
 
 .fa-grin-hearts:before {
-  content: "\f584";
+  content: "";
 }
 
 .fa-grin-squint:before {
-  content: "\f585";
+  content: "";
 }
 
 .fa-grin-squint-tears:before {
-  content: "\f586";
+  content: "";
 }
 
 .fa-grin-stars:before {
-  content: "\f587";
+  content: "";
 }
 
 .fa-grin-tears:before {
-  content: "\f588";
+  content: "";
 }
 
 .fa-grin-tongue:before {
-  content: "\f589";
+  content: "";
 }
 
 .fa-grin-tongue-squint:before {
-  content: "\f58a";
+  content: "";
 }
 
 .fa-grin-tongue-wink:before {
-  content: "\f58b";
+  content: "";
 }
 
 .fa-grin-wink:before {
-  content: "\f58c";
+  content: "";
 }
 
 .fa-grip-horizontal:before {
-  content: "\f58d";
+  content: "";
 }
 
 .fa-grip-vertical:before {
-  content: "\f58e";
+  content: "";
 }
 
 .fa-gripfire:before {
-  content: "\f3ac";
+  content: "";
 }
 
 .fa-grunt:before {
-  content: "\f3ad";
+  content: "";
 }
 
 .fa-gulp:before {
-  content: "\f3ae";
+  content: "";
 }
 
 .fa-h-square:before {
-  content: "\f0fd";
+  content: "";
 }
 
 .fa-hacker-news:before {
-  content: "\f1d4";
+  content: "";
 }
 
 .fa-hacker-news-square:before {
-  content: "\f3af";
+  content: "";
 }
 
 .fa-hackerrank:before {
-  content: "\f5f7";
+  content: "";
 }
 
 .fa-hamsa:before {
-  content: "\f665";
+  content: "";
 }
 
 .fa-hand-holding:before {
-  content: "\f4bd";
+  content: "";
 }
 
 .fa-hand-holding-heart:before {
-  content: "\f4be";
+  content: "";
 }
 
 .fa-hand-holding-usd:before {
-  content: "\f4c0";
+  content: "";
 }
 
 .fa-hand-lizard:before {
-  content: "\f258";
+  content: "";
 }
 
 .fa-hand-paper:before {
-  content: "\f256";
+  content: "";
 }
 
 .fa-hand-peace:before {
-  content: "\f25b";
+  content: "";
 }
 
 .fa-hand-point-down:before {
-  content: "\f0a7";
+  content: "";
 }
 
 .fa-hand-point-left:before {
-  content: "\f0a5";
+  content: "";
 }
 
 .fa-hand-point-right:before {
-  content: "\f0a4";
+  content: "";
 }
 
 .fa-hand-point-up:before {
-  content: "\f0a6";
+  content: "";
 }
 
 .fa-hand-pointer:before {
-  content: "\f25a";
+  content: "";
 }
 
 .fa-hand-rock:before {
-  content: "\f255";
+  content: "";
 }
 
 .fa-hand-scissors:before {
-  content: "\f257";
+  content: "";
 }
 
 .fa-hand-spock:before {
-  content: "\f259";
+  content: "";
 }
 
 .fa-hands:before {
-  content: "\f4c2";
+  content: "";
 }
 
 .fa-hands-helping:before {
-  content: "\f4c4";
+  content: "";
 }
 
 .fa-handshake:before {
-  content: "\f2b5";
+  content: "";
 }
 
 .fa-hashtag:before {
-  content: "\f292";
+  content: "";
 }
 
 .fa-haykal:before {
-  content: "\f666";
+  content: "";
 }
 
 .fa-hdd:before {
-  content: "\f0a0";
+  content: "";
 }
 
 .fa-heading:before {
-  content: "\f1dc";
+  content: "";
 }
 
 .fa-headphones:before {
-  content: "\f025";
+  content: "";
 }
 
 .fa-headphones-alt:before {
-  content: "\f58f";
+  content: "";
 }
 
 .fa-headset:before {
-  content: "\f590";
+  content: "";
 }
 
 .fa-heart:before {
-  content: "\f004";
+  content: "";
 }
 
 .fa-heartbeat:before {
-  content: "\f21e";
+  content: "";
 }
 
 .fa-helicopter:before {
-  content: "\f533";
+  content: "";
 }
 
 .fa-highlighter:before {
-  content: "\f591";
+  content: "";
 }
 
 .fa-hips:before {
-  content: "\f452";
+  content: "";
 }
 
 .fa-hire-a-helper:before {
-  content: "\f3b0";
+  content: "";
 }
 
 .fa-history:before {
-  content: "\f1da";
+  content: "";
 }
 
 .fa-hockey-puck:before {
-  content: "\f453";
+  content: "";
 }
 
 .fa-home:before {
-  content: "\f015";
+  content: "";
 }
 
 .fa-hooli:before {
-  content: "\f427";
+  content: "";
 }
 
 .fa-hornbill:before {
-  content: "\f592";
+  content: "";
 }
 
 .fa-hospital:before {
-  content: "\f0f8";
+  content: "";
 }
 
 .fa-hospital-alt:before {
-  content: "\f47d";
+  content: "";
 }
 
 .fa-hospital-symbol:before {
-  content: "\f47e";
+  content: "";
 }
 
 .fa-hot-tub:before {
-  content: "\f593";
+  content: "";
 }
 
 .fa-hotel:before {
-  content: "\f594";
+  content: "";
 }
 
 .fa-hotjar:before {
-  content: "\f3b1";
+  content: "";
 }
 
 .fa-hourglass:before {
-  content: "\f254";
+  content: "";
 }
 
 .fa-hourglass-end:before {
-  content: "\f253";
+  content: "";
 }
 
 .fa-hourglass-half:before {
-  content: "\f252";
+  content: "";
 }
 
 .fa-hourglass-start:before {
-  content: "\f251";
+  content: "";
 }
 
 .fa-houzz:before {
-  content: "\f27c";
+  content: "";
 }
 
 .fa-html5:before {
-  content: "\f13b";
+  content: "";
 }
 
 .fa-hubspot:before {
-  content: "\f3b2";
+  content: "";
 }
 
 .fa-i-cursor:before {
-  content: "\f246";
+  content: "";
 }
 
 .fa-id-badge:before {
-  content: "\f2c1";
+  content: "";
 }
 
 .fa-id-card:before {
-  content: "\f2c2";
+  content: "";
 }
 
 .fa-id-card-alt:before {
-  content: "\f47f";
+  content: "";
 }
 
 .fa-image:before {
-  content: "\f03e";
+  content: "";
 }
 
 .fa-images:before {
-  content: "\f302";
+  content: "";
 }
 
 .fa-imdb:before {
-  content: "\f2d8";
+  content: "";
 }
 
 .fa-inbox:before {
-  content: "\f01c";
+  content: "";
 }
 
 .fa-indent:before {
-  content: "\f03c";
+  content: "";
 }
 
 .fa-industry:before {
-  content: "\f275";
+  content: "";
 }
 
 .fa-infinity:before {
-  content: "\f534";
+  content: "";
 }
 
 .fa-info:before {
-  content: "\f129";
+  content: "";
 }
 
 .fa-info-circle:before {
-  content: "\f05a";
+  content: "";
 }
 
 .fa-instagram:before {
-  content: "\f16d";
+  content: "";
 }
 
 .fa-internet-explorer:before {
-  content: "\f26b";
+  content: "";
 }
 
 .fa-ioxhost:before {
-  content: "\f208";
+  content: "";
 }
 
 .fa-italic:before {
-  content: "\f033";
+  content: "";
 }
 
 .fa-itunes:before {
-  content: "\f3b4";
+  content: "";
 }
 
 .fa-itunes-note:before {
-  content: "\f3b5";
+  content: "";
 }
 
 .fa-java:before {
-  content: "\f4e4";
+  content: "";
 }
 
 .fa-jedi:before {
-  content: "\f669";
+  content: "";
 }
 
 .fa-jedi-order:before {
-  content: "\f50e";
+  content: "";
 }
 
 .fa-jenkins:before {
-  content: "\f3b6";
+  content: "";
 }
 
 .fa-joget:before {
-  content: "\f3b7";
+  content: "";
 }
 
 .fa-joint:before {
-  content: "\f595";
+  content: "";
 }
 
 .fa-joomla:before {
-  content: "\f1aa";
+  content: "";
 }
 
 .fa-journal-whills:before {
-  content: "\f66a";
+  content: "";
 }
 
 .fa-js:before {
-  content: "\f3b8";
+  content: "";
 }
 
 .fa-js-square:before {
-  content: "\f3b9";
+  content: "";
 }
 
 .fa-jsfiddle:before {
-  content: "\f1cc";
+  content: "";
 }
 
 .fa-kaaba:before {
-  content: "\f66b";
+  content: "";
 }
 
 .fa-kaggle:before {
-  content: "\f5fa";
+  content: "";
 }
 
 .fa-key:before {
-  content: "\f084";
+  content: "";
 }
 
 .fa-keybase:before {
-  content: "\f4f5";
+  content: "";
 }
 
 .fa-keyboard:before {
-  content: "\f11c";
+  content: "";
 }
 
 .fa-keycdn:before {
-  content: "\f3ba";
+  content: "";
 }
 
 .fa-khanda:before {
-  content: "\f66d";
+  content: "";
 }
 
 .fa-kickstarter:before {
-  content: "\f3bb";
+  content: "";
 }
 
 .fa-kickstarter-k:before {
-  content: "\f3bc";
+  content: "";
 }
 
 .fa-kiss:before {
-  content: "\f596";
+  content: "";
 }
 
 .fa-kiss-beam:before {
-  content: "\f597";
+  content: "";
 }
 
 .fa-kiss-wink-heart:before {
-  content: "\f598";
+  content: "";
 }
 
 .fa-kiwi-bird:before {
-  content: "\f535";
+  content: "";
 }
 
 .fa-korvue:before {
-  content: "\f42f";
+  content: "";
 }
 
 .fa-landmark:before {
-  content: "\f66f";
+  content: "";
 }
 
 .fa-language:before {
-  content: "\f1ab";
+  content: "";
 }
 
 .fa-laptop:before {
-  content: "\f109";
+  content: "";
 }
 
 .fa-laptop-code:before {
-  content: "\f5fc";
+  content: "";
 }
 
 .fa-laravel:before {
-  content: "\f3bd";
+  content: "";
 }
 
 .fa-lastfm:before {
-  content: "\f202";
+  content: "";
 }
 
 .fa-lastfm-square:before {
-  content: "\f203";
+  content: "";
 }
 
 .fa-laugh:before {
-  content: "\f599";
+  content: "";
 }
 
 .fa-laugh-beam:before {
-  content: "\f59a";
+  content: "";
 }
 
 .fa-laugh-squint:before {
-  content: "\f59b";
+  content: "";
 }
 
 .fa-laugh-wink:before {
-  content: "\f59c";
+  content: "";
 }
 
 .fa-layer-group:before {
-  content: "\f5fd";
+  content: "";
 }
 
 .fa-leaf:before {
-  content: "\f06c";
+  content: "";
 }
 
 .fa-leanpub:before {
-  content: "\f212";
+  content: "";
 }
 
 .fa-lemon:before {
-  content: "\f094";
+  content: "";
 }
 
 .fa-less:before {
-  content: "\f41d";
+  content: "";
 }
 
 .fa-less-than:before {
-  content: "\f536";
+  content: "";
 }
 
 .fa-less-than-equal:before {
-  content: "\f537";
+  content: "";
 }
 
 .fa-level-down-alt:before {
-  content: "\f3be";
+  content: "";
 }
 
 .fa-level-up-alt:before {
-  content: "\f3bf";
+  content: "";
 }
 
 .fa-life-ring:before {
-  content: "\f1cd";
+  content: "";
 }
 
 .fa-lightbulb:before {
-  content: "\f0eb";
+  content: "";
 }
 
 .fa-line:before {
-  content: "\f3c0";
+  content: "";
 }
 
 .fa-link:before {
-  content: "\f0c1";
+  content: "";
 }
 
 .fa-linkedin:before {
-  content: "\f08c";
+  content: "";
 }
 
 .fa-linkedin-in:before {
-  content: "\f0e1";
+  content: "";
 }
 
 .fa-linode:before {
-  content: "\f2b8";
+  content: "";
 }
 
 .fa-linux:before {
-  content: "\f17c";
+  content: "";
 }
 
 .fa-lira-sign:before {
-  content: "\f195";
+  content: "";
 }
 
 .fa-list:before {
-  content: "\f03a";
+  content: "";
 }
 
 .fa-list-alt:before {
-  content: "\f022";
+  content: "";
 }
 
 .fa-list-ol:before {
-  content: "\f0cb";
+  content: "";
 }
 
 .fa-list-ul:before {
-  content: "\f0ca";
+  content: "";
 }
 
 .fa-location-arrow:before {
-  content: "\f124";
+  content: "";
 }
 
 .fa-lock:before {
-  content: "\f023";
+  content: "";
 }
 
 .fa-lock-open:before {
-  content: "\f3c1";
+  content: "";
 }
 
 .fa-long-arrow-alt-down:before {
-  content: "\f309";
+  content: "";
 }
 
 .fa-long-arrow-alt-left:before {
-  content: "\f30a";
+  content: "";
 }
 
 .fa-long-arrow-alt-right:before {
-  content: "\f30b";
+  content: "";
 }
 
 .fa-long-arrow-alt-up:before {
-  content: "\f30c";
+  content: "";
 }
 
 .fa-low-vision:before {
-  content: "\f2a8";
+  content: "";
 }
 
 .fa-luggage-cart:before {
-  content: "\f59d";
+  content: "";
 }
 
 .fa-lyft:before {
-  content: "\f3c3";
+  content: "";
 }
 
 .fa-magento:before {
-  content: "\f3c4";
+  content: "";
 }
 
 .fa-magic:before {
-  content: "\f0d0";
+  content: "";
 }
 
 .fa-magnet:before {
-  content: "\f076";
+  content: "";
 }
 
 .fa-mail-bulk:before {
-  content: "\f674";
+  content: "";
 }
 
 .fa-mailchimp:before {
-  content: "\f59e";
+  content: "";
 }
 
 .fa-male:before {
-  content: "\f183";
+  content: "";
 }
 
 .fa-mandalorian:before {
-  content: "\f50f";
+  content: "";
 }
 
 .fa-map:before {
-  content: "\f279";
+  content: "";
 }
 
 .fa-map-marked:before {
-  content: "\f59f";
+  content: "";
 }
 
 .fa-map-marked-alt:before {
-  content: "\f5a0";
+  content: "";
 }
 
 .fa-map-marker:before {
-  content: "\f041";
+  content: "";
 }
 
 .fa-map-marker-alt:before {
-  content: "\f3c5";
+  content: "";
 }
 
 .fa-map-pin:before {
-  content: "\f276";
+  content: "";
 }
 
 .fa-map-signs:before {
-  content: "\f277";
+  content: "";
 }
 
 .fa-markdown:before {
-  content: "\f60f";
+  content: "";
 }
 
 .fa-marker:before {
-  content: "\f5a1";
+  content: "";
 }
 
 .fa-mars:before {
-  content: "\f222";
+  content: "";
 }
 
 .fa-mars-double:before {
-  content: "\f227";
+  content: "";
 }
 
 .fa-mars-stroke:before {
-  content: "\f229";
+  content: "";
 }
 
 .fa-mars-stroke-h:before {
-  content: "\f22b";
+  content: "";
 }
 
 .fa-mars-stroke-v:before {
-  content: "\f22a";
+  content: "";
 }
 
 .fa-mastodon:before {
-  content: "\f4f6";
+  content: "";
 }
 
 .fa-maxcdn:before {
-  content: "\f136";
+  content: "";
 }
 
 .fa-medal:before {
-  content: "\f5a2";
+  content: "";
 }
 
 .fa-medapps:before {
-  content: "\f3c6";
+  content: "";
 }
 
 .fa-medium:before {
-  content: "\f23a";
+  content: "";
 }
 
 .fa-medium-m:before {
-  content: "\f3c7";
+  content: "";
 }
 
 .fa-medkit:before {
-  content: "\f0fa";
+  content: "";
 }
 
 .fa-medrt:before {
-  content: "\f3c8";
+  content: "";
 }
 
 .fa-meetup:before {
-  content: "\f2e0";
+  content: "";
 }
 
 .fa-megaport:before {
-  content: "\f5a3";
+  content: "";
 }
 
 .fa-meh:before {
-  content: "\f11a";
+  content: "";
 }
 
 .fa-meh-blank:before {
-  content: "\f5a4";
+  content: "";
 }
 
 .fa-meh-rolling-eyes:before {
-  content: "\f5a5";
+  content: "";
 }
 
 .fa-memory:before {
-  content: "\f538";
+  content: "";
 }
 
 .fa-menorah:before {
-  content: "\f676";
+  content: "";
 }
 
 .fa-mercury:before {
-  content: "\f223";
+  content: "";
 }
 
 .fa-microchip:before {
-  content: "\f2db";
+  content: "";
 }
 
 .fa-microphone:before {
-  content: "\f130";
+  content: "";
 }
 
 .fa-microphone-alt:before {
-  content: "\f3c9";
+  content: "";
 }
 
 .fa-microphone-alt-slash:before {
-  content: "\f539";
+  content: "";
 }
 
 .fa-microphone-slash:before {
-  content: "\f131";
+  content: "";
 }
 
 .fa-microscope:before {
-  content: "\f610";
+  content: "";
 }
 
 .fa-microsoft:before {
-  content: "\f3ca";
+  content: "";
 }
 
 .fa-minus:before {
-  content: "\f068";
+  content: "";
 }
 
 .fa-minus-circle:before {
-  content: "\f056";
+  content: "";
 }
 
 .fa-minus-square:before {
-  content: "\f146";
+  content: "";
 }
 
 .fa-mix:before {
-  content: "\f3cb";
+  content: "";
 }
 
 .fa-mixcloud:before {
-  content: "\f289";
+  content: "";
 }
 
 .fa-mizuni:before {
-  content: "\f3cc";
+  content: "";
 }
 
 .fa-mobile:before {
-  content: "\f10b";
+  content: "";
 }
 
 .fa-mobile-alt:before {
-  content: "\f3cd";
+  content: "";
 }
 
 .fa-modx:before {
-  content: "\f285";
+  content: "";
 }
 
 .fa-monero:before {
-  content: "\f3d0";
+  content: "";
 }
 
 .fa-money-bill:before {
-  content: "\f0d6";
+  content: "";
 }
 
 .fa-money-bill-alt:before {
-  content: "\f3d1";
+  content: "";
 }
 
 .fa-money-bill-wave:before {
-  content: "\f53a";
+  content: "";
 }
 
 .fa-money-bill-wave-alt:before {
-  content: "\f53b";
+  content: "";
 }
 
 .fa-money-check:before {
-  content: "\f53c";
+  content: "";
 }
 
 .fa-money-check-alt:before {
-  content: "\f53d";
+  content: "";
 }
 
 .fa-monument:before {
-  content: "\f5a6";
+  content: "";
 }
 
 .fa-moon:before {
-  content: "\f186";
+  content: "";
 }
 
 .fa-mortar-pestle:before {
-  content: "\f5a7";
+  content: "";
 }
 
 .fa-mosque:before {
-  content: "\f678";
+  content: "";
 }
 
 .fa-motorcycle:before {
-  content: "\f21c";
+  content: "";
 }
 
 .fa-mouse-pointer:before {
-  content: "\f245";
+  content: "";
 }
 
 .fa-music:before {
-  content: "\f001";
+  content: "";
 }
 
 .fa-napster:before {
-  content: "\f3d2";
+  content: "";
 }
 
 .fa-neos:before {
-  content: "\f612";
+  content: "";
 }
 
 .fa-neuter:before {
-  content: "\f22c";
+  content: "";
 }
 
 .fa-newspaper:before {
-  content: "\f1ea";
+  content: "";
 }
 
 .fa-nimblr:before {
-  content: "\f5a8";
+  content: "";
 }
 
 .fa-nintendo-switch:before {
-  content: "\f418";
+  content: "";
 }
 
 .fa-node:before {
-  content: "\f419";
+  content: "";
 }
 
 .fa-node-js:before {
-  content: "\f3d3";
+  content: "";
 }
 
 .fa-not-equal:before {
-  content: "\f53e";
+  content: "";
 }
 
 .fa-notes-medical:before {
-  content: "\f481";
+  content: "";
 }
 
 .fa-npm:before {
-  content: "\f3d4";
+  content: "";
 }
 
 .fa-ns8:before {
-  content: "\f3d5";
+  content: "";
 }
 
 .fa-nutritionix:before {
-  content: "\f3d6";
+  content: "";
 }
 
 .fa-object-group:before {
-  content: "\f247";
+  content: "";
 }
 
 .fa-object-ungroup:before {
-  content: "\f248";
+  content: "";
 }
 
 .fa-odnoklassniki:before {
-  content: "\f263";
+  content: "";
 }
 
 .fa-odnoklassniki-square:before {
-  content: "\f264";
+  content: "";
 }
 
 .fa-oil-can:before {
-  content: "\f613";
+  content: "";
 }
 
 .fa-old-republic:before {
-  content: "\f510";
+  content: "";
 }
 
 .fa-om:before {
-  content: "\f679";
+  content: "";
 }
 
 .fa-opencart:before {
-  content: "\f23d";
+  content: "";
 }
 
 .fa-openid:before {
-  content: "\f19b";
+  content: "";
 }
 
 .fa-opera:before {
-  content: "\f26a";
+  content: "";
 }
 
 .fa-optin-monster:before {
-  content: "\f23c";
+  content: "";
 }
 
 .fa-osi:before {
-  content: "\f41a";
+  content: "";
 }
 
 .fa-outdent:before {
-  content: "\f03b";
+  content: "";
 }
 
 .fa-page4:before {
-  content: "\f3d7";
+  content: "";
 }
 
 .fa-pagelines:before {
-  content: "\f18c";
+  content: "";
 }
 
 .fa-paint-brush:before {
-  content: "\f1fc";
+  content: "";
 }
 
 .fa-paint-roller:before {
-  content: "\f5aa";
+  content: "";
 }
 
 .fa-palette:before {
-  content: "\f53f";
+  content: "";
 }
 
 .fa-palfed:before {
-  content: "\f3d8";
+  content: "";
 }
 
 .fa-pallet:before {
-  content: "\f482";
+  content: "";
 }
 
 .fa-paper-plane:before {
-  content: "\f1d8";
+  content: "";
 }
 
 .fa-paperclip:before {
-  content: "\f0c6";
+  content: "";
 }
 
 .fa-parachute-box:before {
-  content: "\f4cd";
+  content: "";
 }
 
 .fa-paragraph:before {
-  content: "\f1dd";
+  content: "";
 }
 
 .fa-parking:before {
-  content: "\f540";
+  content: "";
 }
 
 .fa-passport:before {
-  content: "\f5ab";
+  content: "";
 }
 
 .fa-pastafarianism:before {
-  content: "\f67b";
+  content: "";
 }
 
 .fa-paste:before {
-  content: "\f0ea";
+  content: "";
 }
 
 .fa-patreon:before {
-  content: "\f3d9";
+  content: "";
 }
 
 .fa-pause:before {
-  content: "\f04c";
+  content: "";
 }
 
 .fa-pause-circle:before {
-  content: "\f28b";
+  content: "";
 }
 
 .fa-paw:before {
-  content: "\f1b0";
+  content: "";
 }
 
 .fa-paypal:before {
-  content: "\f1ed";
+  content: "";
 }
 
 .fa-peace:before {
-  content: "\f67c";
+  content: "";
 }
 
 .fa-pen:before {
-  content: "\f304";
+  content: "";
 }
 
 .fa-pen-alt:before {
-  content: "\f305";
+  content: "";
 }
 
 .fa-pen-fancy:before {
-  content: "\f5ac";
+  content: "";
 }
 
 .fa-pen-nib:before {
-  content: "\f5ad";
+  content: "";
 }
 
 .fa-pen-square:before {
-  content: "\f14b";
+  content: "";
 }
 
 .fa-pencil-alt:before {
-  content: "\f303";
+  content: "";
 }
 
 .fa-pencil-ruler:before {
-  content: "\f5ae";
+  content: "";
 }
 
 .fa-people-carry:before {
-  content: "\f4ce";
+  content: "";
 }
 
 .fa-percent:before {
-  content: "\f295";
+  content: "";
 }
 
 .fa-percentage:before {
-  content: "\f541";
+  content: "";
 }
 
 .fa-periscope:before {
-  content: "\f3da";
+  content: "";
 }
 
 .fa-phabricator:before {
-  content: "\f3db";
+  content: "";
 }
 
 .fa-phoenix-framework:before {
-  content: "\f3dc";
+  content: "";
 }
 
 .fa-phoenix-squadron:before {
-  content: "\f511";
+  content: "";
 }
 
 .fa-phone:before {
-  content: "\f095";
+  content: "";
 }
 
 .fa-phone-slash:before {
-  content: "\f3dd";
+  content: "";
 }
 
 .fa-phone-square:before {
-  content: "\f098";
+  content: "";
 }
 
 .fa-phone-volume:before {
-  content: "\f2a0";
+  content: "";
 }
 
 .fa-php:before {
-  content: "\f457";
+  content: "";
 }
 
 .fa-pied-piper:before {
-  content: "\f2ae";
+  content: "";
 }
 
 .fa-pied-piper-alt:before {
-  content: "\f1a8";
+  content: "";
 }
 
 .fa-pied-piper-hat:before {
-  content: "\f4e5";
+  content: "";
 }
 
 .fa-pied-piper-pp:before {
-  content: "\f1a7";
+  content: "";
 }
 
 .fa-piggy-bank:before {
-  content: "\f4d3";
+  content: "";
 }
 
 .fa-pills:before {
-  content: "\f484";
+  content: "";
 }
 
 .fa-pinterest:before {
-  content: "\f0d2";
+  content: "";
 }
 
 .fa-pinterest-p:before {
-  content: "\f231";
+  content: "";
 }
 
 .fa-pinterest-square:before {
-  content: "\f0d3";
+  content: "";
 }
 
 .fa-place-of-worship:before {
-  content: "\f67f";
+  content: "";
 }
 
 .fa-plane:before {
-  content: "\f072";
+  content: "";
 }
 
 .fa-plane-arrival:before {
-  content: "\f5af";
+  content: "";
 }
 
 .fa-plane-departure:before {
-  content: "\f5b0";
+  content: "";
 }
 
 .fa-play:before {
-  content: "\f04b";
+  content: "";
 }
 
 .fa-play-circle:before {
-  content: "\f144";
+  content: "";
 }
 
 .fa-playstation:before {
-  content: "\f3df";
+  content: "";
 }
 
 .fa-plug:before {
-  content: "\f1e6";
+  content: "";
 }
 
 .fa-plus:before {
-  content: "\f067";
+  content: "";
 }
 
 .fa-plus-circle:before {
-  content: "\f055";
+  content: "";
 }
 
 .fa-plus-square:before {
-  content: "\f0fe";
+  content: "";
 }
 
 .fa-podcast:before {
-  content: "\f2ce";
+  content: "";
 }
 
 .fa-poll:before {
-  content: "\f681";
+  content: "";
 }
 
 .fa-poll-h:before {
-  content: "\f682";
+  content: "";
 }
 
 .fa-poo:before {
-  content: "\f2fe";
+  content: "";
 }
 
 .fa-poop:before {
-  content: "\f619";
+  content: "";
 }
 
 .fa-portrait:before {
-  content: "\f3e0";
+  content: "";
 }
 
 .fa-pound-sign:before {
-  content: "\f154";
+  content: "";
 }
 
 .fa-power-off:before {
-  content: "\f011";
+  content: "";
 }
 
 .fa-pray:before {
-  content: "\f683";
+  content: "";
 }
 
 .fa-praying-hands:before {
-  content: "\f684";
+  content: "";
 }
 
 .fa-prescription:before {
-  content: "\f5b1";
+  content: "";
 }
 
 .fa-prescription-bottle:before {
-  content: "\f485";
+  content: "";
 }
 
 .fa-prescription-bottle-alt:before {
-  content: "\f486";
+  content: "";
 }
 
 .fa-print:before {
-  content: "\f02f";
+  content: "";
 }
 
 .fa-procedures:before {
-  content: "\f487";
+  content: "";
 }
 
 .fa-product-hunt:before {
-  content: "\f288";
+  content: "";
 }
 
 .fa-project-diagram:before {
-  content: "\f542";
+  content: "";
 }
 
 .fa-pushed:before {
-  content: "\f3e1";
+  content: "";
 }
 
 .fa-puzzle-piece:before {
-  content: "\f12e";
+  content: "";
 }
 
 .fa-python:before {
-  content: "\f3e2";
+  content: "";
 }
 
 .fa-qq:before {
-  content: "\f1d6";
+  content: "";
 }
 
 .fa-qrcode:before {
-  content: "\f029";
+  content: "";
 }
 
 .fa-question:before {
-  content: "\f128";
+  content: "";
 }
 
 .fa-question-circle:before {
-  content: "\f059";
+  content: "";
 }
 
 .fa-quidditch:before {
-  content: "\f458";
+  content: "";
 }
 
 .fa-quinscape:before {
-  content: "\f459";
+  content: "";
 }
 
 .fa-quora:before {
-  content: "\f2c4";
+  content: "";
 }
 
 .fa-quote-left:before {
-  content: "\f10d";
+  content: "";
 }
 
 .fa-quote-right:before {
-  content: "\f10e";
+  content: "";
 }
 
 .fa-quran:before {
-  content: "\f687";
+  content: "";
 }
 
 .fa-r-project:before {
-  content: "\f4f7";
+  content: "";
 }
 
 .fa-random:before {
-  content: "\f074";
+  content: "";
 }
 
 .fa-ravelry:before {
-  content: "\f2d9";
+  content: "";
 }
 
 .fa-react:before {
-  content: "\f41b";
+  content: "";
 }
 
 .fa-readme:before {
-  content: "\f4d5";
+  content: "";
 }
 
 .fa-rebel:before {
-  content: "\f1d0";
+  content: "";
 }
 
 .fa-receipt:before {
-  content: "\f543";
+  content: "";
 }
 
 .fa-recycle:before {
-  content: "\f1b8";
+  content: "";
 }
 
 .fa-red-river:before {
-  content: "\f3e3";
+  content: "";
 }
 
 .fa-reddit:before {
-  content: "\f1a1";
+  content: "";
 }
 
 .fa-reddit-alien:before {
-  content: "\f281";
+  content: "";
 }
 
 .fa-reddit-square:before {
-  content: "\f1a2";
+  content: "";
 }
 
 .fa-redo:before {
-  content: "\f01e";
+  content: "";
 }
 
 .fa-redo-alt:before {
-  content: "\f2f9";
+  content: "";
 }
 
 .fa-registered:before {
-  content: "\f25d";
+  content: "";
 }
 
 .fa-rendact:before {
-  content: "\f3e4";
+  content: "";
 }
 
 .fa-renren:before {
-  content: "\f18b";
+  content: "";
 }
 
 .fa-reply:before {
-  content: "\f3e5";
+  content: "";
 }
 
 .fa-reply-all:before {
-  content: "\f122";
+  content: "";
 }
 
 .fa-replyd:before {
-  content: "\f3e6";
+  content: "";
 }
 
 .fa-researchgate:before {
-  content: "\f4f8";
+  content: "";
 }
 
 .fa-resolving:before {
-  content: "\f3e7";
+  content: "";
 }
 
 .fa-retweet:before {
-  content: "\f079";
+  content: "";
 }
 
 .fa-rev:before {
-  content: "\f5b2";
+  content: "";
 }
 
 .fa-ribbon:before {
-  content: "\f4d6";
+  content: "";
 }
 
 .fa-road:before {
-  content: "\f018";
+  content: "";
 }
 
 .fa-robot:before {
-  content: "\f544";
+  content: "";
 }
 
 .fa-rocket:before {
-  content: "\f135";
+  content: "";
 }
 
 .fa-rocketchat:before {
-  content: "\f3e8";
+  content: "";
 }
 
 .fa-rockrms:before {
-  content: "\f3e9";
+  content: "";
 }
 
 .fa-route:before {
-  content: "\f4d7";
+  content: "";
 }
 
 .fa-rss:before {
-  content: "\f09e";
+  content: "";
 }
 
 .fa-rss-square:before {
-  content: "\f143";
+  content: "";
 }
 
 .fa-ruble-sign:before {
-  content: "\f158";
+  content: "";
 }
 
 .fa-ruler:before {
-  content: "\f545";
+  content: "";
 }
 
 .fa-ruler-combined:before {
-  content: "\f546";
+  content: "";
 }
 
 .fa-ruler-horizontal:before {
-  content: "\f547";
+  content: "";
 }
 
 .fa-ruler-vertical:before {
-  content: "\f548";
+  content: "";
 }
 
 .fa-rupee-sign:before {
-  content: "\f156";
+  content: "";
 }
 
 .fa-sad-cry:before {
-  content: "\f5b3";
+  content: "";
 }
 
 .fa-sad-tear:before {
-  content: "\f5b4";
+  content: "";
 }
 
 .fa-safari:before {
-  content: "\f267";
+  content: "";
 }
 
 .fa-sass:before {
-  content: "\f41e";
+  content: "";
 }
 
 .fa-save:before {
-  content: "\f0c7";
+  content: "";
 }
 
 .fa-schlix:before {
-  content: "\f3ea";
+  content: "";
 }
 
 .fa-school:before {
-  content: "\f549";
+  content: "";
 }
 
 .fa-screwdriver:before {
-  content: "\f54a";
+  content: "";
 }
 
 .fa-scribd:before {
-  content: "\f28a";
+  content: "";
 }
 
 .fa-search:before {
-  content: "\f002";
+  content: "";
 }
 
 .fa-search-dollar:before {
-  content: "\f688";
+  content: "";
 }
 
 .fa-search-location:before {
-  content: "\f689";
+  content: "";
 }
 
 .fa-search-minus:before {
-  content: "\f010";
+  content: "";
 }
 
 .fa-search-plus:before {
-  content: "\f00e";
+  content: "";
 }
 
 .fa-searchengin:before {
-  content: "\f3eb";
+  content: "";
 }
 
 .fa-seedling:before {
-  content: "\f4d8";
+  content: "";
 }
 
 .fa-sellcast:before {
-  content: "\f2da";
+  content: "";
 }
 
 .fa-sellsy:before {
-  content: "\f213";
+  content: "";
 }
 
 .fa-server:before {
-  content: "\f233";
+  content: "";
 }
 
 .fa-servicestack:before {
-  content: "\f3ec";
+  content: "";
 }
 
 .fa-shapes:before {
-  content: "\f61f";
+  content: "";
 }
 
 .fa-share:before {
-  content: "\f064";
+  content: "";
 }
 
 .fa-share-alt:before {
-  content: "\f1e0";
+  content: "";
 }
 
 .fa-share-alt-square:before {
-  content: "\f1e1";
+  content: "";
 }
 
 .fa-share-square:before {
-  content: "\f14d";
+  content: "";
 }
 
 .fa-shekel-sign:before {
-  content: "\f20b";
+  content: "";
 }
 
 .fa-shield-alt:before {
-  content: "\f3ed";
+  content: "";
 }
 
 .fa-ship:before {
-  content: "\f21a";
+  content: "";
 }
 
 .fa-shipping-fast:before {
-  content: "\f48b";
+  content: "";
 }
 
 .fa-shirtsinbulk:before {
-  content: "\f214";
+  content: "";
 }
 
 .fa-shoe-prints:before {
-  content: "\f54b";
+  content: "";
 }
 
 .fa-shopping-bag:before {
-  content: "\f290";
+  content: "";
 }
 
 .fa-shopping-basket:before {
-  content: "\f291";
+  content: "";
 }
 
 .fa-shopping-cart:before {
-  content: "\f07a";
+  content: "";
 }
 
 .fa-shopware:before {
-  content: "\f5b5";
+  content: "";
 }
 
 .fa-shower:before {
-  content: "\f2cc";
+  content: "";
 }
 
 .fa-shuttle-van:before {
-  content: "\f5b6";
+  content: "";
 }
 
 .fa-sign:before {
-  content: "\f4d9";
+  content: "";
 }
 
 .fa-sign-in-alt:before {
-  content: "\f2f6";
+  content: "";
 }
 
 .fa-sign-language:before {
-  content: "\f2a7";
+  content: "";
 }
 
 .fa-sign-out-alt:before {
-  content: "\f2f5";
+  content: "";
 }
 
 .fa-signal:before {
-  content: "\f012";
+  content: "";
 }
 
 .fa-signature:before {
-  content: "\f5b7";
+  content: "";
 }
 
 .fa-simplybuilt:before {
-  content: "\f215";
+  content: "";
 }
 
 .fa-sistrix:before {
-  content: "\f3ee";
+  content: "";
 }
 
 .fa-sitemap:before {
-  content: "\f0e8";
+  content: "";
 }
 
 .fa-sith:before {
-  content: "\f512";
+  content: "";
 }
 
 .fa-skull:before {
-  content: "\f54c";
+  content: "";
 }
 
 .fa-skyatlas:before {
-  content: "\f216";
+  content: "";
 }
 
 .fa-skype:before {
-  content: "\f17e";
+  content: "";
 }
 
 .fa-slack:before {
-  content: "\f198";
+  content: "";
 }
 
 .fa-slack-hash:before {
-  content: "\f3ef";
+  content: "";
 }
 
 .fa-sliders-h:before {
-  content: "\f1de";
+  content: "";
 }
 
 .fa-slideshare:before {
-  content: "\f1e7";
+  content: "";
 }
 
 .fa-smile:before {
-  content: "\f118";
+  content: "";
 }
 
 .fa-smile-beam:before {
-  content: "\f5b8";
+  content: "";
 }
 
 .fa-smile-wink:before {
-  content: "\f4da";
+  content: "";
 }
 
 .fa-smoking:before {
-  content: "\f48d";
+  content: "";
 }
 
 .fa-smoking-ban:before {
-  content: "\f54d";
+  content: "";
 }
 
 .fa-snapchat:before {
-  content: "\f2ab";
+  content: "";
 }
 
 .fa-snapchat-ghost:before {
-  content: "\f2ac";
+  content: "";
 }
 
 .fa-snapchat-square:before {
-  content: "\f2ad";
+  content: "";
 }
 
 .fa-snowflake:before {
-  content: "\f2dc";
+  content: "";
 }
 
 .fa-socks:before {
-  content: "\f696";
+  content: "";
 }
 
 .fa-solar-panel:before {
-  content: "\f5ba";
+  content: "";
 }
 
 .fa-sort:before {
-  content: "\f0dc";
+  content: "";
 }
 
 .fa-sort-alpha-down:before {
-  content: "\f15d";
+  content: "";
 }
 
 .fa-sort-alpha-up:before {
-  content: "\f15e";
+  content: "";
 }
 
 .fa-sort-amount-down:before {
-  content: "\f160";
+  content: "";
 }
 
 .fa-sort-amount-up:before {
-  content: "\f161";
+  content: "";
 }
 
 .fa-sort-down:before {
-  content: "\f0dd";
+  content: "";
 }
 
 .fa-sort-numeric-down:before {
-  content: "\f162";
+  content: "";
 }
 
 .fa-sort-numeric-up:before {
-  content: "\f163";
+  content: "";
 }
 
 .fa-sort-up:before {
-  content: "\f0de";
+  content: "";
 }
 
 .fa-soundcloud:before {
-  content: "\f1be";
+  content: "";
 }
 
 .fa-spa:before {
-  content: "\f5bb";
+  content: "";
 }
 
 .fa-space-shuttle:before {
-  content: "\f197";
+  content: "";
 }
 
 .fa-speakap:before {
-  content: "\f3f3";
+  content: "";
 }
 
 .fa-spinner:before {
-  content: "\f110";
+  content: "";
 }
 
 .fa-splotch:before {
-  content: "\f5bc";
+  content: "";
 }
 
 .fa-spotify:before {
-  content: "\f1bc";
+  content: "";
 }
 
 .fa-spray-can:before {
-  content: "\f5bd";
+  content: "";
 }
 
 .fa-square:before {
-  content: "\f0c8";
+  content: "";
 }
 
 .fa-square-full:before {
-  content: "\f45c";
+  content: "";
 }
 
 .fa-square-root-alt:before {
-  content: "\f698";
+  content: "";
 }
 
 .fa-squarespace:before {
-  content: "\f5be";
+  content: "";
 }
 
 .fa-stack-exchange:before {
-  content: "\f18d";
+  content: "";
 }
 
 .fa-stack-overflow:before {
-  content: "\f16c";
+  content: "";
 }
 
 .fa-stamp:before {
-  content: "\f5bf";
+  content: "";
 }
 
 .fa-star:before {
-  content: "\f005";
+  content: "";
 }
 
 .fa-star-and-crescent:before {
-  content: "\f699";
+  content: "";
 }
 
 .fa-star-half:before {
-  content: "\f089";
+  content: "";
 }
 
 .fa-star-half-alt:before {
-  content: "\f5c0";
+  content: "";
 }
 
 .fa-star-of-david:before {
-  content: "\f69a";
+  content: "";
 }
 
 .fa-star-of-life:before {
-  content: "\f621";
+  content: "";
 }
 
 .fa-staylinked:before {
-  content: "\f3f5";
+  content: "";
 }
 
 .fa-steam:before {
-  content: "\f1b6";
+  content: "";
 }
 
 .fa-steam-square:before {
-  content: "\f1b7";
+  content: "";
 }
 
 .fa-steam-symbol:before {
-  content: "\f3f6";
+  content: "";
 }
 
 .fa-step-backward:before {
-  content: "\f048";
+  content: "";
 }
 
 .fa-step-forward:before {
-  content: "\f051";
+  content: "";
 }
 
 .fa-stethoscope:before {
-  content: "\f0f1";
+  content: "";
 }
 
 .fa-sticker-mule:before {
-  content: "\f3f7";
+  content: "";
 }
 
 .fa-sticky-note:before {
-  content: "\f249";
+  content: "";
 }
 
 .fa-stop:before {
-  content: "\f04d";
+  content: "";
 }
 
 .fa-stop-circle:before {
-  content: "\f28d";
+  content: "";
 }
 
 .fa-stopwatch:before {
-  content: "\f2f2";
+  content: "";
 }
 
 .fa-store:before {
-  content: "\f54e";
+  content: "";
 }
 
 .fa-store-alt:before {
-  content: "\f54f";
+  content: "";
 }
 
 .fa-strava:before {
-  content: "\f428";
+  content: "";
 }
 
 .fa-stream:before {
-  content: "\f550";
+  content: "";
 }
 
 .fa-street-view:before {
-  content: "\f21d";
+  content: "";
 }
 
 .fa-strikethrough:before {
-  content: "\f0cc";
+  content: "";
 }
 
 .fa-stripe:before {
-  content: "\f429";
+  content: "";
 }
 
 .fa-stripe-s:before {
-  content: "\f42a";
+  content: "";
 }
 
 .fa-stroopwafel:before {
-  content: "\f551";
+  content: "";
 }
 
 .fa-studiovinari:before {
-  content: "\f3f8";
+  content: "";
 }
 
 .fa-stumbleupon:before {
-  content: "\f1a4";
+  content: "";
 }
 
 .fa-stumbleupon-circle:before {
-  content: "\f1a3";
+  content: "";
 }
 
 .fa-subscript:before {
-  content: "\f12c";
+  content: "";
 }
 
 .fa-subway:before {
-  content: "\f239";
+  content: "";
 }
 
 .fa-suitcase:before {
-  content: "\f0f2";
+  content: "";
 }
 
 .fa-suitcase-rolling:before {
-  content: "\f5c1";
+  content: "";
 }
 
 .fa-sun:before {
-  content: "\f185";
+  content: "";
 }
 
 .fa-superpowers:before {
-  content: "\f2dd";
+  content: "";
 }
 
 .fa-superscript:before {
-  content: "\f12b";
+  content: "";
 }
 
 .fa-supple:before {
-  content: "\f3f9";
+  content: "";
 }
 
 .fa-surprise:before {
-  content: "\f5c2";
+  content: "";
 }
 
 .fa-swatchbook:before {
-  content: "\f5c3";
+  content: "";
 }
 
 .fa-swimmer:before {
-  content: "\f5c4";
+  content: "";
 }
 
 .fa-swimming-pool:before {
-  content: "\f5c5";
+  content: "";
 }
 
 .fa-synagogue:before {
-  content: "\f69b";
+  content: "";
 }
 
 .fa-sync:before {
-  content: "\f021";
+  content: "";
 }
 
 .fa-sync-alt:before {
-  content: "\f2f1";
+  content: "";
 }
 
 .fa-syringe:before {
-  content: "\f48e";
+  content: "";
 }
 
 .fa-table:before {
-  content: "\f0ce";
+  content: "";
 }
 
 .fa-table-tennis:before {
-  content: "\f45d";
+  content: "";
 }
 
 .fa-tablet:before {
-  content: "\f10a";
+  content: "";
 }
 
 .fa-tablet-alt:before {
-  content: "\f3fa";
+  content: "";
 }
 
 .fa-tablets:before {
-  content: "\f490";
+  content: "";
 }
 
 .fa-tachometer-alt:before {
-  content: "\f3fd";
+  content: "";
 }
 
 .fa-tag:before {
-  content: "\f02b";
+  content: "";
 }
 
 .fa-tags:before {
-  content: "\f02c";
+  content: "";
 }
 
 .fa-tape:before {
-  content: "\f4db";
+  content: "";
 }
 
 .fa-tasks:before {
-  content: "\f0ae";
+  content: "";
 }
 
 .fa-taxi:before {
-  content: "\f1ba";
+  content: "";
 }
 
 .fa-teamspeak:before {
-  content: "\f4f9";
+  content: "";
 }
 
 .fa-teeth:before {
-  content: "\f62e";
+  content: "";
 }
 
 .fa-teeth-open:before {
-  content: "\f62f";
+  content: "";
 }
 
 .fa-telegram:before {
-  content: "\f2c6";
+  content: "";
 }
 
 .fa-telegram-plane:before {
-  content: "\f3fe";
+  content: "";
 }
 
 .fa-tencent-weibo:before {
-  content: "\f1d5";
+  content: "";
 }
 
 .fa-terminal:before {
-  content: "\f120";
+  content: "";
 }
 
 .fa-text-height:before {
-  content: "\f034";
+  content: "";
 }
 
 .fa-text-width:before {
-  content: "\f035";
+  content: "";
 }
 
 .fa-th:before {
-  content: "\f00a";
+  content: "";
 }
 
 .fa-th-large:before {
-  content: "\f009";
+  content: "";
 }
 
 .fa-th-list:before {
-  content: "\f00b";
+  content: "";
 }
 
 .fa-the-red-yeti:before {
-  content: "\f69d";
+  content: "";
 }
 
 .fa-theater-masks:before {
-  content: "\f630";
+  content: "";
 }
 
 .fa-themeco:before {
-  content: "\f5c6";
+  content: "";
 }
 
 .fa-themeisle:before {
-  content: "\f2b2";
+  content: "";
 }
 
 .fa-thermometer:before {
-  content: "\f491";
+  content: "";
 }
 
 .fa-thermometer-empty:before {
-  content: "\f2cb";
+  content: "";
 }
 
 .fa-thermometer-full:before {
-  content: "\f2c7";
+  content: "";
 }
 
 .fa-thermometer-half:before {
-  content: "\f2c9";
+  content: "";
 }
 
 .fa-thermometer-quarter:before {
-  content: "\f2ca";
+  content: "";
 }
 
 .fa-thermometer-three-quarters:before {
-  content: "\f2c8";
+  content: "";
 }
 
 .fa-thumbs-down:before {
-  content: "\f165";
+  content: "";
 }
 
 .fa-thumbs-up:before {
-  content: "\f164";
+  content: "";
 }
 
 .fa-thumbtack:before {
-  content: "\f08d";
+  content: "";
 }
 
 .fa-ticket-alt:before {
-  content: "\f3ff";
+  content: "";
 }
 
 .fa-times:before {
-  content: "\f00d";
+  content: "";
 }
 
 .fa-times-circle:before {
-  content: "\f057";
+  content: "";
 }
 
 .fa-tint:before {
-  content: "\f043";
+  content: "";
 }
 
 .fa-tint-slash:before {
-  content: "\f5c7";
+  content: "";
 }
 
 .fa-tired:before {
-  content: "\f5c8";
+  content: "";
 }
 
 .fa-toggle-off:before {
-  content: "\f204";
+  content: "";
 }
 
 .fa-toggle-on:before {
-  content: "\f205";
+  content: "";
 }
 
 .fa-toolbox:before {
-  content: "\f552";
+  content: "";
 }
 
 .fa-tooth:before {
-  content: "\f5c9";
+  content: "";
 }
 
 .fa-torah:before {
-  content: "\f6a0";
+  content: "";
 }
 
 .fa-torii-gate:before {
-  content: "\f6a1";
+  content: "";
 }
 
 .fa-trade-federation:before {
-  content: "\f513";
+  content: "";
 }
 
 .fa-trademark:before {
-  content: "\f25c";
+  content: "";
 }
 
 .fa-traffic-light:before {
-  content: "\f637";
+  content: "";
 }
 
 .fa-train:before {
-  content: "\f238";
+  content: "";
 }
 
 .fa-transgender:before {
-  content: "\f224";
+  content: "";
 }
 
 .fa-transgender-alt:before {
-  content: "\f225";
+  content: "";
 }
 
 .fa-trash:before {
-  content: "\f1f8";
+  content: "";
 }
 
 .fa-trash-alt:before {
-  content: "\f2ed";
+  content: "";
 }
 
 .fa-tree:before {
-  content: "\f1bb";
+  content: "";
 }
 
 .fa-trello:before {
-  content: "\f181";
+  content: "";
 }
 
 .fa-tripadvisor:before {
-  content: "\f262";
+  content: "";
 }
 
 .fa-trophy:before {
-  content: "\f091";
+  content: "";
 }
 
 .fa-truck:before {
-  content: "\f0d1";
+  content: "";
 }
 
 .fa-truck-loading:before {
-  content: "\f4de";
+  content: "";
 }
 
 .fa-truck-monster:before {
-  content: "\f63b";
+  content: "";
 }
 
 .fa-truck-moving:before {
-  content: "\f4df";
+  content: "";
 }
 
 .fa-truck-pickup:before {
-  content: "\f63c";
+  content: "";
 }
 
 .fa-tshirt:before {
-  content: "\f553";
+  content: "";
 }
 
 .fa-tty:before {
-  content: "\f1e4";
+  content: "";
 }
 
 .fa-tumblr:before {
-  content: "\f173";
+  content: "";
 }
 
 .fa-tumblr-square:before {
-  content: "\f174";
+  content: "";
 }
 
 .fa-tv:before {
-  content: "\f26c";
+  content: "";
 }
 
 .fa-twitch:before {
-  content: "\f1e8";
+  content: "";
 }
 
 .fa-twitter:before {
-  content: "\f099";
+  content: "";
 }
 
 .fa-twitter-square:before {
-  content: "\f081";
+  content: "";
 }
 
 .fa-typo3:before {
-  content: "\f42b";
+  content: "";
 }
 
 .fa-uber:before {
-  content: "\f402";
+  content: "";
 }
 
 .fa-uikit:before {
-  content: "\f403";
+  content: "";
 }
 
 .fa-umbrella:before {
-  content: "\f0e9";
+  content: "";
 }
 
 .fa-umbrella-beach:before {
-  content: "\f5ca";
+  content: "";
 }
 
 .fa-underline:before {
-  content: "\f0cd";
+  content: "";
 }
 
 .fa-undo:before {
-  content: "\f0e2";
+  content: "";
 }
 
 .fa-undo-alt:before {
-  content: "\f2ea";
+  content: "";
 }
 
 .fa-uniregistry:before {
-  content: "\f404";
+  content: "";
 }
 
 .fa-universal-access:before {
-  content: "\f29a";
+  content: "";
 }
 
 .fa-university:before {
-  content: "\f19c";
+  content: "";
 }
 
 .fa-unlink:before {
-  content: "\f127";
+  content: "";
 }
 
 .fa-unlock:before {
-  content: "\f09c";
+  content: "";
 }
 
 .fa-unlock-alt:before {
-  content: "\f13e";
+  content: "";
 }
 
 .fa-untappd:before {
-  content: "\f405";
+  content: "";
 }
 
 .fa-upload:before {
-  content: "\f093";
+  content: "";
 }
 
 .fa-usb:before {
-  content: "\f287";
+  content: "";
 }
 
 .fa-user:before {
-  content: "\f007";
+  content: "";
 }
 
 .fa-user-alt:before {
-  content: "\f406";
+  content: "";
 }
 
 .fa-user-alt-slash:before {
-  content: "\f4fa";
+  content: "";
 }
 
 .fa-user-astronaut:before {
-  content: "\f4fb";
+  content: "";
 }
 
 .fa-user-check:before {
-  content: "\f4fc";
+  content: "";
 }
 
 .fa-user-circle:before {
-  content: "\f2bd";
+  content: "";
 }
 
 .fa-user-clock:before {
-  content: "\f4fd";
+  content: "";
 }
 
 .fa-user-cog:before {
-  content: "\f4fe";
+  content: "";
 }
 
 .fa-user-edit:before {
-  content: "\f4ff";
+  content: "";
 }
 
 .fa-user-friends:before {
-  content: "\f500";
+  content: "";
 }
 
 .fa-user-graduate:before {
-  content: "\f501";
+  content: "";
 }
 
 .fa-user-lock:before {
-  content: "\f502";
+  content: "";
 }
 
 .fa-user-md:before {
-  content: "\f0f0";
+  content: "";
 }
 
 .fa-user-minus:before {
-  content: "\f503";
+  content: "";
 }
 
 .fa-user-ninja:before {
-  content: "\f504";
+  content: "";
 }
 
 .fa-user-plus:before {
-  content: "\f234";
+  content: "";
 }
 
 .fa-user-secret:before {
-  content: "\f21b";
+  content: "";
 }
 
 .fa-user-shield:before {
-  content: "\f505";
+  content: "";
 }
 
 .fa-user-slash:before {
-  content: "\f506";
+  content: "";
 }
 
 .fa-user-tag:before {
-  content: "\f507";
+  content: "";
 }
 
 .fa-user-tie:before {
-  content: "\f508";
+  content: "";
 }
 
 .fa-user-times:before {
-  content: "\f235";
+  content: "";
 }
 
 .fa-users:before {
-  content: "\f0c0";
+  content: "";
 }
 
 .fa-users-cog:before {
-  content: "\f509";
+  content: "";
 }
 
 .fa-ussunnah:before {
-  content: "\f407";
+  content: "";
 }
 
 .fa-utensil-spoon:before {
-  content: "\f2e5";
+  content: "";
 }
 
 .fa-utensils:before {
-  content: "\f2e7";
+  content: "";
 }
 
 .fa-vaadin:before {
-  content: "\f408";
+  content: "";
 }
 
 .fa-vector-square:before {
-  content: "\f5cb";
+  content: "";
 }
 
 .fa-venus:before {
-  content: "\f221";
+  content: "";
 }
 
 .fa-venus-double:before {
-  content: "\f226";
+  content: "";
 }
 
 .fa-venus-mars:before {
-  content: "\f228";
+  content: "";
 }
 
 .fa-viacoin:before {
-  content: "\f237";
+  content: "";
 }
 
 .fa-viadeo:before {
-  content: "\f2a9";
+  content: "";
 }
 
 .fa-viadeo-square:before {
-  content: "\f2aa";
+  content: "";
 }
 
 .fa-vial:before {
-  content: "\f492";
+  content: "";
 }
 
 .fa-vials:before {
-  content: "\f493";
+  content: "";
 }
 
 .fa-viber:before {
-  content: "\f409";
+  content: "";
 }
 
 .fa-video:before {
-  content: "\f03d";
+  content: "";
 }
 
 .fa-video-slash:before {
-  content: "\f4e2";
+  content: "";
 }
 
 .fa-vihara:before {
-  content: "\f6a7";
+  content: "";
 }
 
 .fa-vimeo:before {
-  content: "\f40a";
+  content: "";
 }
 
 .fa-vimeo-square:before {
-  content: "\f194";
+  content: "";
 }
 
 .fa-vimeo-v:before {
-  content: "\f27d";
+  content: "";
 }
 
 .fa-vine:before {
-  content: "\f1ca";
+  content: "";
 }
 
 .fa-vk:before {
-  content: "\f189";
+  content: "";
 }
 
 .fa-vnv:before {
-  content: "\f40b";
+  content: "";
 }
 
 .fa-volleyball-ball:before {
-  content: "\f45f";
+  content: "";
 }
 
 .fa-volume-down:before {
-  content: "\f027";
+  content: "";
 }
 
 .fa-volume-off:before {
-  content: "\f026";
+  content: "";
 }
 
 .fa-volume-up:before {
-  content: "\f028";
+  content: "";
 }
 
 .fa-vuejs:before {
-  content: "\f41f";
+  content: "";
 }
 
 .fa-walking:before {
-  content: "\f554";
+  content: "";
 }
 
 .fa-wallet:before {
-  content: "\f555";
+  content: "";
 }
 
 .fa-warehouse:before {
-  content: "\f494";
+  content: "";
 }
 
 .fa-weebly:before {
-  content: "\f5cc";
+  content: "";
 }
 
 .fa-weibo:before {
-  content: "\f18a";
+  content: "";
 }
 
 .fa-weight:before {
-  content: "\f496";
+  content: "";
 }
 
 .fa-weight-hanging:before {
-  content: "\f5cd";
+  content: "";
 }
 
 .fa-weixin:before {
-  content: "\f1d7";
+  content: "";
 }
 
 .fa-whatsapp:before {
-  content: "\f232";
+  content: "";
 }
 
 .fa-whatsapp-square:before {
-  content: "\f40c";
+  content: "";
 }
 
 .fa-wheelchair:before {
-  content: "\f193";
+  content: "";
 }
 
 .fa-whmcs:before {
-  content: "\f40d";
+  content: "";
 }
 
 .fa-wifi:before {
-  content: "\f1eb";
+  content: "";
 }
 
 .fa-wikipedia-w:before {
-  content: "\f266";
+  content: "";
 }
 
 .fa-window-close:before {
-  content: "\f410";
+  content: "";
 }
 
 .fa-window-maximize:before {
-  content: "\f2d0";
+  content: "";
 }
 
 .fa-window-minimize:before {
-  content: "\f2d1";
+  content: "";
 }
 
 .fa-window-restore:before {
-  content: "\f2d2";
+  content: "";
 }
 
 .fa-windows:before {
-  content: "\f17a";
+  content: "";
 }
 
 .fa-wine-glass:before {
-  content: "\f4e3";
+  content: "";
 }
 
 .fa-wine-glass-alt:before {
-  content: "\f5ce";
+  content: "";
 }
 
 .fa-wix:before {
-  content: "\f5cf";
+  content: "";
 }
 
 .fa-wolf-pack-battalion:before {
-  content: "\f514";
+  content: "";
 }
 
 .fa-won-sign:before {
-  content: "\f159";
+  content: "";
 }
 
 .fa-wordpress:before {
-  content: "\f19a";
+  content: "";
 }
 
 .fa-wordpress-simple:before {
-  content: "\f411";
+  content: "";
 }
 
 .fa-wpbeginner:before {
-  content: "\f297";
+  content: "";
 }
 
 .fa-wpexplorer:before {
-  content: "\f2de";
+  content: "";
 }
 
 .fa-wpforms:before {
-  content: "\f298";
+  content: "";
 }
 
 .fa-wrench:before {
-  content: "\f0ad";
+  content: "";
 }
 
 .fa-x-ray:before {
-  content: "\f497";
+  content: "";
 }
 
 .fa-xbox:before {
-  content: "\f412";
+  content: "";
 }
 
 .fa-xing:before {
-  content: "\f168";
+  content: "";
 }
 
 .fa-xing-square:before {
-  content: "\f169";
+  content: "";
 }
 
 .fa-y-combinator:before {
-  content: "\f23b";
+  content: "";
 }
 
 .fa-yahoo:before {
-  content: "\f19e";
+  content: "";
 }
 
 .fa-yandex:before {
-  content: "\f413";
+  content: "";
 }
 
 .fa-yandex-international:before {
-  content: "\f414";
+  content: "";
 }
 
 .fa-yelp:before {
-  content: "\f1e9";
+  content: "";
 }
 
 .fa-yen-sign:before {
-  content: "\f157";
+  content: "";
 }
 
 .fa-yin-yang:before {
-  content: "\f6ad";
+  content: "";
 }
 
 .fa-yoast:before {
-  content: "\f2b1";
+  content: "";
 }
 
 .fa-youtube:before {
-  content: "\f167";
+  content: "";
 }
 
 .fa-youtube-square:before {
-  content: "\f431";
+  content: "";
 }
 
 .fa-zhihu:before {
-  content: "\f63f";
+  content: "";
 }
 
 .sr-only {
@@ -5353,22 +5353,22 @@ and open the template in the editor.
   color: #E5E5E5;
 }
 .enka-custom-radio.star::before {
-  content: "\f005";
+  content: "";
 }
 .enka-custom-radio.thumb::before {
-  content: "\f164";
+  content: "";
 }
 .enka-custom-radio.smiley::before {
-  content: "\f118";
+  content: "";
 }
 .enka-custom-radio.heart::before {
-  content: "\f004";
+  content: "";
 }
 .enka-custom-radio.flag::before {
-  content: "\f024";
+  content: "";
 }
 .enka-custom-radio.user::before {
-  content: "\f007";
+  content: "";
 }
 
 /* visual analog scale - radio buttons */
@@ -5379,25 +5379,25 @@ and open the template in the editor.
   color: #E5E5E5;
 }
 .enka-vizualna-skala.siv-61::before, .enka-vizualna-skala.siv-71::before {
-  content: "\f5b4";
+  content: "";
 }
 .enka-vizualna-skala.siv-41::before, .enka-vizualna-skala.siv-51::before, .enka-vizualna-skala.siv-62::before, .enka-vizualna-skala.siv-72::before {
-  content: "\f57a";
+  content: "";
 }
 .enka-vizualna-skala.siv-21::before, .enka-vizualna-skala.siv-31::before, .enka-vizualna-skala.siv-42::before, .enka-vizualna-skala.siv-52::before, .enka-vizualna-skala.siv-63::before, .enka-vizualna-skala.siv-73::before {
-  content: "\f119";
+  content: "";
 }
 .enka-vizualna-skala.siv-32::before, .enka-vizualna-skala.siv-53::before, .enka-vizualna-skala.siv-74::before {
-  content: "\f11a";
+  content: "";
 }
 .enka-vizualna-skala.siv-22::before, .enka-vizualna-skala.siv-33::before, .enka-vizualna-skala.siv-43::before, .enka-vizualna-skala.siv-54::before, .enka-vizualna-skala.siv-64::before, .enka-vizualna-skala.siv-75::before {
-  content: "\f118";
+  content: "";
 }
 .enka-vizualna-skala.siv-44::before, .enka-vizualna-skala.siv-55::before, .enka-vizualna-skala.siv-65::before, .enka-vizualna-skala.siv-76::before {
-  content: "\f580";
+  content: "";
 }
 .enka-vizualna-skala.siv-66::before, .enka-vizualna-skala.siv-77::before {
-  content: "\f59c";
+  content: "";
 }
 
 /*
@@ -5411,88 +5411,88 @@ and open the template in the editor.
 */
 /* icons */
 span.faicon.plus::before {
-  content: "\f067";
+  content: "";
 }
 
 span.faicon.minus::before {
-  content: "\f068";
+  content: "";
 }
 
 span.faicon.success::before,
 span.circle-check::before {
-  content: "\f058";
+  content: "";
 }
 
 span.faicon.close::before {
   font-size: 18px;
   font-weight: 400;
-  content: "\f057";
+  content: "";
 }
 
 span.faicon.dropdown_blue::before {
   font-size: 16px;
-  content: "\f13a";
+  content: "";
 }
 
 span.faicon.dropup_blue::before {
   font-size: 16px;
-  content: "\f139";
+  content: "";
 }
 
 span.faicon.arrow_back::before {
   font-weight: 600;
   font-size: 16px;
-  content: "\f137";
+  content: "";
 }
 
 span.faicon.add::before {
   font-size: 18px;
-  content: "\f055";
+  content: "";
 }
 
 span.faicon.remove::before {
   font-size: 18px;
-  content: "\f056";
+  content: "";
 }
 
 span.faicon.delete::before {
   font-size: 18px;
   font-weight: 400;
-  content: "\f2ed";
+  content: "";
 }
 
 span.faicon.anketa_delete::before {
   font-size: 24px;
   font-weight: 400;
-  content: "\f2ed";
+  content: "";
 }
 
 span.faicon.copy::before {
   font-size: 18px;
-  content: "\f0c5";
+  content: "";
   font-weight: 400;
 }
 
 span.faicon.anketa_copy::before {
   font-size: 24px;
-  content: "\f0c5";
+  content: "";
   font-weight: 400;
 }
 
 span.faicon.export::before {
   font-size: 24px;
-  content: "\f56e";
+  content: "";
 }
 
 span.faicon.file-import::before {
-  content: "\f56f";
+  content: "";
   transform: scaleX(-1);
 }
 
 span.faicon.import::before {
   font-size: 24px;
   font-weight: 400;
-  content: "\f1c2";
+  content: "";
 }
 
 /*span.faicon.import::after{
@@ -5502,137 +5502,137 @@ span.faicon.import::before {
 }*/
 span.faicon.library::before {
   font-size: 24px;
-  content: "\f518";
+  content: "";
 }
 
 span.faicon.folder::before {
   font-size: 16px;
   font-weight: 600;
-  content: "\f07b";
+  content: "";
 }
 
 span.faicon.folder_empty::before {
   font-size: 16px;
   font-weight: 400;
-  content: "\f07b";
+  content: "";
 }
 
 span.faicon.after.sort_down_arrow::after {
-  content: "\f0d7";
+  content: "";
   margin-left: 5px;
 }
 
 span.faicon.after.sort_up_arrow::after {
-  content: "\f0d8";
+  content: "";
   margin-left: 5px;
 }
 
 span.faicon.info::before {
   font-size: 28px;
-  content: "\f05a";
+  content: "";
   vertical-align: middle;
 }
 
 span.faicon.pagination_left::before {
   margin: 0 1px 0 1px;
-  content: "\f104";
+  content: "";
 }
 
 span.faicon.pagination_right::before {
   margin: 0 0 0 1px;
-  content: "\f105";
+  content: "";
 }
 
 span.faicon.edit::before,
 span.faicon.edit2::before {
-  content: "\f304";
+  content: "";
 }
 
 span.faicon.refresh::before {
   font-size: 18px;
-  content: "\f2f1";
+  content: "";
 }
 
 span.faicon.filter::before {
   font-size: 18px;
-  content: "\f0b0";
+  content: "";
 }
 
 span.faicon.grip::before {
-  content: "\f58e";
+  content: "";
 }
 
 span.faicon.star::before,
 span.faicon.star_off::before {
   font-size: 14px;
   font-weight: 400;
-  content: "\f005";
+  content: "";
 }
 
 span.faicon.star_on::before {
   font-size: 14px;
   font-weight: 700;
-  content: "\f005";
+  content: "";
 }
 
 span.faicon.search::before {
   font-size: 20px;
-  content: "\f002";
+  content: "";
 }
 
 span.faicon.clipboard_notes::before {
   font-size: 20px;
-  content: "\f46d";
+  content: "";
 }
 
 span.faicon.help2::before {
   font-size: 20px;
-  content: "\f059";
+  content: "";
 }
 
 span.faicon.user::before {
   font-size: 18px;
-  content: "\f007";
+  content: "";
 }
 
 span.faicon.logout::before {
   font-size: 20px;
-  content: "\f2f5";
+  content: "";
 }
 
 .faicon.monitor::before {
-  content: "\f108";
+  content: "";
 }
 
 .faicon.mobile::before {
-  content: "\f3cd";
+  content: "";
 }
 
 .faicon.tablet::before {
-  content: "\f3fa";
+  content: "";
 }
 
 span.faicon.users::before {
-  content: "\f500";
+  content: "";
 }
 
 span.faicon.lock_open::before {
-  content: "\f3c1";
+  content: "";
 }
 
 span.faicon.lock_close::before {
-  content: "\f023";
+  content: "";
 }
 
 span.faicon.bottom_saving::before {
   font-size: 24px;
   font-weight: 400;
-  content: "\f0c7";
+  content: "";
 }
 
 span.faicon.bottom_publish::before {
   font-size: 24px;
-  content: "\f093";
+  content: "";
 }
 
 span.faicon.bottom_preview {
@@ -5642,63 +5642,63 @@ span.faicon.bottom_preview {
 span.faicon.bottom_preview::before {
   font-size: 24px;
   font-weight: 400;
-  content: "\f15b";
+  content: "";
 }
 
 span.faicon.bottom_preview::after {
   font-size: 14px;
-  content: "\f002";
+  content: "";
   display: inline-block;
   margin-left: -70%;
 }
 
 span.faicon.bottom_test::before {
   font-size: 24px;
-  content: "\f492";
+  content: "";
 }
 
 span.faicon.language::before {
   font-size: 24px;
-  content: "\f0ac";
+  content: "";
 }
 
 span.faicon.mobile_off::before {
   font-size: 24px;
-  content: "\f3cd";
+  content: "";
 }
 
 span.faicon.mobile_off::after {
   font-size: 24px;
-  content: "\f715";
+  content: "";
   margin-left: -23px;
 }
 
 span.faicon.comments::before {
-  content: "\f27a";
+  content: "";
   font-weight: 700;
 }
 
 span.faicon.comments_empty::before {
-  content: "\f27a";
+  content: "";
   font-weight: 400;
 }
 
 span.faicon.data_link::before {
-  content: "\f0c1";
+  content: "";
 }
 
 span.faicon.data_link_small::before {
-  content: "\f0c1";
+  content: "";
 }
 
 span.faicon.print::before {
   font-size: 24px;
-  content: "\f02f";
+  content: "";
 }
 
 span.faicon.print_small::before {
   font-size: 16px;
-  content: "\f02f";
+  content: "";
 }
 
 span.faicon.preview {
@@ -5708,11 +5708,11 @@ span.faicon.preview {
 span.faicon.preview::before {
   font-size: 18px;
   font-weight: 400;
-  content: "\f15b";
+  content: "";
 }
 
 span.faicon.preview::after {
-  content: "\f002";
+  content: "";
   display: inline-block;
   font-size: 11px;
   margin-left: -50%;
@@ -5720,87 +5720,87 @@ span.faicon.preview::after {
 
 span.faicon.palette::before {
   font-size: 18px;
-  content: "\f53f";
+  content: "";
 }
 
 span.faicon.inline_comment::before {
   font-size: 14px;
   font-weight: 400;
-  content: "\f075";
+  content: "";
 }
 
 span.faicon.inline_double_comment::before {
   font-size: 14px;
   font-weight: 400;
-  content: "\f086";
+  content: "";
 }
 
 span.faicon.comments_creport::before {
   font-size: 16px;
-  content: "\f086";
+  content: "";
 }
 
 span.faicon.compress::before {
   font-size: 15px;
-  content: "\f066";
+  content: "";
 }
 
 span.faicon.expand::before {
   font-size: 15px;
-  content: "\f065";
+  content: "";
 }
 
 span.faicon.hashtag::before {
   font-size: 15px;
-  content: "\f292";
+  content: "";
 }
 
 span.faicon.bug::before {
   font-size: 15px;
-  content: "\f188";
+  content: "";
 }
 
 span.faicon.paragraph::before {
   font-size: 15px;
-  content: "\f1dd";
+  content: "";
 }
 
 span.faicon.replace::before {
   font-size: 15px;
-  content: "\f362";
+  content: "";
 }
 
 span.faicon.plus_square::before {
   font-size: 15px;
   font-weight: 400;
-  content: "\f0fe";
+  content: "";
 }
 
 span.faicon.minus_square::before {
   font-size: 15px;
   font-weight: 400;
-  content: "\f146";
+  content: "";
 }
 
 span.faicon.delete_circle::before {
   font-size: 14px;
-  content: "\f056";
+  content: "";
 }
 
 span.faicon.quick_view::before {
   font-size: 15px;
   font-weight: 400;
-  content: "\f06e";
+  content: "";
 }
 
 span.faicon.edit_square::before {
   font-size: 15px;
-  content: "\f044";
+  content: "";
 }
 
 span.faicon.test::before {
   font-size: 15px;
-  content: "\f492";
+  content: "";
 }
 
 a.faicon.if_add {
@@ -5836,7 +5836,7 @@ span.faicon.if_add:hover:before {
 }
 
 span.faicon.text_file::before {
-  content: "\f15c";
+  content: "";
 }
 
 span.faicon.text_file_small {
@@ -5846,40 +5846,40 @@ span.faicon.text_file_small {
 span.faicon.text_file_small:before {
   font-size: 18px;
   font-weight: 400;
-  content: "\f15c";
+  content: "";
 }
 
 span.faicon.warning::before {
   font-size: 16px;
-  content: "\f071";
+  content: "";
 }
 
 span.faicon.users_small::before {
   font-size: 16px;
-  content: "\f0c0";
+  content: "";
 }
 
 span.faicon.popup_0::before {
   font-size: 14px;
-  content: "\f065";
+  content: "";
   color: #1E88E5;
 }
 
 span.faicon.popup_1::before {
   font-size: 14px;
-  content: "\f065";
+  content: "";
   color: #0059ab;
 }
 
 span.faicon.flat_0::before {
   font-size: 14px;
-  content: "\f03c";
+  content: "";
   color: #0059ab;
 }
 
 span.faicon.flat_1::before {
   font-size: 14px;
-  content: "\f03c";
+  content: "";
   color: #1E88E5;
 }
 
@@ -5894,46 +5894,46 @@ span.basic-icon.spss::before {
 span.faicon.external_link::before {
   font-size: 14px;
   font-weight: 600;
-  content: "\f35d";
+  content: "";
 }
 
 span.faicon.cog_large::before {
   font-size: 34px;
   font-weight: 600;
-  content: "\f013";
+  content: "";
 }
 
 span.faicon.chart_large::before {
   font-size: 34px;
   font-weight: 600;
-  content: "\f201";
+  content: "";
 }
 
 span.faicon.reload_large::before {
   font-size: 34px;
   font-weight: 600;
-  content: "\f021";
+  content: "";
 }
 
 span.faicon.chart::before {
-  content: "\f080";
+  content: "";
   font-size: 16px;
   font-weight: 600;
 }
 
 span.faicon.data::before {
-  content: "\f1c0";
+  content: "";
   font-size: 16px;
   font-weight: 600;
 }
 
 span.faicon.publish::before {
-  content: "\f093";
+  content: "";
   font-size: 16px;
 }
 
 span.faicon.test::before {
-  content: "\f492";
+  content: "";
   font-size: 16px;
 }
 
@@ -5943,63 +5943,63 @@ button.ui-datepicker-trigger::before {
   font-family: "Font Awesome 5 Free";
   font-weight: 400;
   font-size: 16px;
-  content: "\f073";
+  content: "";
 }
 
 /* ARROWS */
 span.faicon.arrow_up::before {
   font-size: 14px;
-  content: "\f062";
+  content: "";
 }
 
 span.faicon.arrow2_r::before {
   font-size: 14px;
-  content: "\f054";
+  content: "";
 }
 
 span.faicon.arrow2_l::before {
   font-size: 14px;
-  content: "\f053";
+  content: "";
 }
 
 span.faicon.arrow2_d::before {
   font-size: 14px;
-  content: "\f078";
+  content: "";
 }
 
 span.faicon.arrow2_u::before {
   font-size: 14px;
-  content: "\f077";
+  content: "";
 }
 
 span.faicon.arrow_large2_r::before {
   font-size: 35px;
-  content: "\f054";
+  content: "";
 }
 
 span.faicon.arrow_large2_l::before {
   font-size: 35px;
-  content: "\f053";
+  content: "";
 }
 
 span.faicon.arrow_verylarge2_r::before {
   font-size: 40px;
-  content: "\f054";
+  content: "";
 }
 
 span.faicon.arrow_verylarge2_l::before {
   font-size: 40px;
-  content: "\f053";
+  content: "";
 }
 
 span.faicon.sort_descending::before {
   font-size: 14px;
-  content: "\f0d7";
+  content: "";
 }
 
 span.faicon.sort_ascending::before {
   font-size: 14px;
-  content: "\f0d8";
+  content: "";
 }
 
 /* Plus/minus sqare */
@@ -6011,127 +6011,127 @@ span.folder_plusminus {
 span.faicon.plus_orange::before {
   font-size: 12px;
   font-weight: 400;
-  content: "\f0fe";
+  content: "";
 }
 
 span.faicon.minus_orange::before {
   font-size: 12px;
   font-weight: 400;
-  content: "\f146";
+  content: "";
 }
 
 /* Spinner */
 span.faicon.spinner::before {
   font-size: 18px;
-  content: "\f1ce";
+  content: "";
 }
 
 /* Bars - mobile menu */
 span.faicon.bars::before {
   font-size: 26px;
-  content: "\f0c9";
+  content: "";
 }
 
 span.faicon.lock_open::before {
-  content: "\f3c1";
+  content: "";
 }
 
 span.faicon.lock_close::before {
-  content: "\f023";
+  content: "";
 }
 
 span.faicon.bell::before {
-  content: "\f0f3";
+  content: "";
 }
 
 span.faicon.bell_slash::before {
-  content: "\f1f6";
+  content: "";
 }
 
 span.faicon.trash::before {
-  content: "\f2ed";
+  content: "";
 }
 
 span.faicon.copy::before {
-  content: "\f0c5";
+  content: "";
 }
 
 span.faicon.circle::before {
-  content: "\f111";
+  content: "";
   vertical-align: middle;
 }
 
 span.faicon.plus::before {
-  content: "\f067";
+  content: "";
 }
 
 span.faicon.plus_circle::before {
-  content: "\f055";
+  content: "";
 }
 
 span.faicon.minus_circle::before {
-  content: "\f056";
+  content: "";
 }
 
 span.faicon.calendar_icon::before {
-  content: "\f073";
+  content: "";
 }
 
 span.faicon.clipboard::before {
-  content: "\f328";
+  content: "";
 }
 
 span.faicon.list-alt::before {
-  content: "\f022";
+  content: "";
 }
 
 span.faicon.vote-yes::before {
-  content: "\f772";
+  content: "";
 }
 
 span.faicon.file-preview::before {
-  content: "\f865";
+  content: "";
 }
 
 span.faicon.dots::before {
-  content: "\f141";
+  content: "";
   font-size: 16px;
   font-weight: 600;
 }
 
 span.faicon.dots_ver:before {
-  content: "\f142";
+  content: "";
   font-size: 16px;
   font-weight: 600;
 }
 
 span.faicon.open_icon::before,
 a.faicon.open_icon::before {
-  content: "\f35d";
+  content: "";
 }
 
 span.faicon.table_icon::before {
-  content: "\f0ce";
+  content: "";
 }
 
 span.faicon.list::before {
-  content: "\f03a";
+  content: "";
 }
 
 span.faicon.link-chain::before {
-  content: "\f0c1";
+  content: "";
 }
 
 span.fa-brands.html5::before {
-  content: "\f13b";
+  content: "";
 }
 
 span.faicon.stopwatch20::before {
-  content: "\e06f";
+  content: "";
 }
 
 span.faicon.checkbox-empty::before {
-  content: "\f0c8";
+  content: "";
   font-weight: 400 !important;
 }
 
@@ -6140,11 +6140,11 @@ span.faicon.fa-1::before {
 }
 
 span.faicon.phone::before {
-  content: "\f095";
+  content: "";
 }
 
 span.faicon.screwdriver::before {
-  content: "\f7d9";
+  content: "";
   font-weight: 600 !important;
 }
 
@@ -6282,23 +6282,23 @@ and open the template in the editor.
 */
 /* Toolbox na levi strani */
 span.faicon.wheel_32::before {
-  content: "\f013";
+  content: "";
 }
 
 span.faicon.radio_32::before {
-  content: "\f192";
+  content: "";
   font-weight: 400;
   font-size: 18px;
 }
 
 span.faicon.check_32::before {
-  content: "\f14a";
+  content: "";
   font-weight: 400;
   font-size: 18px;
 }
 
 span.faicon.matrix_32::before {
-  content: "\f192\f192\a\f192\f192";
+  content: "\a";
   white-space: pre;
   font-weight: 400;
   font-size: 12px;
@@ -6322,7 +6322,7 @@ span.faicon.nagovor::before {
 }
 
 span.faicon.plus_32::before {
-  content: "\f055";
+  content: "";
   font-size: 18px;
 }
 
@@ -6366,12 +6366,12 @@ span.faicon.edit-vprasanje {
 }
 span.faicon.edit-vprasanje:before {
   font-size: 18px;
-  content: "\f031";
+  content: "";
 }
 
 a.faicon.edit::before {
   font-size: 16px;
-  content: "\f304";
+  content: "";
 }
 
 a.faicon.addif::before {
@@ -6383,22 +6383,22 @@ a.faicon.addif::before {
 a.faicon.copy::before {
   font-size: 18px;
   font-weight: 400;
-  content: "\f0c5";
+  content: "";
 }
 
 a.faicon.copycond::before {
   font-size: 18px;
-  content: "\f0c5";
+  content: "";
 }
 
 a.faicon.preview::before {
   font-size: 18px;
   font-weight: 400;
-  content: "\f15b";
+  content: "";
 }
 
 a.faicon.preview::after {
-  content: "\f002";
+  content: "";
   display: inline-block;
   font-size: 11px;
   margin-left: -50%;
@@ -6406,25 +6406,25 @@ a.faicon.preview::after {
 
 a.faicon.arhiv::before {
   font-size: 18px;
-  content: "\f044";
+  content: "";
 }
 
 a.faicon.delete::before {
   font-size: 18px;
   font-weight: 400;
-  content: "\f2ed";
+  content: "";
 }
 
 a.faicon.hide::before {
   font-size: 18px;
   font-weight: 400;
-  content: "\f06e";
+  content: "";
 }
 
 a.faicon.unhide_icon::before {
   font-size: 18px;
   font-weight: 400;
-  content: "\f070";
+  content: "";
 }
 
 /* Urejanje vrednosti inline */
@@ -6438,12 +6438,12 @@ a.faicon.unhide_icon::before {
 
 .variabla span.inline.faicon.edit2::before {
   font-size: 14px;
-  content: "\f304";
+  content: "";
 }
 
 .variabla span.inline.faicon.odg_hidden::before {
   font-size: 14px;
-  content: "\f05e";
+  content: "";
 }
 
 .variabla span.inline.faicon.odg_hidden.show-hidden::before {
@@ -6471,23 +6471,23 @@ span.inline.faicon.odg_if_not::before {
 .variabla span.inline.faicon.odg_if_follow::after {
   font-size: 14px;
   margin-left: 2px;
-  content: "\f0da";
+  content: "";
 }
 
 .variabla span.inline.faicon.correct::before {
   font-size: 14px;
   font-weight: 900;
-  content: "\f00c";
+  content: "";
 }
 
 .faicon.move_updown::before {
   font-size: 16px;
   color: #0059ab;
-  content: "\f338";
+  content: "";
 }
 
 .faicon.image_upload::before {
-  content: "\f03e";
+  content: "";
   font-weight: 400;
 }
 
@@ -6504,22 +6504,22 @@ and open the template in the editor.
 span.faicon.mapca.anketa::before {
   font-size: 16px;
   font-weight: 400;
-  content: "\f022";
+  content: "";
 }
 
 span.faicon.table::before {
   font-size: 16px;
-  content: "\f00b";
+  content: "";
 }
 
 span.faicon.other_vprasanja::before {
   font-size: 16px;
-  content: "\f0ca" !important;
+  content: "" !important;
 }
 
 span.faicon.osnovna_vprasanja::before {
   font-size: 16px;
-  content: "\f0ca";
+  content: "";
 }
 
 span.faicon.mapca.if::before {
@@ -6547,7 +6547,7 @@ and open the template in the editor.
 */
 /* Izvozi */
 span.faicon.pdf::before {
-  content: "\f1c1";
+  content: "";
   font-size: 16px;
   font-weight: 400;
   color: #ed1c24;
@@ -6571,7 +6571,7 @@ span.faicon.pdf.black::before {
 span.faicon.xls::before {
   font-size: 16px;
   font-weight: 400;
-  content: "\f1c3";
+  content: "";
   color: #008000;
 }
 
@@ -6593,7 +6593,7 @@ span.faicon.xls.black::before {
 span.faicon.rtf::before {
   font-size: 16px;
   font-weight: 400;
-  content: "\f1c2";
+  content: "";
   color: #0f3ea8;
 }
 
@@ -6615,7 +6615,7 @@ span.faicon.rtf.black::before {
 span.faicon.ppt::before {
   font-size: 16px;
   font-weight: 400;
-  content: "\f1c4";
+  content: "";
   color: #fa4913;
 }
 
@@ -6637,7 +6637,7 @@ span.faicon.ppt.black::before {
 span.faicon.xml::before {
   font-size: 16px;
   font-weight: 400;
-  content: "\f1c9";
+  content: "";
   color: #00a000;
 }
 
@@ -6657,17 +6657,17 @@ span.faicon.xml.black::before {
 }
 
 span.faicon.arhiv::before {
-  content: "\f187";
+  content: "";
 }
 
 span.faicon.arhiv_mail::before {
   font-size: 16px;
   font-weight: 400;
-  content: "\f14d";
+  content: "";
 }
 
 span.faicon.share-arrow::before {
-  content: "\f14d";
+  content: "";
 }
 
 /*
@@ -6717,7 +6717,7 @@ span.faicon.an_chart_bar::before {
   font-size: 14px;
   font-weight: 700;
   /*content: "\f080";*/
-  content: "\f200";
+  content: "";
 }
 
 /*
@@ -6731,35 +6731,35 @@ and open the template in the editor.
 */
 /* Invitation table */
 span.faicon.inv_sent_0::before {
-  content: "\f2b6";
+  content: "";
 }
 
 span.faicon.inv_sent_1::before {
-  content: "\f0e0";
+  content: "";
 }
 
 span.faicon.inv_responded_0::before {
   font-size: 14px;
   font-weight: 400;
-  content: "\f005";
+  content: "";
 }
 
 span.faicon.inv_responded_1::before {
   font-size: 14px;
   font-weight: 700;
-  content: "\f005";
+  content: "";
 }
 
 span.faicon.inv_unsubscribed_0::before {
   font-size: 14px;
   font-weight: 400;
-  content: "\f111";
+  content: "";
 }
 
 span.faicon.inv_unsubscribed_1::before {
   font-size: 14px;
   font-weight: 700;
-  content: "\f111";
+  content: "";
   color: #FF0000;
 }
 
@@ -6860,7 +6860,7 @@ a.read-more .faicon:before {
 .qtip .qtip-wrapper .qtip-contentWrapper .qtip-content h1::before {
   padding-right: 8px;
   font-family: "Font Awesome 5 Free";
-  content: "\f059";
+  content: "";
   font-size: 20px;
   color: #1E88E5;
   vertical-align: -1px;
@@ -6897,7 +6897,7 @@ a.read-more .faicon:before {
   padding-left: 8px;
   vertical-align: middle;
   font-family: "Font Awesome 5 Free";
-  content: "\f054";
+  content: "";
   font-size: 8px;
   color: #1E88E5;
   transition: 0.2s;
@@ -7220,7 +7220,7 @@ a.read-more .faicon:before {
 .divPopUp.warning_popup h2::before {
   padding-right: 8px;
   font-family: "Font Awesome 5 Free";
-  content: "\f071";
+  content: "";
   font-size: 14px;
   color: #FFC700;
 }
@@ -7261,7 +7261,7 @@ a.read-more .faicon:before {
 .divPopUp_info.warning_popup h2::before {
   padding-right: 8px;
   font-family: "Font Awesome 5 Free";
-  content: "\f071";
+  content: "";
   font-size: 14px;
   color: #FFC700;
 }
@@ -7753,7 +7753,7 @@ body.waitlong #loading {
 #check_pogoji.warning_popup h2::before {
   padding-right: 8px;
   font-family: "Font Awesome 5 Free";
-  content: "\f071";
+  content: "";
   font-size: 14px;
   color: #FFC700;
 }
@@ -7934,7 +7934,7 @@ body.waitlong #loading {
 #dropped_alert.warning_popup h2::before {
   padding-right: 8px;
   font-family: "Font Awesome 5 Free";
-  content: "\f071";
+  content: "";
   font-size: 14px;
   color: #FFC700;
 }
@@ -9175,7 +9175,7 @@ header #topSettingsHolder .left_options_holder #analizaSubNav #globalSetingsLink
   right: 8px;
   top: 5px;
   font-family: "Font Awesome 5 Free";
-  content: "\f078";
+  content: "";
   font-size: 10px;
   font-weight: 600;
 }
@@ -9448,7 +9448,7 @@ footer#srv_footer .footer_right span.faicon.external_link:before {
 footer#srv_footer .footer_right .right_help_button {
   position: fixed;
   right: -71px;
-  top: 50%;
+  top: calc(50%);
   width: 150px;
   padding: 4px 8px;
   border: 1px #1E88E5 solid;
@@ -9828,17 +9828,17 @@ input[type=radio]:checked + label:before, input[type=checkbox]:checked + label:b
   color: #1E88E5;
 }
 input[type=checkbox] + label:before {
-  content: "\f0c8";
+  content: "";
 }
 input[type=checkbox]:checked + label:before {
-  content: "\f14a";
+  content: "";
   font-weight: bold;
 }
 input[type=radio] + label:before {
-  content: "\f111";
+  content: "";
 }
 input[type=radio]:checked + label:before {
-  content: "\f192";
+  content: "";
 }
 input[type=checkbox][disabled] + label:before {
   color: #C4C4C4;
@@ -10336,7 +10336,7 @@ header #top_line #enka_nav .anketa_header_upgrade_package button {
 #popup_user_access.warning_popup h2::before {
   padding-right: 8px;
   font-family: "Font Awesome 5 Free";
-  content: "\f071";
+  content: "";
   font-size: 14px;
   color: #FFC700;
 }
@@ -10623,7 +10623,7 @@ header #top_line #enka_nav .anketa_header_upgrade_package button {
 #survey_list .second_line .filters #folderSwitch#sortButton:after {
   position: absolute;
   font-family: "Font Awesome 5 Free";
-  content: "\f078";
+  content: "";
   right: 8px;
   top: 13px;
   font-weight: 600;
@@ -10969,13 +10969,13 @@ body.eng #survey_list .filters #folderSwitch {
   cursor: pointer;
 }
 #survey_list .div_sl_new.folders .folder_holder .folder_title .folder_arrow_icon::before {
-  content: "\f078";
+  content: "";
   font-size: 14px;
   color: #333333;
   margin-right: 8px;
 }
 #survey_list .div_sl_new.folders .folder_holder .folder_title .folder_icon::before {
-  content: "\f07b";
+  content: "";
   font-size: 16px;
   font-weight: 400;
   color: #1E88E5;
@@ -10985,7 +10985,7 @@ body.eng #survey_list .filters #folderSwitch {
   background-color: #F8F8F8;
 }
 #survey_list .div_sl_new.folders .folder_holder .folder_title.open .folder_arrow_icon::before {
-  content: "\f077";
+  content: "";
 }
 #survey_list .div_sl_new.folders .folder_holder .folder_title.open .folder_icon::before {
   font-weight: 600;
@@ -12080,13 +12080,13 @@ div.page_obvestila #unread_notifications .gdpr_popup_radio input {
   cursor: pointer;
 }
 #anketa_knjiznica #libraryInner ul li .folder_box_holder .folder_box .folder_arrow_icon::before {
-  content: "\f078";
+  content: "";
   font-size: 14px;
   color: #333333;
   margin-right: 8px;
 }
 #anketa_knjiznica #libraryInner ul li .folder_box_holder .folder_box .folder::before {
-  content: "\f07b";
+  content: "";
   font-size: 16px;
   font-weight: 400;
   color: #1E88E5;
@@ -12112,7 +12112,7 @@ div.page_obvestila #unread_notifications .gdpr_popup_radio input {
   }*/
 }
 #anketa_knjiznica #libraryInner ul li .folder_box_holder .folder_box.open .folder_arrow_icon::before {
-  content: "\f077";
+  content: "";
 }
 #anketa_knjiznica #libraryInner ul li .folder_box_holder .folder_box.open .folder::before {
   font-weight: 600;
@@ -12365,7 +12365,7 @@ and open the template in the editor.
 #new_anketa_div .layout_right_item .layout_right_centering .fieldset .setting input[type=radio] + span.enka-checkbox-radio:before {
   font-family: "Font Awesome 5 Free";
   display: inline-block;
-  content: "\f111";
+  content: "";
   letter-spacing: 10px;
 }
 #new_anketa_div .layout_right_item .layout_right_centering .fieldset .setting input[type=radio] + span.enka-custom-radio:before {
@@ -12373,7 +12373,7 @@ and open the template in the editor.
   display: inline-block;
 }
 #new_anketa_div .layout_right_item .layout_right_centering .fieldset .setting input[type=radio]:checked + span.enka-checkbox-radio:before {
-  content: "\f192";
+  content: "";
 }
 #new_anketa_div .layout_right_item .layout_right_centering .fieldset .setting input[type=checkbox] {
   display: none !important;
@@ -12386,11 +12386,11 @@ and open the template in the editor.
 #new_anketa_div .layout_right_item .layout_right_centering .fieldset .setting input[type=checkbox] + span.enka-checkbox-radio:before {
   font-family: "Font Awesome 5 Free";
   display: inline-block;
-  content: "\f0c8";
+  content: "";
   letter-spacing: 10px;
 }
 #new_anketa_div .layout_right_item .layout_right_centering .fieldset .setting input[type=checkbox]:checked + span.enka-checkbox-radio:before {
-  content: "\f14a";
+  content: "";
   letter-spacing: 8px;
 }
 #new_anketa_div .layout_right_item .layout_right_centering .fieldset .setting .custom_radio_picture.obarvan > label > span.enka-custom-radio:before {
@@ -12683,7 +12683,7 @@ and open the template in the editor.
 }
 #new_anketa_div .layout_right_item .layout_right_centering .anketa_from_text .from_text_sidebyside_holder #preview_field_holder #preview_field span.variable input[type=radio] + span.enka-checkbox-radio:before {
   font-family: "Font Awesome 5 Free";
-  content: "\f111";
+  content: "";
   display: inline-block;
   font-size: 14px;
   color: #C4C4C4;
@@ -13295,20 +13295,20 @@ div.drop_setting_transition {
   font-weight: 400;
 }
 #branching input[type=checkbox].enka-admin-custom + span.enka-checkbox-radio:before {
-  content: "\f0c8";
+  content: "";
   letter-spacing: 10px;
 }
 #branching input[type=radio].enka-admin-custom + span.enka-checkbox-radio:before {
-  content: "\f111";
+  content: "";
   letter-spacing: 8px;
 }
 #branching input[type=checkbox].enka-admin-custom:checked + span.enka-checkbox-radio:before {
-  content: "\f14a";
+  content: "";
   color: #D3D3D3;
   letter-spacing: 8px;
 }
 #branching input[type=radio].enka-admin-custom:checked + span.enka-checkbox-radio:before {
-  content: "\f192";
+  content: "";
   color: #D3D3D3;
 }
 #branching span.faicon.delete_circle::before {
@@ -13411,7 +13411,8 @@ div.drop_setting_transition {
 #branching ul li .pb_new .pb_page {
   display: flex;
   align-items: center;
-  width: 200px;
+  white-space: nowrap;
+  padding-right: 16px;
   font-size: 16px;
   font-weight: 600;
   line-height: 16px;
@@ -13421,7 +13422,8 @@ div.drop_setting_transition {
 #branching ul li .pb_new .pb_page_hover {
   display: none;
   align-items: center;
-  width: 200px;
+  white-space: nowrap;
+  padding-right: 16px;
   font-weight: 400;
   font-size: 12px;
 }
@@ -14522,6 +14524,7 @@ div#variabla_new span.correct {
   flex-shrink: 0;
   width: auto;
   margin-left: 8px;
+  padding-right: 0px;
   font-weight: 600;
   font-size: 10px;
   text-align: right;
@@ -19927,7 +19930,7 @@ and open the template in the editor.
   transition: 0.2s;
 }
 .tab_content .content_left ul li.folder_item .faicon.arrow:before {
-  content: "\f078";
+  content: "";
 }
 .tab_content .content_left ul li.folder_item .faicon.folder:before,
 .tab_content .content_left ul li.folder_item .faicon.clipboard:before {
@@ -19944,7 +19947,7 @@ and open the template in the editor.
   color: #1E88E5;
 }
 .tab_content .content_left ul li.folder_item.open .faicon.arrow:before {
-  content: "\f077";
+  content: "";
 }
 .tab_content .content_left ul li.folder_item.no_arrow .faicon.arrow:before {
   display: none;
@@ -20435,7 +20438,7 @@ img.mapster_el {
   border-radius: 4px;
 }
 .jquery-selectbox .jquery-selectbox-moreButton::before {
-  content: "\f078";
+  content: "";
   padding-left: 2px;
   color: #333333;
   font-size: 10px;
@@ -21159,7 +21162,7 @@ div#theme-edit-wrap div#theme-editor #picker .button_holder button:last-child {
 div#theme-edit-wrap div#theme-editor #picker.warning_popup h2::before {
   padding-right: 8px;
   font-family: "Font Awesome 5 Free";
-  content: "\f071";
+  content: "";
   font-size: 14px;
   color: #FFC700;
 }
@@ -21518,7 +21521,7 @@ span.faicon.st-besede-popup {
 #vrednost_edit.warning_popup h2::before {
   padding-right: 8px;
   font-family: "Font Awesome 5 Free";
-  content: "\f071";
+  content: "";
   font-size: 14px;
   color: #FFC700;
 }
@@ -21759,7 +21762,7 @@ span.faicon.st-besede-popup {
 #quota.warning_popup h2::before {
   padding-right: 8px;
   font-family: "Font Awesome 5 Free";
-  content: "\f071";
+  content: "";
   font-size: 14px;
   color: #FFC700;
 }
@@ -22086,7 +22089,7 @@ and open the template in the editor.
 #preview_spremenljivka.warning_popup h2::before {
   padding-right: 8px;
   font-family: "Font Awesome 5 Free";
-  content: "\f071";
+  content: "";
   font-size: 14px;
   color: #FFC700;
 }
@@ -22707,22 +22710,22 @@ and open the template in the editor.
 }
 #preview_spremenljivka #variable_holder input[type=checkbox].enka-admin-custom + span.enka-checkbox-radio:before {
   /*content: "\f096";*/
-  content: "\f0c8";
+  content: "";
   letter-spacing: 10px;
 }
 #preview_spremenljivka #variable_holder input[type=radio].enka-admin-custom + span.enka-checkbox-radio:before {
   /*content: "\f10c";*/
-  content: "\f111";
+  content: "";
   letter-spacing: 8px;
 }
 #preview_spremenljivka #variable_holder input[type=checkbox].enka-admin-custom:checked + span.enka-checkbox-radio:before {
   /*content: "\f046";*/
-  content: "\f14a";
+  content: "";
   letter-spacing: 8px;
 }
 #preview_spremenljivka #variable_holder input[type=radio].enka-admin-custom:checked + span.enka-checkbox-radio:before {
   /*content: "\f192";*/
-  content: "\f192";
+  content: "";
 }
 #preview_spremenljivka input[type=radio] {
   margin: 0 8px 4px 0;
@@ -22735,7 +22738,7 @@ and open the template in the editor.
 #preview_spremenljivka input[type=radio] + span.enka-checkbox-radio:before {
   font-family: "Font Awesome 5 Free";
   display: inline-block;
-  content: "\f111";
+  content: "";
   letter-spacing: 10px;
 }
 #preview_spremenljivka input[type=radio] + span.enka-custom-radio:before {
@@ -22743,7 +22746,7 @@ and open the template in the editor.
   display: inline-block;
 }
 #preview_spremenljivka input[type=radio]:checked + span.enka-checkbox-radio:before {
-  content: "\f192";
+  content: "";
 }
 #preview_spremenljivka input[type=checkbox] {
   display: none !important;
@@ -22756,11 +22759,11 @@ and open the template in the editor.
 #preview_spremenljivka input[type=checkbox] + span.enka-checkbox-radio:before {
   font-family: "Font Awesome 5 Free";
   display: inline-block;
-  content: "\f0c8";
+  content: "";
   letter-spacing: 10px;
 }
 #preview_spremenljivka input[type=checkbox]:checked + span.enka-checkbox-radio:before {
-  content: "\f14a";
+  content: "";
   letter-spacing: 8px;
 }
 
@@ -22845,7 +22848,7 @@ and open the template in the editor.
 }
 #popup_import_from_text .anketa_from_text .import_holder #preview_field_holder #preview_field span.variable input[type=radio] + span.enka-checkbox-radio:before {
   font-family: "Font Awesome 5 Free";
-  content: "\f111";
+  content: "";
   display: inline-block;
   font-size: 14px;
   color: #E5E5E5;
@@ -22853,7 +22856,7 @@ and open the template in the editor.
   font-weight: 400;
 }
 #popup_import_from_text .anketa_from_text .import_holder #preview_field_holder #preview_field span.variable input[type=radio]:checked + span.enka-checkbox-radio:before {
-  content: "\f192";
+  content: "";
   color: #E5E5E5;
 }
 
@@ -23116,7 +23119,7 @@ dl.arch_email dd {
 #inv_view_arch_recipients.warning_popup h2::before {
   padding-right: 8px;
   font-family: "Font Awesome 5 Free";
-  content: "\f071";
+  content: "";
   font-size: 14px;
   color: #FFC700;
 }
@@ -24110,23 +24113,23 @@ div.page_komentarji_anketa ul .spremenljivka_content input[type=radio].enka-admi
 }
 div.page_komentarji ul .spremenljivka_content input[type=checkbox].enka-admin-custom + span.enka-checkbox-radio:before,
 div.page_komentarji_anketa ul .spremenljivka_content input[type=checkbox].enka-admin-custom + span.enka-checkbox-radio:before {
-  content: "\f0c8";
+  content: "";
   letter-spacing: 10px;
 }
 div.page_komentarji ul .spremenljivka_content input[type=radio].enka-admin-custom + span.enka-checkbox-radio:before,
 div.page_komentarji_anketa ul .spremenljivka_content input[type=radio].enka-admin-custom + span.enka-checkbox-radio:before {
-  content: "\f111";
+  content: "";
   letter-spacing: 8px;
 }
 div.page_komentarji ul .spremenljivka_content input[type=checkbox].enka-admin-custom:checked + span.enka-checkbox-radio:before,
 div.page_komentarji_anketa ul .spremenljivka_content input[type=checkbox].enka-admin-custom:checked + span.enka-checkbox-radio:before {
-  content: "\f14a";
+  content: "";
   color: #D3D3D3;
   letter-spacing: 8px;
 }
 div.page_komentarji ul .spremenljivka_content input[type=radio].enka-admin-custom:checked + span.enka-checkbox-radio:before,
 div.page_komentarji_anketa ul .spremenljivka_content input[type=radio].enka-admin-custom:checked + span.enka-checkbox-radio:before {
-  content: "\f192";
+  content: "";
   color: #D3D3D3;
 }
 div.page_komentarji ul .spremenljivka_content input[type=radio],
@@ -24143,7 +24146,7 @@ div.page_komentarji ul .spremenljivka_content input[type=radio] + span.enka-chec
 div.page_komentarji_anketa ul .spremenljivka_content input[type=radio] + span.enka-checkbox-radio:before {
   font-family: "Font Awesome 5 Free";
   display: inline-block;
-  content: "\f111";
+  content: "";
   letter-spacing: 10px;
 }
 div.page_komentarji ul .spremenljivka_content input[type=radio] + span.enka-custom-radio:before,
@@ -24153,7 +24156,7 @@ div.page_komentarji_anketa ul .spremenljivka_content input[type=radio] + span.en
 }
 div.page_komentarji ul .spremenljivka_content input[type=radio]:checked + span.enka-checkbox-radio:before,
 div.page_komentarji_anketa ul .spremenljivka_content input[type=radio]:checked + span.enka-checkbox-radio:before {
-  content: "\f192";
+  content: "";
 }
 div.page_komentarji ul .spremenljivka_content input[type=checkbox],
 div.page_komentarji_anketa ul .spremenljivka_content input[type=checkbox] {
@@ -24169,12 +24172,12 @@ div.page_komentarji ul .spremenljivka_content input[type=checkbox] + span.enka-c
 div.page_komentarji_anketa ul .spremenljivka_content input[type=checkbox] + span.enka-checkbox-radio:before {
   font-family: "Font Awesome 5 Free";
   display: inline-block;
-  content: "\f0c8";
+  content: "";
   letter-spacing: 10px;
 }
 div.page_komentarji ul .spremenljivka_content input[type=checkbox]:checked + span.enka-checkbox-radio:before,
 div.page_komentarji_anketa ul .spremenljivka_content input[type=checkbox]:checked + span.enka-checkbox-radio:before {
-  content: "\f14a";
+  content: "";
   letter-spacing: 8px;
 }
 div.page_komentarji ul div.question_comment_holder,
@@ -26144,7 +26147,7 @@ div.subpage_coding .coding-refresh .button_holder button:last-child {
 div.subpage_coding .coding-refresh.warning_popup h2::before {
   padding-right: 8px;
   font-family: "Font Awesome 5 Free";
-  content: "\f071";
+  content: "";
   font-size: 14px;
   color: #FFC700;
 }
@@ -26326,7 +26329,7 @@ div.subpage_coding #coding .button_holder button:last-child {
 div.subpage_coding #coding.warning_popup h2::before {
   padding-right: 8px;
   font-family: "Font Awesome 5 Free";
-  content: "\f071";
+  content: "";
   font-size: 14px;
   color: #FFC700;
 }
@@ -26650,7 +26653,7 @@ div.subpage_coding .floatRecodeSpremenljivka .button_holder button:last-child {
 div.subpage_coding .floatRecodeSpremenljivka.warning_popup h2::before {
   padding-right: 8px;
   font-family: "Font Awesome 5 Free";
-  content: "\f071";
+  content: "";
   font-size: 14px;
   color: #FFC700;
 }
@@ -27001,18 +27004,18 @@ ul#merge li {
   -webkit-text-stroke: 0.35px;
 }
 .quick_edit_container #edit_survey_data .quick_edit_inner .spremenljivka input[type=checkbox] + span.enka-checkbox-radio:before {
-  content: "\f0c8";
+  content: "";
   letter-spacing: 10px;
 }
 .quick_edit_container #edit_survey_data .quick_edit_inner .spremenljivka input[type=checkbox]:checked + span.enka-checkbox-radio:before {
-  content: "\f14a";
+  content: "";
 }
 .quick_edit_container #edit_survey_data .quick_edit_inner .spremenljivka input[type=radio] + span.enka-checkbox-radio:before {
-  content: "\f111";
+  content: "";
   letter-spacing: 10px;
 }
 .quick_edit_container #edit_survey_data .quick_edit_inner .spremenljivka input[type=radio]:checked + span.enka-checkbox-radio:before {
-  content: "\f192";
+  content: "";
 }
 .quick_edit_container #edit_survey_data .quick_edit_inner .spremenljivka input[type=checkbox] + span.enka-checkbox-radio,
 .quick_edit_container #edit_survey_data .quick_edit_inner .spremenljivka input[type=radio] + span.enka-checkbox-radio,
@@ -27511,7 +27514,7 @@ and open the template in the editor.
 #div_export_setting_show.warning_popup h2::before {
   padding-right: 8px;
   font-family: "Font Awesome 5 Free";
-  content: "\f071";
+  content: "";
   font-size: 14px;
   color: #FFC700;
 }
@@ -29048,15 +29051,15 @@ iframe#ifmcontentstoprint {
 }
 
 .rsdl_bck1 {
-  background-color: rgb(250, 226, 226) !important;
+  background-color: #fae2e2 !important;
 }
 
 .rsdl_bck2 {
-  background-color: rgb(255, 157, 157) !important;
+  background-color: #ff9d9d !important;
 }
 
 .rsdl_bck3 {
-  background-color: rgb(248, 66, 66) !important;
+  background-color: #f84242 !important;
 }
 
 .rsdl_bck4 {
@@ -30569,7 +30572,7 @@ ul.vrednost_sort input[type=text] {
 .subpage_analysis_creport #anketa_custom_report #newCReportProfile.warning_popup h2::before {
   padding-right: 8px;
   font-family: "Font Awesome 5 Free";
-  content: "\f071";
+  content: "";
   font-size: 14px;
   color: #FFC700;
 }
@@ -30853,7 +30856,7 @@ and open the template in the editor.
 #dsp_inspect_cover.warning_popup h2::before {
   padding-right: 8px;
   font-family: "Font Awesome 5 Free";
-  content: "\f071";
+  content: "";
   font-size: 14px;
   color: #FFC700;
 }
@@ -31387,7 +31390,7 @@ input#endDate {
 .mc_table_settings.warning_popup h2::before {
   padding-right: 8px;
   font-family: "Font Awesome 5 Free";
-  content: "\f071";
+  content: "";
   font-size: 14px;
   color: #FFC700;
 }
@@ -31600,7 +31603,7 @@ input#endDate {
 #newMCTable.warning_popup h2::before {
   padding-right: 8px;
   font-family: "Font Awesome 5 Free";
-  content: "\f071";
+  content: "";
   font-size: 14px;
   color: #FFC700;
 }
@@ -31789,7 +31792,7 @@ input#endDate {
 #renameMCTable.warning_popup h2::before {
   padding-right: 8px;
   font-family: "Font Awesome 5 Free";
-  content: "\f071";
+  content: "";
   font-size: 14px;
   color: #FFC700;
 }
@@ -31978,7 +31981,7 @@ input#endDate {
 #deleteMCTable.warning_popup h2::before {
   padding-right: 8px;
   font-family: "Font Awesome 5 Free";
-  content: "\f071";
+  content: "";
   font-size: 14px;
   color: #FFC700;
 }
@@ -32364,7 +32367,7 @@ button.buttons-columnVisibility.active {
 table.usersTable {
   margin-left: 14px;
   margin-right: 14px;
-  width: calc(100% - 28px);
+  width: calc(100% - 2*14px);
   white-space: nowrap;
   border-collapse: collapse !important;
 }
@@ -32485,19 +32488,24 @@ table.dataTable td:not(:first-of-type), table.dataTable th:not(:first-of-type) {
   #quick_comments_link.newCss {
     display: none;
   }
+
   #firstNavigation ol.right-side {
     display: none;
   }
+
   div.status_advanced {
     flex-direction: column;
   }
+
   div.status_advanced_box {
     width: 100%;
     box-sizing: border-box;
   }
+
   a.status_advanced_link {
     width: 95%;
   }
+
   .content_div_normalmode {
     overflow-x: auto;
   }
@@ -32565,6 +32573,7 @@ body #main_holder #main .wide {
     width: 100%;
     margin: 0;
   }
+
   fieldset {
     width: 100% !important;
     box-sizing: border-box !important;
@@ -32594,36 +32603,44 @@ fieldset textarea {
   fieldset .setting {
     height: auto !important;
   }
+
   .setting_horizontal_wrapper {
     flex-direction: column !important;
   }
+
   #vnosi_paginacija div select {
     display: inline-block;
     width: fit-content;
     margin: 0 5px;
     text-align: center;
   }
+
   div.breadcrumbs {
     display: block;
     padding: 15px;
     color: #1e88e5;
     font-weight: 600;
   }
+
   button.small, submit.small {
     min-width: auto;
     padding: 5px 16px;
   }
+
   button.medium, submit.medium {
     min-width: auto;
     padding: 10px 24px;
   }
+
   button.large, submit.large {
     min-width: auto;
     padding: 12px 32px;
   }
+
   .top_note {
     padding: 8px 16px;
   }
+
   header {
     /* Mobile meni */
     /* Mobile meni - NASTAVITVE V UREJANJU ANKETE*/
@@ -32879,6 +32896,7 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
   header .mobile_settings .mobile_settings_content a .setting_text {
     width: auto;
   }
+
   footer#srv_footer {
     display: flex;
     flex-direction: column;
@@ -32900,6 +32918,7 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
     padding: 0;
     border: 0;
   }
+
   /* Popup za vprasajcke */
   .qtip {
     position: fixed !important;
@@ -32910,6 +32929,7 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
     left: 10% !important;
     box-shadow: 0 0 15px 15px rgba(0, 0, 0, 0.34) !important;
   }
+
   .divPopUp {
     width: calc(100% - 32px) !important;
     max-width: calc(100% - 32px) !important;
@@ -32920,10 +32940,12 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
     width: calc(100% - 32px) !important;
     max-width: calc(100% - 32px) !important;
   }
+
   /* Vse povezano s paketi in placili */
   .dt-buttons {
     display: none;
   }
+
   #main #moje_ankete_edit #anketa_edit {
     padding: 0 !important;
   }
@@ -33001,6 +33023,7 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
   #main #moje_ankete_edit fieldset div.setting {
     margin-bottom: 10px;
   }
+
   #new_anketa_div {
     display: flex;
     flex-direction: column;
@@ -33084,6 +33107,7 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
     border: 1px solid #c8e3f8 !important;
     border-radius: 1px;
   }
+
   .dashboard_top_settings {
     flex-direction: column;
   }
@@ -33096,16 +33120,19 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
     margin-left: 0;
     margin-right: 16px;
   }
+
   .dashboard_boxes {
     flex-direction: column;
   }
   .dashboard_boxes .dashboard_box {
     margin: 0 0 32px 0;
   }
+
   .locked .add-variable-mobile,
 .spremenljivka_content .add-variable {
     display: none !important;
   }
+
   #branching {
     width: 100%;
     margin: 0;
@@ -33210,9 +33237,11 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
     margin: 0;
     padding: 0 12px;
   }
+
   .toolbox_holder {
     display: none;
   }
+
   .mobile_add_question {
     display: block;
     position: fixed;
@@ -33232,6 +33261,7 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
     line-height: 15px;
     font-weight: 600;
   }
+
   .mobile_add_question_popup {
     z-index: 9999;
     position: fixed;
@@ -33285,6 +33315,7 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
     font-size: 14px;
     font-weight: 500;
   }
+
   #vprasanje_float_editing .vprasanje_edit_holder {
     position: fixed;
     z-index: 99999;
@@ -33337,6 +33368,7 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
     margin-left: 0 !important;
     text-align: center;
   }
+
   #main #anketa #globalSetingsList {
     max-width: 100% !important;
     width: 100% !important;
@@ -33349,6 +33381,7 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
 #main #anketa #globalSetingsList fieldset span.charalimit#anketa_note_chars {
     width: 100%;
   }
+
   /* NASTAVITVE in ARHIVI */
   /* OBLIKA */
   #main #anketa #anketa_edit.page_tema #div_theme_group_holder {
@@ -33364,15 +33397,18 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
     width: 100%;
     height: auto;
   }
+
   #theme-editor {
     width: 100% !important;
     float: none !important;
   }
+
   #theme-preview {
     width: 100% !important;
     float: none !important;
     margin-top: 80px !important;
   }
+
   /* ARHIVI */
   #main #anketa #anketa_edit.page_arhivi {
     flex-direction: column-reverse;
@@ -33390,6 +33426,7 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
   #main #anketa #anketa_edit.page_arhivi #div_archive_content fieldset input {
     width: 100% !important;
   }
+
   div.page_tema .theme_list {
     flex-wrap: wrap;
   }
@@ -33416,6 +33453,7 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
   div.page_tema div#theme_grid_holder div.div_theme_group div.theme_label .theme_label_options .button {
     margin-right: 8px;
   }
+
   .page_theme-editor #theme-preview {
     display: none;
   }
@@ -33423,6 +33461,7 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
     width: 100% !important;
     flex-wrap: wrap;
   }
+
   #srv_diagnostic br {
     display: none;
   }
@@ -33443,6 +33482,7 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
 #srv_diagnostic #srv_diagnostic_results_right table td + td {
     width: auto !important;
   }
+
   .subpage_testnipodatki {
     line-height: 20px;
   }
@@ -33456,6 +33496,7 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
   .subpage_testnipodatki form label input {
     vertical-align: bottom;
   }
+
   .lastnosti_wrapper {
     flex-direction: column !important;
   }
@@ -33463,6 +33504,7 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
 .lastnosti_wrapper .lastnosti_right {
     width: 100% !important;
   }
+
   .page_vabila #vabila .button_holder {
     flex-direction: column;
     align-items: flex-start;
@@ -33487,6 +33529,7 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
   .page_vabila #vabila .more_block {
     width: 100%;
   }
+
   .page_invitations #inv_top_navi {
     flex-direction: column;
     align-items: flex-start;
@@ -33554,6 +33597,7 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
   .page_invitations .button_holder button {
     margin-bottom: 8px;
   }
+
   #vabila > table,
 table.invitations_settings,
 #inv_msg_preview table,
@@ -33637,6 +33681,7 @@ table.invitations_settings p label input[type=password],
     width: 100% !important;
     box-sizing: border-box;
   }
+
   #surveyInvitationSetting,
 #surveyInvitationSettingServer {
     min-width: 100% !important;
@@ -33644,6 +33689,7 @@ table.invitations_settings p label input[type=password],
     margin: 10px 0 !important;
     box-sizing: border-box !important;
   }
+
   #inv_top_navi {
     display: flex;
     flex-direction: column;
@@ -33682,6 +33728,7 @@ table.invitations_settings p label input[type=password],
   #inv_top_navi > #inv_step_nav.yellow .inv_step_space {
     display: none;
   }
+
   #inv_recipients_profiles_holder,
 #inv_import_list_container,
 #inv_messages_profiles_holder,
@@ -33702,6 +33749,7 @@ table.invitations_settings p label input[type=password],
 #inv_select_mail_preview textarea {
     width: 100%;
   }
+
   #inv_msg_preview table th {
     height: auto !important;
     width: 100% !important;
@@ -33713,6 +33761,7 @@ table.invitations_settings p label input[type=password],
     width: 100%;
     box-sizing: border-box;
   }
+
   .addthis_toolbox {
     line-height: 24px;
   }
@@ -33727,9 +33776,11 @@ table.invitations_settings p label input[type=password],
   .addthis_toolbox .addthis_separator {
     font-size: 16px;
   }
+
   #inv_field_container ul li {
     width: 45%;
   }
+
   /* grafika ko ni podatkov */
   div.no_data_alert img {
     width: 100%;
@@ -33741,6 +33792,7 @@ table.invitations_settings p label input[type=password],
     flex-direction: column;
     align-items: center;
   }
+
   .page_data .data_table_top_holder {
     flex-direction: column;
     align-items: flex-start;
@@ -33811,9 +33863,11 @@ table.invitations_settings p label input[type=password],
     width: 100%;
     margin-bottom: 16px;
   }
+
   body.data_fullscreen #analiza_data {
     top: 68px;
   }
+
   .subpage_append .anketa_edit_main,
 .subpage_merge .anketa_edit_main,
 .subpage_calculation .anketa_edit_main,
@@ -33854,6 +33908,7 @@ table.invitations_settings p label input[type=password],
     clear: both;
     margin: 40px 0 0 0 !important;
   }
+
   .subpage_quick_edit #quick_edit_top_line {
     flex-direction: column-reverse;
   }
@@ -33873,6 +33928,7 @@ table.invitations_settings p label input[type=password],
   .subpage_quick_edit .quick_edit_container .quick_edit_bottom_line {
     justify-content: center;
   }
+
   .analysis_bottom_settings {
     flex-wrap: wrap;
   }
@@ -33882,13 +33938,16 @@ table.invitations_settings p label input[type=password],
     margin: 0 0 16px 0 !important;
     border: 0;
   }
+
   .div_analiza_icons,
 .div_analiza_scale {
     opacity: 1 !important;
   }
+
   .analysis_icons_holder {
     display: none;
   }
+
   .chart_holder {
     width: 100%;
     box-sizing: border-box;
@@ -33911,6 +33970,7 @@ table.invitations_settings p label input[type=password],
     display: block;
     clear: both;
   }
+
   table.analysis_reports {
     border-spacing: 0px;
   }
@@ -33927,12 +33987,14 @@ table.analysis_reports > tbody > tr > td {
   table.analysis_reports fieldset {
     margin-bottom: 0 !important;
   }
+
   .reports_holder {
     flex-direction: column;
   }
   .reports_holder fieldset {
     width: 100%;
   }
+
   .noSurvey_sequence {
     padding: 0;
   }
@@ -33954,11 +34016,13 @@ table.analysis_reports > tbody > tr > td {
   .noSurvey_sequence .buttons_holder a .button {
     margin: 10px 30px;
   }
+
   #table-horizontal-scroll-wrapper1-userchanges {
     display: table;
     table-layout: fixed;
     width: 100%;
   }
+
   #table-horizontal-scroll-wrapper2-userchanges {
     display: table-cell;
     overflow-x: auto;
@@ -33969,6 +34033,7 @@ table.analysis_reports > tbody > tr > td {
     border-collapse: collapse;
     white-space: nowrap;
   }
+
   .page_arhivi .anketa_edit_left,
 .page_tracking .anketa_edit_left,
 .subpage_anal_arch .anketa_edit_left,
diff --git a/resources/sass/admin_new/pages/survey_edit/branching.scss b/resources/sass/admin_new/pages/survey_edit/branching.scss
index 040d8beca..88ccf5df3 100644
--- a/resources/sass/admin_new/pages/survey_edit/branching.scss
+++ b/resources/sass/admin_new/pages/survey_edit/branching.scss
@@ -118,7 +118,8 @@ $branching_main_size_small: calc(100% - 525px);
                     display: flex;
                     align-items: center;
 
-                    width: 200px;
+                    white-space: nowrap;
+                    padding-right: 16px;
 
                     font-size: 16px;
                     font-weight: 600;
@@ -130,7 +131,9 @@ $branching_main_size_small: calc(100% - 525px);
                 .pb_page_hover{
                     display: none;
                     align-items: center;
-                    width: 200px;
+                    
+                    white-space: nowrap;
+                    padding-right: 16px;
 
                     font-weight: 400;
                     font-size: 12px;
diff --git a/resources/sass/admin_new/pages/survey_edit/branching_collapsed.scss b/resources/sass/admin_new/pages/survey_edit/branching_collapsed.scss
index 2e6ee2471..d942e31d7 100644
--- a/resources/sass/admin_new/pages/survey_edit/branching_collapsed.scss
+++ b/resources/sass/admin_new/pages/survey_edit/branching_collapsed.scss
@@ -55,6 +55,7 @@
 
                     width: auto;
                     margin-left: 8px;
+                    padding-right: 0px;
 
                     font-weight: 600;
                     font-size: 10px;

From 4f0e9dfa5a011be774344bf024ccffd451fab69f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nejc=20Kova=C4=8D?= <nejc.kouko@gmail.com>
Date: Mon, 18 Jul 2022 11:55:33 +0200
Subject: [PATCH 082/110] Register form - potrdilo registracije font: sans pro

---
 frontend/simple/css/style.css                     | 7 +++++++
 resources/sass/frontend_simple/modules/pages.scss | 7 +++++++
 2 files changed, 14 insertions(+)

diff --git a/frontend/simple/css/style.css b/frontend/simple/css/style.css
index 433c72ab7..03133ee89 100644
--- a/frontend/simple/css/style.css
+++ b/frontend/simple/css/style.css
@@ -508,6 +508,10 @@ body.login_noEmail #main .landing_page_window .g-recaptcha {
         display: none !important;
     }
 }*/
+body {
+  font-family: "Source Sans Pro", "sans-serif";
+}
+
 /************GDPR OBRAZEC***************/
 body.gdpr {
   line-height: 26px;
@@ -542,6 +546,9 @@ body.gdpr div.label {
 
 /******************************/
 /************REGISTRACIJSKI OBRAZEC***************/
+body.register .register_holder {
+  background-color: red;
+}
 body.register .register_holder .subtitle {
   padding: 0;
   margin: 0;
diff --git a/resources/sass/frontend_simple/modules/pages.scss b/resources/sass/frontend_simple/modules/pages.scss
index a1f317a4d..7cac65514 100644
--- a/resources/sass/frontend_simple/modules/pages.scss
+++ b/resources/sass/frontend_simple/modules/pages.scss
@@ -1,3 +1,7 @@
+body {
+    font-family: $SansPro_font;
+}
+
 /************GDPR OBRAZEC***************/
 body.gdpr{
     line-height: 26px;
@@ -40,8 +44,11 @@ body.gdpr{
 /************REGISTRACIJSKI OBRAZEC***************/
 body.register{
 
+    
     .register_holder{
 
+        background-color: red;
+
         .subtitle{
             padding: 0;
             margin: 0;

From 89808de65bf139a773c0df3ddb6296d0cb105d02 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nejc=20Kova=C4=8D?= <nejc.kouko@gmail.com>
Date: Mon, 18 Jul 2022 12:10:52 +0200
Subject: [PATCH 083/110] Objava - pregled

---
 admin/survey/SurveyAdminAjax.php              |   10 +-
 admin/survey/SurveyAdminSettings.php          |   28 +-
 public/css/admin_new.css                      | 2964 ++++++++---------
 .../pages/survey_objava/pregled.scss          |   16 +-
 4 files changed, 1475 insertions(+), 1543 deletions(-)

diff --git a/admin/survey/SurveyAdminAjax.php b/admin/survey/SurveyAdminAjax.php
index 6b680b65a..92d34185a 100644
--- a/admin/survey/SurveyAdminAjax.php
+++ b/admin/survey/SurveyAdminAjax.php
@@ -6943,13 +6943,13 @@ class SurveyAdminAjax {
 						echo '</p>';
 					}
 					
-					# Prevod
+					// # Prevod
 
-					echo '<p> <span>Prevod: </span>';
-					echo '<span><a href="#">Belarussian</a>, </span>';
-					echo '<span><a href="#">Bulgarian</a></span>';
+					// echo '<p> <span>Prevod: </span>';
+					// echo '<span><a href="#">Belarussian</a>, </span>';
+					// echo '<span><a href="#">Bulgarian</a></span>';
 
-					echo '</p>';
+					// echo '</p>';
 
 
 
diff --git a/admin/survey/SurveyAdminSettings.php b/admin/survey/SurveyAdminSettings.php
index c97d9b0f4..72c8032a8 100644
--- a/admin/survey/SurveyAdminSettings.php
+++ b/admin/survey/SurveyAdminSettings.php
@@ -2797,7 +2797,7 @@ class SurveyAdminSettings {
 			echo '<div class="more_title">';
 			echo '<div class="more_title_icon"><span class="faicon inv_sent_1 empty"></span></div>';
 			echo $lang['srv_publication_invitations'];
-			echo '<img class= "mail_yellow" src="/public\img\icons\lock_yellow.svg">';
+			// echo '<img class= "mail_yellow" src="/public\img\icons\lock_yellow.svg">';
 			echo '</div>';
 			echo $lang['srv_publication_invitations_text'];
 		echo '</div>';
@@ -2924,23 +2924,23 @@ class SurveyAdminSettings {
 		$link1 = $site_url.'a/'.$row['hash'];
 		echo '<div class="grouplang">';
 		echo '<a href="'.$link1.'" target="_blank">'.$link1.'</a>'.(count($lang_array) > 0 ? '&nbsp- '.$base_lang_resp : '');
-		echo '<div class= "lang_span">- English </div>';
+		// echo '<div class= "lang_span">- English </div>';
 		echo '<span class="faicon blue copy" onclick="CopyToClipboard(\''.$link1.'\'); actionNotePopup(\'link_copied\', \'success\'); return false;" title="'.$lang['srv_publication_survey_copylink'].'"></span>';
 		echo '</div>';
 
-		$link1 = $site_url.'a/'.$row['hash'];
-		echo '<div class="grouplang">';
-		echo '<a href="'.$link1.'" target="_blank">'.$link1.'</a>'.(count($lang_array) > 0 ? '&nbsp- '.$base_lang_resp : '');
-		echo '<div class= "lang_span">- Slovenščina </div>';
-		echo '<span class="faicon blue copy" onclick="CopyToClipboard(\''.$link1.'\'); actionNotePopup(\'link_copied\', \'success\'); return false;" title="'.$lang['srv_publication_survey_copylink'].'"></span>';
-		echo '</div>';
+		// $link1 = $site_url.'a/'.$row['hash'];
+		// echo '<div class="grouplang">';
+		// echo '<a href="'.$link1.'" target="_blank">'.$link1.'</a>'.(count($lang_array) > 0 ? '&nbsp- '.$base_lang_resp : '');
+		// echo '<div class= "lang_span">- Slovenščina </div>';
+		// echo '<span class="faicon blue copy" onclick="CopyToClipboard(\''.$link1.'\'); actionNotePopup(\'link_copied\', \'success\'); return false;" title="'.$lang['srv_publication_survey_copylink'].'"></span>';
+		// echo '</div>';
 
-		$link1 = $site_url.'a/'.$row['hash'];
-		echo '<div class="grouplang">';
-		echo '<a href="'.$link1.'" target="_blank">'.$link1.'</a>'.(count($lang_array) > 0 ? '&nbsp- '.$base_lang_resp : '');
-		echo '<div class= "lang_span">- Italian </div>';
-		echo '<span class="faicon blue copy" onclick="CopyToClipboard(\''.$link1.'\'); actionNotePopup(\'link_copied\', \'success\'); return false;" title="'.$lang['srv_publication_survey_copylink'].'"></span>';
-		echo '</div>';
+		// $link1 = $site_url.'a/'.$row['hash'];
+		// echo '<div class="grouplang">';
+		// echo '<a href="'.$link1.'" target="_blank">'.$link1.'</a>'.(count($lang_array) > 0 ? '&nbsp- '.$base_lang_resp : '');
+		// echo '<div class= "lang_span">- Italian </div>';
+		// echo '<span class="faicon blue copy" onclick="CopyToClipboard(\''.$link1.'\'); actionNotePopup(\'link_copied\', \'success\'); return false;" title="'.$lang['srv_publication_survey_copylink'].'"></span>';
+		// echo '</div>';
 
         // Imamo vec linkov za skupine
 		$ss = new SurveySkupine($this->anketa);
diff --git a/public/css/admin_new.css b/public/css/admin_new.css
index f8436a52a..086979607 100644
--- a/public/css/admin_new.css
+++ b/public/css/admin_new.css
@@ -214,4767 +214,4767 @@
 /* Font Awesome uses the Unicode Private Use Area (PUA) to ensure screen
 readers do not read off random characters that represent icons */
 .fa-500px:before {
-  content: "";
+  content: "\f26e";
 }
 
 .fa-accessible-icon:before {
-  content: "";
+  content: "\f368";
 }
 
 .fa-accusoft:before {
-  content: "";
+  content: "\f369";
 }
 
 .fa-ad:before {
-  content: "";
+  content: "\f641";
 }
 
 .fa-address-book:before {
-  content: "";
+  content: "\f2b9";
 }
 
 .fa-address-card:before {
-  content: "";
+  content: "\f2bb";
 }
 
 .fa-adjust:before {
-  content: "";
+  content: "\f042";
 }
 
 .fa-adn:before {
-  content: "";
+  content: "\f170";
 }
 
 .fa-adversal:before {
-  content: "";
+  content: "\f36a";
 }
 
 .fa-affiliatetheme:before {
-  content: "";
+  content: "\f36b";
 }
 
 .fa-air-freshener:before {
-  content: "";
+  content: "\f5d0";
 }
 
 .fa-algolia:before {
-  content: "";
+  content: "\f36c";
 }
 
 .fa-align-center:before {
-  content: "";
+  content: "\f037";
 }
 
 .fa-align-justify:before {
-  content: "";
+  content: "\f039";
 }
 
 .fa-align-left:before {
-  content: "";
+  content: "\f036";
 }
 
 .fa-align-right:before {
-  content: "";
+  content: "\f038";
 }
 
 .fa-alipay:before {
-  content: "";
+  content: "\f642";
 }
 
 .fa-allergies:before {
-  content: "";
+  content: "\f461";
 }
 
 .fa-amazon:before {
-  content: "";
+  content: "\f270";
 }
 
 .fa-amazon-pay:before {
-  content: "";
+  content: "\f42c";
 }
 
 .fa-ambulance:before {
-  content: "";
+  content: "\f0f9";
 }
 
 .fa-american-sign-language-interpreting:before {
-  content: "";
+  content: "\f2a3";
 }
 
 .fa-amilia:before {
-  content: "";
+  content: "\f36d";
 }
 
 .fa-anchor:before {
-  content: "";
+  content: "\f13d";
 }
 
 .fa-android:before {
-  content: "";
+  content: "\f17b";
 }
 
 .fa-angellist:before {
-  content: "";
+  content: "\f209";
 }
 
 .fa-angle-double-down:before {
-  content: "";
+  content: "\f103";
 }
 
 .fa-angle-double-left:before {
-  content: "";
+  content: "\f100";
 }
 
 .fa-angle-double-right:before {
-  content: "";
+  content: "\f101";
 }
 
 .fa-angle-double-up:before {
-  content: "";
+  content: "\f102";
 }
 
 .fa-angle-down:before {
-  content: "";
+  content: "\f107";
 }
 
 .fa-angle-left:before {
-  content: "";
+  content: "\f104";
 }
 
 .fa-angle-right:before {
-  content: "";
+  content: "\f105";
 }
 
 .fa-angle-up:before {
-  content: "";
+  content: "\f106";
 }
 
 .fa-angry:before {
-  content: "";
+  content: "\f556";
 }
 
 .fa-angrycreative:before {
-  content: "";
+  content: "\f36e";
 }
 
 .fa-angular:before {
-  content: "";
+  content: "\f420";
 }
 
 .fa-ankh:before {
-  content: "";
+  content: "\f644";
 }
 
 .fa-app-store:before {
-  content: "";
+  content: "\f36f";
 }
 
 .fa-app-store-ios:before {
-  content: "";
+  content: "\f370";
 }
 
 .fa-apper:before {
-  content: "";
+  content: "\f371";
 }
 
 .fa-apple:before {
-  content: "";
+  content: "\f179";
 }
 
 .fa-apple-alt:before {
-  content: "";
+  content: "\f5d1";
 }
 
 .fa-apple-pay:before {
-  content: "";
+  content: "\f415";
 }
 
 .fa-archive:before {
-  content: "";
+  content: "\f187";
 }
 
 .fa-archway:before {
-  content: "";
+  content: "\f557";
 }
 
 .fa-arrow-alt-circle-down:before {
-  content: "";
+  content: "\f358";
 }
 
 .fa-arrow-alt-circle-left:before {
-  content: "";
+  content: "\f359";
 }
 
 .fa-arrow-alt-circle-right:before {
-  content: "";
+  content: "\f35a";
 }
 
 .fa-arrow-alt-circle-up:before {
-  content: "";
+  content: "\f35b";
 }
 
 .fa-arrow-circle-down:before {
-  content: "";
+  content: "\f0ab";
 }
 
 .fa-arrow-circle-left:before {
-  content: "";
+  content: "\f0a8";
 }
 
 .fa-arrow-circle-right:before {
-  content: "";
+  content: "\f0a9";
 }
 
 .fa-arrow-circle-up:before {
-  content: "";
+  content: "\f0aa";
 }
 
 .fa-arrow-down:before {
-  content: "";
+  content: "\f063";
 }
 
 .fa-arrow-left:before {
-  content: "";
+  content: "\f060";
 }
 
 .fa-arrow-right:before {
-  content: "";
+  content: "\f061";
 }
 
 .fa-arrow-up:before {
-  content: "";
+  content: "\f062";
 }
 
 .fa-arrows-alt:before {
-  content: "";
+  content: "\f0b2";
 }
 
 .fa-arrows-alt-h:before {
-  content: "";
+  content: "\f337";
 }
 
 .fa-arrows-alt-v:before {
-  content: "";
+  content: "\f338";
 }
 
 .fa-assistive-listening-systems:before {
-  content: "";
+  content: "\f2a2";
 }
 
 .fa-asterisk:before {
-  content: "";
+  content: "\f069";
 }
 
 .fa-asymmetrik:before {
-  content: "";
+  content: "\f372";
 }
 
 .fa-at:before {
-  content: "";
+  content: "\f1fa";
 }
 
 .fa-atlas:before {
-  content: "";
+  content: "\f558";
 }
 
 .fa-atom:before {
-  content: "";
+  content: "\f5d2";
 }
 
 .fa-audible:before {
-  content: "";
+  content: "\f373";
 }
 
 .fa-audio-description:before {
-  content: "";
+  content: "\f29e";
 }
 
 .fa-autoprefixer:before {
-  content: "";
+  content: "\f41c";
 }
 
 .fa-avianex:before {
-  content: "";
+  content: "\f374";
 }
 
 .fa-aviato:before {
-  content: "";
+  content: "\f421";
 }
 
 .fa-award:before {
-  content: "";
+  content: "\f559";
 }
 
 .fa-aws:before {
-  content: "";
+  content: "\f375";
 }
 
 .fa-backspace:before {
-  content: "";
+  content: "\f55a";
 }
 
 .fa-backward:before {
-  content: "";
+  content: "\f04a";
 }
 
 .fa-balance-scale:before {
-  content: "";
+  content: "\f24e";
 }
 
 .fa-ban:before {
-  content: "";
+  content: "\f05e";
 }
 
 .fa-band-aid:before {
-  content: "";
+  content: "\f462";
 }
 
 .fa-bandcamp:before {
-  content: "";
+  content: "\f2d5";
 }
 
 .fa-barcode:before {
-  content: "";
+  content: "\f02a";
 }
 
 .fa-bars:before {
-  content: "";
+  content: "\f0c9";
 }
 
 .fa-baseball-ball:before {
-  content: "";
+  content: "\f433";
 }
 
 .fa-basketball-ball:before {
-  content: "";
+  content: "\f434";
 }
 
 .fa-bath:before {
-  content: "";
+  content: "\f2cd";
 }
 
 .fa-battery-empty:before {
-  content: "";
+  content: "\f244";
 }
 
 .fa-battery-full:before {
-  content: "";
+  content: "\f240";
 }
 
 .fa-battery-half:before {
-  content: "";
+  content: "\f242";
 }
 
 .fa-battery-quarter:before {
-  content: "";
+  content: "\f243";
 }
 
 .fa-battery-three-quarters:before {
-  content: "";
+  content: "\f241";
 }
 
 .fa-bed:before {
-  content: "";
+  content: "\f236";
 }
 
 .fa-beer:before {
-  content: "";
+  content: "\f0fc";
 }
 
 .fa-behance:before {
-  content: "";
+  content: "\f1b4";
 }
 
 .fa-behance-square:before {
-  content: "";
+  content: "\f1b5";
 }
 
 .fa-bell:before {
-  content: "";
+  content: "\f0f3";
 }
 
 .fa-bell-slash:before {
-  content: "";
+  content: "\f1f6";
 }
 
 .fa-bezier-curve:before {
-  content: "";
+  content: "\f55b";
 }
 
 .fa-bible:before {
-  content: "";
+  content: "\f647";
 }
 
 .fa-bicycle:before {
-  content: "";
+  content: "\f206";
 }
 
 .fa-bimobject:before {
-  content: "";
+  content: "\f378";
 }
 
 .fa-binoculars:before {
-  content: "";
+  content: "\f1e5";
 }
 
 .fa-birthday-cake:before {
-  content: "";
+  content: "\f1fd";
 }
 
 .fa-bitbucket:before {
-  content: "";
+  content: "\f171";
 }
 
 .fa-bitcoin:before {
-  content: "";
+  content: "\f379";
 }
 
 .fa-bity:before {
-  content: "";
+  content: "\f37a";
 }
 
 .fa-black-tie:before {
-  content: "";
+  content: "\f27e";
 }
 
 .fa-blackberry:before {
-  content: "";
+  content: "\f37b";
 }
 
 .fa-blender:before {
-  content: "";
+  content: "\f517";
 }
 
 .fa-blind:before {
-  content: "";
+  content: "\f29d";
 }
 
 .fa-blogger:before {
-  content: "";
+  content: "\f37c";
 }
 
 .fa-blogger-b:before {
-  content: "";
+  content: "\f37d";
 }
 
 .fa-bluetooth:before {
-  content: "";
+  content: "\f293";
 }
 
 .fa-bluetooth-b:before {
-  content: "";
+  content: "\f294";
 }
 
 .fa-bold:before {
-  content: "";
+  content: "\f032";
 }
 
 .fa-bolt:before {
-  content: "";
+  content: "\f0e7";
 }
 
 .fa-bomb:before {
-  content: "";
+  content: "\f1e2";
 }
 
 .fa-bone:before {
-  content: "";
+  content: "\f5d7";
 }
 
 .fa-bong:before {
-  content: "";
+  content: "\f55c";
 }
 
 .fa-book:before {
-  content: "";
+  content: "\f02d";
 }
 
 .fa-book-open:before {
-  content: "";
+  content: "\f518";
 }
 
 .fa-book-reader:before {
-  content: "";
+  content: "\f5da";
 }
 
 .fa-bookmark:before {
-  content: "";
+  content: "\f02e";
 }
 
 .fa-bowling-ball:before {
-  content: "";
+  content: "\f436";
 }
 
 .fa-box:before {
-  content: "";
+  content: "\f466";
 }
 
 .fa-box-open:before {
-  content: "";
+  content: "\f49e";
 }
 
 .fa-boxes:before {
-  content: "";
+  content: "\f468";
 }
 
 .fa-braille:before {
-  content: "";
+  content: "\f2a1";
 }
 
 .fa-brain:before {
-  content: "";
+  content: "\f5dc";
 }
 
 .fa-briefcase:before {
-  content: "";
+  content: "\f0b1";
 }
 
 .fa-briefcase-medical:before {
-  content: "";
+  content: "\f469";
 }
 
 .fa-broadcast-tower:before {
-  content: "";
+  content: "\f519";
 }
 
 .fa-broom:before {
-  content: "";
+  content: "\f51a";
 }
 
 .fa-brush:before {
-  content: "";
+  content: "\f55d";
 }
 
 .fa-btc:before {
-  content: "";
+  content: "\f15a";
 }
 
 .fa-bug:before {
-  content: "";
+  content: "\f188";
 }
 
 .fa-building:before {
-  content: "";
+  content: "\f1ad";
 }
 
 .fa-bullhorn:before {
-  content: "";
+  content: "\f0a1";
 }
 
 .fa-bullseye:before {
-  content: "";
+  content: "\f140";
 }
 
 .fa-burn:before {
-  content: "";
+  content: "\f46a";
 }
 
 .fa-buromobelexperte:before {
-  content: "";
+  content: "\f37f";
 }
 
 .fa-bus:before {
-  content: "";
+  content: "\f207";
 }
 
 .fa-bus-alt:before {
-  content: "";
+  content: "\f55e";
 }
 
 .fa-business-time:before {
-  content: "";
+  content: "\f64a";
 }
 
 .fa-buysellads:before {
-  content: "";
+  content: "\f20d";
 }
 
 .fa-calculator:before {
-  content: "";
+  content: "\f1ec";
 }
 
 .fa-calendar:before {
-  content: "";
+  content: "\f133";
 }
 
 .fa-calendar-alt:before {
-  content: "";
+  content: "\f073";
 }
 
 .fa-calendar-check:before {
-  content: "";
+  content: "\f274";
 }
 
 .fa-calendar-minus:before {
-  content: "";
+  content: "\f272";
 }
 
 .fa-calendar-plus:before {
-  content: "";
+  content: "\f271";
 }
 
 .fa-calendar-times:before {
-  content: "";
+  content: "\f273";
 }
 
 .fa-camera:before {
-  content: "";
+  content: "\f030";
 }
 
 .fa-camera-retro:before {
-  content: "";
+  content: "\f083";
 }
 
 .fa-cannabis:before {
-  content: "";
+  content: "\f55f";
 }
 
 .fa-capsules:before {
-  content: "";
+  content: "\f46b";
 }
 
 .fa-car:before {
-  content: "";
+  content: "\f1b9";
 }
 
 .fa-car-alt:before {
-  content: "";
+  content: "\f5de";
 }
 
 .fa-car-battery:before {
-  content: "";
+  content: "\f5df";
 }
 
 .fa-car-crash:before {
-  content: "";
+  content: "\f5e1";
 }
 
 .fa-car-side:before {
-  content: "";
+  content: "\f5e4";
 }
 
 .fa-caret-down:before {
-  content: "";
+  content: "\f0d7";
 }
 
 .fa-caret-left:before {
-  content: "";
+  content: "\f0d9";
 }
 
 .fa-caret-right:before {
-  content: "";
+  content: "\f0da";
 }
 
 .fa-caret-square-down:before {
-  content: "";
+  content: "\f150";
 }
 
 .fa-caret-square-left:before {
-  content: "";
+  content: "\f191";
 }
 
 .fa-caret-square-right:before {
-  content: "";
+  content: "\f152";
 }
 
 .fa-caret-square-up:before {
-  content: "";
+  content: "\f151";
 }
 
 .fa-caret-up:before {
-  content: "";
+  content: "\f0d8";
 }
 
 .fa-cart-arrow-down:before {
-  content: "";
+  content: "\f218";
 }
 
 .fa-cart-plus:before {
-  content: "";
+  content: "\f217";
 }
 
 .fa-cc-amazon-pay:before {
-  content: "";
+  content: "\f42d";
 }
 
 .fa-cc-amex:before {
-  content: "";
+  content: "\f1f3";
 }
 
 .fa-cc-apple-pay:before {
-  content: "";
+  content: "\f416";
 }
 
 .fa-cc-diners-club:before {
-  content: "";
+  content: "\f24c";
 }
 
 .fa-cc-discover:before {
-  content: "";
+  content: "\f1f2";
 }
 
 .fa-cc-jcb:before {
-  content: "";
+  content: "\f24b";
 }
 
 .fa-cc-mastercard:before {
-  content: "";
+  content: "\f1f1";
 }
 
 .fa-cc-paypal:before {
-  content: "";
+  content: "\f1f4";
 }
 
 .fa-cc-stripe:before {
-  content: "";
+  content: "\f1f5";
 }
 
 .fa-cc-visa:before {
-  content: "";
+  content: "\f1f0";
 }
 
 .fa-centercode:before {
-  content: "";
+  content: "\f380";
 }
 
 .fa-certificate:before {
-  content: "";
+  content: "\f0a3";
 }
 
 .fa-chalkboard:before {
-  content: "";
+  content: "\f51b";
 }
 
 .fa-chalkboard-teacher:before {
-  content: "";
+  content: "\f51c";
 }
 
 .fa-charging-station:before {
-  content: "";
+  content: "\f5e7";
 }
 
 .fa-chart-area:before {
-  content: "";
+  content: "\f1fe";
 }
 
 .fa-chart-bar:before {
-  content: "";
+  content: "\f080";
 }
 
 .fa-chart-line:before {
-  content: "";
+  content: "\f201";
 }
 
 .fa-chart-pie:before {
-  content: "";
+  content: "\f200";
 }
 
 .fa-check:before {
-  content: "";
+  content: "\f00c";
 }
 
 .fa-check-circle:before {
-  content: "";
+  content: "\f058";
 }
 
 .fa-check-double:before {
-  content: "";
+  content: "\f560";
 }
 
 .fa-check-square:before {
-  content: "";
+  content: "\f14a";
 }
 
 .fa-chess:before {
-  content: "";
+  content: "\f439";
 }
 
 .fa-chess-bishop:before {
-  content: "";
+  content: "\f43a";
 }
 
 .fa-chess-board:before {
-  content: "";
+  content: "\f43c";
 }
 
 .fa-chess-king:before {
-  content: "";
+  content: "\f43f";
 }
 
 .fa-chess-knight:before {
-  content: "";
+  content: "\f441";
 }
 
 .fa-chess-pawn:before {
-  content: "";
+  content: "\f443";
 }
 
 .fa-chess-queen:before {
-  content: "";
+  content: "\f445";
 }
 
 .fa-chess-rook:before {
-  content: "";
+  content: "\f447";
 }
 
 .fa-chevron-circle-down:before {
-  content: "";
+  content: "\f13a";
 }
 
 .fa-chevron-circle-left:before {
-  content: "";
+  content: "\f137";
 }
 
 .fa-chevron-circle-right:before {
-  content: "";
+  content: "\f138";
 }
 
 .fa-chevron-circle-up:before {
-  content: "";
+  content: "\f139";
 }
 
 .fa-chevron-down:before {
-  content: "";
+  content: "\f078";
 }
 
 .fa-chevron-left:before {
-  content: "";
+  content: "\f053";
 }
 
 .fa-chevron-right:before {
-  content: "";
+  content: "\f054";
 }
 
 .fa-chevron-up:before {
-  content: "";
+  content: "\f077";
 }
 
 .fa-child:before {
-  content: "";
+  content: "\f1ae";
 }
 
 .fa-chrome:before {
-  content: "";
+  content: "\f268";
 }
 
 .fa-church:before {
-  content: "";
+  content: "\f51d";
 }
 
 .fa-circle:before {
-  content: "";
+  content: "\f111";
 }
 
 .fa-circle-notch:before {
-  content: "";
+  content: "\f1ce";
 }
 
 .fa-city:before {
-  content: "";
+  content: "\f64f";
 }
 
 .fa-clipboard:before {
-  content: "";
+  content: "\f328";
 }
 
 .fa-clipboard-check:before {
-  content: "";
+  content: "\f46c";
 }
 
 .fa-clipboard-list:before {
-  content: "";
+  content: "\f46d";
 }
 
 .fa-clock:before {
-  content: "";
+  content: "\f017";
 }
 
 .fa-clone:before {
-  content: "";
+  content: "\f24d";
 }
 
 .fa-closed-captioning:before {
-  content: "";
+  content: "\f20a";
 }
 
 .fa-cloud:before {
-  content: "";
+  content: "\f0c2";
 }
 
 .fa-cloud-download-alt:before {
-  content: "";
+  content: "\f381";
 }
 
 .fa-cloud-upload-alt:before {
-  content: "";
+  content: "\f382";
 }
 
 .fa-cloudscale:before {
-  content: "";
+  content: "\f383";
 }
 
 .fa-cloudsmith:before {
-  content: "";
+  content: "\f384";
 }
 
 .fa-cloudversify:before {
-  content: "";
+  content: "\f385";
 }
 
 .fa-cocktail:before {
-  content: "";
+  content: "\f561";
 }
 
 .fa-code:before {
-  content: "";
+  content: "\f121";
 }
 
 .fa-code-branch:before {
-  content: "";
+  content: "\f126";
 }
 
 .fa-codepen:before {
-  content: "";
+  content: "\f1cb";
 }
 
 .fa-codiepie:before {
-  content: "";
+  content: "\f284";
 }
 
 .fa-coffee:before {
-  content: "";
+  content: "\f0f4";
 }
 
 .fa-cog:before {
-  content: "";
+  content: "\f013";
 }
 
 .fa-cogs:before {
-  content: "";
+  content: "\f085";
 }
 
 .fa-coins:before {
-  content: "";
+  content: "\f51e";
 }
 
 .fa-columns:before {
-  content: "";
+  content: "\f0db";
 }
 
 .fa-comment:before {
-  content: "";
+  content: "\f075";
 }
 
 .fa-comment-alt:before {
-  content: "";
+  content: "\f27a";
 }
 
 .fa-comment-dollar:before {
-  content: "";
+  content: "\f651";
 }
 
 .fa-comment-dots:before {
-  content: "";
+  content: "\f4ad";
 }
 
 .fa-comment-slash:before {
-  content: "";
+  content: "\f4b3";
 }
 
 .fa-comments:before {
-  content: "";
+  content: "\f086";
 }
 
 .fa-comments-dollar:before {
-  content: "";
+  content: "\f653";
 }
 
 .fa-compact-disc:before {
-  content: "";
+  content: "\f51f";
 }
 
 .fa-compass:before {
-  content: "";
+  content: "\f14e";
 }
 
 .fa-compress:before {
-  content: "";
+  content: "\f066";
 }
 
 .fa-concierge-bell:before {
-  content: "";
+  content: "\f562";
 }
 
 .fa-connectdevelop:before {
-  content: "";
+  content: "\f20e";
 }
 
 .fa-contao:before {
-  content: "";
+  content: "\f26d";
 }
 
 .fa-cookie:before {
-  content: "";
+  content: "\f563";
 }
 
 .fa-cookie-bite:before {
-  content: "";
+  content: "\f564";
 }
 
 .fa-copy:before {
-  content: "";
+  content: "\f0c5";
 }
 
 .fa-copyright:before {
-  content: "";
+  content: "\f1f9";
 }
 
 .fa-couch:before {
-  content: "";
+  content: "\f4b8";
 }
 
 .fa-cpanel:before {
-  content: "";
+  content: "\f388";
 }
 
 .fa-creative-commons:before {
-  content: "";
+  content: "\f25e";
 }
 
 .fa-creative-commons-by:before {
-  content: "";
+  content: "\f4e7";
 }
 
 .fa-creative-commons-nc:before {
-  content: "";
+  content: "\f4e8";
 }
 
 .fa-creative-commons-nc-eu:before {
-  content: "";
+  content: "\f4e9";
 }
 
 .fa-creative-commons-nc-jp:before {
-  content: "";
+  content: "\f4ea";
 }
 
 .fa-creative-commons-nd:before {
-  content: "";
+  content: "\f4eb";
 }
 
 .fa-creative-commons-pd:before {
-  content: "";
+  content: "\f4ec";
 }
 
 .fa-creative-commons-pd-alt:before {
-  content: "";
+  content: "\f4ed";
 }
 
 .fa-creative-commons-remix:before {
-  content: "";
+  content: "\f4ee";
 }
 
 .fa-creative-commons-sa:before {
-  content: "";
+  content: "\f4ef";
 }
 
 .fa-creative-commons-sampling:before {
-  content: "";
+  content: "\f4f0";
 }
 
 .fa-creative-commons-sampling-plus:before {
-  content: "";
+  content: "\f4f1";
 }
 
 .fa-creative-commons-share:before {
-  content: "";
+  content: "\f4f2";
 }
 
 .fa-credit-card:before {
-  content: "";
+  content: "\f09d";
 }
 
 .fa-crop:before {
-  content: "";
+  content: "\f125";
 }
 
 .fa-crop-alt:before {
-  content: "";
+  content: "\f565";
 }
 
 .fa-cross:before {
-  content: "";
+  content: "\f654";
 }
 
 .fa-crosshairs:before {
-  content: "";
+  content: "\f05b";
 }
 
 .fa-crow:before {
-  content: "";
+  content: "\f520";
 }
 
 .fa-crown:before {
-  content: "";
+  content: "\f521";
 }
 
 .fa-css3:before {
-  content: "";
+  content: "\f13c";
 }
 
 .fa-css3-alt:before {
-  content: "";
+  content: "\f38b";
 }
 
 .fa-cube:before {
-  content: "";
+  content: "\f1b2";
 }
 
 .fa-cubes:before {
-  content: "";
+  content: "\f1b3";
 }
 
 .fa-cut:before {
-  content: "";
+  content: "\f0c4";
 }
 
 .fa-cuttlefish:before {
-  content: "";
+  content: "\f38c";
 }
 
 .fa-d-and-d:before {
-  content: "";
+  content: "\f38d";
 }
 
 .fa-dashcube:before {
-  content: "";
+  content: "\f210";
 }
 
 .fa-database:before {
-  content: "";
+  content: "\f1c0";
 }
 
 .fa-deaf:before {
-  content: "";
+  content: "\f2a4";
 }
 
 .fa-delicious:before {
-  content: "";
+  content: "\f1a5";
 }
 
 .fa-deploydog:before {
-  content: "";
+  content: "\f38e";
 }
 
 .fa-deskpro:before {
-  content: "";
+  content: "\f38f";
 }
 
 .fa-desktop:before {
-  content: "";
+  content: "\f108";
 }
 
 .fa-deviantart:before {
-  content: "";
+  content: "\f1bd";
 }
 
 .fa-dharmachakra:before {
-  content: "";
+  content: "\f655";
 }
 
 .fa-diagnoses:before {
-  content: "";
+  content: "\f470";
 }
 
 .fa-dice:before {
-  content: "";
+  content: "\f522";
 }
 
 .fa-dice-five:before {
-  content: "";
+  content: "\f523";
 }
 
 .fa-dice-four:before {
-  content: "";
+  content: "\f524";
 }
 
 .fa-dice-one:before {
-  content: "";
+  content: "\f525";
 }
 
 .fa-dice-six:before {
-  content: "";
+  content: "\f526";
 }
 
 .fa-dice-three:before {
-  content: "";
+  content: "\f527";
 }
 
 .fa-dice-two:before {
-  content: "";
+  content: "\f528";
 }
 
 .fa-digg:before {
-  content: "";
+  content: "\f1a6";
 }
 
 .fa-digital-ocean:before {
-  content: "";
+  content: "\f391";
 }
 
 .fa-digital-tachograph:before {
-  content: "";
+  content: "\f566";
 }
 
 .fa-directions:before {
-  content: "";
+  content: "\f5eb";
 }
 
 .fa-discord:before {
-  content: "";
+  content: "\f392";
 }
 
 .fa-discourse:before {
-  content: "";
+  content: "\f393";
 }
 
 .fa-divide:before {
-  content: "";
+  content: "\f529";
 }
 
 .fa-dizzy:before {
-  content: "";
+  content: "\f567";
 }
 
 .fa-dna:before {
-  content: "";
+  content: "\f471";
 }
 
 .fa-dochub:before {
-  content: "";
+  content: "\f394";
 }
 
 .fa-docker:before {
-  content: "";
+  content: "\f395";
 }
 
 .fa-dollar-sign:before {
-  content: "";
+  content: "\f155";
 }
 
 .fa-dolly:before {
-  content: "";
+  content: "\f472";
 }
 
 .fa-dolly-flatbed:before {
-  content: "";
+  content: "\f474";
 }
 
 .fa-donate:before {
-  content: "";
+  content: "\f4b9";
 }
 
 .fa-door-closed:before {
-  content: "";
+  content: "\f52a";
 }
 
 .fa-door-open:before {
-  content: "";
+  content: "\f52b";
 }
 
 .fa-dot-circle:before {
-  content: "";
+  content: "\f192";
 }
 
 .fa-dove:before {
-  content: "";
+  content: "\f4ba";
 }
 
 .fa-download:before {
-  content: "";
+  content: "\f019";
 }
 
 .fa-draft2digital:before {
-  content: "";
+  content: "\f396";
 }
 
 .fa-drafting-compass:before {
-  content: "";
+  content: "\f568";
 }
 
 .fa-draw-polygon:before {
-  content: "";
+  content: "\f5ee";
 }
 
 .fa-dribbble:before {
-  content: "";
+  content: "\f17d";
 }
 
 .fa-dribbble-square:before {
-  content: "";
+  content: "\f397";
 }
 
 .fa-dropbox:before {
-  content: "";
+  content: "\f16b";
 }
 
 .fa-drum:before {
-  content: "";
+  content: "\f569";
 }
 
 .fa-drum-steelpan:before {
-  content: "";
+  content: "\f56a";
 }
 
 .fa-drupal:before {
-  content: "";
+  content: "\f1a9";
 }
 
 .fa-dumbbell:before {
-  content: "";
+  content: "\f44b";
 }
 
 .fa-dyalog:before {
-  content: "";
+  content: "\f399";
 }
 
 .fa-earlybirds:before {
-  content: "";
+  content: "\f39a";
 }
 
 .fa-ebay:before {
-  content: "";
+  content: "\f4f4";
 }
 
 .fa-edge:before {
-  content: "";
+  content: "\f282";
 }
 
 .fa-edit:before {
-  content: "";
+  content: "\f044";
 }
 
 .fa-eject:before {
-  content: "";
+  content: "\f052";
 }
 
 .fa-elementor:before {
-  content: "";
+  content: "\f430";
 }
 
 .fa-ellipsis-h:before {
-  content: "";
+  content: "\f141";
 }
 
 .fa-ellipsis-v:before {
-  content: "";
+  content: "\f142";
 }
 
 .fa-ello:before {
-  content: "";
+  content: "\f5f1";
 }
 
 .fa-ember:before {
-  content: "";
+  content: "\f423";
 }
 
 .fa-empire:before {
-  content: "";
+  content: "\f1d1";
 }
 
 .fa-envelope:before {
-  content: "";
+  content: "\f0e0";
 }
 
 .fa-envelope-open:before {
-  content: "";
+  content: "\f2b6";
 }
 
 .fa-envelope-open-text:before {
-  content: "";
+  content: "\f658";
 }
 
 .fa-envelope-square:before {
-  content: "";
+  content: "\f199";
 }
 
 .fa-envira:before {
-  content: "";
+  content: "\f299";
 }
 
 .fa-equals:before {
-  content: "";
+  content: "\f52c";
 }
 
 .fa-eraser:before {
-  content: "";
+  content: "\f12d";
 }
 
 .fa-erlang:before {
-  content: "";
+  content: "\f39d";
 }
 
 .fa-ethereum:before {
-  content: "";
+  content: "\f42e";
 }
 
 .fa-etsy:before {
-  content: "";
+  content: "\f2d7";
 }
 
 .fa-euro-sign:before {
-  content: "";
+  content: "\f153";
 }
 
 .fa-exchange-alt:before {
-  content: "";
+  content: "\f362";
 }
 
 .fa-exclamation:before {
-  content: "";
+  content: "\f12a";
 }
 
 .fa-exclamation-circle:before {
-  content: "";
+  content: "\f06a";
 }
 
 .fa-exclamation-triangle:before {
-  content: "";
+  content: "\f071";
 }
 
 .fa-expand:before {
-  content: "";
+  content: "\f065";
 }
 
 .fa-expand-arrows-alt:before {
-  content: "";
+  content: "\f31e";
 }
 
 .fa-expeditedssl:before {
-  content: "";
+  content: "\f23e";
 }
 
 .fa-external-link-alt:before {
-  content: "";
+  content: "\f35d";
 }
 
 .fa-external-link-square-alt:before {
-  content: "";
+  content: "\f360";
 }
 
 .fa-eye:before {
-  content: "";
+  content: "\f06e";
 }
 
 .fa-eye-dropper:before {
-  content: "";
+  content: "\f1fb";
 }
 
 .fa-eye-slash:before {
-  content: "";
+  content: "\f070";
 }
 
 .fa-facebook:before {
-  content: "";
+  content: "\f09a";
 }
 
 .fa-facebook-f:before {
-  content: "";
+  content: "\f39e";
 }
 
 .fa-facebook-messenger:before {
-  content: "";
+  content: "\f39f";
 }
 
 .fa-facebook-square:before {
-  content: "";
+  content: "\f082";
 }
 
 .fa-fast-backward:before {
-  content: "";
+  content: "\f049";
 }
 
 .fa-fast-forward:before {
-  content: "";
+  content: "\f050";
 }
 
 .fa-fax:before {
-  content: "";
+  content: "\f1ac";
 }
 
 .fa-feather:before {
-  content: "";
+  content: "\f52d";
 }
 
 .fa-feather-alt:before {
-  content: "";
+  content: "\f56b";
 }
 
 .fa-female:before {
-  content: "";
+  content: "\f182";
 }
 
 .fa-fighter-jet:before {
-  content: "";
+  content: "\f0fb";
 }
 
 .fa-file:before {
-  content: "";
+  content: "\f15b";
 }
 
 .fa-file-alt:before {
-  content: "";
+  content: "\f15c";
 }
 
 .fa-file-archive:before {
-  content: "";
+  content: "\f1c6";
 }
 
 .fa-file-audio:before {
-  content: "";
+  content: "\f1c7";
 }
 
 .fa-file-code:before {
-  content: "";
+  content: "\f1c9";
 }
 
 .fa-file-contract:before {
-  content: "";
+  content: "\f56c";
 }
 
 .fa-file-download:before {
-  content: "";
+  content: "\f56d";
 }
 
 .fa-file-excel:before {
-  content: "";
+  content: "\f1c3";
 }
 
 .fa-file-export:before {
-  content: "";
+  content: "\f56e";
 }
 
 .fa-file-image:before {
-  content: "";
+  content: "\f1c5";
 }
 
 .fa-file-import:before {
-  content: "";
+  content: "\f56f";
 }
 
 .fa-file-invoice:before {
-  content: "";
+  content: "\f570";
 }
 
 .fa-file-invoice-dollar:before {
-  content: "";
+  content: "\f571";
 }
 
 .fa-file-medical:before {
-  content: "";
+  content: "\f477";
 }
 
 .fa-file-medical-alt:before {
-  content: "";
+  content: "\f478";
 }
 
 .fa-file-pdf:before {
-  content: "";
+  content: "\f1c1";
 }
 
 .fa-file-powerpoint:before {
-  content: "";
+  content: "\f1c4";
 }
 
 .fa-file-prescription:before {
-  content: "";
+  content: "\f572";
 }
 
 .fa-file-signature:before {
-  content: "";
+  content: "\f573";
 }
 
 .fa-file-upload:before {
-  content: "";
+  content: "\f574";
 }
 
 .fa-file-video:before {
-  content: "";
+  content: "\f1c8";
 }
 
 .fa-file-word:before {
-  content: "";
+  content: "\f1c2";
 }
 
 .fa-fill:before {
-  content: "";
+  content: "\f575";
 }
 
 .fa-fill-drip:before {
-  content: "";
+  content: "\f576";
 }
 
 .fa-film:before {
-  content: "";
+  content: "\f008";
 }
 
 .fa-filter:before {
-  content: "";
+  content: "\f0b0";
 }
 
 .fa-fingerprint:before {
-  content: "";
+  content: "\f577";
 }
 
 .fa-fire:before {
-  content: "";
+  content: "\f06d";
 }
 
 .fa-fire-extinguisher:before {
-  content: "";
+  content: "\f134";
 }
 
 .fa-firefox:before {
-  content: "";
+  content: "\f269";
 }
 
 .fa-first-aid:before {
-  content: "";
+  content: "\f479";
 }
 
 .fa-first-order:before {
-  content: "";
+  content: "\f2b0";
 }
 
 .fa-first-order-alt:before {
-  content: "";
+  content: "\f50a";
 }
 
 .fa-firstdraft:before {
-  content: "";
+  content: "\f3a1";
 }
 
 .fa-fish:before {
-  content: "";
+  content: "\f578";
 }
 
 .fa-flag:before {
-  content: "";
+  content: "\f024";
 }
 
 .fa-flag-checkered:before {
-  content: "";
+  content: "\f11e";
 }
 
 .fa-flask:before {
-  content: "";
+  content: "\f0c3";
 }
 
 .fa-flickr:before {
-  content: "";
+  content: "\f16e";
 }
 
 .fa-flipboard:before {
-  content: "";
+  content: "\f44d";
 }
 
 .fa-flushed:before {
-  content: "";
+  content: "\f579";
 }
 
 .fa-fly:before {
-  content: "";
+  content: "\f417";
 }
 
 .fa-folder:before {
-  content: "";
+  content: "\f07b";
 }
 
 .fa-folder-minus:before {
-  content: "";
+  content: "\f65d";
 }
 
 .fa-folder-open:before {
-  content: "";
+  content: "\f07c";
 }
 
 .fa-folder-plus:before {
-  content: "";
+  content: "\f65e";
 }
 
 .fa-font:before {
-  content: "";
+  content: "\f031";
 }
 
 .fa-font-awesome:before {
-  content: "";
+  content: "\f2b4";
 }
 
 .fa-font-awesome-alt:before {
-  content: "";
+  content: "\f35c";
 }
 
 .fa-font-awesome-flag:before {
-  content: "";
+  content: "\f425";
 }
 
 .fa-font-awesome-logo-full:before {
-  content: "";
+  content: "\f4e6";
 }
 
 .fa-fonticons:before {
-  content: "";
+  content: "\f280";
 }
 
 .fa-fonticons-fi:before {
-  content: "";
+  content: "\f3a2";
 }
 
 .fa-football-ball:before {
-  content: "";
+  content: "\f44e";
 }
 
 .fa-fort-awesome:before {
-  content: "";
+  content: "\f286";
 }
 
 .fa-fort-awesome-alt:before {
-  content: "";
+  content: "\f3a3";
 }
 
 .fa-forumbee:before {
-  content: "";
+  content: "\f211";
 }
 
 .fa-forward:before {
-  content: "";
+  content: "\f04e";
 }
 
 .fa-foursquare:before {
-  content: "";
+  content: "\f180";
 }
 
 .fa-free-code-camp:before {
-  content: "";
+  content: "\f2c5";
 }
 
 .fa-freebsd:before {
-  content: "";
+  content: "\f3a4";
 }
 
 .fa-frog:before {
-  content: "";
+  content: "\f52e";
 }
 
 .fa-frown:before {
-  content: "";
+  content: "\f119";
 }
 
 .fa-frown-open:before {
-  content: "";
+  content: "\f57a";
 }
 
 .fa-fulcrum:before {
-  content: "";
+  content: "\f50b";
 }
 
 .fa-funnel-dollar:before {
-  content: "";
+  content: "\f662";
 }
 
 .fa-futbol:before {
-  content: "";
+  content: "\f1e3";
 }
 
 .fa-galactic-republic:before {
-  content: "";
+  content: "\f50c";
 }
 
 .fa-galactic-senate:before {
-  content: "";
+  content: "\f50d";
 }
 
 .fa-gamepad:before {
-  content: "";
+  content: "\f11b";
 }
 
 .fa-gas-pump:before {
-  content: "";
+  content: "\f52f";
 }
 
 .fa-gavel:before {
-  content: "";
+  content: "\f0e3";
 }
 
 .fa-gem:before {
-  content: "";
+  content: "\f3a5";
 }
 
 .fa-genderless:before {
-  content: "";
+  content: "\f22d";
 }
 
 .fa-get-pocket:before {
-  content: "";
+  content: "\f265";
 }
 
 .fa-gg:before {
-  content: "";
+  content: "\f260";
 }
 
 .fa-gg-circle:before {
-  content: "";
+  content: "\f261";
 }
 
 .fa-gift:before {
-  content: "";
+  content: "\f06b";
 }
 
 .fa-git:before {
-  content: "";
+  content: "\f1d3";
 }
 
 .fa-git-square:before {
-  content: "";
+  content: "\f1d2";
 }
 
 .fa-github:before {
-  content: "";
+  content: "\f09b";
 }
 
 .fa-github-alt:before {
-  content: "";
+  content: "\f113";
 }
 
 .fa-github-square:before {
-  content: "";
+  content: "\f092";
 }
 
 .fa-gitkraken:before {
-  content: "";
+  content: "\f3a6";
 }
 
 .fa-gitlab:before {
-  content: "";
+  content: "\f296";
 }
 
 .fa-gitter:before {
-  content: "";
+  content: "\f426";
 }
 
 .fa-glass-martini:before {
-  content: "";
+  content: "\f000";
 }
 
 .fa-glass-martini-alt:before {
-  content: "";
+  content: "\f57b";
 }
 
 .fa-glasses:before {
-  content: "";
+  content: "\f530";
 }
 
 .fa-glide:before {
-  content: "";
+  content: "\f2a5";
 }
 
 .fa-glide-g:before {
-  content: "";
+  content: "\f2a6";
 }
 
 .fa-globe:before {
-  content: "";
+  content: "\f0ac";
 }
 
 .fa-globe-africa:before {
-  content: "";
+  content: "\f57c";
 }
 
 .fa-globe-americas:before {
-  content: "";
+  content: "\f57d";
 }
 
 .fa-globe-asia:before {
-  content: "";
+  content: "\f57e";
 }
 
 .fa-gofore:before {
-  content: "";
+  content: "\f3a7";
 }
 
 .fa-golf-ball:before {
-  content: "";
+  content: "\f450";
 }
 
 .fa-goodreads:before {
-  content: "";
+  content: "\f3a8";
 }
 
 .fa-goodreads-g:before {
-  content: "";
+  content: "\f3a9";
 }
 
 .fa-google:before {
-  content: "";
+  content: "\f1a0";
 }
 
 .fa-google-drive:before {
-  content: "";
+  content: "\f3aa";
 }
 
 .fa-google-play:before {
-  content: "";
+  content: "\f3ab";
 }
 
 .fa-google-plus:before {
-  content: "";
+  content: "\f2b3";
 }
 
 .fa-google-plus-g:before {
-  content: "";
+  content: "\f0d5";
 }
 
 .fa-google-plus-square:before {
-  content: "";
+  content: "\f0d4";
 }
 
 .fa-google-wallet:before {
-  content: "";
+  content: "\f1ee";
 }
 
 .fa-gopuram:before {
-  content: "";
+  content: "\f664";
 }
 
 .fa-graduation-cap:before {
-  content: "";
+  content: "\f19d";
 }
 
 .fa-gratipay:before {
-  content: "";
+  content: "\f184";
 }
 
 .fa-grav:before {
-  content: "";
+  content: "\f2d6";
 }
 
 .fa-greater-than:before {
-  content: "";
+  content: "\f531";
 }
 
 .fa-greater-than-equal:before {
-  content: "";
+  content: "\f532";
 }
 
 .fa-grimace:before {
-  content: "";
+  content: "\f57f";
 }
 
 .fa-grin:before {
-  content: "";
+  content: "\f580";
 }
 
 .fa-grin-alt:before {
-  content: "";
+  content: "\f581";
 }
 
 .fa-grin-beam:before {
-  content: "";
+  content: "\f582";
 }
 
 .fa-grin-beam-sweat:before {
-  content: "";
+  content: "\f583";
 }
 
 .fa-grin-hearts:before {
-  content: "";
+  content: "\f584";
 }
 
 .fa-grin-squint:before {
-  content: "";
+  content: "\f585";
 }
 
 .fa-grin-squint-tears:before {
-  content: "";
+  content: "\f586";
 }
 
 .fa-grin-stars:before {
-  content: "";
+  content: "\f587";
 }
 
 .fa-grin-tears:before {
-  content: "";
+  content: "\f588";
 }
 
 .fa-grin-tongue:before {
-  content: "";
+  content: "\f589";
 }
 
 .fa-grin-tongue-squint:before {
-  content: "";
+  content: "\f58a";
 }
 
 .fa-grin-tongue-wink:before {
-  content: "";
+  content: "\f58b";
 }
 
 .fa-grin-wink:before {
-  content: "";
+  content: "\f58c";
 }
 
 .fa-grip-horizontal:before {
-  content: "";
+  content: "\f58d";
 }
 
 .fa-grip-vertical:before {
-  content: "";
+  content: "\f58e";
 }
 
 .fa-gripfire:before {
-  content: "";
+  content: "\f3ac";
 }
 
 .fa-grunt:before {
-  content: "";
+  content: "\f3ad";
 }
 
 .fa-gulp:before {
-  content: "";
+  content: "\f3ae";
 }
 
 .fa-h-square:before {
-  content: "";
+  content: "\f0fd";
 }
 
 .fa-hacker-news:before {
-  content: "";
+  content: "\f1d4";
 }
 
 .fa-hacker-news-square:before {
-  content: "";
+  content: "\f3af";
 }
 
 .fa-hackerrank:before {
-  content: "";
+  content: "\f5f7";
 }
 
 .fa-hamsa:before {
-  content: "";
+  content: "\f665";
 }
 
 .fa-hand-holding:before {
-  content: "";
+  content: "\f4bd";
 }
 
 .fa-hand-holding-heart:before {
-  content: "";
+  content: "\f4be";
 }
 
 .fa-hand-holding-usd:before {
-  content: "";
+  content: "\f4c0";
 }
 
 .fa-hand-lizard:before {
-  content: "";
+  content: "\f258";
 }
 
 .fa-hand-paper:before {
-  content: "";
+  content: "\f256";
 }
 
 .fa-hand-peace:before {
-  content: "";
+  content: "\f25b";
 }
 
 .fa-hand-point-down:before {
-  content: "";
+  content: "\f0a7";
 }
 
 .fa-hand-point-left:before {
-  content: "";
+  content: "\f0a5";
 }
 
 .fa-hand-point-right:before {
-  content: "";
+  content: "\f0a4";
 }
 
 .fa-hand-point-up:before {
-  content: "";
+  content: "\f0a6";
 }
 
 .fa-hand-pointer:before {
-  content: "";
+  content: "\f25a";
 }
 
 .fa-hand-rock:before {
-  content: "";
+  content: "\f255";
 }
 
 .fa-hand-scissors:before {
-  content: "";
+  content: "\f257";
 }
 
 .fa-hand-spock:before {
-  content: "";
+  content: "\f259";
 }
 
 .fa-hands:before {
-  content: "";
+  content: "\f4c2";
 }
 
 .fa-hands-helping:before {
-  content: "";
+  content: "\f4c4";
 }
 
 .fa-handshake:before {
-  content: "";
+  content: "\f2b5";
 }
 
 .fa-hashtag:before {
-  content: "";
+  content: "\f292";
 }
 
 .fa-haykal:before {
-  content: "";
+  content: "\f666";
 }
 
 .fa-hdd:before {
-  content: "";
+  content: "\f0a0";
 }
 
 .fa-heading:before {
-  content: "";
+  content: "\f1dc";
 }
 
 .fa-headphones:before {
-  content: "";
+  content: "\f025";
 }
 
 .fa-headphones-alt:before {
-  content: "";
+  content: "\f58f";
 }
 
 .fa-headset:before {
-  content: "";
+  content: "\f590";
 }
 
 .fa-heart:before {
-  content: "";
+  content: "\f004";
 }
 
 .fa-heartbeat:before {
-  content: "";
+  content: "\f21e";
 }
 
 .fa-helicopter:before {
-  content: "";
+  content: "\f533";
 }
 
 .fa-highlighter:before {
-  content: "";
+  content: "\f591";
 }
 
 .fa-hips:before {
-  content: "";
+  content: "\f452";
 }
 
 .fa-hire-a-helper:before {
-  content: "";
+  content: "\f3b0";
 }
 
 .fa-history:before {
-  content: "";
+  content: "\f1da";
 }
 
 .fa-hockey-puck:before {
-  content: "";
+  content: "\f453";
 }
 
 .fa-home:before {
-  content: "";
+  content: "\f015";
 }
 
 .fa-hooli:before {
-  content: "";
+  content: "\f427";
 }
 
 .fa-hornbill:before {
-  content: "";
+  content: "\f592";
 }
 
 .fa-hospital:before {
-  content: "";
+  content: "\f0f8";
 }
 
 .fa-hospital-alt:before {
-  content: "";
+  content: "\f47d";
 }
 
 .fa-hospital-symbol:before {
-  content: "";
+  content: "\f47e";
 }
 
 .fa-hot-tub:before {
-  content: "";
+  content: "\f593";
 }
 
 .fa-hotel:before {
-  content: "";
+  content: "\f594";
 }
 
 .fa-hotjar:before {
-  content: "";
+  content: "\f3b1";
 }
 
 .fa-hourglass:before {
-  content: "";
+  content: "\f254";
 }
 
 .fa-hourglass-end:before {
-  content: "";
+  content: "\f253";
 }
 
 .fa-hourglass-half:before {
-  content: "";
+  content: "\f252";
 }
 
 .fa-hourglass-start:before {
-  content: "";
+  content: "\f251";
 }
 
 .fa-houzz:before {
-  content: "";
+  content: "\f27c";
 }
 
 .fa-html5:before {
-  content: "";
+  content: "\f13b";
 }
 
 .fa-hubspot:before {
-  content: "";
+  content: "\f3b2";
 }
 
 .fa-i-cursor:before {
-  content: "";
+  content: "\f246";
 }
 
 .fa-id-badge:before {
-  content: "";
+  content: "\f2c1";
 }
 
 .fa-id-card:before {
-  content: "";
+  content: "\f2c2";
 }
 
 .fa-id-card-alt:before {
-  content: "";
+  content: "\f47f";
 }
 
 .fa-image:before {
-  content: "";
+  content: "\f03e";
 }
 
 .fa-images:before {
-  content: "";
+  content: "\f302";
 }
 
 .fa-imdb:before {
-  content: "";
+  content: "\f2d8";
 }
 
 .fa-inbox:before {
-  content: "";
+  content: "\f01c";
 }
 
 .fa-indent:before {
-  content: "";
+  content: "\f03c";
 }
 
 .fa-industry:before {
-  content: "";
+  content: "\f275";
 }
 
 .fa-infinity:before {
-  content: "";
+  content: "\f534";
 }
 
 .fa-info:before {
-  content: "";
+  content: "\f129";
 }
 
 .fa-info-circle:before {
-  content: "";
+  content: "\f05a";
 }
 
 .fa-instagram:before {
-  content: "";
+  content: "\f16d";
 }
 
 .fa-internet-explorer:before {
-  content: "";
+  content: "\f26b";
 }
 
 .fa-ioxhost:before {
-  content: "";
+  content: "\f208";
 }
 
 .fa-italic:before {
-  content: "";
+  content: "\f033";
 }
 
 .fa-itunes:before {
-  content: "";
+  content: "\f3b4";
 }
 
 .fa-itunes-note:before {
-  content: "";
+  content: "\f3b5";
 }
 
 .fa-java:before {
-  content: "";
+  content: "\f4e4";
 }
 
 .fa-jedi:before {
-  content: "";
+  content: "\f669";
 }
 
 .fa-jedi-order:before {
-  content: "";
+  content: "\f50e";
 }
 
 .fa-jenkins:before {
-  content: "";
+  content: "\f3b6";
 }
 
 .fa-joget:before {
-  content: "";
+  content: "\f3b7";
 }
 
 .fa-joint:before {
-  content: "";
+  content: "\f595";
 }
 
 .fa-joomla:before {
-  content: "";
+  content: "\f1aa";
 }
 
 .fa-journal-whills:before {
-  content: "";
+  content: "\f66a";
 }
 
 .fa-js:before {
-  content: "";
+  content: "\f3b8";
 }
 
 .fa-js-square:before {
-  content: "";
+  content: "\f3b9";
 }
 
 .fa-jsfiddle:before {
-  content: "";
+  content: "\f1cc";
 }
 
 .fa-kaaba:before {
-  content: "";
+  content: "\f66b";
 }
 
 .fa-kaggle:before {
-  content: "";
+  content: "\f5fa";
 }
 
 .fa-key:before {
-  content: "";
+  content: "\f084";
 }
 
 .fa-keybase:before {
-  content: "";
+  content: "\f4f5";
 }
 
 .fa-keyboard:before {
-  content: "";
+  content: "\f11c";
 }
 
 .fa-keycdn:before {
-  content: "";
+  content: "\f3ba";
 }
 
 .fa-khanda:before {
-  content: "";
+  content: "\f66d";
 }
 
 .fa-kickstarter:before {
-  content: "";
+  content: "\f3bb";
 }
 
 .fa-kickstarter-k:before {
-  content: "";
+  content: "\f3bc";
 }
 
 .fa-kiss:before {
-  content: "";
+  content: "\f596";
 }
 
 .fa-kiss-beam:before {
-  content: "";
+  content: "\f597";
 }
 
 .fa-kiss-wink-heart:before {
-  content: "";
+  content: "\f598";
 }
 
 .fa-kiwi-bird:before {
-  content: "";
+  content: "\f535";
 }
 
 .fa-korvue:before {
-  content: "";
+  content: "\f42f";
 }
 
 .fa-landmark:before {
-  content: "";
+  content: "\f66f";
 }
 
 .fa-language:before {
-  content: "";
+  content: "\f1ab";
 }
 
 .fa-laptop:before {
-  content: "";
+  content: "\f109";
 }
 
 .fa-laptop-code:before {
-  content: "";
+  content: "\f5fc";
 }
 
 .fa-laravel:before {
-  content: "";
+  content: "\f3bd";
 }
 
 .fa-lastfm:before {
-  content: "";
+  content: "\f202";
 }
 
 .fa-lastfm-square:before {
-  content: "";
+  content: "\f203";
 }
 
 .fa-laugh:before {
-  content: "";
+  content: "\f599";
 }
 
 .fa-laugh-beam:before {
-  content: "";
+  content: "\f59a";
 }
 
 .fa-laugh-squint:before {
-  content: "";
+  content: "\f59b";
 }
 
 .fa-laugh-wink:before {
-  content: "";
+  content: "\f59c";
 }
 
 .fa-layer-group:before {
-  content: "";
+  content: "\f5fd";
 }
 
 .fa-leaf:before {
-  content: "";
+  content: "\f06c";
 }
 
 .fa-leanpub:before {
-  content: "";
+  content: "\f212";
 }
 
 .fa-lemon:before {
-  content: "";
+  content: "\f094";
 }
 
 .fa-less:before {
-  content: "";
+  content: "\f41d";
 }
 
 .fa-less-than:before {
-  content: "";
+  content: "\f536";
 }
 
 .fa-less-than-equal:before {
-  content: "";
+  content: "\f537";
 }
 
 .fa-level-down-alt:before {
-  content: "";
+  content: "\f3be";
 }
 
 .fa-level-up-alt:before {
-  content: "";
+  content: "\f3bf";
 }
 
 .fa-life-ring:before {
-  content: "";
+  content: "\f1cd";
 }
 
 .fa-lightbulb:before {
-  content: "";
+  content: "\f0eb";
 }
 
 .fa-line:before {
-  content: "";
+  content: "\f3c0";
 }
 
 .fa-link:before {
-  content: "";
+  content: "\f0c1";
 }
 
 .fa-linkedin:before {
-  content: "";
+  content: "\f08c";
 }
 
 .fa-linkedin-in:before {
-  content: "";
+  content: "\f0e1";
 }
 
 .fa-linode:before {
-  content: "";
+  content: "\f2b8";
 }
 
 .fa-linux:before {
-  content: "";
+  content: "\f17c";
 }
 
 .fa-lira-sign:before {
-  content: "";
+  content: "\f195";
 }
 
 .fa-list:before {
-  content: "";
+  content: "\f03a";
 }
 
 .fa-list-alt:before {
-  content: "";
+  content: "\f022";
 }
 
 .fa-list-ol:before {
-  content: "";
+  content: "\f0cb";
 }
 
 .fa-list-ul:before {
-  content: "";
+  content: "\f0ca";
 }
 
 .fa-location-arrow:before {
-  content: "";
+  content: "\f124";
 }
 
 .fa-lock:before {
-  content: "";
+  content: "\f023";
 }
 
 .fa-lock-open:before {
-  content: "";
+  content: "\f3c1";
 }
 
 .fa-long-arrow-alt-down:before {
-  content: "";
+  content: "\f309";
 }
 
 .fa-long-arrow-alt-left:before {
-  content: "";
+  content: "\f30a";
 }
 
 .fa-long-arrow-alt-right:before {
-  content: "";
+  content: "\f30b";
 }
 
 .fa-long-arrow-alt-up:before {
-  content: "";
+  content: "\f30c";
 }
 
 .fa-low-vision:before {
-  content: "";
+  content: "\f2a8";
 }
 
 .fa-luggage-cart:before {
-  content: "";
+  content: "\f59d";
 }
 
 .fa-lyft:before {
-  content: "";
+  content: "\f3c3";
 }
 
 .fa-magento:before {
-  content: "";
+  content: "\f3c4";
 }
 
 .fa-magic:before {
-  content: "";
+  content: "\f0d0";
 }
 
 .fa-magnet:before {
-  content: "";
+  content: "\f076";
 }
 
 .fa-mail-bulk:before {
-  content: "";
+  content: "\f674";
 }
 
 .fa-mailchimp:before {
-  content: "";
+  content: "\f59e";
 }
 
 .fa-male:before {
-  content: "";
+  content: "\f183";
 }
 
 .fa-mandalorian:before {
-  content: "";
+  content: "\f50f";
 }
 
 .fa-map:before {
-  content: "";
+  content: "\f279";
 }
 
 .fa-map-marked:before {
-  content: "";
+  content: "\f59f";
 }
 
 .fa-map-marked-alt:before {
-  content: "";
+  content: "\f5a0";
 }
 
 .fa-map-marker:before {
-  content: "";
+  content: "\f041";
 }
 
 .fa-map-marker-alt:before {
-  content: "";
+  content: "\f3c5";
 }
 
 .fa-map-pin:before {
-  content: "";
+  content: "\f276";
 }
 
 .fa-map-signs:before {
-  content: "";
+  content: "\f277";
 }
 
 .fa-markdown:before {
-  content: "";
+  content: "\f60f";
 }
 
 .fa-marker:before {
-  content: "";
+  content: "\f5a1";
 }
 
 .fa-mars:before {
-  content: "";
+  content: "\f222";
 }
 
 .fa-mars-double:before {
-  content: "";
+  content: "\f227";
 }
 
 .fa-mars-stroke:before {
-  content: "";
+  content: "\f229";
 }
 
 .fa-mars-stroke-h:before {
-  content: "";
+  content: "\f22b";
 }
 
 .fa-mars-stroke-v:before {
-  content: "";
+  content: "\f22a";
 }
 
 .fa-mastodon:before {
-  content: "";
+  content: "\f4f6";
 }
 
 .fa-maxcdn:before {
-  content: "";
+  content: "\f136";
 }
 
 .fa-medal:before {
-  content: "";
+  content: "\f5a2";
 }
 
 .fa-medapps:before {
-  content: "";
+  content: "\f3c6";
 }
 
 .fa-medium:before {
-  content: "";
+  content: "\f23a";
 }
 
 .fa-medium-m:before {
-  content: "";
+  content: "\f3c7";
 }
 
 .fa-medkit:before {
-  content: "";
+  content: "\f0fa";
 }
 
 .fa-medrt:before {
-  content: "";
+  content: "\f3c8";
 }
 
 .fa-meetup:before {
-  content: "";
+  content: "\f2e0";
 }
 
 .fa-megaport:before {
-  content: "";
+  content: "\f5a3";
 }
 
 .fa-meh:before {
-  content: "";
+  content: "\f11a";
 }
 
 .fa-meh-blank:before {
-  content: "";
+  content: "\f5a4";
 }
 
 .fa-meh-rolling-eyes:before {
-  content: "";
+  content: "\f5a5";
 }
 
 .fa-memory:before {
-  content: "";
+  content: "\f538";
 }
 
 .fa-menorah:before {
-  content: "";
+  content: "\f676";
 }
 
 .fa-mercury:before {
-  content: "";
+  content: "\f223";
 }
 
 .fa-microchip:before {
-  content: "";
+  content: "\f2db";
 }
 
 .fa-microphone:before {
-  content: "";
+  content: "\f130";
 }
 
 .fa-microphone-alt:before {
-  content: "";
+  content: "\f3c9";
 }
 
 .fa-microphone-alt-slash:before {
-  content: "";
+  content: "\f539";
 }
 
 .fa-microphone-slash:before {
-  content: "";
+  content: "\f131";
 }
 
 .fa-microscope:before {
-  content: "";
+  content: "\f610";
 }
 
 .fa-microsoft:before {
-  content: "";
+  content: "\f3ca";
 }
 
 .fa-minus:before {
-  content: "";
+  content: "\f068";
 }
 
 .fa-minus-circle:before {
-  content: "";
+  content: "\f056";
 }
 
 .fa-minus-square:before {
-  content: "";
+  content: "\f146";
 }
 
 .fa-mix:before {
-  content: "";
+  content: "\f3cb";
 }
 
 .fa-mixcloud:before {
-  content: "";
+  content: "\f289";
 }
 
 .fa-mizuni:before {
-  content: "";
+  content: "\f3cc";
 }
 
 .fa-mobile:before {
-  content: "";
+  content: "\f10b";
 }
 
 .fa-mobile-alt:before {
-  content: "";
+  content: "\f3cd";
 }
 
 .fa-modx:before {
-  content: "";
+  content: "\f285";
 }
 
 .fa-monero:before {
-  content: "";
+  content: "\f3d0";
 }
 
 .fa-money-bill:before {
-  content: "";
+  content: "\f0d6";
 }
 
 .fa-money-bill-alt:before {
-  content: "";
+  content: "\f3d1";
 }
 
 .fa-money-bill-wave:before {
-  content: "";
+  content: "\f53a";
 }
 
 .fa-money-bill-wave-alt:before {
-  content: "";
+  content: "\f53b";
 }
 
 .fa-money-check:before {
-  content: "";
+  content: "\f53c";
 }
 
 .fa-money-check-alt:before {
-  content: "";
+  content: "\f53d";
 }
 
 .fa-monument:before {
-  content: "";
+  content: "\f5a6";
 }
 
 .fa-moon:before {
-  content: "";
+  content: "\f186";
 }
 
 .fa-mortar-pestle:before {
-  content: "";
+  content: "\f5a7";
 }
 
 .fa-mosque:before {
-  content: "";
+  content: "\f678";
 }
 
 .fa-motorcycle:before {
-  content: "";
+  content: "\f21c";
 }
 
 .fa-mouse-pointer:before {
-  content: "";
+  content: "\f245";
 }
 
 .fa-music:before {
-  content: "";
+  content: "\f001";
 }
 
 .fa-napster:before {
-  content: "";
+  content: "\f3d2";
 }
 
 .fa-neos:before {
-  content: "";
+  content: "\f612";
 }
 
 .fa-neuter:before {
-  content: "";
+  content: "\f22c";
 }
 
 .fa-newspaper:before {
-  content: "";
+  content: "\f1ea";
 }
 
 .fa-nimblr:before {
-  content: "";
+  content: "\f5a8";
 }
 
 .fa-nintendo-switch:before {
-  content: "";
+  content: "\f418";
 }
 
 .fa-node:before {
-  content: "";
+  content: "\f419";
 }
 
 .fa-node-js:before {
-  content: "";
+  content: "\f3d3";
 }
 
 .fa-not-equal:before {
-  content: "";
+  content: "\f53e";
 }
 
 .fa-notes-medical:before {
-  content: "";
+  content: "\f481";
 }
 
 .fa-npm:before {
-  content: "";
+  content: "\f3d4";
 }
 
 .fa-ns8:before {
-  content: "";
+  content: "\f3d5";
 }
 
 .fa-nutritionix:before {
-  content: "";
+  content: "\f3d6";
 }
 
 .fa-object-group:before {
-  content: "";
+  content: "\f247";
 }
 
 .fa-object-ungroup:before {
-  content: "";
+  content: "\f248";
 }
 
 .fa-odnoklassniki:before {
-  content: "";
+  content: "\f263";
 }
 
 .fa-odnoklassniki-square:before {
-  content: "";
+  content: "\f264";
 }
 
 .fa-oil-can:before {
-  content: "";
+  content: "\f613";
 }
 
 .fa-old-republic:before {
-  content: "";
+  content: "\f510";
 }
 
 .fa-om:before {
-  content: "";
+  content: "\f679";
 }
 
 .fa-opencart:before {
-  content: "";
+  content: "\f23d";
 }
 
 .fa-openid:before {
-  content: "";
+  content: "\f19b";
 }
 
 .fa-opera:before {
-  content: "";
+  content: "\f26a";
 }
 
 .fa-optin-monster:before {
-  content: "";
+  content: "\f23c";
 }
 
 .fa-osi:before {
-  content: "";
+  content: "\f41a";
 }
 
 .fa-outdent:before {
-  content: "";
+  content: "\f03b";
 }
 
 .fa-page4:before {
-  content: "";
+  content: "\f3d7";
 }
 
 .fa-pagelines:before {
-  content: "";
+  content: "\f18c";
 }
 
 .fa-paint-brush:before {
-  content: "";
+  content: "\f1fc";
 }
 
 .fa-paint-roller:before {
-  content: "";
+  content: "\f5aa";
 }
 
 .fa-palette:before {
-  content: "";
+  content: "\f53f";
 }
 
 .fa-palfed:before {
-  content: "";
+  content: "\f3d8";
 }
 
 .fa-pallet:before {
-  content: "";
+  content: "\f482";
 }
 
 .fa-paper-plane:before {
-  content: "";
+  content: "\f1d8";
 }
 
 .fa-paperclip:before {
-  content: "";
+  content: "\f0c6";
 }
 
 .fa-parachute-box:before {
-  content: "";
+  content: "\f4cd";
 }
 
 .fa-paragraph:before {
-  content: "";
+  content: "\f1dd";
 }
 
 .fa-parking:before {
-  content: "";
+  content: "\f540";
 }
 
 .fa-passport:before {
-  content: "";
+  content: "\f5ab";
 }
 
 .fa-pastafarianism:before {
-  content: "";
+  content: "\f67b";
 }
 
 .fa-paste:before {
-  content: "";
+  content: "\f0ea";
 }
 
 .fa-patreon:before {
-  content: "";
+  content: "\f3d9";
 }
 
 .fa-pause:before {
-  content: "";
+  content: "\f04c";
 }
 
 .fa-pause-circle:before {
-  content: "";
+  content: "\f28b";
 }
 
 .fa-paw:before {
-  content: "";
+  content: "\f1b0";
 }
 
 .fa-paypal:before {
-  content: "";
+  content: "\f1ed";
 }
 
 .fa-peace:before {
-  content: "";
+  content: "\f67c";
 }
 
 .fa-pen:before {
-  content: "";
+  content: "\f304";
 }
 
 .fa-pen-alt:before {
-  content: "";
+  content: "\f305";
 }
 
 .fa-pen-fancy:before {
-  content: "";
+  content: "\f5ac";
 }
 
 .fa-pen-nib:before {
-  content: "";
+  content: "\f5ad";
 }
 
 .fa-pen-square:before {
-  content: "";
+  content: "\f14b";
 }
 
 .fa-pencil-alt:before {
-  content: "";
+  content: "\f303";
 }
 
 .fa-pencil-ruler:before {
-  content: "";
+  content: "\f5ae";
 }
 
 .fa-people-carry:before {
-  content: "";
+  content: "\f4ce";
 }
 
 .fa-percent:before {
-  content: "";
+  content: "\f295";
 }
 
 .fa-percentage:before {
-  content: "";
+  content: "\f541";
 }
 
 .fa-periscope:before {
-  content: "";
+  content: "\f3da";
 }
 
 .fa-phabricator:before {
-  content: "";
+  content: "\f3db";
 }
 
 .fa-phoenix-framework:before {
-  content: "";
+  content: "\f3dc";
 }
 
 .fa-phoenix-squadron:before {
-  content: "";
+  content: "\f511";
 }
 
 .fa-phone:before {
-  content: "";
+  content: "\f095";
 }
 
 .fa-phone-slash:before {
-  content: "";
+  content: "\f3dd";
 }
 
 .fa-phone-square:before {
-  content: "";
+  content: "\f098";
 }
 
 .fa-phone-volume:before {
-  content: "";
+  content: "\f2a0";
 }
 
 .fa-php:before {
-  content: "";
+  content: "\f457";
 }
 
 .fa-pied-piper:before {
-  content: "";
+  content: "\f2ae";
 }
 
 .fa-pied-piper-alt:before {
-  content: "";
+  content: "\f1a8";
 }
 
 .fa-pied-piper-hat:before {
-  content: "";
+  content: "\f4e5";
 }
 
 .fa-pied-piper-pp:before {
-  content: "";
+  content: "\f1a7";
 }
 
 .fa-piggy-bank:before {
-  content: "";
+  content: "\f4d3";
 }
 
 .fa-pills:before {
-  content: "";
+  content: "\f484";
 }
 
 .fa-pinterest:before {
-  content: "";
+  content: "\f0d2";
 }
 
 .fa-pinterest-p:before {
-  content: "";
+  content: "\f231";
 }
 
 .fa-pinterest-square:before {
-  content: "";
+  content: "\f0d3";
 }
 
 .fa-place-of-worship:before {
-  content: "";
+  content: "\f67f";
 }
 
 .fa-plane:before {
-  content: "";
+  content: "\f072";
 }
 
 .fa-plane-arrival:before {
-  content: "";
+  content: "\f5af";
 }
 
 .fa-plane-departure:before {
-  content: "";
+  content: "\f5b0";
 }
 
 .fa-play:before {
-  content: "";
+  content: "\f04b";
 }
 
 .fa-play-circle:before {
-  content: "";
+  content: "\f144";
 }
 
 .fa-playstation:before {
-  content: "";
+  content: "\f3df";
 }
 
 .fa-plug:before {
-  content: "";
+  content: "\f1e6";
 }
 
 .fa-plus:before {
-  content: "";
+  content: "\f067";
 }
 
 .fa-plus-circle:before {
-  content: "";
+  content: "\f055";
 }
 
 .fa-plus-square:before {
-  content: "";
+  content: "\f0fe";
 }
 
 .fa-podcast:before {
-  content: "";
+  content: "\f2ce";
 }
 
 .fa-poll:before {
-  content: "";
+  content: "\f681";
 }
 
 .fa-poll-h:before {
-  content: "";
+  content: "\f682";
 }
 
 .fa-poo:before {
-  content: "";
+  content: "\f2fe";
 }
 
 .fa-poop:before {
-  content: "";
+  content: "\f619";
 }
 
 .fa-portrait:before {
-  content: "";
+  content: "\f3e0";
 }
 
 .fa-pound-sign:before {
-  content: "";
+  content: "\f154";
 }
 
 .fa-power-off:before {
-  content: "";
+  content: "\f011";
 }
 
 .fa-pray:before {
-  content: "";
+  content: "\f683";
 }
 
 .fa-praying-hands:before {
-  content: "";
+  content: "\f684";
 }
 
 .fa-prescription:before {
-  content: "";
+  content: "\f5b1";
 }
 
 .fa-prescription-bottle:before {
-  content: "";
+  content: "\f485";
 }
 
 .fa-prescription-bottle-alt:before {
-  content: "";
+  content: "\f486";
 }
 
 .fa-print:before {
-  content: "";
+  content: "\f02f";
 }
 
 .fa-procedures:before {
-  content: "";
+  content: "\f487";
 }
 
 .fa-product-hunt:before {
-  content: "";
+  content: "\f288";
 }
 
 .fa-project-diagram:before {
-  content: "";
+  content: "\f542";
 }
 
 .fa-pushed:before {
-  content: "";
+  content: "\f3e1";
 }
 
 .fa-puzzle-piece:before {
-  content: "";
+  content: "\f12e";
 }
 
 .fa-python:before {
-  content: "";
+  content: "\f3e2";
 }
 
 .fa-qq:before {
-  content: "";
+  content: "\f1d6";
 }
 
 .fa-qrcode:before {
-  content: "";
+  content: "\f029";
 }
 
 .fa-question:before {
-  content: "";
+  content: "\f128";
 }
 
 .fa-question-circle:before {
-  content: "";
+  content: "\f059";
 }
 
 .fa-quidditch:before {
-  content: "";
+  content: "\f458";
 }
 
 .fa-quinscape:before {
-  content: "";
+  content: "\f459";
 }
 
 .fa-quora:before {
-  content: "";
+  content: "\f2c4";
 }
 
 .fa-quote-left:before {
-  content: "";
+  content: "\f10d";
 }
 
 .fa-quote-right:before {
-  content: "";
+  content: "\f10e";
 }
 
 .fa-quran:before {
-  content: "";
+  content: "\f687";
 }
 
 .fa-r-project:before {
-  content: "";
+  content: "\f4f7";
 }
 
 .fa-random:before {
-  content: "";
+  content: "\f074";
 }
 
 .fa-ravelry:before {
-  content: "";
+  content: "\f2d9";
 }
 
 .fa-react:before {
-  content: "";
+  content: "\f41b";
 }
 
 .fa-readme:before {
-  content: "";
+  content: "\f4d5";
 }
 
 .fa-rebel:before {
-  content: "";
+  content: "\f1d0";
 }
 
 .fa-receipt:before {
-  content: "";
+  content: "\f543";
 }
 
 .fa-recycle:before {
-  content: "";
+  content: "\f1b8";
 }
 
 .fa-red-river:before {
-  content: "";
+  content: "\f3e3";
 }
 
 .fa-reddit:before {
-  content: "";
+  content: "\f1a1";
 }
 
 .fa-reddit-alien:before {
-  content: "";
+  content: "\f281";
 }
 
 .fa-reddit-square:before {
-  content: "";
+  content: "\f1a2";
 }
 
 .fa-redo:before {
-  content: "";
+  content: "\f01e";
 }
 
 .fa-redo-alt:before {
-  content: "";
+  content: "\f2f9";
 }
 
 .fa-registered:before {
-  content: "";
+  content: "\f25d";
 }
 
 .fa-rendact:before {
-  content: "";
+  content: "\f3e4";
 }
 
 .fa-renren:before {
-  content: "";
+  content: "\f18b";
 }
 
 .fa-reply:before {
-  content: "";
+  content: "\f3e5";
 }
 
 .fa-reply-all:before {
-  content: "";
+  content: "\f122";
 }
 
 .fa-replyd:before {
-  content: "";
+  content: "\f3e6";
 }
 
 .fa-researchgate:before {
-  content: "";
+  content: "\f4f8";
 }
 
 .fa-resolving:before {
-  content: "";
+  content: "\f3e7";
 }
 
 .fa-retweet:before {
-  content: "";
+  content: "\f079";
 }
 
 .fa-rev:before {
-  content: "";
+  content: "\f5b2";
 }
 
 .fa-ribbon:before {
-  content: "";
+  content: "\f4d6";
 }
 
 .fa-road:before {
-  content: "";
+  content: "\f018";
 }
 
 .fa-robot:before {
-  content: "";
+  content: "\f544";
 }
 
 .fa-rocket:before {
-  content: "";
+  content: "\f135";
 }
 
 .fa-rocketchat:before {
-  content: "";
+  content: "\f3e8";
 }
 
 .fa-rockrms:before {
-  content: "";
+  content: "\f3e9";
 }
 
 .fa-route:before {
-  content: "";
+  content: "\f4d7";
 }
 
 .fa-rss:before {
-  content: "";
+  content: "\f09e";
 }
 
 .fa-rss-square:before {
-  content: "";
+  content: "\f143";
 }
 
 .fa-ruble-sign:before {
-  content: "";
+  content: "\f158";
 }
 
 .fa-ruler:before {
-  content: "";
+  content: "\f545";
 }
 
 .fa-ruler-combined:before {
-  content: "";
+  content: "\f546";
 }
 
 .fa-ruler-horizontal:before {
-  content: "";
+  content: "\f547";
 }
 
 .fa-ruler-vertical:before {
-  content: "";
+  content: "\f548";
 }
 
 .fa-rupee-sign:before {
-  content: "";
+  content: "\f156";
 }
 
 .fa-sad-cry:before {
-  content: "";
+  content: "\f5b3";
 }
 
 .fa-sad-tear:before {
-  content: "";
+  content: "\f5b4";
 }
 
 .fa-safari:before {
-  content: "";
+  content: "\f267";
 }
 
 .fa-sass:before {
-  content: "";
+  content: "\f41e";
 }
 
 .fa-save:before {
-  content: "";
+  content: "\f0c7";
 }
 
 .fa-schlix:before {
-  content: "";
+  content: "\f3ea";
 }
 
 .fa-school:before {
-  content: "";
+  content: "\f549";
 }
 
 .fa-screwdriver:before {
-  content: "";
+  content: "\f54a";
 }
 
 .fa-scribd:before {
-  content: "";
+  content: "\f28a";
 }
 
 .fa-search:before {
-  content: "";
+  content: "\f002";
 }
 
 .fa-search-dollar:before {
-  content: "";
+  content: "\f688";
 }
 
 .fa-search-location:before {
-  content: "";
+  content: "\f689";
 }
 
 .fa-search-minus:before {
-  content: "";
+  content: "\f010";
 }
 
 .fa-search-plus:before {
-  content: "";
+  content: "\f00e";
 }
 
 .fa-searchengin:before {
-  content: "";
+  content: "\f3eb";
 }
 
 .fa-seedling:before {
-  content: "";
+  content: "\f4d8";
 }
 
 .fa-sellcast:before {
-  content: "";
+  content: "\f2da";
 }
 
 .fa-sellsy:before {
-  content: "";
+  content: "\f213";
 }
 
 .fa-server:before {
-  content: "";
+  content: "\f233";
 }
 
 .fa-servicestack:before {
-  content: "";
+  content: "\f3ec";
 }
 
 .fa-shapes:before {
-  content: "";
+  content: "\f61f";
 }
 
 .fa-share:before {
-  content: "";
+  content: "\f064";
 }
 
 .fa-share-alt:before {
-  content: "";
+  content: "\f1e0";
 }
 
 .fa-share-alt-square:before {
-  content: "";
+  content: "\f1e1";
 }
 
 .fa-share-square:before {
-  content: "";
+  content: "\f14d";
 }
 
 .fa-shekel-sign:before {
-  content: "";
+  content: "\f20b";
 }
 
 .fa-shield-alt:before {
-  content: "";
+  content: "\f3ed";
 }
 
 .fa-ship:before {
-  content: "";
+  content: "\f21a";
 }
 
 .fa-shipping-fast:before {
-  content: "";
+  content: "\f48b";
 }
 
 .fa-shirtsinbulk:before {
-  content: "";
+  content: "\f214";
 }
 
 .fa-shoe-prints:before {
-  content: "";
+  content: "\f54b";
 }
 
 .fa-shopping-bag:before {
-  content: "";
+  content: "\f290";
 }
 
 .fa-shopping-basket:before {
-  content: "";
+  content: "\f291";
 }
 
 .fa-shopping-cart:before {
-  content: "";
+  content: "\f07a";
 }
 
 .fa-shopware:before {
-  content: "";
+  content: "\f5b5";
 }
 
 .fa-shower:before {
-  content: "";
+  content: "\f2cc";
 }
 
 .fa-shuttle-van:before {
-  content: "";
+  content: "\f5b6";
 }
 
 .fa-sign:before {
-  content: "";
+  content: "\f4d9";
 }
 
 .fa-sign-in-alt:before {
-  content: "";
+  content: "\f2f6";
 }
 
 .fa-sign-language:before {
-  content: "";
+  content: "\f2a7";
 }
 
 .fa-sign-out-alt:before {
-  content: "";
+  content: "\f2f5";
 }
 
 .fa-signal:before {
-  content: "";
+  content: "\f012";
 }
 
 .fa-signature:before {
-  content: "";
+  content: "\f5b7";
 }
 
 .fa-simplybuilt:before {
-  content: "";
+  content: "\f215";
 }
 
 .fa-sistrix:before {
-  content: "";
+  content: "\f3ee";
 }
 
 .fa-sitemap:before {
-  content: "";
+  content: "\f0e8";
 }
 
 .fa-sith:before {
-  content: "";
+  content: "\f512";
 }
 
 .fa-skull:before {
-  content: "";
+  content: "\f54c";
 }
 
 .fa-skyatlas:before {
-  content: "";
+  content: "\f216";
 }
 
 .fa-skype:before {
-  content: "";
+  content: "\f17e";
 }
 
 .fa-slack:before {
-  content: "";
+  content: "\f198";
 }
 
 .fa-slack-hash:before {
-  content: "";
+  content: "\f3ef";
 }
 
 .fa-sliders-h:before {
-  content: "";
+  content: "\f1de";
 }
 
 .fa-slideshare:before {
-  content: "";
+  content: "\f1e7";
 }
 
 .fa-smile:before {
-  content: "";
+  content: "\f118";
 }
 
 .fa-smile-beam:before {
-  content: "";
+  content: "\f5b8";
 }
 
 .fa-smile-wink:before {
-  content: "";
+  content: "\f4da";
 }
 
 .fa-smoking:before {
-  content: "";
+  content: "\f48d";
 }
 
 .fa-smoking-ban:before {
-  content: "";
+  content: "\f54d";
 }
 
 .fa-snapchat:before {
-  content: "";
+  content: "\f2ab";
 }
 
 .fa-snapchat-ghost:before {
-  content: "";
+  content: "\f2ac";
 }
 
 .fa-snapchat-square:before {
-  content: "";
+  content: "\f2ad";
 }
 
 .fa-snowflake:before {
-  content: "";
+  content: "\f2dc";
 }
 
 .fa-socks:before {
-  content: "";
+  content: "\f696";
 }
 
 .fa-solar-panel:before {
-  content: "";
+  content: "\f5ba";
 }
 
 .fa-sort:before {
-  content: "";
+  content: "\f0dc";
 }
 
 .fa-sort-alpha-down:before {
-  content: "";
+  content: "\f15d";
 }
 
 .fa-sort-alpha-up:before {
-  content: "";
+  content: "\f15e";
 }
 
 .fa-sort-amount-down:before {
-  content: "";
+  content: "\f160";
 }
 
 .fa-sort-amount-up:before {
-  content: "";
+  content: "\f161";
 }
 
 .fa-sort-down:before {
-  content: "";
+  content: "\f0dd";
 }
 
 .fa-sort-numeric-down:before {
-  content: "";
+  content: "\f162";
 }
 
 .fa-sort-numeric-up:before {
-  content: "";
+  content: "\f163";
 }
 
 .fa-sort-up:before {
-  content: "";
+  content: "\f0de";
 }
 
 .fa-soundcloud:before {
-  content: "";
+  content: "\f1be";
 }
 
 .fa-spa:before {
-  content: "";
+  content: "\f5bb";
 }
 
 .fa-space-shuttle:before {
-  content: "";
+  content: "\f197";
 }
 
 .fa-speakap:before {
-  content: "";
+  content: "\f3f3";
 }
 
 .fa-spinner:before {
-  content: "";
+  content: "\f110";
 }
 
 .fa-splotch:before {
-  content: "";
+  content: "\f5bc";
 }
 
 .fa-spotify:before {
-  content: "";
+  content: "\f1bc";
 }
 
 .fa-spray-can:before {
-  content: "";
+  content: "\f5bd";
 }
 
 .fa-square:before {
-  content: "";
+  content: "\f0c8";
 }
 
 .fa-square-full:before {
-  content: "";
+  content: "\f45c";
 }
 
 .fa-square-root-alt:before {
-  content: "";
+  content: "\f698";
 }
 
 .fa-squarespace:before {
-  content: "";
+  content: "\f5be";
 }
 
 .fa-stack-exchange:before {
-  content: "";
+  content: "\f18d";
 }
 
 .fa-stack-overflow:before {
-  content: "";
+  content: "\f16c";
 }
 
 .fa-stamp:before {
-  content: "";
+  content: "\f5bf";
 }
 
 .fa-star:before {
-  content: "";
+  content: "\f005";
 }
 
 .fa-star-and-crescent:before {
-  content: "";
+  content: "\f699";
 }
 
 .fa-star-half:before {
-  content: "";
+  content: "\f089";
 }
 
 .fa-star-half-alt:before {
-  content: "";
+  content: "\f5c0";
 }
 
 .fa-star-of-david:before {
-  content: "";
+  content: "\f69a";
 }
 
 .fa-star-of-life:before {
-  content: "";
+  content: "\f621";
 }
 
 .fa-staylinked:before {
-  content: "";
+  content: "\f3f5";
 }
 
 .fa-steam:before {
-  content: "";
+  content: "\f1b6";
 }
 
 .fa-steam-square:before {
-  content: "";
+  content: "\f1b7";
 }
 
 .fa-steam-symbol:before {
-  content: "";
+  content: "\f3f6";
 }
 
 .fa-step-backward:before {
-  content: "";
+  content: "\f048";
 }
 
 .fa-step-forward:before {
-  content: "";
+  content: "\f051";
 }
 
 .fa-stethoscope:before {
-  content: "";
+  content: "\f0f1";
 }
 
 .fa-sticker-mule:before {
-  content: "";
+  content: "\f3f7";
 }
 
 .fa-sticky-note:before {
-  content: "";
+  content: "\f249";
 }
 
 .fa-stop:before {
-  content: "";
+  content: "\f04d";
 }
 
 .fa-stop-circle:before {
-  content: "";
+  content: "\f28d";
 }
 
 .fa-stopwatch:before {
-  content: "";
+  content: "\f2f2";
 }
 
 .fa-store:before {
-  content: "";
+  content: "\f54e";
 }
 
 .fa-store-alt:before {
-  content: "";
+  content: "\f54f";
 }
 
 .fa-strava:before {
-  content: "";
+  content: "\f428";
 }
 
 .fa-stream:before {
-  content: "";
+  content: "\f550";
 }
 
 .fa-street-view:before {
-  content: "";
+  content: "\f21d";
 }
 
 .fa-strikethrough:before {
-  content: "";
+  content: "\f0cc";
 }
 
 .fa-stripe:before {
-  content: "";
+  content: "\f429";
 }
 
 .fa-stripe-s:before {
-  content: "";
+  content: "\f42a";
 }
 
 .fa-stroopwafel:before {
-  content: "";
+  content: "\f551";
 }
 
 .fa-studiovinari:before {
-  content: "";
+  content: "\f3f8";
 }
 
 .fa-stumbleupon:before {
-  content: "";
+  content: "\f1a4";
 }
 
 .fa-stumbleupon-circle:before {
-  content: "";
+  content: "\f1a3";
 }
 
 .fa-subscript:before {
-  content: "";
+  content: "\f12c";
 }
 
 .fa-subway:before {
-  content: "";
+  content: "\f239";
 }
 
 .fa-suitcase:before {
-  content: "";
+  content: "\f0f2";
 }
 
 .fa-suitcase-rolling:before {
-  content: "";
+  content: "\f5c1";
 }
 
 .fa-sun:before {
-  content: "";
+  content: "\f185";
 }
 
 .fa-superpowers:before {
-  content: "";
+  content: "\f2dd";
 }
 
 .fa-superscript:before {
-  content: "";
+  content: "\f12b";
 }
 
 .fa-supple:before {
-  content: "";
+  content: "\f3f9";
 }
 
 .fa-surprise:before {
-  content: "";
+  content: "\f5c2";
 }
 
 .fa-swatchbook:before {
-  content: "";
+  content: "\f5c3";
 }
 
 .fa-swimmer:before {
-  content: "";
+  content: "\f5c4";
 }
 
 .fa-swimming-pool:before {
-  content: "";
+  content: "\f5c5";
 }
 
 .fa-synagogue:before {
-  content: "";
+  content: "\f69b";
 }
 
 .fa-sync:before {
-  content: "";
+  content: "\f021";
 }
 
 .fa-sync-alt:before {
-  content: "";
+  content: "\f2f1";
 }
 
 .fa-syringe:before {
-  content: "";
+  content: "\f48e";
 }
 
 .fa-table:before {
-  content: "";
+  content: "\f0ce";
 }
 
 .fa-table-tennis:before {
-  content: "";
+  content: "\f45d";
 }
 
 .fa-tablet:before {
-  content: "";
+  content: "\f10a";
 }
 
 .fa-tablet-alt:before {
-  content: "";
+  content: "\f3fa";
 }
 
 .fa-tablets:before {
-  content: "";
+  content: "\f490";
 }
 
 .fa-tachometer-alt:before {
-  content: "";
+  content: "\f3fd";
 }
 
 .fa-tag:before {
-  content: "";
+  content: "\f02b";
 }
 
 .fa-tags:before {
-  content: "";
+  content: "\f02c";
 }
 
 .fa-tape:before {
-  content: "";
+  content: "\f4db";
 }
 
 .fa-tasks:before {
-  content: "";
+  content: "\f0ae";
 }
 
 .fa-taxi:before {
-  content: "";
+  content: "\f1ba";
 }
 
 .fa-teamspeak:before {
-  content: "";
+  content: "\f4f9";
 }
 
 .fa-teeth:before {
-  content: "";
+  content: "\f62e";
 }
 
 .fa-teeth-open:before {
-  content: "";
+  content: "\f62f";
 }
 
 .fa-telegram:before {
-  content: "";
+  content: "\f2c6";
 }
 
 .fa-telegram-plane:before {
-  content: "";
+  content: "\f3fe";
 }
 
 .fa-tencent-weibo:before {
-  content: "";
+  content: "\f1d5";
 }
 
 .fa-terminal:before {
-  content: "";
+  content: "\f120";
 }
 
 .fa-text-height:before {
-  content: "";
+  content: "\f034";
 }
 
 .fa-text-width:before {
-  content: "";
+  content: "\f035";
 }
 
 .fa-th:before {
-  content: "";
+  content: "\f00a";
 }
 
 .fa-th-large:before {
-  content: "";
+  content: "\f009";
 }
 
 .fa-th-list:before {
-  content: "";
+  content: "\f00b";
 }
 
 .fa-the-red-yeti:before {
-  content: "";
+  content: "\f69d";
 }
 
 .fa-theater-masks:before {
-  content: "";
+  content: "\f630";
 }
 
 .fa-themeco:before {
-  content: "";
+  content: "\f5c6";
 }
 
 .fa-themeisle:before {
-  content: "";
+  content: "\f2b2";
 }
 
 .fa-thermometer:before {
-  content: "";
+  content: "\f491";
 }
 
 .fa-thermometer-empty:before {
-  content: "";
+  content: "\f2cb";
 }
 
 .fa-thermometer-full:before {
-  content: "";
+  content: "\f2c7";
 }
 
 .fa-thermometer-half:before {
-  content: "";
+  content: "\f2c9";
 }
 
 .fa-thermometer-quarter:before {
-  content: "";
+  content: "\f2ca";
 }
 
 .fa-thermometer-three-quarters:before {
-  content: "";
+  content: "\f2c8";
 }
 
 .fa-thumbs-down:before {
-  content: "";
+  content: "\f165";
 }
 
 .fa-thumbs-up:before {
-  content: "";
+  content: "\f164";
 }
 
 .fa-thumbtack:before {
-  content: "";
+  content: "\f08d";
 }
 
 .fa-ticket-alt:before {
-  content: "";
+  content: "\f3ff";
 }
 
 .fa-times:before {
-  content: "";
+  content: "\f00d";
 }
 
 .fa-times-circle:before {
-  content: "";
+  content: "\f057";
 }
 
 .fa-tint:before {
-  content: "";
+  content: "\f043";
 }
 
 .fa-tint-slash:before {
-  content: "";
+  content: "\f5c7";
 }
 
 .fa-tired:before {
-  content: "";
+  content: "\f5c8";
 }
 
 .fa-toggle-off:before {
-  content: "";
+  content: "\f204";
 }
 
 .fa-toggle-on:before {
-  content: "";
+  content: "\f205";
 }
 
 .fa-toolbox:before {
-  content: "";
+  content: "\f552";
 }
 
 .fa-tooth:before {
-  content: "";
+  content: "\f5c9";
 }
 
 .fa-torah:before {
-  content: "";
+  content: "\f6a0";
 }
 
 .fa-torii-gate:before {
-  content: "";
+  content: "\f6a1";
 }
 
 .fa-trade-federation:before {
-  content: "";
+  content: "\f513";
 }
 
 .fa-trademark:before {
-  content: "";
+  content: "\f25c";
 }
 
 .fa-traffic-light:before {
-  content: "";
+  content: "\f637";
 }
 
 .fa-train:before {
-  content: "";
+  content: "\f238";
 }
 
 .fa-transgender:before {
-  content: "";
+  content: "\f224";
 }
 
 .fa-transgender-alt:before {
-  content: "";
+  content: "\f225";
 }
 
 .fa-trash:before {
-  content: "";
+  content: "\f1f8";
 }
 
 .fa-trash-alt:before {
-  content: "";
+  content: "\f2ed";
 }
 
 .fa-tree:before {
-  content: "";
+  content: "\f1bb";
 }
 
 .fa-trello:before {
-  content: "";
+  content: "\f181";
 }
 
 .fa-tripadvisor:before {
-  content: "";
+  content: "\f262";
 }
 
 .fa-trophy:before {
-  content: "";
+  content: "\f091";
 }
 
 .fa-truck:before {
-  content: "";
+  content: "\f0d1";
 }
 
 .fa-truck-loading:before {
-  content: "";
+  content: "\f4de";
 }
 
 .fa-truck-monster:before {
-  content: "";
+  content: "\f63b";
 }
 
 .fa-truck-moving:before {
-  content: "";
+  content: "\f4df";
 }
 
 .fa-truck-pickup:before {
-  content: "";
+  content: "\f63c";
 }
 
 .fa-tshirt:before {
-  content: "";
+  content: "\f553";
 }
 
 .fa-tty:before {
-  content: "";
+  content: "\f1e4";
 }
 
 .fa-tumblr:before {
-  content: "";
+  content: "\f173";
 }
 
 .fa-tumblr-square:before {
-  content: "";
+  content: "\f174";
 }
 
 .fa-tv:before {
-  content: "";
+  content: "\f26c";
 }
 
 .fa-twitch:before {
-  content: "";
+  content: "\f1e8";
 }
 
 .fa-twitter:before {
-  content: "";
+  content: "\f099";
 }
 
 .fa-twitter-square:before {
-  content: "";
+  content: "\f081";
 }
 
 .fa-typo3:before {
-  content: "";
+  content: "\f42b";
 }
 
 .fa-uber:before {
-  content: "";
+  content: "\f402";
 }
 
 .fa-uikit:before {
-  content: "";
+  content: "\f403";
 }
 
 .fa-umbrella:before {
-  content: "";
+  content: "\f0e9";
 }
 
 .fa-umbrella-beach:before {
-  content: "";
+  content: "\f5ca";
 }
 
 .fa-underline:before {
-  content: "";
+  content: "\f0cd";
 }
 
 .fa-undo:before {
-  content: "";
+  content: "\f0e2";
 }
 
 .fa-undo-alt:before {
-  content: "";
+  content: "\f2ea";
 }
 
 .fa-uniregistry:before {
-  content: "";
+  content: "\f404";
 }
 
 .fa-universal-access:before {
-  content: "";
+  content: "\f29a";
 }
 
 .fa-university:before {
-  content: "";
+  content: "\f19c";
 }
 
 .fa-unlink:before {
-  content: "";
+  content: "\f127";
 }
 
 .fa-unlock:before {
-  content: "";
+  content: "\f09c";
 }
 
 .fa-unlock-alt:before {
-  content: "";
+  content: "\f13e";
 }
 
 .fa-untappd:before {
-  content: "";
+  content: "\f405";
 }
 
 .fa-upload:before {
-  content: "";
+  content: "\f093";
 }
 
 .fa-usb:before {
-  content: "";
+  content: "\f287";
 }
 
 .fa-user:before {
-  content: "";
+  content: "\f007";
 }
 
 .fa-user-alt:before {
-  content: "";
+  content: "\f406";
 }
 
 .fa-user-alt-slash:before {
-  content: "";
+  content: "\f4fa";
 }
 
 .fa-user-astronaut:before {
-  content: "";
+  content: "\f4fb";
 }
 
 .fa-user-check:before {
-  content: "";
+  content: "\f4fc";
 }
 
 .fa-user-circle:before {
-  content: "";
+  content: "\f2bd";
 }
 
 .fa-user-clock:before {
-  content: "";
+  content: "\f4fd";
 }
 
 .fa-user-cog:before {
-  content: "";
+  content: "\f4fe";
 }
 
 .fa-user-edit:before {
-  content: "";
+  content: "\f4ff";
 }
 
 .fa-user-friends:before {
-  content: "";
+  content: "\f500";
 }
 
 .fa-user-graduate:before {
-  content: "";
+  content: "\f501";
 }
 
 .fa-user-lock:before {
-  content: "";
+  content: "\f502";
 }
 
 .fa-user-md:before {
-  content: "";
+  content: "\f0f0";
 }
 
 .fa-user-minus:before {
-  content: "";
+  content: "\f503";
 }
 
 .fa-user-ninja:before {
-  content: "";
+  content: "\f504";
 }
 
 .fa-user-plus:before {
-  content: "";
+  content: "\f234";
 }
 
 .fa-user-secret:before {
-  content: "";
+  content: "\f21b";
 }
 
 .fa-user-shield:before {
-  content: "";
+  content: "\f505";
 }
 
 .fa-user-slash:before {
-  content: "";
+  content: "\f506";
 }
 
 .fa-user-tag:before {
-  content: "";
+  content: "\f507";
 }
 
 .fa-user-tie:before {
-  content: "";
+  content: "\f508";
 }
 
 .fa-user-times:before {
-  content: "";
+  content: "\f235";
 }
 
 .fa-users:before {
-  content: "";
+  content: "\f0c0";
 }
 
 .fa-users-cog:before {
-  content: "";
+  content: "\f509";
 }
 
 .fa-ussunnah:before {
-  content: "";
+  content: "\f407";
 }
 
 .fa-utensil-spoon:before {
-  content: "";
+  content: "\f2e5";
 }
 
 .fa-utensils:before {
-  content: "";
+  content: "\f2e7";
 }
 
 .fa-vaadin:before {
-  content: "";
+  content: "\f408";
 }
 
 .fa-vector-square:before {
-  content: "";
+  content: "\f5cb";
 }
 
 .fa-venus:before {
-  content: "";
+  content: "\f221";
 }
 
 .fa-venus-double:before {
-  content: "";
+  content: "\f226";
 }
 
 .fa-venus-mars:before {
-  content: "";
+  content: "\f228";
 }
 
 .fa-viacoin:before {
-  content: "";
+  content: "\f237";
 }
 
 .fa-viadeo:before {
-  content: "";
+  content: "\f2a9";
 }
 
 .fa-viadeo-square:before {
-  content: "";
+  content: "\f2aa";
 }
 
 .fa-vial:before {
-  content: "";
+  content: "\f492";
 }
 
 .fa-vials:before {
-  content: "";
+  content: "\f493";
 }
 
 .fa-viber:before {
-  content: "";
+  content: "\f409";
 }
 
 .fa-video:before {
-  content: "";
+  content: "\f03d";
 }
 
 .fa-video-slash:before {
-  content: "";
+  content: "\f4e2";
 }
 
 .fa-vihara:before {
-  content: "";
+  content: "\f6a7";
 }
 
 .fa-vimeo:before {
-  content: "";
+  content: "\f40a";
 }
 
 .fa-vimeo-square:before {
-  content: "";
+  content: "\f194";
 }
 
 .fa-vimeo-v:before {
-  content: "";
+  content: "\f27d";
 }
 
 .fa-vine:before {
-  content: "";
+  content: "\f1ca";
 }
 
 .fa-vk:before {
-  content: "";
+  content: "\f189";
 }
 
 .fa-vnv:before {
-  content: "";
+  content: "\f40b";
 }
 
 .fa-volleyball-ball:before {
-  content: "";
+  content: "\f45f";
 }
 
 .fa-volume-down:before {
-  content: "";
+  content: "\f027";
 }
 
 .fa-volume-off:before {
-  content: "";
+  content: "\f026";
 }
 
 .fa-volume-up:before {
-  content: "";
+  content: "\f028";
 }
 
 .fa-vuejs:before {
-  content: "";
+  content: "\f41f";
 }
 
 .fa-walking:before {
-  content: "";
+  content: "\f554";
 }
 
 .fa-wallet:before {
-  content: "";
+  content: "\f555";
 }
 
 .fa-warehouse:before {
-  content: "";
+  content: "\f494";
 }
 
 .fa-weebly:before {
-  content: "";
+  content: "\f5cc";
 }
 
 .fa-weibo:before {
-  content: "";
+  content: "\f18a";
 }
 
 .fa-weight:before {
-  content: "";
+  content: "\f496";
 }
 
 .fa-weight-hanging:before {
-  content: "";
+  content: "\f5cd";
 }
 
 .fa-weixin:before {
-  content: "";
+  content: "\f1d7";
 }
 
 .fa-whatsapp:before {
-  content: "";
+  content: "\f232";
 }
 
 .fa-whatsapp-square:before {
-  content: "";
+  content: "\f40c";
 }
 
 .fa-wheelchair:before {
-  content: "";
+  content: "\f193";
 }
 
 .fa-whmcs:before {
-  content: "";
+  content: "\f40d";
 }
 
 .fa-wifi:before {
-  content: "";
+  content: "\f1eb";
 }
 
 .fa-wikipedia-w:before {
-  content: "";
+  content: "\f266";
 }
 
 .fa-window-close:before {
-  content: "";
+  content: "\f410";
 }
 
 .fa-window-maximize:before {
-  content: "";
+  content: "\f2d0";
 }
 
 .fa-window-minimize:before {
-  content: "";
+  content: "\f2d1";
 }
 
 .fa-window-restore:before {
-  content: "";
+  content: "\f2d2";
 }
 
 .fa-windows:before {
-  content: "";
+  content: "\f17a";
 }
 
 .fa-wine-glass:before {
-  content: "";
+  content: "\f4e3";
 }
 
 .fa-wine-glass-alt:before {
-  content: "";
+  content: "\f5ce";
 }
 
 .fa-wix:before {
-  content: "";
+  content: "\f5cf";
 }
 
 .fa-wolf-pack-battalion:before {
-  content: "";
+  content: "\f514";
 }
 
 .fa-won-sign:before {
-  content: "";
+  content: "\f159";
 }
 
 .fa-wordpress:before {
-  content: "";
+  content: "\f19a";
 }
 
 .fa-wordpress-simple:before {
-  content: "";
+  content: "\f411";
 }
 
 .fa-wpbeginner:before {
-  content: "";
+  content: "\f297";
 }
 
 .fa-wpexplorer:before {
-  content: "";
+  content: "\f2de";
 }
 
 .fa-wpforms:before {
-  content: "";
+  content: "\f298";
 }
 
 .fa-wrench:before {
-  content: "";
+  content: "\f0ad";
 }
 
 .fa-x-ray:before {
-  content: "";
+  content: "\f497";
 }
 
 .fa-xbox:before {
-  content: "";
+  content: "\f412";
 }
 
 .fa-xing:before {
-  content: "";
+  content: "\f168";
 }
 
 .fa-xing-square:before {
-  content: "";
+  content: "\f169";
 }
 
 .fa-y-combinator:before {
-  content: "";
+  content: "\f23b";
 }
 
 .fa-yahoo:before {
-  content: "";
+  content: "\f19e";
 }
 
 .fa-yandex:before {
-  content: "";
+  content: "\f413";
 }
 
 .fa-yandex-international:before {
-  content: "";
+  content: "\f414";
 }
 
 .fa-yelp:before {
-  content: "";
+  content: "\f1e9";
 }
 
 .fa-yen-sign:before {
-  content: "";
+  content: "\f157";
 }
 
 .fa-yin-yang:before {
-  content: "";
+  content: "\f6ad";
 }
 
 .fa-yoast:before {
-  content: "";
+  content: "\f2b1";
 }
 
 .fa-youtube:before {
-  content: "";
+  content: "\f167";
 }
 
 .fa-youtube-square:before {
-  content: "";
+  content: "\f431";
 }
 
 .fa-zhihu:before {
-  content: "";
+  content: "\f63f";
 }
 
 .sr-only {
@@ -5353,22 +5353,22 @@ and open the template in the editor.
   color: #E5E5E5;
 }
 .enka-custom-radio.star::before {
-  content: "";
+  content: "\f005";
 }
 .enka-custom-radio.thumb::before {
-  content: "";
+  content: "\f164";
 }
 .enka-custom-radio.smiley::before {
-  content: "";
+  content: "\f118";
 }
 .enka-custom-radio.heart::before {
-  content: "";
+  content: "\f004";
 }
 .enka-custom-radio.flag::before {
-  content: "";
+  content: "\f024";
 }
 .enka-custom-radio.user::before {
-  content: "";
+  content: "\f007";
 }
 
 /* visual analog scale - radio buttons */
@@ -5379,25 +5379,25 @@ and open the template in the editor.
   color: #E5E5E5;
 }
 .enka-vizualna-skala.siv-61::before, .enka-vizualna-skala.siv-71::before {
-  content: "";
+  content: "\f5b4";
 }
 .enka-vizualna-skala.siv-41::before, .enka-vizualna-skala.siv-51::before, .enka-vizualna-skala.siv-62::before, .enka-vizualna-skala.siv-72::before {
-  content: "";
+  content: "\f57a";
 }
 .enka-vizualna-skala.siv-21::before, .enka-vizualna-skala.siv-31::before, .enka-vizualna-skala.siv-42::before, .enka-vizualna-skala.siv-52::before, .enka-vizualna-skala.siv-63::before, .enka-vizualna-skala.siv-73::before {
-  content: "";
+  content: "\f119";
 }
 .enka-vizualna-skala.siv-32::before, .enka-vizualna-skala.siv-53::before, .enka-vizualna-skala.siv-74::before {
-  content: "";
+  content: "\f11a";
 }
 .enka-vizualna-skala.siv-22::before, .enka-vizualna-skala.siv-33::before, .enka-vizualna-skala.siv-43::before, .enka-vizualna-skala.siv-54::before, .enka-vizualna-skala.siv-64::before, .enka-vizualna-skala.siv-75::before {
-  content: "";
+  content: "\f118";
 }
 .enka-vizualna-skala.siv-44::before, .enka-vizualna-skala.siv-55::before, .enka-vizualna-skala.siv-65::before, .enka-vizualna-skala.siv-76::before {
-  content: "";
+  content: "\f580";
 }
 .enka-vizualna-skala.siv-66::before, .enka-vizualna-skala.siv-77::before {
-  content: "";
+  content: "\f59c";
 }
 
 /*
@@ -5411,88 +5411,88 @@ and open the template in the editor.
 */
 /* icons */
 span.faicon.plus::before {
-  content: "";
+  content: "\f067";
 }
 
 span.faicon.minus::before {
-  content: "";
+  content: "\f068";
 }
 
 span.faicon.success::before,
 span.circle-check::before {
-  content: "";
+  content: "\f058";
 }
 
 span.faicon.close::before {
   font-size: 18px;
   font-weight: 400;
-  content: "";
+  content: "\f057";
 }
 
 span.faicon.dropdown_blue::before {
   font-size: 16px;
-  content: "";
+  content: "\f13a";
 }
 
 span.faicon.dropup_blue::before {
   font-size: 16px;
-  content: "";
+  content: "\f139";
 }
 
 span.faicon.arrow_back::before {
   font-weight: 600;
   font-size: 16px;
-  content: "";
+  content: "\f137";
 }
 
 span.faicon.add::before {
   font-size: 18px;
-  content: "";
+  content: "\f055";
 }
 
 span.faicon.remove::before {
   font-size: 18px;
-  content: "";
+  content: "\f056";
 }
 
 span.faicon.delete::before {
   font-size: 18px;
   font-weight: 400;
-  content: "";
+  content: "\f2ed";
 }
 
 span.faicon.anketa_delete::before {
   font-size: 24px;
   font-weight: 400;
-  content: "";
+  content: "\f2ed";
 }
 
 span.faicon.copy::before {
   font-size: 18px;
-  content: "";
+  content: "\f0c5";
   font-weight: 400;
 }
 
 span.faicon.anketa_copy::before {
   font-size: 24px;
-  content: "";
+  content: "\f0c5";
   font-weight: 400;
 }
 
 span.faicon.export::before {
   font-size: 24px;
-  content: "";
+  content: "\f56e";
 }
 
 span.faicon.file-import::before {
-  content: "";
+  content: "\f56f";
   transform: scaleX(-1);
 }
 
 span.faicon.import::before {
   font-size: 24px;
   font-weight: 400;
-  content: "";
+  content: "\f1c2";
 }
 
 /*span.faicon.import::after{
@@ -5502,137 +5502,137 @@ span.faicon.import::before {
 }*/
 span.faicon.library::before {
   font-size: 24px;
-  content: "";
+  content: "\f518";
 }
 
 span.faicon.folder::before {
   font-size: 16px;
   font-weight: 600;
-  content: "";
+  content: "\f07b";
 }
 
 span.faicon.folder_empty::before {
   font-size: 16px;
   font-weight: 400;
-  content: "";
+  content: "\f07b";
 }
 
 span.faicon.after.sort_down_arrow::after {
-  content: "";
+  content: "\f0d7";
   margin-left: 5px;
 }
 
 span.faicon.after.sort_up_arrow::after {
-  content: "";
+  content: "\f0d8";
   margin-left: 5px;
 }
 
 span.faicon.info::before {
   font-size: 28px;
-  content: "";
+  content: "\f05a";
   vertical-align: middle;
 }
 
 span.faicon.pagination_left::before {
   margin: 0 1px 0 1px;
-  content: "";
+  content: "\f104";
 }
 
 span.faicon.pagination_right::before {
   margin: 0 0 0 1px;
-  content: "";
+  content: "\f105";
 }
 
 span.faicon.edit::before,
 span.faicon.edit2::before {
-  content: "";
+  content: "\f304";
 }
 
 span.faicon.refresh::before {
   font-size: 18px;
-  content: "";
+  content: "\f2f1";
 }
 
 span.faicon.filter::before {
   font-size: 18px;
-  content: "";
+  content: "\f0b0";
 }
 
 span.faicon.grip::before {
-  content: "";
+  content: "\f58e";
 }
 
 span.faicon.star::before,
 span.faicon.star_off::before {
   font-size: 14px;
   font-weight: 400;
-  content: "";
+  content: "\f005";
 }
 
 span.faicon.star_on::before {
   font-size: 14px;
   font-weight: 700;
-  content: "";
+  content: "\f005";
 }
 
 span.faicon.search::before {
   font-size: 20px;
-  content: "";
+  content: "\f002";
 }
 
 span.faicon.clipboard_notes::before {
   font-size: 20px;
-  content: "";
+  content: "\f46d";
 }
 
 span.faicon.help2::before {
   font-size: 20px;
-  content: "";
+  content: "\f059";
 }
 
 span.faicon.user::before {
   font-size: 18px;
-  content: "";
+  content: "\f007";
 }
 
 span.faicon.logout::before {
   font-size: 20px;
-  content: "";
+  content: "\f2f5";
 }
 
 .faicon.monitor::before {
-  content: "";
+  content: "\f108";
 }
 
 .faicon.mobile::before {
-  content: "";
+  content: "\f3cd";
 }
 
 .faicon.tablet::before {
-  content: "";
+  content: "\f3fa";
 }
 
 span.faicon.users::before {
-  content: "";
+  content: "\f500";
 }
 
 span.faicon.lock_open::before {
-  content: "";
+  content: "\f3c1";
 }
 
 span.faicon.lock_close::before {
-  content: "";
+  content: "\f023";
 }
 
 span.faicon.bottom_saving::before {
   font-size: 24px;
   font-weight: 400;
-  content: "";
+  content: "\f0c7";
 }
 
 span.faicon.bottom_publish::before {
   font-size: 24px;
-  content: "";
+  content: "\f093";
 }
 
 span.faicon.bottom_preview {
@@ -5642,63 +5642,63 @@ span.faicon.bottom_preview {
 span.faicon.bottom_preview::before {
   font-size: 24px;
   font-weight: 400;
-  content: "";
+  content: "\f15b";
 }
 
 span.faicon.bottom_preview::after {
   font-size: 14px;
-  content: "";
+  content: "\f002";
   display: inline-block;
   margin-left: -70%;
 }
 
 span.faicon.bottom_test::before {
   font-size: 24px;
-  content: "";
+  content: "\f492";
 }
 
 span.faicon.language::before {
   font-size: 24px;
-  content: "";
+  content: "\f0ac";
 }
 
 span.faicon.mobile_off::before {
   font-size: 24px;
-  content: "";
+  content: "\f3cd";
 }
 
 span.faicon.mobile_off::after {
   font-size: 24px;
-  content: "";
+  content: "\f715";
   margin-left: -23px;
 }
 
 span.faicon.comments::before {
-  content: "";
+  content: "\f27a";
   font-weight: 700;
 }
 
 span.faicon.comments_empty::before {
-  content: "";
+  content: "\f27a";
   font-weight: 400;
 }
 
 span.faicon.data_link::before {
-  content: "";
+  content: "\f0c1";
 }
 
 span.faicon.data_link_small::before {
-  content: "";
+  content: "\f0c1";
 }
 
 span.faicon.print::before {
   font-size: 24px;
-  content: "";
+  content: "\f02f";
 }
 
 span.faicon.print_small::before {
   font-size: 16px;
-  content: "";
+  content: "\f02f";
 }
 
 span.faicon.preview {
@@ -5708,11 +5708,11 @@ span.faicon.preview {
 span.faicon.preview::before {
   font-size: 18px;
   font-weight: 400;
-  content: "";
+  content: "\f15b";
 }
 
 span.faicon.preview::after {
-  content: "";
+  content: "\f002";
   display: inline-block;
   font-size: 11px;
   margin-left: -50%;
@@ -5720,87 +5720,87 @@ span.faicon.preview::after {
 
 span.faicon.palette::before {
   font-size: 18px;
-  content: "";
+  content: "\f53f";
 }
 
 span.faicon.inline_comment::before {
   font-size: 14px;
   font-weight: 400;
-  content: "";
+  content: "\f075";
 }
 
 span.faicon.inline_double_comment::before {
   font-size: 14px;
   font-weight: 400;
-  content: "";
+  content: "\f086";
 }
 
 span.faicon.comments_creport::before {
   font-size: 16px;
-  content: "";
+  content: "\f086";
 }
 
 span.faicon.compress::before {
   font-size: 15px;
-  content: "";
+  content: "\f066";
 }
 
 span.faicon.expand::before {
   font-size: 15px;
-  content: "";
+  content: "\f065";
 }
 
 span.faicon.hashtag::before {
   font-size: 15px;
-  content: "";
+  content: "\f292";
 }
 
 span.faicon.bug::before {
   font-size: 15px;
-  content: "";
+  content: "\f188";
 }
 
 span.faicon.paragraph::before {
   font-size: 15px;
-  content: "";
+  content: "\f1dd";
 }
 
 span.faicon.replace::before {
   font-size: 15px;
-  content: "";
+  content: "\f362";
 }
 
 span.faicon.plus_square::before {
   font-size: 15px;
   font-weight: 400;
-  content: "";
+  content: "\f0fe";
 }
 
 span.faicon.minus_square::before {
   font-size: 15px;
   font-weight: 400;
-  content: "";
+  content: "\f146";
 }
 
 span.faicon.delete_circle::before {
   font-size: 14px;
-  content: "";
+  content: "\f056";
 }
 
 span.faicon.quick_view::before {
   font-size: 15px;
   font-weight: 400;
-  content: "";
+  content: "\f06e";
 }
 
 span.faicon.edit_square::before {
   font-size: 15px;
-  content: "";
+  content: "\f044";
 }
 
 span.faicon.test::before {
   font-size: 15px;
-  content: "";
+  content: "\f492";
 }
 
 a.faicon.if_add {
@@ -5836,7 +5836,7 @@ span.faicon.if_add:hover:before {
 }
 
 span.faicon.text_file::before {
-  content: "";
+  content: "\f15c";
 }
 
 span.faicon.text_file_small {
@@ -5846,40 +5846,40 @@ span.faicon.text_file_small {
 span.faicon.text_file_small:before {
   font-size: 18px;
   font-weight: 400;
-  content: "";
+  content: "\f15c";
 }
 
 span.faicon.warning::before {
   font-size: 16px;
-  content: "";
+  content: "\f071";
 }
 
 span.faicon.users_small::before {
   font-size: 16px;
-  content: "";
+  content: "\f0c0";
 }
 
 span.faicon.popup_0::before {
   font-size: 14px;
-  content: "";
+  content: "\f065";
   color: #1E88E5;
 }
 
 span.faicon.popup_1::before {
   font-size: 14px;
-  content: "";
+  content: "\f065";
   color: #0059ab;
 }
 
 span.faicon.flat_0::before {
   font-size: 14px;
-  content: "";
+  content: "\f03c";
   color: #0059ab;
 }
 
 span.faicon.flat_1::before {
   font-size: 14px;
-  content: "";
+  content: "\f03c";
   color: #1E88E5;
 }
 
@@ -5894,46 +5894,46 @@ span.basic-icon.spss::before {
 span.faicon.external_link::before {
   font-size: 14px;
   font-weight: 600;
-  content: "";
+  content: "\f35d";
 }
 
 span.faicon.cog_large::before {
   font-size: 34px;
   font-weight: 600;
-  content: "";
+  content: "\f013";
 }
 
 span.faicon.chart_large::before {
   font-size: 34px;
   font-weight: 600;
-  content: "";
+  content: "\f201";
 }
 
 span.faicon.reload_large::before {
   font-size: 34px;
   font-weight: 600;
-  content: "";
+  content: "\f021";
 }
 
 span.faicon.chart::before {
-  content: "";
+  content: "\f080";
   font-size: 16px;
   font-weight: 600;
 }
 
 span.faicon.data::before {
-  content: "";
+  content: "\f1c0";
   font-size: 16px;
   font-weight: 600;
 }
 
 span.faicon.publish::before {
-  content: "";
+  content: "\f093";
   font-size: 16px;
 }
 
 span.faicon.test::before {
-  content: "";
+  content: "\f492";
   font-size: 16px;
 }
 
@@ -5943,63 +5943,63 @@ button.ui-datepicker-trigger::before {
   font-family: "Font Awesome 5 Free";
   font-weight: 400;
   font-size: 16px;
-  content: "";
+  content: "\f073";
 }
 
 /* ARROWS */
 span.faicon.arrow_up::before {
   font-size: 14px;
-  content: "";
+  content: "\f062";
 }
 
 span.faicon.arrow2_r::before {
   font-size: 14px;
-  content: "";
+  content: "\f054";
 }
 
 span.faicon.arrow2_l::before {
   font-size: 14px;
-  content: "";
+  content: "\f053";
 }
 
 span.faicon.arrow2_d::before {
   font-size: 14px;
-  content: "";
+  content: "\f078";
 }
 
 span.faicon.arrow2_u::before {
   font-size: 14px;
-  content: "";
+  content: "\f077";
 }
 
 span.faicon.arrow_large2_r::before {
   font-size: 35px;
-  content: "";
+  content: "\f054";
 }
 
 span.faicon.arrow_large2_l::before {
   font-size: 35px;
-  content: "";
+  content: "\f053";
 }
 
 span.faicon.arrow_verylarge2_r::before {
   font-size: 40px;
-  content: "";
+  content: "\f054";
 }
 
 span.faicon.arrow_verylarge2_l::before {
   font-size: 40px;
-  content: "";
+  content: "\f053";
 }
 
 span.faicon.sort_descending::before {
   font-size: 14px;
-  content: "";
+  content: "\f0d7";
 }
 
 span.faicon.sort_ascending::before {
   font-size: 14px;
-  content: "";
+  content: "\f0d8";
 }
 
 /* Plus/minus sqare */
@@ -6011,127 +6011,127 @@ span.folder_plusminus {
 span.faicon.plus_orange::before {
   font-size: 12px;
   font-weight: 400;
-  content: "";
+  content: "\f0fe";
 }
 
 span.faicon.minus_orange::before {
   font-size: 12px;
   font-weight: 400;
-  content: "";
+  content: "\f146";
 }
 
 /* Spinner */
 span.faicon.spinner::before {
   font-size: 18px;
-  content: "";
+  content: "\f1ce";
 }
 
 /* Bars - mobile menu */
 span.faicon.bars::before {
   font-size: 26px;
-  content: "";
+  content: "\f0c9";
 }
 
 span.faicon.lock_open::before {
-  content: "";
+  content: "\f3c1";
 }
 
 span.faicon.lock_close::before {
-  content: "";
+  content: "\f023";
 }
 
 span.faicon.bell::before {
-  content: "";
+  content: "\f0f3";
 }
 
 span.faicon.bell_slash::before {
-  content: "";
+  content: "\f1f6";
 }
 
 span.faicon.trash::before {
-  content: "";
+  content: "\f2ed";
 }
 
 span.faicon.copy::before {
-  content: "";
+  content: "\f0c5";
 }
 
 span.faicon.circle::before {
-  content: "";
+  content: "\f111";
   vertical-align: middle;
 }
 
 span.faicon.plus::before {
-  content: "";
+  content: "\f067";
 }
 
 span.faicon.plus_circle::before {
-  content: "";
+  content: "\f055";
 }
 
 span.faicon.minus_circle::before {
-  content: "";
+  content: "\f056";
 }
 
 span.faicon.calendar_icon::before {
-  content: "";
+  content: "\f073";
 }
 
 span.faicon.clipboard::before {
-  content: "";
+  content: "\f328";
 }
 
 span.faicon.list-alt::before {
-  content: "";
+  content: "\f022";
 }
 
 span.faicon.vote-yes::before {
-  content: "";
+  content: "\f772";
 }
 
 span.faicon.file-preview::before {
-  content: "";
+  content: "\f865";
 }
 
 span.faicon.dots::before {
-  content: "";
+  content: "\f141";
   font-size: 16px;
   font-weight: 600;
 }
 
 span.faicon.dots_ver:before {
-  content: "";
+  content: "\f142";
   font-size: 16px;
   font-weight: 600;
 }
 
 span.faicon.open_icon::before,
 a.faicon.open_icon::before {
-  content: "";
+  content: "\f35d";
 }
 
 span.faicon.table_icon::before {
-  content: "";
+  content: "\f0ce";
 }
 
 span.faicon.list::before {
-  content: "";
+  content: "\f03a";
 }
 
 span.faicon.link-chain::before {
-  content: "";
+  content: "\f0c1";
 }
 
 span.fa-brands.html5::before {
-  content: "";
+  content: "\f13b";
 }
 
 span.faicon.stopwatch20::before {
-  content: "";
+  content: "\e06f";
 }
 
 span.faicon.checkbox-empty::before {
-  content: "";
+  content: "\f0c8";
   font-weight: 400 !important;
 }
 
@@ -6140,11 +6140,11 @@ span.faicon.fa-1::before {
 }
 
 span.faicon.phone::before {
-  content: "";
+  content: "\f095";
 }
 
 span.faicon.screwdriver::before {
-  content: "";
+  content: "\f7d9";
   font-weight: 600 !important;
 }
 
@@ -6282,23 +6282,23 @@ and open the template in the editor.
 */
 /* Toolbox na levi strani */
 span.faicon.wheel_32::before {
-  content: "";
+  content: "\f013";
 }
 
 span.faicon.radio_32::before {
-  content: "";
+  content: "\f192";
   font-weight: 400;
   font-size: 18px;
 }
 
 span.faicon.check_32::before {
-  content: "";
+  content: "\f14a";
   font-weight: 400;
   font-size: 18px;
 }
 
 span.faicon.matrix_32::before {
-  content: "\a";
+  content: "\f192\f192\a\f192\f192";
   white-space: pre;
   font-weight: 400;
   font-size: 12px;
@@ -6322,7 +6322,7 @@ span.faicon.nagovor::before {
 }
 
 span.faicon.plus_32::before {
-  content: "";
+  content: "\f055";
   font-size: 18px;
 }
 
@@ -6366,12 +6366,12 @@ span.faicon.edit-vprasanje {
 }
 span.faicon.edit-vprasanje:before {
   font-size: 18px;
-  content: "";
+  content: "\f031";
 }
 
 a.faicon.edit::before {
   font-size: 16px;
-  content: "";
+  content: "\f304";
 }
 
 a.faicon.addif::before {
@@ -6383,22 +6383,22 @@ a.faicon.addif::before {
 a.faicon.copy::before {
   font-size: 18px;
   font-weight: 400;
-  content: "";
+  content: "\f0c5";
 }
 
 a.faicon.copycond::before {
   font-size: 18px;
-  content: "";
+  content: "\f0c5";
 }
 
 a.faicon.preview::before {
   font-size: 18px;
   font-weight: 400;
-  content: "";
+  content: "\f15b";
 }
 
 a.faicon.preview::after {
-  content: "";
+  content: "\f002";
   display: inline-block;
   font-size: 11px;
   margin-left: -50%;
@@ -6406,25 +6406,25 @@ a.faicon.preview::after {
 
 a.faicon.arhiv::before {
   font-size: 18px;
-  content: "";
+  content: "\f044";
 }
 
 a.faicon.delete::before {
   font-size: 18px;
   font-weight: 400;
-  content: "";
+  content: "\f2ed";
 }
 
 a.faicon.hide::before {
   font-size: 18px;
   font-weight: 400;
-  content: "";
+  content: "\f06e";
 }
 
 a.faicon.unhide_icon::before {
   font-size: 18px;
   font-weight: 400;
-  content: "";
+  content: "\f070";
 }
 
 /* Urejanje vrednosti inline */
@@ -6438,12 +6438,12 @@ a.faicon.unhide_icon::before {
 
 .variabla span.inline.faicon.edit2::before {
   font-size: 14px;
-  content: "";
+  content: "\f304";
 }
 
 .variabla span.inline.faicon.odg_hidden::before {
   font-size: 14px;
-  content: "";
+  content: "\f05e";
 }
 
 .variabla span.inline.faicon.odg_hidden.show-hidden::before {
@@ -6471,23 +6471,23 @@ span.inline.faicon.odg_if_not::before {
 .variabla span.inline.faicon.odg_if_follow::after {
   font-size: 14px;
   margin-left: 2px;
-  content: "";
+  content: "\f0da";
 }
 
 .variabla span.inline.faicon.correct::before {
   font-size: 14px;
   font-weight: 900;
-  content: "";
+  content: "\f00c";
 }
 
 .faicon.move_updown::before {
   font-size: 16px;
   color: #0059ab;
-  content: "";
+  content: "\f338";
 }
 
 .faicon.image_upload::before {
-  content: "";
+  content: "\f03e";
   font-weight: 400;
 }
 
@@ -6504,22 +6504,22 @@ and open the template in the editor.
 span.faicon.mapca.anketa::before {
   font-size: 16px;
   font-weight: 400;
-  content: "";
+  content: "\f022";
 }
 
 span.faicon.table::before {
   font-size: 16px;
-  content: "";
+  content: "\f00b";
 }
 
 span.faicon.other_vprasanja::before {
   font-size: 16px;
-  content: "" !important;
+  content: "\f0ca" !important;
 }
 
 span.faicon.osnovna_vprasanja::before {
   font-size: 16px;
-  content: "";
+  content: "\f0ca";
 }
 
 span.faicon.mapca.if::before {
@@ -6547,7 +6547,7 @@ and open the template in the editor.
 */
 /* Izvozi */
 span.faicon.pdf::before {
-  content: "";
+  content: "\f1c1";
   font-size: 16px;
   font-weight: 400;
   color: #ed1c24;
@@ -6571,7 +6571,7 @@ span.faicon.pdf.black::before {
 span.faicon.xls::before {
   font-size: 16px;
   font-weight: 400;
-  content: "";
+  content: "\f1c3";
   color: #008000;
 }
 
@@ -6593,7 +6593,7 @@ span.faicon.xls.black::before {
 span.faicon.rtf::before {
   font-size: 16px;
   font-weight: 400;
-  content: "";
+  content: "\f1c2";
   color: #0f3ea8;
 }
 
@@ -6615,7 +6615,7 @@ span.faicon.rtf.black::before {
 span.faicon.ppt::before {
   font-size: 16px;
   font-weight: 400;
-  content: "";
+  content: "\f1c4";
   color: #fa4913;
 }
 
@@ -6637,7 +6637,7 @@ span.faicon.ppt.black::before {
 span.faicon.xml::before {
   font-size: 16px;
   font-weight: 400;
-  content: "";
+  content: "\f1c9";
   color: #00a000;
 }
 
@@ -6657,17 +6657,17 @@ span.faicon.xml.black::before {
 }
 
 span.faicon.arhiv::before {
-  content: "";
+  content: "\f187";
 }
 
 span.faicon.arhiv_mail::before {
   font-size: 16px;
   font-weight: 400;
-  content: "";
+  content: "\f14d";
 }
 
 span.faicon.share-arrow::before {
-  content: "";
+  content: "\f14d";
 }
 
 /*
@@ -6717,7 +6717,7 @@ span.faicon.an_chart_bar::before {
   font-size: 14px;
   font-weight: 700;
   /*content: "\f080";*/
-  content: "";
+  content: "\f200";
 }
 
 /*
@@ -6731,35 +6731,35 @@ and open the template in the editor.
 */
 /* Invitation table */
 span.faicon.inv_sent_0::before {
-  content: "";
+  content: "\f2b6";
 }
 
 span.faicon.inv_sent_1::before {
-  content: "";
+  content: "\f0e0";
 }
 
 span.faicon.inv_responded_0::before {
   font-size: 14px;
   font-weight: 400;
-  content: "";
+  content: "\f005";
 }
 
 span.faicon.inv_responded_1::before {
   font-size: 14px;
   font-weight: 700;
-  content: "";
+  content: "\f005";
 }
 
 span.faicon.inv_unsubscribed_0::before {
   font-size: 14px;
   font-weight: 400;
-  content: "";
+  content: "\f111";
 }
 
 span.faicon.inv_unsubscribed_1::before {
   font-size: 14px;
   font-weight: 700;
-  content: "";
+  content: "\f111";
   color: #FF0000;
 }
 
@@ -6860,7 +6860,7 @@ a.read-more .faicon:before {
 .qtip .qtip-wrapper .qtip-contentWrapper .qtip-content h1::before {
   padding-right: 8px;
   font-family: "Font Awesome 5 Free";
-  content: "";
+  content: "\f059";
   font-size: 20px;
   color: #1E88E5;
   vertical-align: -1px;
@@ -6897,7 +6897,7 @@ a.read-more .faicon:before {
   padding-left: 8px;
   vertical-align: middle;
   font-family: "Font Awesome 5 Free";
-  content: "";
+  content: "\f054";
   font-size: 8px;
   color: #1E88E5;
   transition: 0.2s;
@@ -7220,7 +7220,7 @@ a.read-more .faicon:before {
 .divPopUp.warning_popup h2::before {
   padding-right: 8px;
   font-family: "Font Awesome 5 Free";
-  content: "";
+  content: "\f071";
   font-size: 14px;
   color: #FFC700;
 }
@@ -7261,7 +7261,7 @@ a.read-more .faicon:before {
 .divPopUp_info.warning_popup h2::before {
   padding-right: 8px;
   font-family: "Font Awesome 5 Free";
-  content: "";
+  content: "\f071";
   font-size: 14px;
   color: #FFC700;
 }
@@ -7753,7 +7753,7 @@ body.waitlong #loading {
 #check_pogoji.warning_popup h2::before {
   padding-right: 8px;
   font-family: "Font Awesome 5 Free";
-  content: "";
+  content: "\f071";
   font-size: 14px;
   color: #FFC700;
 }
@@ -7934,7 +7934,7 @@ body.waitlong #loading {
 #dropped_alert.warning_popup h2::before {
   padding-right: 8px;
   font-family: "Font Awesome 5 Free";
-  content: "";
+  content: "\f071";
   font-size: 14px;
   color: #FFC700;
 }
@@ -9175,7 +9175,7 @@ header #topSettingsHolder .left_options_holder #analizaSubNav #globalSetingsLink
   right: 8px;
   top: 5px;
   font-family: "Font Awesome 5 Free";
-  content: "";
+  content: "\f078";
   font-size: 10px;
   font-weight: 600;
 }
@@ -9448,7 +9448,7 @@ footer#srv_footer .footer_right span.faicon.external_link:before {
 footer#srv_footer .footer_right .right_help_button {
   position: fixed;
   right: -71px;
-  top: calc(50%);
+  top: 50%;
   width: 150px;
   padding: 4px 8px;
   border: 1px #1E88E5 solid;
@@ -9828,17 +9828,17 @@ input[type=radio]:checked + label:before, input[type=checkbox]:checked + label:b
   color: #1E88E5;
 }
 input[type=checkbox] + label:before {
-  content: "";
+  content: "\f0c8";
 }
 input[type=checkbox]:checked + label:before {
-  content: "";
+  content: "\f14a";
   font-weight: bold;
 }
 input[type=radio] + label:before {
-  content: "";
+  content: "\f111";
 }
 input[type=radio]:checked + label:before {
-  content: "";
+  content: "\f192";
 }
 input[type=checkbox][disabled] + label:before {
   color: #C4C4C4;
@@ -10336,7 +10336,7 @@ header #top_line #enka_nav .anketa_header_upgrade_package button {
 #popup_user_access.warning_popup h2::before {
   padding-right: 8px;
   font-family: "Font Awesome 5 Free";
-  content: "";
+  content: "\f071";
   font-size: 14px;
   color: #FFC700;
 }
@@ -10623,7 +10623,7 @@ header #top_line #enka_nav .anketa_header_upgrade_package button {
 #survey_list .second_line .filters #folderSwitch#sortButton:after {
   position: absolute;
   font-family: "Font Awesome 5 Free";
-  content: "";
+  content: "\f078";
   right: 8px;
   top: 13px;
   font-weight: 600;
@@ -10969,13 +10969,13 @@ body.eng #survey_list .filters #folderSwitch {
   cursor: pointer;
 }
 #survey_list .div_sl_new.folders .folder_holder .folder_title .folder_arrow_icon::before {
-  content: "";
+  content: "\f078";
   font-size: 14px;
   color: #333333;
   margin-right: 8px;
 }
 #survey_list .div_sl_new.folders .folder_holder .folder_title .folder_icon::before {
-  content: "";
+  content: "\f07b";
   font-size: 16px;
   font-weight: 400;
   color: #1E88E5;
@@ -10985,7 +10985,7 @@ body.eng #survey_list .filters #folderSwitch {
   background-color: #F8F8F8;
 }
 #survey_list .div_sl_new.folders .folder_holder .folder_title.open .folder_arrow_icon::before {
-  content: "";
+  content: "\f077";
 }
 #survey_list .div_sl_new.folders .folder_holder .folder_title.open .folder_icon::before {
   font-weight: 600;
@@ -12080,13 +12080,13 @@ div.page_obvestila #unread_notifications .gdpr_popup_radio input {
   cursor: pointer;
 }
 #anketa_knjiznica #libraryInner ul li .folder_box_holder .folder_box .folder_arrow_icon::before {
-  content: "";
+  content: "\f078";
   font-size: 14px;
   color: #333333;
   margin-right: 8px;
 }
 #anketa_knjiznica #libraryInner ul li .folder_box_holder .folder_box .folder::before {
-  content: "";
+  content: "\f07b";
   font-size: 16px;
   font-weight: 400;
   color: #1E88E5;
@@ -12112,7 +12112,7 @@ div.page_obvestila #unread_notifications .gdpr_popup_radio input {
   }*/
 }
 #anketa_knjiznica #libraryInner ul li .folder_box_holder .folder_box.open .folder_arrow_icon::before {
-  content: "";
+  content: "\f077";
 }
 #anketa_knjiznica #libraryInner ul li .folder_box_holder .folder_box.open .folder::before {
   font-weight: 600;
@@ -12365,7 +12365,7 @@ and open the template in the editor.
 #new_anketa_div .layout_right_item .layout_right_centering .fieldset .setting input[type=radio] + span.enka-checkbox-radio:before {
   font-family: "Font Awesome 5 Free";
   display: inline-block;
-  content: "";
+  content: "\f111";
   letter-spacing: 10px;
 }
 #new_anketa_div .layout_right_item .layout_right_centering .fieldset .setting input[type=radio] + span.enka-custom-radio:before {
@@ -12373,7 +12373,7 @@ and open the template in the editor.
   display: inline-block;
 }
 #new_anketa_div .layout_right_item .layout_right_centering .fieldset .setting input[type=radio]:checked + span.enka-checkbox-radio:before {
-  content: "";
+  content: "\f192";
 }
 #new_anketa_div .layout_right_item .layout_right_centering .fieldset .setting input[type=checkbox] {
   display: none !important;
@@ -12386,11 +12386,11 @@ and open the template in the editor.
 #new_anketa_div .layout_right_item .layout_right_centering .fieldset .setting input[type=checkbox] + span.enka-checkbox-radio:before {
   font-family: "Font Awesome 5 Free";
   display: inline-block;
-  content: "";
+  content: "\f0c8";
   letter-spacing: 10px;
 }
 #new_anketa_div .layout_right_item .layout_right_centering .fieldset .setting input[type=checkbox]:checked + span.enka-checkbox-radio:before {
-  content: "";
+  content: "\f14a";
   letter-spacing: 8px;
 }
 #new_anketa_div .layout_right_item .layout_right_centering .fieldset .setting .custom_radio_picture.obarvan > label > span.enka-custom-radio:before {
@@ -12683,7 +12683,7 @@ and open the template in the editor.
 }
 #new_anketa_div .layout_right_item .layout_right_centering .anketa_from_text .from_text_sidebyside_holder #preview_field_holder #preview_field span.variable input[type=radio] + span.enka-checkbox-radio:before {
   font-family: "Font Awesome 5 Free";
-  content: "";
+  content: "\f111";
   display: inline-block;
   font-size: 14px;
   color: #C4C4C4;
@@ -13295,20 +13295,20 @@ div.drop_setting_transition {
   font-weight: 400;
 }
 #branching input[type=checkbox].enka-admin-custom + span.enka-checkbox-radio:before {
-  content: "";
+  content: "\f0c8";
   letter-spacing: 10px;
 }
 #branching input[type=radio].enka-admin-custom + span.enka-checkbox-radio:before {
-  content: "";
+  content: "\f111";
   letter-spacing: 8px;
 }
 #branching input[type=checkbox].enka-admin-custom:checked + span.enka-checkbox-radio:before {
-  content: "";
+  content: "\f14a";
   color: #D3D3D3;
   letter-spacing: 8px;
 }
 #branching input[type=radio].enka-admin-custom:checked + span.enka-checkbox-radio:before {
-  content: "";
+  content: "\f192";
   color: #D3D3D3;
 }
 #branching span.faicon.delete_circle::before {
@@ -19930,7 +19930,7 @@ and open the template in the editor.
   transition: 0.2s;
 }
 .tab_content .content_left ul li.folder_item .faicon.arrow:before {
-  content: "";
+  content: "\f078";
 }
 .tab_content .content_left ul li.folder_item .faicon.folder:before,
 .tab_content .content_left ul li.folder_item .faicon.clipboard:before {
@@ -19947,7 +19947,7 @@ and open the template in the editor.
   color: #1E88E5;
 }
 .tab_content .content_left ul li.folder_item.open .faicon.arrow:before {
-  content: "";
+  content: "\f077";
 }
 .tab_content .content_left ul li.folder_item.no_arrow .faicon.arrow:before {
   display: none;
@@ -20438,7 +20438,7 @@ img.mapster_el {
   border-radius: 4px;
 }
 .jquery-selectbox .jquery-selectbox-moreButton::before {
-  content: "";
+  content: "\f078";
   padding-left: 2px;
   color: #333333;
   font-size: 10px;
@@ -21162,7 +21162,7 @@ div#theme-edit-wrap div#theme-editor #picker .button_holder button:last-child {
 div#theme-edit-wrap div#theme-editor #picker.warning_popup h2::before {
   padding-right: 8px;
   font-family: "Font Awesome 5 Free";
-  content: "";
+  content: "\f071";
   font-size: 14px;
   color: #FFC700;
 }
@@ -21521,7 +21521,7 @@ span.faicon.st-besede-popup {
 #vrednost_edit.warning_popup h2::before {
   padding-right: 8px;
   font-family: "Font Awesome 5 Free";
-  content: "";
+  content: "\f071";
   font-size: 14px;
   color: #FFC700;
 }
@@ -21762,7 +21762,7 @@ span.faicon.st-besede-popup {
 #quota.warning_popup h2::before {
   padding-right: 8px;
   font-family: "Font Awesome 5 Free";
-  content: "";
+  content: "\f071";
   font-size: 14px;
   color: #FFC700;
 }
@@ -22089,7 +22089,7 @@ and open the template in the editor.
 #preview_spremenljivka.warning_popup h2::before {
   padding-right: 8px;
   font-family: "Font Awesome 5 Free";
-  content: "";
+  content: "\f071";
   font-size: 14px;
   color: #FFC700;
 }
@@ -22710,22 +22710,22 @@ and open the template in the editor.
 }
 #preview_spremenljivka #variable_holder input[type=checkbox].enka-admin-custom + span.enka-checkbox-radio:before {
   /*content: "\f096";*/
-  content: "";
+  content: "\f0c8";
   letter-spacing: 10px;
 }
 #preview_spremenljivka #variable_holder input[type=radio].enka-admin-custom + span.enka-checkbox-radio:before {
   /*content: "\f10c";*/
-  content: "";
+  content: "\f111";
   letter-spacing: 8px;
 }
 #preview_spremenljivka #variable_holder input[type=checkbox].enka-admin-custom:checked + span.enka-checkbox-radio:before {
   /*content: "\f046";*/
-  content: "";
+  content: "\f14a";
   letter-spacing: 8px;
 }
 #preview_spremenljivka #variable_holder input[type=radio].enka-admin-custom:checked + span.enka-checkbox-radio:before {
   /*content: "\f192";*/
-  content: "";
+  content: "\f192";
 }
 #preview_spremenljivka input[type=radio] {
   margin: 0 8px 4px 0;
@@ -22738,7 +22738,7 @@ and open the template in the editor.
 #preview_spremenljivka input[type=radio] + span.enka-checkbox-radio:before {
   font-family: "Font Awesome 5 Free";
   display: inline-block;
-  content: "";
+  content: "\f111";
   letter-spacing: 10px;
 }
 #preview_spremenljivka input[type=radio] + span.enka-custom-radio:before {
@@ -22746,7 +22746,7 @@ and open the template in the editor.
   display: inline-block;
 }
 #preview_spremenljivka input[type=radio]:checked + span.enka-checkbox-radio:before {
-  content: "";
+  content: "\f192";
 }
 #preview_spremenljivka input[type=checkbox] {
   display: none !important;
@@ -22759,11 +22759,11 @@ and open the template in the editor.
 #preview_spremenljivka input[type=checkbox] + span.enka-checkbox-radio:before {
   font-family: "Font Awesome 5 Free";
   display: inline-block;
-  content: "";
+  content: "\f0c8";
   letter-spacing: 10px;
 }
 #preview_spremenljivka input[type=checkbox]:checked + span.enka-checkbox-radio:before {
-  content: "";
+  content: "\f14a";
   letter-spacing: 8px;
 }
 
@@ -22848,7 +22848,7 @@ and open the template in the editor.
 }
 #popup_import_from_text .anketa_from_text .import_holder #preview_field_holder #preview_field span.variable input[type=radio] + span.enka-checkbox-radio:before {
   font-family: "Font Awesome 5 Free";
-  content: "";
+  content: "\f111";
   display: inline-block;
   font-size: 14px;
   color: #E5E5E5;
@@ -22856,7 +22856,7 @@ and open the template in the editor.
   font-weight: 400;
 }
 #popup_import_from_text .anketa_from_text .import_holder #preview_field_holder #preview_field span.variable input[type=radio]:checked + span.enka-checkbox-radio:before {
-  content: "";
+  content: "\f192";
   color: #E5E5E5;
 }
 
@@ -23119,7 +23119,7 @@ dl.arch_email dd {
 #inv_view_arch_recipients.warning_popup h2::before {
   padding-right: 8px;
   font-family: "Font Awesome 5 Free";
-  content: "";
+  content: "\f071";
   font-size: 14px;
   color: #FFC700;
 }
@@ -24113,23 +24113,23 @@ div.page_komentarji_anketa ul .spremenljivka_content input[type=radio].enka-admi
 }
 div.page_komentarji ul .spremenljivka_content input[type=checkbox].enka-admin-custom + span.enka-checkbox-radio:before,
 div.page_komentarji_anketa ul .spremenljivka_content input[type=checkbox].enka-admin-custom + span.enka-checkbox-radio:before {
-  content: "";
+  content: "\f0c8";
   letter-spacing: 10px;
 }
 div.page_komentarji ul .spremenljivka_content input[type=radio].enka-admin-custom + span.enka-checkbox-radio:before,
 div.page_komentarji_anketa ul .spremenljivka_content input[type=radio].enka-admin-custom + span.enka-checkbox-radio:before {
-  content: "";
+  content: "\f111";
   letter-spacing: 8px;
 }
 div.page_komentarji ul .spremenljivka_content input[type=checkbox].enka-admin-custom:checked + span.enka-checkbox-radio:before,
 div.page_komentarji_anketa ul .spremenljivka_content input[type=checkbox].enka-admin-custom:checked + span.enka-checkbox-radio:before {
-  content: "";
+  content: "\f14a";
   color: #D3D3D3;
   letter-spacing: 8px;
 }
 div.page_komentarji ul .spremenljivka_content input[type=radio].enka-admin-custom:checked + span.enka-checkbox-radio:before,
 div.page_komentarji_anketa ul .spremenljivka_content input[type=radio].enka-admin-custom:checked + span.enka-checkbox-radio:before {
-  content: "";
+  content: "\f192";
   color: #D3D3D3;
 }
 div.page_komentarji ul .spremenljivka_content input[type=radio],
@@ -24146,7 +24146,7 @@ div.page_komentarji ul .spremenljivka_content input[type=radio] + span.enka-chec
 div.page_komentarji_anketa ul .spremenljivka_content input[type=radio] + span.enka-checkbox-radio:before {
   font-family: "Font Awesome 5 Free";
   display: inline-block;
-  content: "";
+  content: "\f111";
   letter-spacing: 10px;
 }
 div.page_komentarji ul .spremenljivka_content input[type=radio] + span.enka-custom-radio:before,
@@ -24156,7 +24156,7 @@ div.page_komentarji_anketa ul .spremenljivka_content input[type=radio] + span.en
 }
 div.page_komentarji ul .spremenljivka_content input[type=radio]:checked + span.enka-checkbox-radio:before,
 div.page_komentarji_anketa ul .spremenljivka_content input[type=radio]:checked + span.enka-checkbox-radio:before {
-  content: "";
+  content: "\f192";
 }
 div.page_komentarji ul .spremenljivka_content input[type=checkbox],
 div.page_komentarji_anketa ul .spremenljivka_content input[type=checkbox] {
@@ -24172,12 +24172,12 @@ div.page_komentarji ul .spremenljivka_content input[type=checkbox] + span.enka-c
 div.page_komentarji_anketa ul .spremenljivka_content input[type=checkbox] + span.enka-checkbox-radio:before {
   font-family: "Font Awesome 5 Free";
   display: inline-block;
-  content: "";
+  content: "\f0c8";
   letter-spacing: 10px;
 }
 div.page_komentarji ul .spremenljivka_content input[type=checkbox]:checked + span.enka-checkbox-radio:before,
 div.page_komentarji_anketa ul .spremenljivka_content input[type=checkbox]:checked + span.enka-checkbox-radio:before {
-  content: "";
+  content: "\f14a";
   letter-spacing: 8px;
 }
 div.page_komentarji ul div.question_comment_holder,
@@ -24607,12 +24607,6 @@ div#vabila div.more div.more_block div.more_title a.help {
   text-decoration: none;
   margin-left: 5px;
 }
-div#vabila div.more div.more_block:first-of-type .more_title {
-  color: #FFC700;
-}
-div#vabila div.more div.more_block:first-of-type span.faicon.empty {
-  color: #FFC700;
-}
 
 div#general_popup div.popup_content.publish {
   max-width: 600px;
@@ -26147,7 +26141,7 @@ div.subpage_coding .coding-refresh .button_holder button:last-child {
 div.subpage_coding .coding-refresh.warning_popup h2::before {
   padding-right: 8px;
   font-family: "Font Awesome 5 Free";
-  content: "";
+  content: "\f071";
   font-size: 14px;
   color: #FFC700;
 }
@@ -26329,7 +26323,7 @@ div.subpage_coding #coding .button_holder button:last-child {
 div.subpage_coding #coding.warning_popup h2::before {
   padding-right: 8px;
   font-family: "Font Awesome 5 Free";
-  content: "";
+  content: "\f071";
   font-size: 14px;
   color: #FFC700;
 }
@@ -26653,7 +26647,7 @@ div.subpage_coding .floatRecodeSpremenljivka .button_holder button:last-child {
 div.subpage_coding .floatRecodeSpremenljivka.warning_popup h2::before {
   padding-right: 8px;
   font-family: "Font Awesome 5 Free";
-  content: "";
+  content: "\f071";
   font-size: 14px;
   color: #FFC700;
 }
@@ -27004,18 +26998,18 @@ ul#merge li {
   -webkit-text-stroke: 0.35px;
 }
 .quick_edit_container #edit_survey_data .quick_edit_inner .spremenljivka input[type=checkbox] + span.enka-checkbox-radio:before {
-  content: "";
+  content: "\f0c8";
   letter-spacing: 10px;
 }
 .quick_edit_container #edit_survey_data .quick_edit_inner .spremenljivka input[type=checkbox]:checked + span.enka-checkbox-radio:before {
-  content: "";
+  content: "\f14a";
 }
 .quick_edit_container #edit_survey_data .quick_edit_inner .spremenljivka input[type=radio] + span.enka-checkbox-radio:before {
-  content: "";
+  content: "\f111";
   letter-spacing: 10px;
 }
 .quick_edit_container #edit_survey_data .quick_edit_inner .spremenljivka input[type=radio]:checked + span.enka-checkbox-radio:before {
-  content: "";
+  content: "\f192";
 }
 .quick_edit_container #edit_survey_data .quick_edit_inner .spremenljivka input[type=checkbox] + span.enka-checkbox-radio,
 .quick_edit_container #edit_survey_data .quick_edit_inner .spremenljivka input[type=radio] + span.enka-checkbox-radio,
@@ -27514,7 +27508,7 @@ and open the template in the editor.
 #div_export_setting_show.warning_popup h2::before {
   padding-right: 8px;
   font-family: "Font Awesome 5 Free";
-  content: "";
+  content: "\f071";
   font-size: 14px;
   color: #FFC700;
 }
@@ -29051,15 +29045,15 @@ iframe#ifmcontentstoprint {
 }
 
 .rsdl_bck1 {
-  background-color: #fae2e2 !important;
+  background-color: rgb(250, 226, 226) !important;
 }
 
 .rsdl_bck2 {
-  background-color: #ff9d9d !important;
+  background-color: rgb(255, 157, 157) !important;
 }
 
 .rsdl_bck3 {
-  background-color: #f84242 !important;
+  background-color: rgb(248, 66, 66) !important;
 }
 
 .rsdl_bck4 {
@@ -30572,7 +30566,7 @@ ul.vrednost_sort input[type=text] {
 .subpage_analysis_creport #anketa_custom_report #newCReportProfile.warning_popup h2::before {
   padding-right: 8px;
   font-family: "Font Awesome 5 Free";
-  content: "";
+  content: "\f071";
   font-size: 14px;
   color: #FFC700;
 }
@@ -30856,7 +30850,7 @@ and open the template in the editor.
 #dsp_inspect_cover.warning_popup h2::before {
   padding-right: 8px;
   font-family: "Font Awesome 5 Free";
-  content: "";
+  content: "\f071";
   font-size: 14px;
   color: #FFC700;
 }
@@ -31390,7 +31384,7 @@ input#endDate {
 .mc_table_settings.warning_popup h2::before {
   padding-right: 8px;
   font-family: "Font Awesome 5 Free";
-  content: "";
+  content: "\f071";
   font-size: 14px;
   color: #FFC700;
 }
@@ -31603,7 +31597,7 @@ input#endDate {
 #newMCTable.warning_popup h2::before {
   padding-right: 8px;
   font-family: "Font Awesome 5 Free";
-  content: "";
+  content: "\f071";
   font-size: 14px;
   color: #FFC700;
 }
@@ -31792,7 +31786,7 @@ input#endDate {
 #renameMCTable.warning_popup h2::before {
   padding-right: 8px;
   font-family: "Font Awesome 5 Free";
-  content: "";
+  content: "\f071";
   font-size: 14px;
   color: #FFC700;
 }
@@ -31981,7 +31975,7 @@ input#endDate {
 #deleteMCTable.warning_popup h2::before {
   padding-right: 8px;
   font-family: "Font Awesome 5 Free";
-  content: "";
+  content: "\f071";
   font-size: 14px;
   color: #FFC700;
 }
@@ -32367,7 +32361,7 @@ button.buttons-columnVisibility.active {
 table.usersTable {
   margin-left: 14px;
   margin-right: 14px;
-  width: calc(100% - 2*14px);
+  width: calc(100% - 28px);
   white-space: nowrap;
   border-collapse: collapse !important;
 }
@@ -32488,24 +32482,19 @@ table.dataTable td:not(:first-of-type), table.dataTable th:not(:first-of-type) {
   #quick_comments_link.newCss {
     display: none;
   }
-
   #firstNavigation ol.right-side {
     display: none;
   }
-
   div.status_advanced {
     flex-direction: column;
   }
-
   div.status_advanced_box {
     width: 100%;
     box-sizing: border-box;
   }
-
   a.status_advanced_link {
     width: 95%;
   }
-
   .content_div_normalmode {
     overflow-x: auto;
   }
@@ -32573,7 +32562,6 @@ body #main_holder #main .wide {
     width: 100%;
     margin: 0;
   }
-
   fieldset {
     width: 100% !important;
     box-sizing: border-box !important;
@@ -32603,44 +32591,36 @@ fieldset textarea {
   fieldset .setting {
     height: auto !important;
   }
-
   .setting_horizontal_wrapper {
     flex-direction: column !important;
   }
-
   #vnosi_paginacija div select {
     display: inline-block;
     width: fit-content;
     margin: 0 5px;
     text-align: center;
   }
-
   div.breadcrumbs {
     display: block;
     padding: 15px;
     color: #1e88e5;
     font-weight: 600;
   }
-
   button.small, submit.small {
     min-width: auto;
     padding: 5px 16px;
   }
-
   button.medium, submit.medium {
     min-width: auto;
     padding: 10px 24px;
   }
-
   button.large, submit.large {
     min-width: auto;
     padding: 12px 32px;
   }
-
   .top_note {
     padding: 8px 16px;
   }
-
   header {
     /* Mobile meni */
     /* Mobile meni - NASTAVITVE V UREJANJU ANKETE*/
@@ -32896,7 +32876,6 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
   header .mobile_settings .mobile_settings_content a .setting_text {
     width: auto;
   }
-
   footer#srv_footer {
     display: flex;
     flex-direction: column;
@@ -32918,7 +32897,6 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
     padding: 0;
     border: 0;
   }
-
   /* Popup za vprasajcke */
   .qtip {
     position: fixed !important;
@@ -32929,7 +32907,6 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
     left: 10% !important;
     box-shadow: 0 0 15px 15px rgba(0, 0, 0, 0.34) !important;
   }
-
   .divPopUp {
     width: calc(100% - 32px) !important;
     max-width: calc(100% - 32px) !important;
@@ -32940,12 +32917,10 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
     width: calc(100% - 32px) !important;
     max-width: calc(100% - 32px) !important;
   }
-
   /* Vse povezano s paketi in placili */
   .dt-buttons {
     display: none;
   }
-
   #main #moje_ankete_edit #anketa_edit {
     padding: 0 !important;
   }
@@ -33023,7 +32998,6 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
   #main #moje_ankete_edit fieldset div.setting {
     margin-bottom: 10px;
   }
-
   #new_anketa_div {
     display: flex;
     flex-direction: column;
@@ -33107,7 +33081,6 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
     border: 1px solid #c8e3f8 !important;
     border-radius: 1px;
   }
-
   .dashboard_top_settings {
     flex-direction: column;
   }
@@ -33120,19 +33093,16 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
     margin-left: 0;
     margin-right: 16px;
   }
-
   .dashboard_boxes {
     flex-direction: column;
   }
   .dashboard_boxes .dashboard_box {
     margin: 0 0 32px 0;
   }
-
   .locked .add-variable-mobile,
 .spremenljivka_content .add-variable {
     display: none !important;
   }
-
   #branching {
     width: 100%;
     margin: 0;
@@ -33237,11 +33207,9 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
     margin: 0;
     padding: 0 12px;
   }
-
   .toolbox_holder {
     display: none;
   }
-
   .mobile_add_question {
     display: block;
     position: fixed;
@@ -33261,7 +33229,6 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
     line-height: 15px;
     font-weight: 600;
   }
-
   .mobile_add_question_popup {
     z-index: 9999;
     position: fixed;
@@ -33315,7 +33282,6 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
     font-size: 14px;
     font-weight: 500;
   }
-
   #vprasanje_float_editing .vprasanje_edit_holder {
     position: fixed;
     z-index: 99999;
@@ -33368,7 +33334,6 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
     margin-left: 0 !important;
     text-align: center;
   }
-
   #main #anketa #globalSetingsList {
     max-width: 100% !important;
     width: 100% !important;
@@ -33381,7 +33346,6 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
 #main #anketa #globalSetingsList fieldset span.charalimit#anketa_note_chars {
     width: 100%;
   }
-
   /* NASTAVITVE in ARHIVI */
   /* OBLIKA */
   #main #anketa #anketa_edit.page_tema #div_theme_group_holder {
@@ -33397,18 +33361,15 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
     width: 100%;
     height: auto;
   }
-
   #theme-editor {
     width: 100% !important;
     float: none !important;
   }
-
   #theme-preview {
     width: 100% !important;
     float: none !important;
     margin-top: 80px !important;
   }
-
   /* ARHIVI */
   #main #anketa #anketa_edit.page_arhivi {
     flex-direction: column-reverse;
@@ -33426,7 +33387,6 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
   #main #anketa #anketa_edit.page_arhivi #div_archive_content fieldset input {
     width: 100% !important;
   }
-
   div.page_tema .theme_list {
     flex-wrap: wrap;
   }
@@ -33453,7 +33413,6 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
   div.page_tema div#theme_grid_holder div.div_theme_group div.theme_label .theme_label_options .button {
     margin-right: 8px;
   }
-
   .page_theme-editor #theme-preview {
     display: none;
   }
@@ -33461,7 +33420,6 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
     width: 100% !important;
     flex-wrap: wrap;
   }
-
   #srv_diagnostic br {
     display: none;
   }
@@ -33482,7 +33440,6 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
 #srv_diagnostic #srv_diagnostic_results_right table td + td {
     width: auto !important;
   }
-
   .subpage_testnipodatki {
     line-height: 20px;
   }
@@ -33496,7 +33453,6 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
   .subpage_testnipodatki form label input {
     vertical-align: bottom;
   }
-
   .lastnosti_wrapper {
     flex-direction: column !important;
   }
@@ -33504,7 +33460,6 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
 .lastnosti_wrapper .lastnosti_right {
     width: 100% !important;
   }
-
   .page_vabila #vabila .button_holder {
     flex-direction: column;
     align-items: flex-start;
@@ -33529,7 +33484,6 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
   .page_vabila #vabila .more_block {
     width: 100%;
   }
-
   .page_invitations #inv_top_navi {
     flex-direction: column;
     align-items: flex-start;
@@ -33597,7 +33551,6 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
   .page_invitations .button_holder button {
     margin-bottom: 8px;
   }
-
   #vabila > table,
 table.invitations_settings,
 #inv_msg_preview table,
@@ -33681,7 +33634,6 @@ table.invitations_settings p label input[type=password],
     width: 100% !important;
     box-sizing: border-box;
   }
-
   #surveyInvitationSetting,
 #surveyInvitationSettingServer {
     min-width: 100% !important;
@@ -33689,7 +33641,6 @@ table.invitations_settings p label input[type=password],
     margin: 10px 0 !important;
     box-sizing: border-box !important;
   }
-
   #inv_top_navi {
     display: flex;
     flex-direction: column;
@@ -33728,7 +33679,6 @@ table.invitations_settings p label input[type=password],
   #inv_top_navi > #inv_step_nav.yellow .inv_step_space {
     display: none;
   }
-
   #inv_recipients_profiles_holder,
 #inv_import_list_container,
 #inv_messages_profiles_holder,
@@ -33749,7 +33699,6 @@ table.invitations_settings p label input[type=password],
 #inv_select_mail_preview textarea {
     width: 100%;
   }
-
   #inv_msg_preview table th {
     height: auto !important;
     width: 100% !important;
@@ -33761,7 +33710,6 @@ table.invitations_settings p label input[type=password],
     width: 100%;
     box-sizing: border-box;
   }
-
   .addthis_toolbox {
     line-height: 24px;
   }
@@ -33776,11 +33724,9 @@ table.invitations_settings p label input[type=password],
   .addthis_toolbox .addthis_separator {
     font-size: 16px;
   }
-
   #inv_field_container ul li {
     width: 45%;
   }
-
   /* grafika ko ni podatkov */
   div.no_data_alert img {
     width: 100%;
@@ -33792,7 +33738,6 @@ table.invitations_settings p label input[type=password],
     flex-direction: column;
     align-items: center;
   }
-
   .page_data .data_table_top_holder {
     flex-direction: column;
     align-items: flex-start;
@@ -33863,11 +33808,9 @@ table.invitations_settings p label input[type=password],
     width: 100%;
     margin-bottom: 16px;
   }
-
   body.data_fullscreen #analiza_data {
     top: 68px;
   }
-
   .subpage_append .anketa_edit_main,
 .subpage_merge .anketa_edit_main,
 .subpage_calculation .anketa_edit_main,
@@ -33908,7 +33851,6 @@ table.invitations_settings p label input[type=password],
     clear: both;
     margin: 40px 0 0 0 !important;
   }
-
   .subpage_quick_edit #quick_edit_top_line {
     flex-direction: column-reverse;
   }
@@ -33928,7 +33870,6 @@ table.invitations_settings p label input[type=password],
   .subpage_quick_edit .quick_edit_container .quick_edit_bottom_line {
     justify-content: center;
   }
-
   .analysis_bottom_settings {
     flex-wrap: wrap;
   }
@@ -33938,16 +33879,13 @@ table.invitations_settings p label input[type=password],
     margin: 0 0 16px 0 !important;
     border: 0;
   }
-
   .div_analiza_icons,
 .div_analiza_scale {
     opacity: 1 !important;
   }
-
   .analysis_icons_holder {
     display: none;
   }
-
   .chart_holder {
     width: 100%;
     box-sizing: border-box;
@@ -33970,7 +33908,6 @@ table.invitations_settings p label input[type=password],
     display: block;
     clear: both;
   }
-
   table.analysis_reports {
     border-spacing: 0px;
   }
@@ -33987,14 +33924,12 @@ table.analysis_reports > tbody > tr > td {
   table.analysis_reports fieldset {
     margin-bottom: 0 !important;
   }
-
   .reports_holder {
     flex-direction: column;
   }
   .reports_holder fieldset {
     width: 100%;
   }
-
   .noSurvey_sequence {
     padding: 0;
   }
@@ -34016,13 +33951,11 @@ table.analysis_reports > tbody > tr > td {
   .noSurvey_sequence .buttons_holder a .button {
     margin: 10px 30px;
   }
-
   #table-horizontal-scroll-wrapper1-userchanges {
     display: table;
     table-layout: fixed;
     width: 100%;
   }
-
   #table-horizontal-scroll-wrapper2-userchanges {
     display: table-cell;
     overflow-x: auto;
@@ -34033,7 +33966,6 @@ table.analysis_reports > tbody > tr > td {
     border-collapse: collapse;
     white-space: nowrap;
   }
-
   .page_arhivi .anketa_edit_left,
 .page_tracking .anketa_edit_left,
 .subpage_anal_arch .anketa_edit_left,
diff --git a/resources/sass/admin_new/pages/survey_objava/pregled.scss b/resources/sass/admin_new/pages/survey_objava/pregled.scss
index 568c24018..1f8c353af 100644
--- a/resources/sass/admin_new/pages/survey_objava/pregled.scss
+++ b/resources/sass/admin_new/pages/survey_objava/pregled.scss
@@ -260,15 +260,15 @@ div#vabila {
 
         }
 
-        div.more_block:first-of-type{
-            .more_title{
-                color: #FFC700;
-            }
+        // div.more_block:first-of-type{
+        //     .more_title{
+        //         color: #FFC700;
+        //     }
 
-            span.faicon.empty{
-                color: #FFC700;
-            }
-        }
+        //     span.faicon.empty{
+        //         color: #FFC700;
+        //     }
+        // }
     }
 
 }

From 4c421854580bef64cbae064ff97b27f503f1a108 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nejc=20Kova=C4=8D?= <nejc.kouko@gmail.com>
Date: Mon, 18 Jul 2022 12:36:00 +0200
Subject: [PATCH 084/110] potrditev registracije: gumb font sans pro

---
 frontend/simple/css/style.css                 | 25 +++++--------------
 .../sass/frontend_simple/basic/popravki.scss  |  6 ++++-
 2 files changed, 11 insertions(+), 20 deletions(-)

diff --git a/frontend/simple/css/style.css b/frontend/simple/css/style.css
index 8a6ed95d6..5404f04d7 100644
--- a/frontend/simple/css/style.css
+++ b/frontend/simple/css/style.css
@@ -3,8 +3,7 @@
     Created on : 28.3.2020
     Author     : Peter Hrvatin
 */
-/* BARVE */
-/* FONTI */
+/* BARVE */ /* FONTI */
 @import url("https://fonts.googleapis.com/css?family=Montserrat:300,400,400i,600,700&amp;subset=latin-ext");
 @import url("https://fonts.googleapis.com/css2?family=Source+Sans+Pro:wght@300;400;600;700&display=swap");
 .thin {
@@ -731,16 +730,13 @@ body.reset_password_activate div.label {
   #main .main_content {
     min-height: unset;
   }
-
   /* --------------HAMBURGER---------------------------------- */
   .nav-desktop {
     display: none;
   }
-
   .mobile {
     display: block;
   }
-
   #nav-icon3 {
     width: 38px;
     height: 20px;
@@ -784,42 +780,35 @@ body.reset_password_activate div.label {
   #nav-icon3 span:nth-child(4) {
     top: 18px;
   }
-
   #nav-icon3.open span:nth-child(1) {
     top: 9px;
     width: 0%;
     left: 50%;
   }
-
   #nav-icon3.open span:nth-child(2) {
     -webkit-transform: rotate(45deg);
     -moz-transform: rotate(45deg);
     -o-transform: rotate(45deg);
     transform: rotate(45deg);
   }
-
   #nav-icon3.open span:nth-child(3) {
     -webkit-transform: rotate(-45deg);
     -moz-transform: rotate(-45deg);
     -o-transform: rotate(-45deg);
     transform: rotate(-45deg);
   }
-
   #nav-icon3.open span:nth-child(4) {
     top: 9px;
     width: 0%;
     left: 50%;
   }
-
   #links {
     display: none;
   }
-
   /*  */
   .aai a {
     color: #333333;
   }
-
   #links.open {
     position: absolute;
     top: 72px;
@@ -829,9 +818,8 @@ body.reset_password_activate div.label {
     align-items: center;
     width: 100%;
     height: 100vh;
-    background-color: white;
+    background-color: rgb(255, 255, 255);
   }
-
   #links .menu_item {
     font-size: 30px;
     margin-top: 30px;
@@ -843,7 +831,6 @@ body.reset_password_activate div.label {
   #links .menu_item a:hover {
     color: #1E88E5;
   }
-
   body #main .main_content {
     padding: 10px 20px 40px 20px;
   }
@@ -885,7 +872,6 @@ body #main .main_content input[type=button] {
     margin: 0;
     width: 100%;
   }
-
   body.landing_page,
 body.login,
 body.register,
@@ -972,7 +958,6 @@ body.login_noEmail #content.aai #main .main_content .app_subtitle {
     width: 100%;
     box-sizing: border-box;
   }
-
   footer {
     padding: 0 20px;
   }
@@ -1003,7 +988,6 @@ body.login_noEmail #content.aai #main .main_content .app_subtitle {
   footer .footer_content .logo_holder img {
     margin: 20px auto 30px auto;
   }
-
   .cookie_notice {
     flex-direction: column;
   }
@@ -1011,7 +995,6 @@ body.login_noEmail #content.aai #main .main_content .app_subtitle {
     margin: 0 0 20px 0;
     text-align: center;
   }
-
   body #main .main_content .register_holder h1 {
     font-size: 50px;
     font-weight: 300;
@@ -1527,6 +1510,10 @@ body.register #main .landing_page_window label:first-of-type {
   margin-top: 0px;
 }
 
+.register_email input[type=button] {
+  font-family: "Source Sans Pro", "sans-serif";
+}
+
 /* GDPR ZAHTEVEK -------------------------------------- */
 #main {
   background-color: #FFFFFF;
diff --git a/resources/sass/frontend_simple/basic/popravki.scss b/resources/sass/frontend_simple/basic/popravki.scss
index 3e0c7a509..7364b0be4 100644
--- a/resources/sass/frontend_simple/basic/popravki.scss
+++ b/resources/sass/frontend_simple/basic/popravki.scss
@@ -587,4 +587,8 @@ body.register #main .landing_page_window label:first-of-type {
     margin-top: 0px;
 }
 
-// -----------------------------------------
\ No newline at end of file
+// ------REGISTER_EMAIL----------------------------------
+
+.register_email input[type="button"] {
+    font-family: $SansPro_font;
+}
\ No newline at end of file

From b13f70d84865875986e3c51dad1e467bec708ee2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nejc=20Kova=C4=8D?= <nejc.kouko@gmail.com>
Date: Mon, 18 Jul 2022 15:38:07 +0200
Subject: [PATCH 085/110] login pozabljeno geslo popravljen font, barva

---
 frontend/simple/css/style.css                      |  7 +++++++
 resources/sass/frontend_simple/basic/popravki.scss | 11 +++++++++++
 2 files changed, 18 insertions(+)

diff --git a/frontend/simple/css/style.css b/frontend/simple/css/style.css
index 5404f04d7..f89329de0 100644
--- a/frontend/simple/css/style.css
+++ b/frontend/simple/css/style.css
@@ -1514,6 +1514,13 @@ body.register #main .landing_page_window label:first-of-type {
   font-family: "Source Sans Pro", "sans-serif";
 }
 
+body.reset_password {
+  color: #333;
+}
+body.reset_password input[type=button] {
+  font-family: "Source Sans Pro", "sans-serif";
+}
+
 /* GDPR ZAHTEVEK -------------------------------------- */
 #main {
   background-color: #FFFFFF;
diff --git a/resources/sass/frontend_simple/basic/popravki.scss b/resources/sass/frontend_simple/basic/popravki.scss
index 7364b0be4..24592d2c3 100644
--- a/resources/sass/frontend_simple/basic/popravki.scss
+++ b/resources/sass/frontend_simple/basic/popravki.scss
@@ -591,4 +591,15 @@ body.register #main .landing_page_window label:first-of-type {
 
 .register_email input[type="button"] {
     font-family: $SansPro_font;
+}
+
+// ------RESET PASSWORD----------------------------------
+
+body.reset_password{
+
+    color: #333;
+
+    input[type="button"]{
+        font-family: $SansPro_font;
+    }
 }
\ No newline at end of file

From d00951513adb6541df3e0c5eb7db8a202e6f67db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nejc=20Kova=C4=8D?= <nejc.kouko@gmail.com>
Date: Mon, 18 Jul 2022 16:16:36 +0200
Subject: [PATCH 086/110] objava-pregled responsive block

---
 public/css/admin_new.css                      | 21 ++++++-------
 .../pages/survey_objava/pregled.scss          | 30 ++++++++++++-------
 2 files changed, 31 insertions(+), 20 deletions(-)

diff --git a/public/css/admin_new.css b/public/css/admin_new.css
index 086979607..17b521e5b 100644
--- a/public/css/admin_new.css
+++ b/public/css/admin_new.css
@@ -24507,8 +24507,6 @@ div#vabila div.button_holder .copy_survey_url_holder button {
 }
 div#vabila div.button_holder #nice_url_button {
   margin: 0 0 0 32px;
-  background-color: #FFC700;
-  border: 1px #FFC700 solid;
 }
 div#vabila div.button_holder #nice_url_holder {
   display: flex;
@@ -24557,11 +24555,11 @@ div#vabila div.more {
   display: flex;
   flex-direction: row;
   flex-wrap: wrap;
-  gap: 16px 32px;
+  gap: 16px;
 }
 div#vabila div.more div.more_block {
   height: auto;
-  width: 298px;
+  width: 464px;
   background-color: #FFFFFF;
   border: 1px solid #E5E5E5;
   padding: 16px;
@@ -24654,7 +24652,7 @@ div#general_popup div.popup_content.publish.settings div#publish_settings_more {
 
 @media screen and (max-width: 1130px) {
   .more_block {
-    width: 40% !important;
+    width: 42% !important;
   }
 }
 @media screen and (max-width: 1025px) {
@@ -24676,8 +24674,11 @@ div#general_popup div.popup_content.publish.settings div#publish_settings_more {
   .page_vabila #vabila .button_holder #nice_url_holder {
     flex-direction: row !important;
   }
+  .page_vabila #vabila .button_holder #nice_url_holder .url {
+    margin-top: 9px;
+  }
   .page_vabila #vabila .button_holder #nice_url_holder .buttons {
-    margin: 0px !important;
+    margin: 9px 0px 0px 0px !important;
   }
 }
 @media screen and (max-width: 725px) {
@@ -24685,19 +24686,19 @@ div#general_popup div.popup_content.publish.settings div#publish_settings_more {
     font-size: 20px !important;
   }
 }
-@media screen and (max-width: 540px) {
+@media screen and (max-width: 660px) {
   .page_vabila #vabila .more .more_block {
     width: unset !important;
     width: 100% !important;
   }
+  .page_vabila #vabila .more .more_block #text {
+    width: 100%;
+  }
 }
 @media screen and (max-width: 500px) {
   .page_vabila #vabila .button_holder #nice_url_holder {
     flex-direction: column !important;
   }
-  .page_vabila #vabila .button_holder #nice_url_holder .buttons {
-    margin: 0px !important;
-  }
 }
 .page_invitations .invitations_holder.half-half {
   display: flex;
diff --git a/resources/sass/admin_new/pages/survey_objava/pregled.scss b/resources/sass/admin_new/pages/survey_objava/pregled.scss
index 1f8c353af..4efaf9319 100644
--- a/resources/sass/admin_new/pages/survey_objava/pregled.scss
+++ b/resources/sass/admin_new/pages/survey_objava/pregled.scss
@@ -124,8 +124,7 @@ div#vabila {
         // Nice URL - gumb
         #nice_url_button{
             margin: 0 0 0 32px;
-            background-color: #FFC700;
-            border: 1px #FFC700 solid;
+
         }
 
         // Nice URL - dodajanje
@@ -190,11 +189,11 @@ div#vabila {
         flex-direction: row;
         flex-wrap: wrap;
 
-        gap: 16px 32px;
+        gap: 16px;
 
         div.more_block {
             height: auto;
-            width: 298px;
+            width: 464px;
 
             background-color: $white;
             border: 1px solid $gray;
@@ -341,7 +340,7 @@ div#general_popup {
 @media screen and (max-width: 1130px){
 
     .more_block{
-        width: 40% !important;
+        width: 42% !important;
     }
 }
 
@@ -395,8 +394,13 @@ div#general_popup {
 
                     flex-direction: row !important;
 
+                    .url{
+                        margin-top: 9px;
+                    }
+
                     .buttons{
-                        margin: 0px !important;
+                        margin: 9px 0px 0px 0px !important;
+                        
                     }
 
                 }
@@ -419,7 +423,7 @@ div#general_popup {
     }
 }
 
-@media screen and (max-width: 540px) {
+@media screen and (max-width: 660px) {
     .page_vabila{
 
         #vabila{
@@ -430,7 +434,15 @@ div#general_popup {
                 .more_block{
                     width: unset !important;
                     width: 100% !important;
+
+                    #text {
+                        width: 100%;
+                    }
+
+
                 }
+
+
             }
 
     
@@ -451,9 +463,7 @@ div#general_popup {
 
                     flex-direction: column !important;
 
-                    .buttons{
-                        margin: 0px !important;
-                    }
+
 
                 }
 

From a274b36938472292abce1fc1220c789f7a55a83f Mon Sep 17 00:00:00 2001
From: tejagerjovic <teja.gerjovic@fdv.uni-lj.si>
Date: Tue, 19 Jul 2022 01:08:31 +0200
Subject: [PATCH 087/110] Lang popravki

---
 lang/1.php | 4 ++--
 lang/2.php | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lang/1.php b/lang/1.php
index 9f68c68dd..e20f2ab9d 100644
--- a/lang/1.php
+++ b/lang/1.php
@@ -2431,8 +2431,8 @@ $lang = array (
     "srv_knjiznica_add"     =>	 "&#268;e &#382;elite dodati spremenljivko v knji&#382;nico, jo povlecite v to polje",
     "srv_knjiznica_copy"    =>	 "&#268;e &#382;elite kopirati vpra&#154;anje, ga označite z ikono COPY",
     "srv_deleteall"         =>	 "Izbri&#154;i vse vnose",
-    "srv_expand"            =>	 "Odpri vse",
-    "srv_collapse"          =>	 "Zapri vse",
+    "srv_expand"            =>	 "Odpri vse bloke in pogoje",
+    "srv_collapse"          =>	 "Zapri vse bloke in pogoje",
     "srv_copy_tourl"        =>	 "Kopiraj anketo na spletno stran",
     "srv_copy_tourl_1"       =>	 "Kopiraj anketo med strežniki",
     "srv_copy"              =>	 "Kopiraj",
diff --git a/lang/2.php b/lang/2.php
index 2f711cde6..79ef91eca 100644
--- a/lang/2.php
+++ b/lang/2.php
@@ -2412,8 +2412,8 @@ $lang = array (
     "srv_knjiznica_add"     =>  "To add a question to a library, drag it to this field",
     "srv_knjiznica_copy"    =>  "To copy a question, click on COPY icon",
     "srv_deleteall"         =>  "Delete all inserts",
-    "srv_expand"            =>  "Expand all",
-    "srv_collapse"          =>  "Collapse all",
+    "srv_expand"            =>  "Expand all blocks and conditions",
+    "srv_collapse"          =>  "Collapse all blocks and conditions",
     "srv_copy_tourl"        =>  "Copy survey to webpage",
 	"srv_copy_tourl_1"       =>	"Copy survey between servers",
     "srv_copy"              =>  "Copy",

From 85e9e715e579440af35ee5bbae83376c635b0fa4 Mon Sep 17 00:00:00 2001
From: tejagerjovic <teja.gerjovic@fdv.uni-lj.si>
Date: Tue, 19 Jul 2022 02:27:04 +0200
Subject: [PATCH 088/110] [Redizajn 1KA v2] - Testiranje --> Diagnostika - v1
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Middle section: grafa za dolžino in kompleksnost ankete
---
 .../classes/class.SurveyDiagnostics.php       |  83 +++++++++++-
 admin/survey/script/script.js                 |  29 +++++
 public/css/admin_new.css                      | 121 +++++++++++++++++-
 .../pages/survey_testiranje/diagnostika.scss  |  48 ++++++-
 4 files changed, 273 insertions(+), 8 deletions(-)

diff --git a/admin/survey/classes/class.SurveyDiagnostics.php b/admin/survey/classes/class.SurveyDiagnostics.php
index 21ee0b601..a0f76052c 100644
--- a/admin/survey/classes/class.SurveyDiagnostics.php
+++ b/admin/survey/classes/class.SurveyDiagnostics.php
@@ -197,28 +197,42 @@ class SurveyDiagnostics
 
 		if ($total < 120) { # 2min
 			$time = $lang['srv_diagnostic_time_1'];
+			$time_chart = 20;
 		} else if ($total < 300) { # 5min
 			$time = $lang['srv_diagnostic_time_2'];
+			$time_chart = 40;
 		} else if ($total < 900) { # 15 min
 			$time = $lang['srv_diagnostic_time_3'];
+			$time_chart = 60;
 		} else if ($total < 1800) { # 30 min
 			$time = $lang['srv_diagnostic_time_4'];
+			$time_chart = 80;
 		}	else { #> 30 min
 			$time = $lang['srv_diagnostic_time_5'];
+			$time_chart = 100;
 		}
-		
+		$excess = 100 - $time_chart;
+		$display_length = "'[".$time_chart.",".$excess."]'"; //array za chart
+
 		# Kompleksnost
 		if ((int)($this->cnt_blocks + $this->cnt_conditions) == 0) {
 			$kompleksnost = $lang['srv_diagnostic_complexity_1'];
+			$complex_chart = 20;
 		} else if ((int)($this->cnt_blocks + $this->cnt_conditions) == 1) {
 			$kompleksnost = $lang['srv_diagnostic_complexity_2'];
+			$complex_chart = 40;
 		} else if ((int)($this->cnt_blocks + $this->cnt_conditions) < 10) {
 			$kompleksnost = $lang['srv_diagnostic_complexity_3'];
+			$complex_chart = 60;
 		} else if ((int)($this->cnt_blocks + $this->cnt_conditions) < 50) {
 			$kompleksnost = $lang['srv_diagnostic_complexity_4'];
+			$complex_chart = 80;
 		} else {
 			$kompleksnost = $lang['srv_diagnostic_complexity_5'];
+			$complex_chart = 100;
 		}
+		$excess = 100 - $complex_chart;
+		$display_complex = "'[".$complex_chart.",".$excess."]'"; //array za chart
 
 		echo '<h2>'.$lang['srv_testiranje_diagnostika'].'</h2>';
 
@@ -453,8 +467,75 @@ class SurveyDiagnostics
 		echo '</table>';
 
 		// LASTNOSTI ANKETE
+		echo '<script src="https://cdn.jsdelivr.net/npm/chart.js"></script>'; //Chart.js source
+
 		echo '<h2>'.$lang['srv_testiranje_diagnostika_lastnosti'].'</h2>';
 
+		echo '<div class="lastnosti_wrapper">';
+
+		echo '<div class="lastnosti_left">';
+		echo '</div>'; #lastnosti_left
+
+		echo '<div class="lastnosti_middle">';
+		// Dolžina ankete
+		if($lang['id'] == '1')
+			$link_time = 'href="https://www.1ka.si/d/sl/spletne-ankete/osnovna-priporocila/kako-dolga-naj-bo-moja-anketa?from1ka=1" target="_blank"';
+        else
+			$link_time = 'href="https://www.1ka.si/d/en/web-surveys/basic-recommendations/how-long-should-my-survey-be?from1ka=1" target="_blank"';
+		
+		echo '<div class="box">';
+		echo '<div class="title">'.$lang['srv_diagnostic_1_element_5'].'</div>';
+		
+		echo '<div class="diagnostic_graph">';
+		
+		echo '<div class="circle">';
+		echo '<canvas id="survey_length"></canvas>';
+		echo '</div>';
+		echo '<script type="text/javascript"> diagnosticsChart(\'survey_length\','.$display_length.'); </script>';
+		
+		echo '<div class="other_text">';
+		echo '<p>'.$time.'</p>';
+		echo '<a '.$link_time.'>'.$lang['srv_diagnostic_time_extra'].'</a>';
+		echo '</div>';
+		
+		echo '</div>';
+		echo '</div>'; #box
+
+		// Kompleksnost ankete
+		if($lang['id'] == '1')
+			$link_complex = 'href="https://www.1ka.si/d/sl/spletne-ankete/osnovna-priporocila/kaj-pomeni-kompleksnost-ankete?from1ka=1" target="_blank"';
+        else
+			$link_complex = 'href="https://www.1ka.si/d/en/web-surveys/basic-recommendations/what-does-survey-complexity-mean?from1ka=1" target="_blank"';
+		
+		echo '<div class="box">';
+		echo '<div class="title">'.$lang['srv_diagnostic_1_element_4'].'</div>';
+		echo '<div class="diagnostic_graph">';
+		
+		echo '<div class="circle">';
+		echo '<canvas id="survey_complex"></canvas>';
+		echo '</div>';
+		echo '<script type="text/javascript"> diagnosticsChart(\'survey_complex\','.$display_complex.'); </script>';
+		
+		echo '<div class="other_text">';
+		echo '<p>'.$kompleksnost.'</p>';
+		echo '<a '.$link_complex.'>'.$lang['srv_diagnostic_complexity_extra'].'</a>';
+		echo '</div>';
+		
+		echo '</div>';
+		echo '</div>'; #box
+		
+		echo '</div>'; #lastnosti_middle
+
+		echo '<div class="lastnosti_right">';
+		echo '</div>'; #lastnosti_right
+
+		echo '</div>'; #lastnosti_wrapper
+
+
+
+
+		/////////////////////////////////////////////////////////////////////// Lastnosti staro
+
 		echo '<div class="lastnosti_wrapper">';
 		
 		echo '<div class="lastnosti_left">';
diff --git a/admin/survey/script/script.js b/admin/survey/script/script.js
index 65faa9537..494809807 100644
--- a/admin/survey/script/script.js
+++ b/admin/survey/script/script.js
@@ -5638,4 +5638,33 @@ function oneClickArchive(){
 	$('#general_popup').addClass('PopUpNarrow');
 	$('#general_popup').html('').fadeIn('slow');
 	$("#general_popup").load('ajax.php?a=oneClickArchive', {anketa: srv_meta_anketa_id});
+}
+
+function diagnosticsChart(place,display) {
+
+	const data = {
+		datasets: [{
+		  data: display,
+		  backgroundColor: [
+			'rgb(229,229,229)',
+			'rgb(30, 136, 229)',
+		  ],
+		  borderWidth: 0, //spacing between slices
+		}]
+	};
+	
+	  const config = {
+		type: 'doughnut',
+		data: data,
+		options: {
+			events: [], //no hover labels,animations,...
+			cutout: 32, //slice width
+		}
+	};
+
+	  const myChart = new Chart(
+		document.getElementById(place),
+		config
+	  );
+
 }
\ No newline at end of file
diff --git a/public/css/admin_new.css b/public/css/admin_new.css
index 17b521e5b..f2b9c31ec 100644
--- a/public/css/admin_new.css
+++ b/public/css/admin_new.css
@@ -23909,12 +23909,61 @@ div#srv_diagnostic table td div.status_wrapper div.status a {
 div#srv_diagnostic div.lastnosti_wrapper {
   display: flex;
   flex-direction: row;
-  align-items: flex-start;
+  align-items: space-between;
   gap: 32px;
 }
 div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_left,
+div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_middle,
 div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_right {
-  width: 50%;
+  width: 33%;
+  display: flex;
+  flex-direction: column;
+  gap: 16px;
+}
+div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_left .box,
+div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_middle .box,
+div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_right .box {
+  border: 1px solid #E5E5E5;
+  border-radius: 2px;
+  padding: 16px;
+  display: flex;
+  flex-direction: column;
+}
+div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_left .box .title,
+div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_middle .box .title,
+div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_right .box .title {
+  text-transform: uppercase;
+  font-weight: 600;
+  margin-bottom: 16px;
+}
+div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_left .box .diagnostic_graph,
+div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_middle .box .diagnostic_graph,
+div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_right .box .diagnostic_graph {
+  display: flex;
+  flex-direction: row;
+  margin-top: -8px;
+}
+div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_left .box .diagnostic_graph .circle,
+div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_middle .box .diagnostic_graph .circle,
+div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_right .box .diagnostic_graph .circle {
+  height: 100px;
+  width: 100px;
+  margin-right: 16px;
+}
+div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_left .box .diagnostic_graph .other_text,
+div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_middle .box .diagnostic_graph .other_text,
+div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_right .box .diagnostic_graph .other_text {
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  gap: 16px;
+}
+div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_left .box .diagnostic_graph .other_text a,
+div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_middle .box .diagnostic_graph .other_text a,
+div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_right .box .diagnostic_graph .other_text a {
+  text-decoration: none;
+  font-size: 14px !important;
+  white-space: nowrap;
 }
 div#srv_diagnostic div.input_box {
   display: flex;
@@ -29046,15 +29095,15 @@ iframe#ifmcontentstoprint {
 }
 
 .rsdl_bck1 {
-  background-color: rgb(250, 226, 226) !important;
+  background-color: #fae2e2 !important;
 }
 
 .rsdl_bck2 {
-  background-color: rgb(255, 157, 157) !important;
+  background-color: #ff9d9d !important;
 }
 
 .rsdl_bck3 {
-  background-color: rgb(248, 66, 66) !important;
+  background-color: #f84242 !important;
 }
 
 .rsdl_bck4 {
@@ -32483,19 +32532,24 @@ table.dataTable td:not(:first-of-type), table.dataTable th:not(:first-of-type) {
   #quick_comments_link.newCss {
     display: none;
   }
+
   #firstNavigation ol.right-side {
     display: none;
   }
+
   div.status_advanced {
     flex-direction: column;
   }
+
   div.status_advanced_box {
     width: 100%;
     box-sizing: border-box;
   }
+
   a.status_advanced_link {
     width: 95%;
   }
+
   .content_div_normalmode {
     overflow-x: auto;
   }
@@ -32563,6 +32617,7 @@ body #main_holder #main .wide {
     width: 100%;
     margin: 0;
   }
+
   fieldset {
     width: 100% !important;
     box-sizing: border-box !important;
@@ -32592,36 +32647,44 @@ fieldset textarea {
   fieldset .setting {
     height: auto !important;
   }
+
   .setting_horizontal_wrapper {
     flex-direction: column !important;
   }
+
   #vnosi_paginacija div select {
     display: inline-block;
     width: fit-content;
     margin: 0 5px;
     text-align: center;
   }
+
   div.breadcrumbs {
     display: block;
     padding: 15px;
     color: #1e88e5;
     font-weight: 600;
   }
+
   button.small, submit.small {
     min-width: auto;
     padding: 5px 16px;
   }
+
   button.medium, submit.medium {
     min-width: auto;
     padding: 10px 24px;
   }
+
   button.large, submit.large {
     min-width: auto;
     padding: 12px 32px;
   }
+
   .top_note {
     padding: 8px 16px;
   }
+
   header {
     /* Mobile meni */
     /* Mobile meni - NASTAVITVE V UREJANJU ANKETE*/
@@ -32877,6 +32940,7 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
   header .mobile_settings .mobile_settings_content a .setting_text {
     width: auto;
   }
+
   footer#srv_footer {
     display: flex;
     flex-direction: column;
@@ -32898,6 +32962,7 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
     padding: 0;
     border: 0;
   }
+
   /* Popup za vprasajcke */
   .qtip {
     position: fixed !important;
@@ -32908,6 +32973,7 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
     left: 10% !important;
     box-shadow: 0 0 15px 15px rgba(0, 0, 0, 0.34) !important;
   }
+
   .divPopUp {
     width: calc(100% - 32px) !important;
     max-width: calc(100% - 32px) !important;
@@ -32918,10 +32984,12 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
     width: calc(100% - 32px) !important;
     max-width: calc(100% - 32px) !important;
   }
+
   /* Vse povezano s paketi in placili */
   .dt-buttons {
     display: none;
   }
+
   #main #moje_ankete_edit #anketa_edit {
     padding: 0 !important;
   }
@@ -32999,6 +33067,7 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
   #main #moje_ankete_edit fieldset div.setting {
     margin-bottom: 10px;
   }
+
   #new_anketa_div {
     display: flex;
     flex-direction: column;
@@ -33082,6 +33151,7 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
     border: 1px solid #c8e3f8 !important;
     border-radius: 1px;
   }
+
   .dashboard_top_settings {
     flex-direction: column;
   }
@@ -33094,16 +33164,19 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
     margin-left: 0;
     margin-right: 16px;
   }
+
   .dashboard_boxes {
     flex-direction: column;
   }
   .dashboard_boxes .dashboard_box {
     margin: 0 0 32px 0;
   }
+
   .locked .add-variable-mobile,
 .spremenljivka_content .add-variable {
     display: none !important;
   }
+
   #branching {
     width: 100%;
     margin: 0;
@@ -33208,9 +33281,11 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
     margin: 0;
     padding: 0 12px;
   }
+
   .toolbox_holder {
     display: none;
   }
+
   .mobile_add_question {
     display: block;
     position: fixed;
@@ -33230,6 +33305,7 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
     line-height: 15px;
     font-weight: 600;
   }
+
   .mobile_add_question_popup {
     z-index: 9999;
     position: fixed;
@@ -33283,6 +33359,7 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
     font-size: 14px;
     font-weight: 500;
   }
+
   #vprasanje_float_editing .vprasanje_edit_holder {
     position: fixed;
     z-index: 99999;
@@ -33335,6 +33412,7 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
     margin-left: 0 !important;
     text-align: center;
   }
+
   #main #anketa #globalSetingsList {
     max-width: 100% !important;
     width: 100% !important;
@@ -33347,6 +33425,7 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
 #main #anketa #globalSetingsList fieldset span.charalimit#anketa_note_chars {
     width: 100%;
   }
+
   /* NASTAVITVE in ARHIVI */
   /* OBLIKA */
   #main #anketa #anketa_edit.page_tema #div_theme_group_holder {
@@ -33362,15 +33441,18 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
     width: 100%;
     height: auto;
   }
+
   #theme-editor {
     width: 100% !important;
     float: none !important;
   }
+
   #theme-preview {
     width: 100% !important;
     float: none !important;
     margin-top: 80px !important;
   }
+
   /* ARHIVI */
   #main #anketa #anketa_edit.page_arhivi {
     flex-direction: column-reverse;
@@ -33388,6 +33470,7 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
   #main #anketa #anketa_edit.page_arhivi #div_archive_content fieldset input {
     width: 100% !important;
   }
+
   div.page_tema .theme_list {
     flex-wrap: wrap;
   }
@@ -33414,6 +33497,7 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
   div.page_tema div#theme_grid_holder div.div_theme_group div.theme_label .theme_label_options .button {
     margin-right: 8px;
   }
+
   .page_theme-editor #theme-preview {
     display: none;
   }
@@ -33421,6 +33505,7 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
     width: 100% !important;
     flex-wrap: wrap;
   }
+
   #srv_diagnostic br {
     display: none;
   }
@@ -33441,6 +33526,7 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
 #srv_diagnostic #srv_diagnostic_results_right table td + td {
     width: auto !important;
   }
+
   .subpage_testnipodatki {
     line-height: 20px;
   }
@@ -33454,6 +33540,7 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
   .subpage_testnipodatki form label input {
     vertical-align: bottom;
   }
+
   .lastnosti_wrapper {
     flex-direction: column !important;
   }
@@ -33461,6 +33548,7 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
 .lastnosti_wrapper .lastnosti_right {
     width: 100% !important;
   }
+
   .page_vabila #vabila .button_holder {
     flex-direction: column;
     align-items: flex-start;
@@ -33485,6 +33573,7 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
   .page_vabila #vabila .more_block {
     width: 100%;
   }
+
   .page_invitations #inv_top_navi {
     flex-direction: column;
     align-items: flex-start;
@@ -33552,6 +33641,7 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
   .page_invitations .button_holder button {
     margin-bottom: 8px;
   }
+
   #vabila > table,
 table.invitations_settings,
 #inv_msg_preview table,
@@ -33635,6 +33725,7 @@ table.invitations_settings p label input[type=password],
     width: 100% !important;
     box-sizing: border-box;
   }
+
   #surveyInvitationSetting,
 #surveyInvitationSettingServer {
     min-width: 100% !important;
@@ -33642,6 +33733,7 @@ table.invitations_settings p label input[type=password],
     margin: 10px 0 !important;
     box-sizing: border-box !important;
   }
+
   #inv_top_navi {
     display: flex;
     flex-direction: column;
@@ -33680,6 +33772,7 @@ table.invitations_settings p label input[type=password],
   #inv_top_navi > #inv_step_nav.yellow .inv_step_space {
     display: none;
   }
+
   #inv_recipients_profiles_holder,
 #inv_import_list_container,
 #inv_messages_profiles_holder,
@@ -33700,6 +33793,7 @@ table.invitations_settings p label input[type=password],
 #inv_select_mail_preview textarea {
     width: 100%;
   }
+
   #inv_msg_preview table th {
     height: auto !important;
     width: 100% !important;
@@ -33711,6 +33805,7 @@ table.invitations_settings p label input[type=password],
     width: 100%;
     box-sizing: border-box;
   }
+
   .addthis_toolbox {
     line-height: 24px;
   }
@@ -33725,9 +33820,11 @@ table.invitations_settings p label input[type=password],
   .addthis_toolbox .addthis_separator {
     font-size: 16px;
   }
+
   #inv_field_container ul li {
     width: 45%;
   }
+
   /* grafika ko ni podatkov */
   div.no_data_alert img {
     width: 100%;
@@ -33739,6 +33836,7 @@ table.invitations_settings p label input[type=password],
     flex-direction: column;
     align-items: center;
   }
+
   .page_data .data_table_top_holder {
     flex-direction: column;
     align-items: flex-start;
@@ -33809,9 +33907,11 @@ table.invitations_settings p label input[type=password],
     width: 100%;
     margin-bottom: 16px;
   }
+
   body.data_fullscreen #analiza_data {
     top: 68px;
   }
+
   .subpage_append .anketa_edit_main,
 .subpage_merge .anketa_edit_main,
 .subpage_calculation .anketa_edit_main,
@@ -33852,6 +33952,7 @@ table.invitations_settings p label input[type=password],
     clear: both;
     margin: 40px 0 0 0 !important;
   }
+
   .subpage_quick_edit #quick_edit_top_line {
     flex-direction: column-reverse;
   }
@@ -33871,6 +33972,7 @@ table.invitations_settings p label input[type=password],
   .subpage_quick_edit .quick_edit_container .quick_edit_bottom_line {
     justify-content: center;
   }
+
   .analysis_bottom_settings {
     flex-wrap: wrap;
   }
@@ -33880,13 +33982,16 @@ table.invitations_settings p label input[type=password],
     margin: 0 0 16px 0 !important;
     border: 0;
   }
+
   .div_analiza_icons,
 .div_analiza_scale {
     opacity: 1 !important;
   }
+
   .analysis_icons_holder {
     display: none;
   }
+
   .chart_holder {
     width: 100%;
     box-sizing: border-box;
@@ -33909,6 +34014,7 @@ table.invitations_settings p label input[type=password],
     display: block;
     clear: both;
   }
+
   table.analysis_reports {
     border-spacing: 0px;
   }
@@ -33925,12 +34031,14 @@ table.analysis_reports > tbody > tr > td {
   table.analysis_reports fieldset {
     margin-bottom: 0 !important;
   }
+
   .reports_holder {
     flex-direction: column;
   }
   .reports_holder fieldset {
     width: 100%;
   }
+
   .noSurvey_sequence {
     padding: 0;
   }
@@ -33952,11 +34060,13 @@ table.analysis_reports > tbody > tr > td {
   .noSurvey_sequence .buttons_holder a .button {
     margin: 10px 30px;
   }
+
   #table-horizontal-scroll-wrapper1-userchanges {
     display: table;
     table-layout: fixed;
     width: 100%;
   }
+
   #table-horizontal-scroll-wrapper2-userchanges {
     display: table-cell;
     overflow-x: auto;
@@ -33967,6 +34077,7 @@ table.analysis_reports > tbody > tr > td {
     border-collapse: collapse;
     white-space: nowrap;
   }
+
   .page_arhivi .anketa_edit_left,
 .page_tracking .anketa_edit_left,
 .subpage_anal_arch .anketa_edit_left,
diff --git a/resources/sass/admin_new/pages/survey_testiranje/diagnostika.scss b/resources/sass/admin_new/pages/survey_testiranje/diagnostika.scss
index 9d8462b9b..c039c4015 100644
--- a/resources/sass/admin_new/pages/survey_testiranje/diagnostika.scss
+++ b/resources/sass/admin_new/pages/survey_testiranje/diagnostika.scss
@@ -62,12 +62,56 @@ div#srv_diagnostic {
     div.lastnosti_wrapper {
         display: flex;
         flex-direction: row;
-        align-items: flex-start;
+        align-items: space-between;
         gap: 32px;
 
         div.lastnosti_left,
+        div.lastnosti_middle,
         div.lastnosti_right {
-            width: 50%;
+            width: 33%;
+            display: flex;
+            flex-direction: column;
+            gap: 16px;
+
+            .box {
+                border: 1px solid $gray;
+                border-radius: 2px;
+                padding: 16px;
+
+                display: flex;
+                flex-direction: column;
+
+                .title {
+                    text-transform: uppercase;
+                    font-weight: $semi-bold;
+                    margin-bottom: 16px;
+                }
+
+                .diagnostic_graph {
+                    display: flex;
+                    flex-direction: row;
+                    margin-top: -8px;
+
+                    .circle {
+                        height: 100px;
+                        width: 100px;
+                        margin-right: 16px;
+                    }
+
+                    .other_text {
+                        display: flex;
+                        flex-direction: column;
+                        justify-content: center;
+                        gap: 16px;
+
+                        a {
+                            text-decoration: none;
+                            font-size: 14px !important;
+                            white-space: nowrap;
+                        }
+                    }
+                }
+            }
         }
         
     }

From 773d8fc42c575006d4ab30a4d06f46380a8f42b2 Mon Sep 17 00:00:00 2001
From: tejagerjovic <teja.gerjovic@fdv.uni-lj.si>
Date: Tue, 19 Jul 2022 03:05:52 +0200
Subject: [PATCH 089/110] =?UTF-8?q?Dodana=20preview=20ikona=20za=20uvod=20?=
 =?UTF-8?q?in=20zaklju=C4=8Dek=20v=20urejanju?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 admin/survey/script/branching.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/admin/survey/script/branching.js b/admin/survey/script/branching.js
index 6fb248157..3c54145f4 100644
--- a/admin/survey/script/branching.js
+++ b/admin/survey/script/branching.js
@@ -536,6 +536,7 @@ function branching_mouseover(event) {
                         html_snippet = '<div class="spr_edit" id="edit_' + edit + '">' +
                         '<a title="' + (hidden == 1 ? lang['edit_show'] : lang['edit_hide']) + '" class="hide faicon ' + (hidden == 1 ? 'unhide_icon' : 'hide_icon') + '"></a>' +
                         '<a title="' + (edit == -1 ? lang['srv_editirajuvod'] : lang['srv_editirajzakljucek']) + '" class="faicon edit"></a>' +
+                        '<a title="' + lang['srv_predogled_spremenljivka'] + '" class="monitor faicon"></a>'+
                         '</div>';
 
                         branchborder.prepend(html_snippet);

From bb39db9dbf17645da2a79ec7a8e2968d54ea6751 Mon Sep 17 00:00:00 2001
From: tejagerjovic <teja.gerjovic@fdv.uni-lj.si>
Date: Tue, 19 Jul 2022 03:24:16 +0200
Subject: [PATCH 090/110] =?UTF-8?q?[Redizajn=201KA=20v2]=20Popupi:=20Ureja?=
 =?UTF-8?q?nje=20-->=20Vpra=C5=A1alnik=20-->=20Predogled=20spremenljivke?=
 =?UTF-8?q?=20-=20v1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Poenotenje stylinga za preview s tem, kar je trenutno v Podatki - Vpogled
---
 public/css/admin_new.css                      | 496 ++++++++++++++----
 .../components/popup/page_specific.scss       |  93 ----
 .../survey_edit/popups/preview_question.scss  | 420 ++++++++++++++-
 3 files changed, 816 insertions(+), 193 deletions(-)

diff --git a/public/css/admin_new.css b/public/css/admin_new.css
index f2b9c31ec..8184b00fd 100644
--- a/public/css/admin_new.css
+++ b/public/css/admin_new.css
@@ -8069,53 +8069,6 @@ div.setting_holder .setting_item input[type=checkbox][disabled] + label:before {
   pointer-events: none;
 }
 
-div#fullscreen div#preview_spremenljivka div#spremenljivka_preview div.spremenljivka div.naslov {
-  margin-bottom: 16px;
-  padding-bottom: 0;
-}
-div#fullscreen div#preview_spremenljivka div#spremenljivka_preview div.spremenljivka div.naslov p {
-  font-size: 18px !important;
-  font-weight: 600;
-}
-div#fullscreen div#preview_spremenljivka div#spremenljivka_preview div.spremenljivka div.naslov p.spremenljivka_info {
-  color: #777777;
-  font-size: 14px !important;
-  font-weight: 400;
-  margin-top: 16px;
-}
-div#fullscreen div#preview_spremenljivka div#spremenljivka_preview div.spremenljivka div.variable_holder {
-  margin-top: 0;
-}
-div#fullscreen div#preview_spremenljivka div#spremenljivka_preview div.spremenljivka div.variable_holder div.variabla {
-  padding: 0;
-}
-div#fullscreen div#preview_spremenljivka div#spremenljivka_preview div.spremenljivka div.variable_holder table td {
-  border: none;
-}
-div#fullscreen div#preview_spremenljivka div#spremenljivka_preview div.spremenljivka div.variable_holder table td.category label {
-  margin-right: 0;
-}
-div#fullscreen div#preview_spremenljivka div#spremenljivka_preview div.spremenljivka div.variable_holder table td.category textarea {
-  height: 30px !important;
-  width: 100% !important;
-  outline: 1px solid #C4C4C4;
-}
-div#fullscreen div#preview_spremenljivka div#spremenljivka_preview div.spremenljivka div.variable_holder table.grid_table tr:nth-child(2n+1) {
-  background-color: #F8F8F8;
-}
-div#fullscreen div#preview_spremenljivka div#spremenljivka_preview div.spremenljivka div.variable_holder table.ranking_table td div.dropzone {
-  border-top: 1px solid #E5E5E5;
-}
-div#fullscreen div#preview_spremenljivka div#spremenljivka_preview div.spremenljivka div.variable_holder table.text_vrednost td div.fotoresults_delete {
-  margin-left: 27px;
-  font-size: 14px !important;
-  color: #777777;
-  margin-top: 16px;
-}
-div#fullscreen div#preview_spremenljivka div#spremenljivka_preview div.spremenljivka div.variable_holder table.text_vrednost td div input.sig_clear_button {
-  margin-bottom: 16px;
-}
-
 div.qtip_comment {
   padding: 2px 16px 16px 16px;
 }
@@ -21909,7 +21862,7 @@ and open the template in the editor.
 /*
 * USED FROM: template.css
 */
-#preview_spremenljivka {
+#fullscreen #preview_spremenljivka {
   /*max-height: 90vh;
   overflow-y: scroll;*/
   max-width: 90vw;
@@ -21922,10 +21875,8 @@ and open the template in the editor.
   height: auto;
   max-height: 500px;
   width: 60vw;
-  /* font awesom za admin */
-  /* select, checked */
 }
-#preview_spremenljivka .popup_close {
+#fullscreen #preview_spremenljivka .popup_close {
   position: absolute !important;
   top: 10px;
   right: 10px;
@@ -21933,18 +21884,18 @@ and open the template in the editor.
   font-size: 12px !important;
   color: #777777;
 }
-#preview_spremenljivka .popup_close:hover {
+#fullscreen #preview_spremenljivka .popup_close:hover {
   color: #333333;
 }
-#preview_spremenljivka .popup_close a {
+#fullscreen #preview_spremenljivka .popup_close a {
   color: #777777;
   text-decoration: none;
 }
-#preview_spremenljivka .popup_close a:hover {
+#fullscreen #preview_spremenljivka .popup_close a:hover {
   color: #333333;
 }
-#preview_spremenljivka h2,
-#preview_spremenljivka .divPopUp_top {
+#fullscreen #preview_spremenljivka h2,
+#fullscreen #preview_spremenljivka .divPopUp_top {
   width: 100%;
   margin-bottom: 16px;
   padding-bottom: 8px;
@@ -21954,41 +21905,41 @@ and open the template in the editor.
   border-bottom: 1px #E5E5E5 solid;
   margin-block-start: 0;
 }
-#preview_spremenljivka h2 span.faicon,
-#preview_spremenljivka h2 span.fa-brands,
-#preview_spremenljivka .divPopUp_top span.faicon,
-#preview_spremenljivka .divPopUp_top span.fa-brands {
+#fullscreen #preview_spremenljivka h2 span.faicon,
+#fullscreen #preview_spremenljivka h2 span.fa-brands,
+#fullscreen #preview_spremenljivka .divPopUp_top span.faicon,
+#fullscreen #preview_spremenljivka .divPopUp_top span.fa-brands {
   margin-right: 6px;
   color: #1E88E5;
 }
-#preview_spremenljivka h2 span.faicon:before,
-#preview_spremenljivka h2 span.fa-brands:before,
-#preview_spremenljivka .divPopUp_top span.faicon:before,
-#preview_spremenljivka .divPopUp_top span.fa-brands:before {
+#fullscreen #preview_spremenljivka h2 span.faicon:before,
+#fullscreen #preview_spremenljivka h2 span.fa-brands:before,
+#fullscreen #preview_spremenljivka .divPopUp_top span.faicon:before,
+#fullscreen #preview_spremenljivka .divPopUp_top span.fa-brands:before {
   font-size: 14px;
 }
-#preview_spremenljivka p {
+#fullscreen #preview_spremenljivka p {
   line-height: 20px;
 }
-#preview_spremenljivka .popup_note,
-#preview_spremenljivka .profile_right_note {
+#fullscreen #preview_spremenljivka .popup_note,
+#fullscreen #preview_spremenljivka .profile_right_note {
   margin-bottom: 16px;
   padding: 8px;
   font-size: 16px;
   border: 1px #C4C4C4 solid;
 }
-#preview_spremenljivka .popup_main {
+#fullscreen #preview_spremenljivka .popup_main {
   display: flex;
   flex-direction: column;
   border-bottom: 1px #C4C4C4 solid;
 }
-#preview_spremenljivka .popup_main.no_border {
+#fullscreen #preview_spremenljivka .popup_main.no_border {
   border-bottom: none;
 }
-#preview_spremenljivka .popup_main.with_menu {
+#fullscreen #preview_spremenljivka .popup_main.with_menu {
   flex-direction: row;
 }
-#preview_spremenljivka .popup_main .popup_left {
+#fullscreen #preview_spremenljivka .popup_main .popup_left {
   box-sizing: border-box;
   width: 216px;
   min-width: 216px;
@@ -21997,11 +21948,11 @@ and open the template in the editor.
   margin-right: 16px;
   border-right: 1px #C4C4C4 solid;
 }
-#preview_spremenljivka .popup_main .popup_left .list {
+#fullscreen #preview_spremenljivka .popup_main .popup_left .list {
   display: flex;
   flex-direction: column;
 }
-#preview_spremenljivka .popup_main .popup_left .list .list-item {
+#fullscreen #preview_spremenljivka .popup_main .popup_left .list .list-item {
   cursor: pointer;
   display: flex;
   justify-content: space-between;
@@ -22013,38 +21964,38 @@ and open the template in the editor.
   border-radius: 2px;
   transition: 0.2s;
 }
-#preview_spremenljivka .popup_main .popup_left .list .list-item.active, #preview_spremenljivka .popup_main .popup_left .list .list-item:hover {
+#fullscreen #preview_spremenljivka .popup_main .popup_left .list .list-item.active, #fullscreen #preview_spremenljivka .popup_main .popup_left .list .list-item:hover {
   background-color: #F8F8F8;
   border-color: #1E88E5;
 }
-#preview_spremenljivka .popup_main .popup_left .list .list-item .profile_icons a {
+#fullscreen #preview_spremenljivka .popup_main .popup_left .list .list-item .profile_icons a {
   margin-left: 8px;
 }
-#preview_spremenljivka .popup_main .popup_left button {
+#fullscreen #preview_spremenljivka .popup_main .popup_left button {
   display: flex;
   align-items: center;
   width: 100%;
   font-weight: 400;
 }
-#preview_spremenljivka .popup_main .popup_left button .faicon {
+#fullscreen #preview_spremenljivka .popup_main .popup_left button .faicon {
   font-size: 12px;
   line-height: 14px;
 }
-#preview_spremenljivka .popup_main .popup_left button .faicon::before {
+#fullscreen #preview_spremenljivka .popup_main .popup_left button .faicon::before {
   margin-right: 8px;
   font-size: 14px;
   color: #1E88E5;
 }
-#preview_spremenljivka .popup_main .popup_right {
+#fullscreen #preview_spremenljivka .popup_main .popup_right {
   overflow-y: auto;
   max-height: 70vh;
   width: 100%;
 }
-#preview_spremenljivka .popup_main .popup_right .popup_right_note {
+#fullscreen #preview_spremenljivka .popup_main .popup_right .popup_right_note {
   margin-bottom: 16px;
   font-size: 16px;
 }
-#preview_spremenljivka .popup_main fieldset {
+#fullscreen #preview_spremenljivka .popup_main fieldset {
   display: flex;
   flex-direction: column;
   padding: 16px 0 0 0;
@@ -22052,47 +22003,406 @@ and open the template in the editor.
   border: 0;
   border-top: 1px #E5E5E5 solid;
 }
-#preview_spremenljivka .popup_main fieldset legend {
+#fullscreen #preview_spremenljivka .popup_main fieldset legend {
   padding: 0 8px 0 0;
   font-size: 14px;
 }
-#preview_spremenljivka .popup_main span {
+#fullscreen #preview_spremenljivka .popup_main span {
   font-size: 14px;
 }
-#preview_spremenljivka .popup_main .setting_line {
+#fullscreen #preview_spremenljivka .popup_main .setting_line {
   margin-bottom: 8px;
   font-size: 14px;
 }
-#preview_spremenljivka .popup_main .setting_line:last-of-type {
+#fullscreen #preview_spremenljivka .popup_main .setting_line:last-of-type {
   margin-bottom: 0;
 }
-#preview_spremenljivka .popup_main .setting_line label,
-#preview_spremenljivka .popup_main .setting_line span {
+#fullscreen #preview_spremenljivka .popup_main .setting_line label,
+#fullscreen #preview_spremenljivka .popup_main .setting_line span {
   font-size: 14px;
 }
-#preview_spremenljivka .popup_main .settings_block {
+#fullscreen #preview_spremenljivka .popup_main .settings_block {
   display: flex;
   flex-direction: column;
   margin-bottom: 16px;
 }
-#preview_spremenljivka .popup_main .settings_block label,
-#preview_spremenljivka .popup_main .settings_block span {
+#fullscreen #preview_spremenljivka .popup_main .settings_block label,
+#fullscreen #preview_spremenljivka .popup_main .settings_block span {
   font-size: 14px;
 }
-#preview_spremenljivka .button_holder {
+#fullscreen #preview_spremenljivka .button_holder {
   justify-content: end !important;
   margin: 20px 0 0 0;
 }
-#preview_spremenljivka .button_holder button:last-child {
+#fullscreen #preview_spremenljivka .button_holder button:last-child {
   margin-right: 0;
 }
-#preview_spremenljivka.warning_popup h2::before {
+#fullscreen #preview_spremenljivka.warning_popup h2::before {
   padding-right: 8px;
   font-family: "Font Awesome 5 Free";
   content: "\f071";
   font-size: 14px;
   color: #FFC700;
 }
+#fullscreen #preview_spremenljivka #spremenljivka_preview .spremenljivka {
+  box-sizing: border-box;
+  width: 100%;
+  margin: 0;
+  padding: 24px 0;
+  color: #333333;
+  /* awesome radio in checkboxi */
+  /* custom checkbox and radio buttons */
+  /* Obstoječe skrijemo*/
+  /* Disabled radio / checkbox */
+  /* checkbox */
+  /* radio */
+}
+#fullscreen #preview_spremenljivka #spremenljivka_preview .spremenljivka .naslov {
+  margin: 0 0 24px 0;
+}
+#fullscreen #preview_spremenljivka #spremenljivka_preview .spremenljivka .naslov p {
+  margin: 0;
+  font-weight: 700;
+  font-size: 20px;
+}
+#fullscreen #preview_spremenljivka #spremenljivka_preview .spremenljivka .naslov .spremenljivka_info {
+  margin-top: 4px;
+  color: #a9a9a9;
+  font-size: 14px;
+  font-weight: 400;
+}
+#fullscreen #preview_spremenljivka #spremenljivka_preview .spremenljivka .variable_holder {
+  height: auto !important;
+}
+#fullscreen #preview_spremenljivka #spremenljivka_preview .spremenljivka .variable_holder .variabla {
+  padding: 0 0 16px 0;
+  font-size: 16px;
+}
+#fullscreen #preview_spremenljivka #spremenljivka_preview .spremenljivka .variable_holder .variabla:last-child {
+  padding-bottom: 0;
+}
+#fullscreen #preview_spremenljivka #spremenljivka_preview .spremenljivka input[type=text], #fullscreen #preview_spremenljivka #spremenljivka_preview .spremenljivka textarea, #fullscreen #preview_spremenljivka #spremenljivka_preview .spremenljivka select {
+  margin: 0;
+  padding: 5px 7px;
+  min-width: 100px;
+  border-radius: 3px;
+  border: 1px #3e3e3e solid;
+  background-color: #fff;
+}
+#fullscreen #preview_spremenljivka #spremenljivka_preview .spremenljivka input[type=checkbox], #fullscreen #preview_spremenljivka #spremenljivka_preview .spremenljivka input[type=radio] {
+  opacity: 0;
+  position: absolute !important;
+  width: 30px;
+  height: 24px;
+}
+#fullscreen #preview_spremenljivka #spremenljivka_preview .spremenljivka input[type=checkbox] + span.enka-checkbox-radio:before,
+#fullscreen #preview_spremenljivka #spremenljivka_preview .spremenljivka input[type=radio] + span.enka-checkbox-radio:before,
+#fullscreen #preview_spremenljivka #spremenljivka_preview .spremenljivka input[type=radio] + span.enka-custom-radio:before,
+#fullscreen #preview_spremenljivka #spremenljivka_preview .spremenljivka input[type=radio] + span.enka-vizualna-skala::before {
+  font-family: "Font Awesome 5 Free";
+  display: inline-block;
+  font-weight: 400;
+}
+#fullscreen #preview_spremenljivka #spremenljivka_preview .spremenljivka input[type=checkbox]:disabled + span.enka-checkbox-radio:before,
+#fullscreen #preview_spremenljivka #spremenljivka_preview .spremenljivka input[type=radio]:disabled + span.enka-checkbox-radio:before {
+  opacity: 0.5;
+}
+#fullscreen #preview_spremenljivka #spremenljivka_preview .spremenljivka input[type=checkbox] + span.enka-checkbox-radio,
+#fullscreen #preview_spremenljivka #spremenljivka_preview .spremenljivka input[type=radio] + span.enka-checkbox-radio {
+  font-size: 15px;
+  -webkit-text-stroke: 0.35px;
+}
+#fullscreen #preview_spremenljivka #spremenljivka_preview .spremenljivka input[type=checkbox] + span.enka-checkbox-radio:before {
+  content: "\f0c8";
+  letter-spacing: 10px;
+}
+#fullscreen #preview_spremenljivka #spremenljivka_preview .spremenljivka input[type=checkbox]:checked + span.enka-checkbox-radio:before {
+  content: "\f14a";
+}
+#fullscreen #preview_spremenljivka #spremenljivka_preview .spremenljivka input[type=radio] + span.enka-checkbox-radio:before {
+  content: "\f111";
+  letter-spacing: 10px;
+}
+#fullscreen #preview_spremenljivka #spremenljivka_preview .spremenljivka input[type=radio]:checked + span.enka-checkbox-radio:before {
+  content: "\f192";
+}
+#fullscreen #preview_spremenljivka #spremenljivka_preview .spremenljivka input[type=checkbox] + span.enka-checkbox-radio,
+#fullscreen #preview_spremenljivka #spremenljivka_preview .spremenljivka input[type=radio] + span.enka-checkbox-radio,
+#fullscreen #preview_spremenljivka #spremenljivka_preview .spremenljivka .custom_radio_picture.obarvan > label > span.enka-custom-radio:before,
+#fullscreen #preview_spremenljivka #spremenljivka_preview .spremenljivka .visual-radio-scale.checked .enka-vizualna-skala {
+  color: #1E88E5;
+  font-size: 20px;
+  vertical-align: -1px;
+}
+#fullscreen #preview_spremenljivka #spremenljivka_preview .spremenljivka input[type=text]:focus,
+#fullscreen #preview_spremenljivka #spremenljivka_preview .spremenljivka input[type=number]:focus,
+#fullscreen #preview_spremenljivka #spremenljivka_preview .spremenljivka input[type=email]:focus,
+#fullscreen #preview_spremenljivka #spremenljivka_preview .spremenljivka input[type=password]:focus,
+#fullscreen #preview_spremenljivka #spremenljivka_preview .spremenljivka textarea:focus {
+  border-color: #1E88E5;
+}
+#fullscreen #preview_spremenljivka #spremenljivka_preview .spremenljivka table.grid_table {
+  margin: 0;
+}
+#fullscreen #preview_spremenljivka #spremenljivka_preview .spremenljivka table.grid_table tr td,
+#fullscreen #preview_spremenljivka #spremenljivka_preview .spremenljivka table.grid_table tr th {
+  border: 0;
+}
+#fullscreen #preview_spremenljivka #spremenljivka_preview .spremenljivka table.grid_table tr td.category {
+  text-align: center;
+}
+#fullscreen #preview_spremenljivka #spremenljivka_preview .spremenljivka table.grid_table tr td.category label {
+  margin: 0;
+}
+#fullscreen #preview_spremenljivka #spremenljivka_preview .spremenljivka table.grid_table tr td.category span.enka-checkbox-radio:before {
+  letter-spacing: 0 !important;
+}
+#fullscreen #preview_spremenljivka #spremenljivka_preview .spremenljivka table.grid_table tr:nth-child(2n+1) {
+  background-color: #F1F8FD;
+}
+#fullscreen #preview_spremenljivka #spremenljivka_preview .spremenljivka table.text_vrednost {
+  table-layout: fixed;
+  text-align: left;
+  width: 100%;
+  border-spacing: 0;
+  margin: 0;
+}
+#fullscreen #preview_spremenljivka #spremenljivka_preview .spremenljivka table.text_vrednost tr td,
+#fullscreen #preview_spremenljivka #spremenljivka_preview .spremenljivka table.text_vrednost tr th {
+  border: 0;
+}
+#fullscreen #preview_spremenljivka #spremenljivka_preview .spremenljivka .width_5 {
+  width: 5%;
+}
+#fullscreen #preview_spremenljivka #spremenljivka_preview .spremenljivka .width_10 {
+  width: 10%;
+}
+#fullscreen #preview_spremenljivka #spremenljivka_preview .spremenljivka .width_15 {
+  width: 15%;
+}
+#fullscreen #preview_spremenljivka #spremenljivka_preview .spremenljivka .width_20 {
+  width: 20%;
+}
+#fullscreen #preview_spremenljivka #spremenljivka_preview .spremenljivka .width_25 {
+  width: 25%;
+}
+#fullscreen #preview_spremenljivka #spremenljivka_preview .spremenljivka .width_30 {
+  width: 30%;
+}
+#fullscreen #preview_spremenljivka #spremenljivka_preview .spremenljivka .width_33 {
+  width: 33.3%;
+}
+#fullscreen #preview_spremenljivka #spremenljivka_preview .spremenljivka .width_35 {
+  width: 35%;
+}
+#fullscreen #preview_spremenljivka #spremenljivka_preview .spremenljivka .width_40 {
+  width: 40%;
+}
+#fullscreen #preview_spremenljivka #spremenljivka_preview .spremenljivka .width_45 {
+  width: 45%;
+}
+#fullscreen #preview_spremenljivka #spremenljivka_preview .spremenljivka .width_50 {
+  width: 50%;
+}
+#fullscreen #preview_spremenljivka #spremenljivka_preview .spremenljivka .width_55 {
+  width: 55%;
+}
+#fullscreen #preview_spremenljivka #spremenljivka_preview .spremenljivka .width_60 {
+  width: 60%;
+}
+#fullscreen #preview_spremenljivka #spremenljivka_preview .spremenljivka .width_65 {
+  width: 65%;
+}
+#fullscreen #preview_spremenljivka #spremenljivka_preview .spremenljivka .width_70 {
+  width: 70%;
+}
+#fullscreen #preview_spremenljivka #spremenljivka_preview .spremenljivka .width_75 {
+  width: 75%;
+}
+#fullscreen #preview_spremenljivka #spremenljivka_preview .spremenljivka .width_80 {
+  width: 80%;
+}
+#fullscreen #preview_spremenljivka #spremenljivka_preview .spremenljivka .width_85 {
+  width: 85%;
+}
+#fullscreen #preview_spremenljivka #spremenljivka_preview .spremenljivka .width_90 {
+  width: 90%;
+}
+#fullscreen #preview_spremenljivka #spremenljivka_preview .spremenljivka .width_95 {
+  width: 95%;
+}
+#fullscreen #preview_spremenljivka #spremenljivka_preview .spremenljivka .width_100 {
+  width: 100%;
+}
+#fullscreen #preview_spremenljivka #spremenljivka_preview .spremenljivka .frame_dropping_titles {
+  width: 230px;
+  padding: 5px;
+  margin: 0px auto 0px auto;
+  height: 15px;
+  text-align: center;
+  background-color: white;
+  border-top: 1px solid #E5E5E5;
+  border-left: 1px solid #E5E5E5;
+  border-right: 1px solid #E5E5E5;
+}
+#fullscreen #preview_spremenljivka #spremenljivka_preview .spremenljivka .frame_dropping {
+  width: 230px;
+  padding: 5px;
+  margin: 0px auto 10px auto;
+  height: 15px;
+  text-indent: -25px;
+  background-color: #F2F2F2;
+  border: 1px solid #E5E5E5;
+}
+#fullscreen #preview_spremenljivka #spremenljivka_preview .spremenljivka table.ranking_table {
+  width: 100%;
+  table-layout: fixed;
+  border-spacing: 0;
+}
+#fullscreen #preview_spremenljivka #spremenljivka_preview .spremenljivka table.ranking_table td {
+  width: 45%;
+  padding: 5px;
+  vertical-align: top;
+}
+#fullscreen #preview_spremenljivka #spremenljivka_preview .spremenljivka table.ranking_table td.middle {
+  width: 10%;
+  vertical-align: top;
+  text-align: center;
+}
+#fullscreen #preview_spremenljivka #spremenljivka_preview .spremenljivka table.ranking_table ul {
+  list-style: none;
+  margin: 0;
+  padding: 0;
+}
+#fullscreen #preview_spremenljivka #spremenljivka_preview .spremenljivka td.middle img {
+  display: block;
+  margin: 50% 0 0 20px;
+}
+#fullscreen #preview_spremenljivka #spremenljivka_preview .spremenljivka .ranking {
+  width: 230px;
+  padding: 5px;
+  margin: 0 auto 10px auto;
+  border: 1px solid black;
+  height: 15px;
+  text-align: center;
+  overflow: hidden;
+  cursor: pointer;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+#fullscreen #preview_spremenljivka #spremenljivka_preview .spremenljivka .ranking_long {
+  width: 230px;
+  padding: 5px;
+  margin: 0 auto 10px auto;
+  border: 1px solid black;
+  height: 15px;
+  text-align: center;
+  overflow: hidden;
+  cursor: pointer;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+#fullscreen #preview_spremenljivka #spremenljivka_preview .spremenljivka .handle {
+  width: 230px;
+  padding: 5px;
+  margin: 0 auto 10px auto;
+  border: 1px solid black;
+  height: 15px;
+  text-align: center;
+  overflow: hidden;
+}
+#fullscreen #preview_spremenljivka #spremenljivka_preview .spremenljivka .handle_long {
+  width: 230px;
+  padding: 5px;
+  margin: 0 auto 10px auto;
+  border: 1px solid black;
+  height: 15px;
+  text-align: center;
+  overflow: hidden;
+}
+#fullscreen #preview_spremenljivka #spremenljivka_preview .spremenljivka .ime {
+  width: 230px;
+  padding: 5px;
+  margin: 0 auto 10px auto;
+  border: 1px solid black;
+  height: 15px;
+  text-align: center;
+  overflow: hidden;
+}
+#fullscreen #preview_spremenljivka #spremenljivka_preview .spremenljivka .izbran {
+  width: 230px;
+  padding: 5px;
+  margin: 0 auto 10px auto;
+  border: 1px solid black;
+  height: 15px;
+  text-align: center;
+  overflow: hidden;
+}
+#fullscreen #preview_spremenljivka #spremenljivka_preview .spremenljivka .frame_ranking {
+  width: 230px;
+  padding: 5px;
+  margin: 0px auto 10px auto;
+  border: 1px dashed black;
+  height: 15px;
+  text-indent: -25px;
+  font-weight: bold;
+}
+#fullscreen #preview_spremenljivka #spremenljivka_preview .spremenljivka .dropholder {
+  position: relative;
+  padding-top: 11px;
+}
+#fullscreen #preview_spremenljivka #spremenljivka_preview .spremenljivka .dropholder .dropzone {
+  position: absolute;
+  left: 0;
+  right: 0;
+  top: 0;
+  bottom: 0;
+}
+#fullscreen #preview_spremenljivka #spremenljivka_preview .spremenljivka .dropzone {
+  border-top: 1px solid black;
+  min-height: 100px;
+  padding-top: 10px;
+}
+#fullscreen #preview_spremenljivka #spremenljivka_preview .spremenljivka .moving {
+  cursor: pointer;
+  margin-left: auto;
+  margin-right: auto;
+  width: 230px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+#fullscreen #preview_spremenljivka #spremenljivka_preview .spremenljivka .frame_moving {
+  width: 230px;
+  padding: 5px;
+  margin: 0px auto 10px auto;
+  border: 1px dashed black;
+  height: 15px;
+  text-indent: -25px;
+  font-weight: bold;
+}
+#fullscreen #preview_spremenljivka #spremenljivka_preview .spremenljivka ul.sorting {
+  list-style: none;
+  margin: 0;
+  padding: 0;
+}
+#fullscreen #preview_spremenljivka #spremenljivka_preview .spremenljivka .sortholder {
+  margin: 0 auto;
+  width: 250px;
+  padding: 5px;
+}
+#fullscreen #preview_spremenljivka #spremenljivka_preview .spremenljivka .sortzone {
+  position: absolute;
+  margin: 0 auto 0 auto;
+  width: 250px;
+}
+
+#preview_spremenljivka {
+  /* font awesom za admin */
+  /* select, checked */
+}
 #preview_spremenljivka .buttons_holder {
   margin-top: 30px;
 }
diff --git a/resources/sass/admin_new/components/popup/page_specific.scss b/resources/sass/admin_new/components/popup/page_specific.scss
index fa5307557..3cddb958f 100644
--- a/resources/sass/admin_new/components/popup/page_specific.scss
+++ b/resources/sass/admin_new/components/popup/page_specific.scss
@@ -129,99 +129,6 @@ div.setting_holder {
     }
 }
 
-//Preview spremenljivka
-div#fullscreen {
-    div#preview_spremenljivka {
-        div#spremenljivka_preview {
-            div.spremenljivka {
-                div.naslov {
-                    p {
-                        font-size: 18px !important;
-                        font-weight: $semi-bold;
-
-                        //Opomba na vprašanje
-                        &.spremenljivka_info {
-                            color: $very-dark-gray;
-                            font-size: 14px !important;
-                            font-weight: $regular;
-                            margin-top: 16px;
-                        }
-                    }
-
-                    margin-bottom: 16px;
-                    padding-bottom: 0;
-                }
-
-                div.variable_holder {
-
-                    margin-top: 0;
-
-                    div.variabla {
-                        padding: 0;
-                    }
-
-                    table {
-                        td {
-                            border: none;
-
-                            &.category {
-                                label {
-                                    margin-right: 0; //za centriranje radio buttonov v tabelah
-                                }
-
-                                textarea {
-                                    height: 30px !important;
-                                    width: 100% !important;
-                                    outline: 1px solid $dark-gray;
-                                }
-                            }
-                        }
-
-                        //Tabele
-                        &.grid_table {
-
-                            tr:nth-child(2n+1) {
-                                background-color: $light-gray;
-                            }
-
-                        }
-
-                        //Razvršanje
-                        &.ranking_table {
-
-                            td {
-                                div.dropzone {
-                                    border-top: 1px solid $gray;
-                                }
-                            }
-
-                        }
-
-                        //Fotografiraj
-                        &.text_vrednost {
-
-                            td {
-                                div.fotoresults_delete {
-                                    margin-left: 27px;
-                                    font-size: 14px!important;
-                                    color: $very-dark-gray;
-                                    margin-top: 16px;
-                                }
-
-                                div {
-                                    input.sig_clear_button {
-                                        margin-bottom: 16px;
-                                    }
-                                }
-                            }
-                            
-                        }
-                    }
-                }
-            }
-        }
-    }
-}
 
 //Komentarji
 div.qtip_comment {
diff --git a/resources/sass/admin_new/pages/survey_edit/popups/preview_question.scss b/resources/sass/admin_new/pages/survey_edit/popups/preview_question.scss
index fd970f0d8..f945f950a 100644
--- a/resources/sass/admin_new/pages/survey_edit/popups/preview_question.scss
+++ b/resources/sass/admin_new/pages/survey_edit/popups/preview_question.scss
@@ -26,14 +26,420 @@ $progress_bar_background: black;
 * USED FROM: template.css
 */
 
-#preview_spremenljivka {
-    @include popup_general();
+//Preview spremenljivka
+#fullscreen {
+    #preview_spremenljivka {
+		@include popup_general();
 
-	overflow-x: hidden;
-	overflow-y: auto;
-    height: auto;
-    max-height: 500px;
-    width: 60vw;
+		overflow-x: hidden;
+		overflow-y: auto;
+		height: auto;
+		max-height: 500px;
+		width: 60vw;
+
+        #spremenljivka_preview {
+            .spremenljivka {
+                box-sizing: border-box;
+                width: 100%;
+                margin: 0;
+                padding: 24px 0;
+
+                color: $black;
+
+                .naslov {
+                    margin: 0 0 24px 0;
+
+                    p {
+                        margin: 0;
+
+                        font-weight: 700;
+                        font-size: 20px;
+                    }
+                    
+                    .spremenljivka_info{
+                        margin-top: 4px;
+                        
+                        color:#a9a9a9;
+                        font-size: 14px;
+                        font-weight: 400;
+                    }
+                }
+                .variable_holder {
+                    height: auto !important;
+
+                    .variabla{
+                        padding: 0 0 16px 0;
+                        font-size: 16px;
+
+                        &:last-child{
+                            padding-bottom: 0;
+                        }
+                    }
+                }
+
+
+                input[type="text"], textarea, select{
+                    margin: 0;
+                    padding: 5px 7px;
+                    min-width: 100px;
+                    
+                    border-radius: 3px;
+                    border: 1px #3e3e3e solid;
+                    background-color: #fff;
+                }
+
+                /* awesome radio in checkboxi */
+                /* custom checkbox and radio buttons */
+                /* Obstoječe skrijemo*/
+                input[type="checkbox"], input[type="radio"] {
+                    //display: none !important;
+                    opacity: 0;
+                    position: absolute !important;
+
+                    width: 30px;
+                    height: 24px;
+                }
+
+                input[type="checkbox"] + span.enka-checkbox-radio:before,
+                input[type="radio"] + span.enka-checkbox-radio:before,
+                input[type="radio"] + span.enka-custom-radio:before,
+                input[type="radio"] + span.enka-vizualna-skala::before{
+                    font-family: "Font Awesome 5 Free";
+                    display: inline-block;
+                    
+                    font-weight: 400;
+                }
+
+                /* Disabled radio / checkbox */
+                input[type="checkbox"]:disabled + span.enka-checkbox-radio:before,
+                input[type="radio"]:disabled + span.enka-checkbox-radio:before{
+                    opacity: 0.5;
+                }
+
+                input[type="checkbox"] + span.enka-checkbox-radio,
+                input[type="radio"] + span.enka-checkbox-radio {
+                    font-size: 15px;
+                    -webkit-text-stroke: 0.35px;
+                }
+
+                /* checkbox */
+                input[type="checkbox"] + span.enka-checkbox-radio:before {
+                    content: "\f0c8";
+                    letter-spacing: 10px;
+                }
+
+                input[type="checkbox"]:checked + span.enka-checkbox-radio:before {
+                    content: "\f14a";
+                }
+
+                /* radio */
+                input[type="radio"] + span.enka-checkbox-radio:before {
+                    content: "\f111";
+                    letter-spacing: 10px;
+                }
+
+                input[type="radio"]:checked + span.enka-checkbox-radio:before {
+                    content: "\f192";
+                }
+
+                input[type="checkbox"] + span.enka-checkbox-radio,
+                input[type="radio"] + span.enka-checkbox-radio,
+                .custom_radio_picture.obarvan > label > span.enka-custom-radio:before,
+                .visual-radio-scale.checked .enka-vizualna-skala{
+                    color: $blue;
+                    font-size: 20px;
+                    vertical-align: -1px;
+                }
+
+                input[type="text"]:focus,
+                input[type="number"]:focus,
+                input[type="email"]:focus,
+                input[type="password"]:focus,
+                textarea:focus{
+                    border-color: $blue;
+                }
+
+
+                table.grid_table{
+                    margin: 0;
+
+                    tr{
+                        td,
+                        th{
+                            border: 0;
+                        }
+
+                        td.category{
+                            text-align: center;
+        
+                            label{
+                                margin: 0;
+                            }
+        
+                            span.enka-checkbox-radio:before{
+                                letter-spacing: 0 !important;
+                            }
+                        }
+
+                        &:nth-child(2n+1){
+                            background-color: #F1F8FD;
+                        }
+                    }
+                } 
+
+                table.text_vrednost {
+                    table-layout: fixed;
+                    text-align: left;
+                    width: 100%;
+                    border-spacing: 0;
+                    margin: 0;
+
+                    tr{
+
+                        td,
+                        th{
+                            border: 0;
+                        }
+                    }
+                }
+                .width_5 {
+                    width: 5%;
+                }
+                .width_10 {
+                    width: 10%;
+                }
+                .width_15 {
+                    width: 15%;
+                }
+                .width_20 {
+                    width: 20%;
+                }
+                .width_25 {
+                    width: 25%;
+                }
+                .width_30 {
+                    width: 30%;
+                }
+                .width_33 {
+                    width: 33.3%;
+                }
+                .width_35 {
+                    width: 35%;
+                }
+                .width_40 {
+                    width: 40%;
+                }
+                .width_45 {
+                    width: 45%;
+                }
+                .width_50 {
+                    width: 50%;
+                }
+                .width_55 {
+                    width: 55%;
+                }
+                .width_60 {
+                    width: 60%;
+                }
+                .width_65 {
+                    width: 65%;
+                }
+                .width_70 {
+                    width: 70%;
+                }
+                .width_75 {
+                    width: 75%;
+                }
+                .width_80 {
+                    width: 80%;
+                }
+                .width_85 {
+                    width: 85%;
+                }
+                .width_90 {
+                    width: 90%;
+                }
+                .width_95 {
+                    width: 95%;
+                }
+                .width_100 {
+                    width: 100%;
+                }
+                .frame_dropping_titles {
+                    width: 230px;
+                    padding: 5px;
+                    margin: 0px auto 0px auto;
+                    height: 15px;
+                    text-align: center;
+                    background-color: white;
+                    border-top: 1px solid $gray;
+                    border-left: 1px solid $gray;
+                    border-right: 1px solid $gray;
+                }
+                .frame_dropping {
+                    width: 230px;
+                    padding: 5px;
+                    margin: 0px auto 10px auto;
+                    height: 15px;
+                    text-indent: -25px;
+                    background-color: $light-gray2;
+                    border: 1px solid $gray;
+                }
+
+                table.ranking_table {
+                    width: 100%;
+                    table-layout: fixed;
+                    border-spacing: 0;
+                    td {
+                        width: 45%;
+                        padding: 5px;
+                        vertical-align: top;
+                    }
+                    td.middle {
+                        width: 10%;
+                        vertical-align: top;
+                        text-align: center;
+                    }
+                    ul {
+                        list-style: none;
+                        margin: 0;
+                        padding: 0;
+                    }
+                }
+                td.middle {
+                    img {
+                        display: block;
+                        margin: 50% 0 0 20px;
+                    }
+                }
+                .ranking {
+                    width: 230px;
+                    padding: 5px;
+                    margin: 0 auto 10px auto;
+                    border: 1px solid black;
+                    height: 15px;
+                    text-align: center;
+                    overflow: hidden;
+                    cursor: pointer;
+                    overflow: hidden;
+                    text-overflow: ellipsis;
+                    white-space: nowrap;
+                }
+                .ranking_long {
+                    width: 230px;
+                    padding: 5px;
+                    margin: 0 auto 10px auto;
+                    border: 1px solid black;
+                    height: 15px;
+                    text-align: center;
+                    overflow: hidden;
+                    cursor: pointer;
+                    overflow: hidden;
+                    text-overflow: ellipsis;
+                    white-space: nowrap;
+                }
+                .handle {
+                    width: 230px;
+                    padding: 5px;
+                    margin: 0 auto 10px auto;
+                    border: 1px solid black;
+                    height: 15px;
+                    text-align: center;
+                    overflow: hidden;
+                }
+                .handle_long {
+                    width: 230px;
+                    padding: 5px;
+                    margin: 0 auto 10px auto;
+                    border: 1px solid black;
+                    height: 15px;
+                    text-align: center;
+                    overflow: hidden;
+                }
+                .ime {
+                    width: 230px;
+                    padding: 5px;
+                    margin: 0 auto 10px auto;
+                    border: 1px solid black;
+                    height: 15px;
+                    text-align: center;
+                    overflow: hidden;
+                }
+                .izbran {
+                    width: 230px;
+                    padding: 5px;
+                    margin: 0 auto 10px auto;
+                    border: 1px solid black;
+                    height: 15px;
+                    text-align: center;
+                    overflow: hidden;
+                }
+                .frame_ranking {
+                    width: 230px;
+                    padding: 5px;
+                    margin: 0px auto 10px auto;
+                    border: 1px dashed black;
+                    height: 15px;
+                    text-indent: -25px;
+                    font-weight: bold;
+                }
+                .dropholder {
+                    position: relative;
+                    padding-top: 11px;
+                    .dropzone {
+                        position: absolute;
+                        left: 0;
+                        right: 0;
+                        top: 0;
+                        bottom: 0;
+                    }
+                }
+                .dropzone {
+                    border-top: 1px solid black;
+                    min-height: 100px;
+                    padding-top: 10px;
+                }
+                .moving {
+                    cursor: pointer;
+                    margin-left: auto;
+                    margin-right: auto;
+                    width: 230px;
+                    overflow: hidden;
+                    text-overflow: ellipsis;
+                    white-space: nowrap;
+                }
+                .frame_moving {
+                    width: 230px;
+                    padding: 5px;
+                    margin: 0px auto 10px auto;
+                    border: 1px dashed black;
+                    height: 15px;
+                    text-indent: -25px;
+                    font-weight: bold;
+                }
+                ul.sorting {
+                    list-style: none;
+                    margin: 0;
+                    padding: 0;
+                }
+                .sortholder {
+                    margin: 0 auto;
+                    width: 250px;
+                    padding: 5px;
+                }
+                .sortzone {
+                    position: absolute;
+                    margin: 0 auto 0 auto;
+                    width: 250px;
+                }
+            }
+        }
+    }
+}
+
+
+////// - stari styling
+#preview_spremenljivka {
     
     .buttons_holder{
         margin-top: 30px;

From f7293646a36b74202ff1c94ba79d30ae6bacc720 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nejc=20Kova=C4=8D?= <nejc.kouko@gmail.com>
Date: Tue, 19 Jul 2022 10:38:08 +0200
Subject: [PATCH 091/110] Objava-pregled odstranjena zakomentirana testna koda

---
 admin/survey/SurveyAdminAjax.php     | 11 -----
 admin/survey/SurveyAdminSettings.php | 16 -------
 public/css/admin_new.css             | 68 ++--------------------------
 3 files changed, 3 insertions(+), 92 deletions(-)

diff --git a/admin/survey/SurveyAdminAjax.php b/admin/survey/SurveyAdminAjax.php
index 92d34185a..5ee721642 100644
--- a/admin/survey/SurveyAdminAjax.php
+++ b/admin/survey/SurveyAdminAjax.php
@@ -6943,17 +6943,6 @@ class SurveyAdminAjax {
 						echo '</p>';
 					}
 					
-					// # Prevod
-
-					// echo '<p> <span>Prevod: </span>';
-					// echo '<span><a href="#">Belarussian</a>, </span>';
-					// echo '<span><a href="#">Bulgarian</a></span>';
-
-					// echo '</p>';
-
-
-
-
 					#piškotki
 					echo '<p><span>'.$lang['srv_cookie'].':</span> <a href="'.$base_url.'&a='.A_COOKIE.'&f=vabila_settings" title="'.$lang['srv_cookie'].'"><span class="qs_data as_link">'.$lang['srv_cookie_'.$row['cookie']].'</span></a></p>';
 					echo '<p><span>'.$lang['srv_cookie_return'].':</span> <a href="'.$base_url.'&a='.A_COOKIE.'&f=vabila_settings" title="'.$lang['srv_cookie_return'].'"><span class="qs_data as_link">'.($row['cookie_return'] == 0 ? $lang['srv_cookie_return_start'] : $lang['srv_cookie_return_middle']).'</span></a></p>';
diff --git a/admin/survey/SurveyAdminSettings.php b/admin/survey/SurveyAdminSettings.php
index 72c8032a8..aff2d3ef7 100644
--- a/admin/survey/SurveyAdminSettings.php
+++ b/admin/survey/SurveyAdminSettings.php
@@ -2797,7 +2797,6 @@ class SurveyAdminSettings {
 			echo '<div class="more_title">';
 			echo '<div class="more_title_icon"><span class="faicon inv_sent_1 empty"></span></div>';
 			echo $lang['srv_publication_invitations'];
-			// echo '<img class= "mail_yellow" src="/public\img\icons\lock_yellow.svg">';
 			echo '</div>';
 			echo $lang['srv_publication_invitations_text'];
 		echo '</div>';
@@ -2924,24 +2923,9 @@ class SurveyAdminSettings {
 		$link1 = $site_url.'a/'.$row['hash'];
 		echo '<div class="grouplang">';
 		echo '<a href="'.$link1.'" target="_blank">'.$link1.'</a>'.(count($lang_array) > 0 ? '&nbsp- '.$base_lang_resp : '');
-		// echo '<div class= "lang_span">- English </div>';
 		echo '<span class="faicon blue copy" onclick="CopyToClipboard(\''.$link1.'\'); actionNotePopup(\'link_copied\', \'success\'); return false;" title="'.$lang['srv_publication_survey_copylink'].'"></span>';
 		echo '</div>';
 
-		// $link1 = $site_url.'a/'.$row['hash'];
-		// echo '<div class="grouplang">';
-		// echo '<a href="'.$link1.'" target="_blank">'.$link1.'</a>'.(count($lang_array) > 0 ? '&nbsp- '.$base_lang_resp : '');
-		// echo '<div class= "lang_span">- Slovenščina </div>';
-		// echo '<span class="faicon blue copy" onclick="CopyToClipboard(\''.$link1.'\'); actionNotePopup(\'link_copied\', \'success\'); return false;" title="'.$lang['srv_publication_survey_copylink'].'"></span>';
-		// echo '</div>';
-
-		// $link1 = $site_url.'a/'.$row['hash'];
-		// echo '<div class="grouplang">';
-		// echo '<a href="'.$link1.'" target="_blank">'.$link1.'</a>'.(count($lang_array) > 0 ? '&nbsp- '.$base_lang_resp : '');
-		// echo '<div class= "lang_span">- Italian </div>';
-		// echo '<span class="faicon blue copy" onclick="CopyToClipboard(\''.$link1.'\'); actionNotePopup(\'link_copied\', \'success\'); return false;" title="'.$lang['srv_publication_survey_copylink'].'"></span>';
-		// echo '</div>';
-
         // Imamo vec linkov za skupine
 		$ss = new SurveySkupine($this->anketa);
 		$spr_id = $ss->hasSkupine();	
diff --git a/public/css/admin_new.css b/public/css/admin_new.css
index 8184b00fd..23ab2a1f7 100644
--- a/public/css/admin_new.css
+++ b/public/css/admin_new.css
@@ -29405,15 +29405,15 @@ iframe#ifmcontentstoprint {
 }
 
 .rsdl_bck1 {
-  background-color: #fae2e2 !important;
+  background-color: rgb(250, 226, 226) !important;
 }
 
 .rsdl_bck2 {
-  background-color: #ff9d9d !important;
+  background-color: rgb(255, 157, 157) !important;
 }
 
 .rsdl_bck3 {
-  background-color: #f84242 !important;
+  background-color: rgb(248, 66, 66) !important;
 }
 
 .rsdl_bck4 {
@@ -32842,24 +32842,19 @@ table.dataTable td:not(:first-of-type), table.dataTable th:not(:first-of-type) {
   #quick_comments_link.newCss {
     display: none;
   }
-
   #firstNavigation ol.right-side {
     display: none;
   }
-
   div.status_advanced {
     flex-direction: column;
   }
-
   div.status_advanced_box {
     width: 100%;
     box-sizing: border-box;
   }
-
   a.status_advanced_link {
     width: 95%;
   }
-
   .content_div_normalmode {
     overflow-x: auto;
   }
@@ -32927,7 +32922,6 @@ body #main_holder #main .wide {
     width: 100%;
     margin: 0;
   }
-
   fieldset {
     width: 100% !important;
     box-sizing: border-box !important;
@@ -32957,44 +32951,36 @@ fieldset textarea {
   fieldset .setting {
     height: auto !important;
   }
-
   .setting_horizontal_wrapper {
     flex-direction: column !important;
   }
-
   #vnosi_paginacija div select {
     display: inline-block;
     width: fit-content;
     margin: 0 5px;
     text-align: center;
   }
-
   div.breadcrumbs {
     display: block;
     padding: 15px;
     color: #1e88e5;
     font-weight: 600;
   }
-
   button.small, submit.small {
     min-width: auto;
     padding: 5px 16px;
   }
-
   button.medium, submit.medium {
     min-width: auto;
     padding: 10px 24px;
   }
-
   button.large, submit.large {
     min-width: auto;
     padding: 12px 32px;
   }
-
   .top_note {
     padding: 8px 16px;
   }
-
   header {
     /* Mobile meni */
     /* Mobile meni - NASTAVITVE V UREJANJU ANKETE*/
@@ -33250,7 +33236,6 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
   header .mobile_settings .mobile_settings_content a .setting_text {
     width: auto;
   }
-
   footer#srv_footer {
     display: flex;
     flex-direction: column;
@@ -33272,7 +33257,6 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
     padding: 0;
     border: 0;
   }
-
   /* Popup za vprasajcke */
   .qtip {
     position: fixed !important;
@@ -33283,7 +33267,6 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
     left: 10% !important;
     box-shadow: 0 0 15px 15px rgba(0, 0, 0, 0.34) !important;
   }
-
   .divPopUp {
     width: calc(100% - 32px) !important;
     max-width: calc(100% - 32px) !important;
@@ -33294,12 +33277,10 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
     width: calc(100% - 32px) !important;
     max-width: calc(100% - 32px) !important;
   }
-
   /* Vse povezano s paketi in placili */
   .dt-buttons {
     display: none;
   }
-
   #main #moje_ankete_edit #anketa_edit {
     padding: 0 !important;
   }
@@ -33377,7 +33358,6 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
   #main #moje_ankete_edit fieldset div.setting {
     margin-bottom: 10px;
   }
-
   #new_anketa_div {
     display: flex;
     flex-direction: column;
@@ -33461,7 +33441,6 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
     border: 1px solid #c8e3f8 !important;
     border-radius: 1px;
   }
-
   .dashboard_top_settings {
     flex-direction: column;
   }
@@ -33474,19 +33453,16 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
     margin-left: 0;
     margin-right: 16px;
   }
-
   .dashboard_boxes {
     flex-direction: column;
   }
   .dashboard_boxes .dashboard_box {
     margin: 0 0 32px 0;
   }
-
   .locked .add-variable-mobile,
 .spremenljivka_content .add-variable {
     display: none !important;
   }
-
   #branching {
     width: 100%;
     margin: 0;
@@ -33591,11 +33567,9 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
     margin: 0;
     padding: 0 12px;
   }
-
   .toolbox_holder {
     display: none;
   }
-
   .mobile_add_question {
     display: block;
     position: fixed;
@@ -33615,7 +33589,6 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
     line-height: 15px;
     font-weight: 600;
   }
-
   .mobile_add_question_popup {
     z-index: 9999;
     position: fixed;
@@ -33669,7 +33642,6 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
     font-size: 14px;
     font-weight: 500;
   }
-
   #vprasanje_float_editing .vprasanje_edit_holder {
     position: fixed;
     z-index: 99999;
@@ -33722,7 +33694,6 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
     margin-left: 0 !important;
     text-align: center;
   }
-
   #main #anketa #globalSetingsList {
     max-width: 100% !important;
     width: 100% !important;
@@ -33735,7 +33706,6 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
 #main #anketa #globalSetingsList fieldset span.charalimit#anketa_note_chars {
     width: 100%;
   }
-
   /* NASTAVITVE in ARHIVI */
   /* OBLIKA */
   #main #anketa #anketa_edit.page_tema #div_theme_group_holder {
@@ -33751,18 +33721,15 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
     width: 100%;
     height: auto;
   }
-
   #theme-editor {
     width: 100% !important;
     float: none !important;
   }
-
   #theme-preview {
     width: 100% !important;
     float: none !important;
     margin-top: 80px !important;
   }
-
   /* ARHIVI */
   #main #anketa #anketa_edit.page_arhivi {
     flex-direction: column-reverse;
@@ -33780,7 +33747,6 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
   #main #anketa #anketa_edit.page_arhivi #div_archive_content fieldset input {
     width: 100% !important;
   }
-
   div.page_tema .theme_list {
     flex-wrap: wrap;
   }
@@ -33807,7 +33773,6 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
   div.page_tema div#theme_grid_holder div.div_theme_group div.theme_label .theme_label_options .button {
     margin-right: 8px;
   }
-
   .page_theme-editor #theme-preview {
     display: none;
   }
@@ -33815,7 +33780,6 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
     width: 100% !important;
     flex-wrap: wrap;
   }
-
   #srv_diagnostic br {
     display: none;
   }
@@ -33836,7 +33800,6 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
 #srv_diagnostic #srv_diagnostic_results_right table td + td {
     width: auto !important;
   }
-
   .subpage_testnipodatki {
     line-height: 20px;
   }
@@ -33850,7 +33813,6 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
   .subpage_testnipodatki form label input {
     vertical-align: bottom;
   }
-
   .lastnosti_wrapper {
     flex-direction: column !important;
   }
@@ -33858,7 +33820,6 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
 .lastnosti_wrapper .lastnosti_right {
     width: 100% !important;
   }
-
   .page_vabila #vabila .button_holder {
     flex-direction: column;
     align-items: flex-start;
@@ -33883,7 +33844,6 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
   .page_vabila #vabila .more_block {
     width: 100%;
   }
-
   .page_invitations #inv_top_navi {
     flex-direction: column;
     align-items: flex-start;
@@ -33951,7 +33911,6 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
   .page_invitations .button_holder button {
     margin-bottom: 8px;
   }
-
   #vabila > table,
 table.invitations_settings,
 #inv_msg_preview table,
@@ -34035,7 +33994,6 @@ table.invitations_settings p label input[type=password],
     width: 100% !important;
     box-sizing: border-box;
   }
-
   #surveyInvitationSetting,
 #surveyInvitationSettingServer {
     min-width: 100% !important;
@@ -34043,7 +34001,6 @@ table.invitations_settings p label input[type=password],
     margin: 10px 0 !important;
     box-sizing: border-box !important;
   }
-
   #inv_top_navi {
     display: flex;
     flex-direction: column;
@@ -34082,7 +34039,6 @@ table.invitations_settings p label input[type=password],
   #inv_top_navi > #inv_step_nav.yellow .inv_step_space {
     display: none;
   }
-
   #inv_recipients_profiles_holder,
 #inv_import_list_container,
 #inv_messages_profiles_holder,
@@ -34103,7 +34059,6 @@ table.invitations_settings p label input[type=password],
 #inv_select_mail_preview textarea {
     width: 100%;
   }
-
   #inv_msg_preview table th {
     height: auto !important;
     width: 100% !important;
@@ -34115,7 +34070,6 @@ table.invitations_settings p label input[type=password],
     width: 100%;
     box-sizing: border-box;
   }
-
   .addthis_toolbox {
     line-height: 24px;
   }
@@ -34130,11 +34084,9 @@ table.invitations_settings p label input[type=password],
   .addthis_toolbox .addthis_separator {
     font-size: 16px;
   }
-
   #inv_field_container ul li {
     width: 45%;
   }
-
   /* grafika ko ni podatkov */
   div.no_data_alert img {
     width: 100%;
@@ -34146,7 +34098,6 @@ table.invitations_settings p label input[type=password],
     flex-direction: column;
     align-items: center;
   }
-
   .page_data .data_table_top_holder {
     flex-direction: column;
     align-items: flex-start;
@@ -34217,11 +34168,9 @@ table.invitations_settings p label input[type=password],
     width: 100%;
     margin-bottom: 16px;
   }
-
   body.data_fullscreen #analiza_data {
     top: 68px;
   }
-
   .subpage_append .anketa_edit_main,
 .subpage_merge .anketa_edit_main,
 .subpage_calculation .anketa_edit_main,
@@ -34262,7 +34211,6 @@ table.invitations_settings p label input[type=password],
     clear: both;
     margin: 40px 0 0 0 !important;
   }
-
   .subpage_quick_edit #quick_edit_top_line {
     flex-direction: column-reverse;
   }
@@ -34282,7 +34230,6 @@ table.invitations_settings p label input[type=password],
   .subpage_quick_edit .quick_edit_container .quick_edit_bottom_line {
     justify-content: center;
   }
-
   .analysis_bottom_settings {
     flex-wrap: wrap;
   }
@@ -34292,16 +34239,13 @@ table.invitations_settings p label input[type=password],
     margin: 0 0 16px 0 !important;
     border: 0;
   }
-
   .div_analiza_icons,
 .div_analiza_scale {
     opacity: 1 !important;
   }
-
   .analysis_icons_holder {
     display: none;
   }
-
   .chart_holder {
     width: 100%;
     box-sizing: border-box;
@@ -34324,7 +34268,6 @@ table.invitations_settings p label input[type=password],
     display: block;
     clear: both;
   }
-
   table.analysis_reports {
     border-spacing: 0px;
   }
@@ -34341,14 +34284,12 @@ table.analysis_reports > tbody > tr > td {
   table.analysis_reports fieldset {
     margin-bottom: 0 !important;
   }
-
   .reports_holder {
     flex-direction: column;
   }
   .reports_holder fieldset {
     width: 100%;
   }
-
   .noSurvey_sequence {
     padding: 0;
   }
@@ -34370,13 +34311,11 @@ table.analysis_reports > tbody > tr > td {
   .noSurvey_sequence .buttons_holder a .button {
     margin: 10px 30px;
   }
-
   #table-horizontal-scroll-wrapper1-userchanges {
     display: table;
     table-layout: fixed;
     width: 100%;
   }
-
   #table-horizontal-scroll-wrapper2-userchanges {
     display: table-cell;
     overflow-x: auto;
@@ -34387,7 +34326,6 @@ table.analysis_reports > tbody > tr > td {
     border-collapse: collapse;
     white-space: nowrap;
   }
-
   .page_arhivi .anketa_edit_left,
 .page_tracking .anketa_edit_left,
 .subpage_anal_arch .anketa_edit_left,

From ae33fd6ee8cb2235b46e4b54b17094de917d4150 Mon Sep 17 00:00:00 2001
From: tejagerjovic <teja.gerjovic@fdv.uni-lj.si>
Date: Tue, 19 Jul 2022 10:46:54 +0200
Subject: [PATCH 092/110] [Redizajn 1KA v2] - Testiranje --> Diagnostika - v2

Premaknjen source in funkcija za graf v svoj .js file
---
 .../classes/class.SurveyDiagnostics.php       |  2 --
 admin/survey/minify/groupsConfig.php          |  3 ++
 admin/survey/script/Chartjs.js                | 28 ++++++++++++++++++
 admin/survey/script/Chartjs/chart.js          | 13 +++++++++
 admin/survey/script/script.js                 | 29 -------------------
 5 files changed, 44 insertions(+), 31 deletions(-)
 create mode 100644 admin/survey/script/Chartjs.js
 create mode 100644 admin/survey/script/Chartjs/chart.js

diff --git a/admin/survey/classes/class.SurveyDiagnostics.php b/admin/survey/classes/class.SurveyDiagnostics.php
index a0f76052c..4f058e48f 100644
--- a/admin/survey/classes/class.SurveyDiagnostics.php
+++ b/admin/survey/classes/class.SurveyDiagnostics.php
@@ -467,8 +467,6 @@ class SurveyDiagnostics
 		echo '</table>';
 
 		// LASTNOSTI ANKETE
-		echo '<script src="https://cdn.jsdelivr.net/npm/chart.js"></script>'; //Chart.js source
-
 		echo '<h2>'.$lang['srv_testiranje_diagnostika_lastnosti'].'</h2>';
 
 		echo '<div class="lastnosti_wrapper">';
diff --git a/admin/survey/minify/groupsConfig.php b/admin/survey/minify/groupsConfig.php
index 203ea278b..d66d59c19 100644
--- a/admin/survey/minify/groupsConfig.php
+++ b/admin/survey/minify/groupsConfig.php
@@ -96,6 +96,9 @@ return [
         dirname(__FILE__).'/../script/DragDrop/dragdropInAdmin.js',
         dirname(__FILE__).'/../script/custom_column_label_respondent.js',
         dirname(__FILE__).'/../script/ImageHotSpot/imagemap_question_editor.js',
+        dirname(__FILE__).'/../script/ImageHotSpot/imageHotspot.js',
+        dirname(__FILE__).'/../script/Chartjs/Chart.js', //source za chartjs grafe
+        dirname(__FILE__).'/../script/Chartjs.js',
 
         dirname(__FILE__).'/../script/jquery/jquery.imagemapster.js',
 
diff --git a/admin/survey/script/Chartjs.js b/admin/survey/script/Chartjs.js
new file mode 100644
index 000000000..20b1f89ec
--- /dev/null
+++ b/admin/survey/script/Chartjs.js
@@ -0,0 +1,28 @@
+function diagnosticsChart(place,display) {
+
+	const data = {
+		datasets: [{
+		  data: display,
+		  backgroundColor: [
+			'rgb(229,229,229)',
+			'rgb(30, 136, 229)',
+		  ],
+		  borderWidth: 0, //spacing between slices
+		}]
+	};
+	
+	  const config = {
+		type: 'doughnut',
+		data: data,
+		options: {
+			events: [], //no hover labels,animations,...
+			cutout: 32, //slice width
+		}
+	};
+
+	  const myChart = new Chart(
+		document.getElementById(place),
+		config
+	  );
+
+}
\ No newline at end of file
diff --git a/admin/survey/script/Chartjs/chart.js b/admin/survey/script/Chartjs/chart.js
new file mode 100644
index 000000000..5399a164a
--- /dev/null
+++ b/admin/survey/script/Chartjs/chart.js
@@ -0,0 +1,13 @@
+/*!
+ * Chart.js v3.8.0
+ * https://www.chartjs.org
+ * (c) 2022 Chart.js Contributors
+ * Released under the MIT License
+ */
+!function(t,e){"object"==typeof exports&&"undefined"!=typeof module?module.exports=e():"function"==typeof define&&define.amd?define(e):(t="undefined"!=typeof globalThis?globalThis:t||self).Chart=e()}(this,(function(){"use strict";const t="undefined"==typeof window?function(t){return t()}:window.requestAnimationFrame;function e(e,i,s){const n=s||(t=>Array.prototype.slice.call(t));let o=!1,a=[];return function(...s){a=n(s),o||(o=!0,t.call(window,(()=>{o=!1,e.apply(i,a)})))}}function i(t,e){let i;return function(...s){return e?(clearTimeout(i),i=setTimeout(t,e,s)):t.apply(this,s),e}}const s=t=>"start"===t?"left":"end"===t?"right":"center",n=(t,e,i)=>"start"===t?e:"end"===t?i:(e+i)/2,o=(t,e,i,s)=>t===(s?"left":"right")?i:"center"===t?(e+i)/2:e;var a=new class{constructor(){this._request=null,this._charts=new Map,this._running=!1,this._lastDate=void 0}_notify(t,e,i,s){const n=e.listeners[s],o=e.duration;n.forEach((s=>s({chart:t,initial:e.initial,numSteps:o,currentStep:Math.min(i-e.start,o)})))}_refresh(){this._request||(this._running=!0,this._request=t.call(window,(()=>{this._update(),this._request=null,this._running&&this._refresh()})))}_update(t=Date.now()){let e=0;this._charts.forEach(((i,s)=>{if(!i.running||!i.items.length)return;const n=i.items;let o,a=n.length-1,r=!1;for(;a>=0;--a)o=n[a],o._active?(o._total>i.duration&&(i.duration=o._total),o.tick(t),r=!0):(n[a]=n[n.length-1],n.pop());r&&(s.draw(),this._notify(s,i,t,"progress")),n.length||(i.running=!1,this._notify(s,i,t,"complete"),i.initial=!1),e+=n.length})),this._lastDate=t,0===e&&(this._running=!1)}_getAnims(t){const e=this._charts;let i=e.get(t);return i||(i={running:!1,initial:!0,items:[],listeners:{complete:[],progress:[]}},e.set(t,i)),i}listen(t,e,i){this._getAnims(t).listeners[e].push(i)}add(t,e){e&&e.length&&this._getAnims(t).items.push(...e)}has(t){return this._getAnims(t).items.length>0}start(t){const e=this._charts.get(t);e&&(e.running=!0,e.start=Date.now(),e.duration=e.items.reduce(((t,e)=>Math.max(t,e._duration)),0),this._refresh())}running(t){if(!this._running)return!1;const e=this._charts.get(t);return!!(e&&e.running&&e.items.length)}stop(t){const e=this._charts.get(t);if(!e||!e.items.length)return;const i=e.items;let s=i.length-1;for(;s>=0;--s)i[s].cancel();e.items=[],this._notify(t,e,Date.now(),"complete")}remove(t){return this._charts.delete(t)}};
+/*!
+ * @kurkle/color v0.2.1
+ * https://github.com/kurkle/color#readme
+ * (c) 2022 Jukka Kurkela
+ * Released under the MIT License
+ */function r(t){return t+.5|0}const l=(t,e,i)=>Math.max(Math.min(t,i),e);function h(t){return l(r(2.55*t),0,255)}function c(t){return l(r(255*t),0,255)}function d(t){return l(r(t/2.55)/100,0,1)}function u(t){return l(r(100*t),0,100)}const f={0:0,1:1,2:2,3:3,4:4,5:5,6:6,7:7,8:8,9:9,A:10,B:11,C:12,D:13,E:14,F:15,a:10,b:11,c:12,d:13,e:14,f:15},g=[..."0123456789ABCDEF"],p=t=>g[15&t],m=t=>g[(240&t)>>4]+g[15&t],b=t=>(240&t)>>4==(15&t);function x(t){var e=(t=>b(t.r)&&b(t.g)&&b(t.b)&&b(t.a))(t)?p:m;return t?"#"+e(t.r)+e(t.g)+e(t.b)+((t,e)=>t<255?e(t):"")(t.a,e):void 0}const _=/^(hsla?|hwb|hsv)\(\s*([-+.e\d]+)(?:deg)?[\s,]+([-+.e\d]+)%[\s,]+([-+.e\d]+)%(?:[\s,]+([-+.e\d]+)(%)?)?\s*\)$/;function y(t,e,i){const s=e*Math.min(i,1-i),n=(e,n=(e+t/30)%12)=>i-s*Math.max(Math.min(n-3,9-n,1),-1);return[n(0),n(8),n(4)]}function v(t,e,i){const s=(s,n=(s+t/60)%6)=>i-i*e*Math.max(Math.min(n,4-n,1),0);return[s(5),s(3),s(1)]}function w(t,e,i){const s=y(t,1,.5);let n;for(e+i>1&&(n=1/(e+i),e*=n,i*=n),n=0;n<3;n++)s[n]*=1-e-i,s[n]+=e;return s}function M(t){const e=t.r/255,i=t.g/255,s=t.b/255,n=Math.max(e,i,s),o=Math.min(e,i,s),a=(n+o)/2;let r,l,h;return n!==o&&(h=n-o,l=a>.5?h/(2-n-o):h/(n+o),r=function(t,e,i,s,n){return t===n?(e-i)/s+(e<i?6:0):e===n?(i-t)/s+2:(t-e)/s+4}(e,i,s,h,n),r=60*r+.5),[0|r,l||0,a]}function k(t,e,i,s){return(Array.isArray(e)?t(e[0],e[1],e[2]):t(e,i,s)).map(c)}function S(t,e,i){return k(y,t,e,i)}function P(t){return(t%360+360)%360}function D(t){const e=_.exec(t);let i,s=255;if(!e)return;e[5]!==i&&(s=e[6]?h(+e[5]):c(+e[5]));const n=P(+e[2]),o=+e[3]/100,a=+e[4]/100;return i="hwb"===e[1]?function(t,e,i){return k(w,t,e,i)}(n,o,a):"hsv"===e[1]?function(t,e,i){return k(v,t,e,i)}(n,o,a):S(n,o,a),{r:i[0],g:i[1],b:i[2],a:s}}const C={x:"dark",Z:"light",Y:"re",X:"blu",W:"gr",V:"medium",U:"slate",A:"ee",T:"ol",S:"or",B:"ra",C:"lateg",D:"ights",R:"in",Q:"turquois",E:"hi",P:"ro",O:"al",N:"le",M:"de",L:"yello",F:"en",K:"ch",G:"arks",H:"ea",I:"ightg",J:"wh"},O={OiceXe:"f0f8ff",antiquewEte:"faebd7",aqua:"ffff",aquamarRe:"7fffd4",azuY:"f0ffff",beige:"f5f5dc",bisque:"ffe4c4",black:"0",blanKedOmond:"ffebcd",Xe:"ff",XeviTet:"8a2be2",bPwn:"a52a2a",burlywood:"deb887",caMtXe:"5f9ea0",KartYuse:"7fff00",KocTate:"d2691e",cSO:"ff7f50",cSnflowerXe:"6495ed",cSnsilk:"fff8dc",crimson:"dc143c",cyan:"ffff",xXe:"8b",xcyan:"8b8b",xgTMnPd:"b8860b",xWay:"a9a9a9",xgYF:"6400",xgYy:"a9a9a9",xkhaki:"bdb76b",xmagFta:"8b008b",xTivegYF:"556b2f",xSange:"ff8c00",xScEd:"9932cc",xYd:"8b0000",xsOmon:"e9967a",xsHgYF:"8fbc8f",xUXe:"483d8b",xUWay:"2f4f4f",xUgYy:"2f4f4f",xQe:"ced1",xviTet:"9400d3",dAppRk:"ff1493",dApskyXe:"bfff",dimWay:"696969",dimgYy:"696969",dodgerXe:"1e90ff",fiYbrick:"b22222",flSOwEte:"fffaf0",foYstWAn:"228b22",fuKsia:"ff00ff",gaRsbSo:"dcdcdc",ghostwEte:"f8f8ff",gTd:"ffd700",gTMnPd:"daa520",Way:"808080",gYF:"8000",gYFLw:"adff2f",gYy:"808080",honeyMw:"f0fff0",hotpRk:"ff69b4",RdianYd:"cd5c5c",Rdigo:"4b0082",ivSy:"fffff0",khaki:"f0e68c",lavFMr:"e6e6fa",lavFMrXsh:"fff0f5",lawngYF:"7cfc00",NmoncEffon:"fffacd",ZXe:"add8e6",ZcSO:"f08080",Zcyan:"e0ffff",ZgTMnPdLw:"fafad2",ZWay:"d3d3d3",ZgYF:"90ee90",ZgYy:"d3d3d3",ZpRk:"ffb6c1",ZsOmon:"ffa07a",ZsHgYF:"20b2aa",ZskyXe:"87cefa",ZUWay:"778899",ZUgYy:"778899",ZstAlXe:"b0c4de",ZLw:"ffffe0",lime:"ff00",limegYF:"32cd32",lRF:"faf0e6",magFta:"ff00ff",maPon:"800000",VaquamarRe:"66cdaa",VXe:"cd",VScEd:"ba55d3",VpurpN:"9370db",VsHgYF:"3cb371",VUXe:"7b68ee",VsprRggYF:"fa9a",VQe:"48d1cc",VviTetYd:"c71585",midnightXe:"191970",mRtcYam:"f5fffa",mistyPse:"ffe4e1",moccasR:"ffe4b5",navajowEte:"ffdead",navy:"80",Tdlace:"fdf5e6",Tive:"808000",TivedBb:"6b8e23",Sange:"ffa500",SangeYd:"ff4500",ScEd:"da70d6",pOegTMnPd:"eee8aa",pOegYF:"98fb98",pOeQe:"afeeee",pOeviTetYd:"db7093",papayawEp:"ffefd5",pHKpuff:"ffdab9",peru:"cd853f",pRk:"ffc0cb",plum:"dda0dd",powMrXe:"b0e0e6",purpN:"800080",YbeccapurpN:"663399",Yd:"ff0000",Psybrown:"bc8f8f",PyOXe:"4169e1",saddNbPwn:"8b4513",sOmon:"fa8072",sandybPwn:"f4a460",sHgYF:"2e8b57",sHshell:"fff5ee",siFna:"a0522d",silver:"c0c0c0",skyXe:"87ceeb",UXe:"6a5acd",UWay:"708090",UgYy:"708090",snow:"fffafa",sprRggYF:"ff7f",stAlXe:"4682b4",tan:"d2b48c",teO:"8080",tEstN:"d8bfd8",tomato:"ff6347",Qe:"40e0d0",viTet:"ee82ee",JHt:"f5deb3",wEte:"ffffff",wEtesmoke:"f5f5f5",Lw:"ffff00",LwgYF:"9acd32"};let A;function T(t){A||(A=function(){const t={},e=Object.keys(O),i=Object.keys(C);let s,n,o,a,r;for(s=0;s<e.length;s++){for(a=r=e[s],n=0;n<i.length;n++)o=i[n],r=r.replace(o,C[o]);o=parseInt(O[a],16),t[r]=[o>>16&255,o>>8&255,255&o]}return t}(),A.transparent=[0,0,0,0]);const e=A[t.toLowerCase()];return e&&{r:e[0],g:e[1],b:e[2],a:4===e.length?e[3]:255}}const L=/^rgba?\(\s*([-+.\d]+)(%)?[\s,]+([-+.e\d]+)(%)?[\s,]+([-+.e\d]+)(%)?(?:[\s,/]+([-+.e\d]+)(%)?)?\s*\)$/;const R=t=>t<=.0031308?12.92*t:1.055*Math.pow(t,1/2.4)-.055,E=t=>t<=.04045?t/12.92:Math.pow((t+.055)/1.055,2.4);function I(t,e,i){if(t){let s=M(t);s[e]=Math.max(0,Math.min(s[e]+s[e]*i,0===e?360:1)),s=S(s),t.r=s[0],t.g=s[1],t.b=s[2]}}function z(t,e){return t?Object.assign(e||{},t):t}function F(t){var e={r:0,g:0,b:0,a:255};return Array.isArray(t)?t.length>=3&&(e={r:t[0],g:t[1],b:t[2],a:255},t.length>3&&(e.a=c(t[3]))):(e=z(t,{r:0,g:0,b:0,a:1})).a=c(e.a),e}function B(t){return"r"===t.charAt(0)?function(t){const e=L.exec(t);let i,s,n,o=255;if(e){if(e[7]!==i){const t=+e[7];o=e[8]?h(t):l(255*t,0,255)}return i=+e[1],s=+e[3],n=+e[5],i=255&(e[2]?h(i):l(i,0,255)),s=255&(e[4]?h(s):l(s,0,255)),n=255&(e[6]?h(n):l(n,0,255)),{r:i,g:s,b:n,a:o}}}(t):D(t)}class V{constructor(t){if(t instanceof V)return t;const e=typeof t;let i;var s,n,o;"object"===e?i=F(t):"string"===e&&(o=(s=t).length,"#"===s[0]&&(4===o||5===o?n={r:255&17*f[s[1]],g:255&17*f[s[2]],b:255&17*f[s[3]],a:5===o?17*f[s[4]]:255}:7!==o&&9!==o||(n={r:f[s[1]]<<4|f[s[2]],g:f[s[3]]<<4|f[s[4]],b:f[s[5]]<<4|f[s[6]],a:9===o?f[s[7]]<<4|f[s[8]]:255})),i=n||T(t)||B(t)),this._rgb=i,this._valid=!!i}get valid(){return this._valid}get rgb(){var t=z(this._rgb);return t&&(t.a=d(t.a)),t}set rgb(t){this._rgb=F(t)}rgbString(){return this._valid?(t=this._rgb)&&(t.a<255?`rgba(${t.r}, ${t.g}, ${t.b}, ${d(t.a)})`:`rgb(${t.r}, ${t.g}, ${t.b})`):void 0;var t}hexString(){return this._valid?x(this._rgb):void 0}hslString(){return this._valid?function(t){if(!t)return;const e=M(t),i=e[0],s=u(e[1]),n=u(e[2]);return t.a<255?`hsla(${i}, ${s}%, ${n}%, ${d(t.a)})`:`hsl(${i}, ${s}%, ${n}%)`}(this._rgb):void 0}mix(t,e){if(t){const i=this.rgb,s=t.rgb;let n;const o=e===n?.5:e,a=2*o-1,r=i.a-s.a,l=((a*r==-1?a:(a+r)/(1+a*r))+1)/2;n=1-l,i.r=255&l*i.r+n*s.r+.5,i.g=255&l*i.g+n*s.g+.5,i.b=255&l*i.b+n*s.b+.5,i.a=o*i.a+(1-o)*s.a,this.rgb=i}return this}interpolate(t,e){return t&&(this._rgb=function(t,e,i){const s=E(d(t.r)),n=E(d(t.g)),o=E(d(t.b));return{r:c(R(s+i*(E(d(e.r))-s))),g:c(R(n+i*(E(d(e.g))-n))),b:c(R(o+i*(E(d(e.b))-o))),a:t.a+i*(e.a-t.a)}}(this._rgb,t._rgb,e)),this}clone(){return new V(this.rgb)}alpha(t){return this._rgb.a=c(t),this}clearer(t){return this._rgb.a*=1-t,this}greyscale(){const t=this._rgb,e=r(.3*t.r+.59*t.g+.11*t.b);return t.r=t.g=t.b=e,this}opaquer(t){return this._rgb.a*=1+t,this}negate(){const t=this._rgb;return t.r=255-t.r,t.g=255-t.g,t.b=255-t.b,this}lighten(t){return I(this._rgb,2,t),this}darken(t){return I(this._rgb,2,-t),this}saturate(t){return I(this._rgb,1,t),this}desaturate(t){return I(this._rgb,1,-t),this}rotate(t){return function(t,e){var i=M(t);i[0]=P(i[0]+e),i=S(i),t.r=i[0],t.g=i[1],t.b=i[2]}(this._rgb,t),this}}function N(t){return new V(t)}function W(t){if(t&&"object"==typeof t){const e=t.toString();return"[object CanvasPattern]"===e||"[object CanvasGradient]"===e}return!1}function H(t){return W(t)?t:N(t)}function j(t){return W(t)?t:N(t).saturate(.5).darken(.1).hexString()}function $(){}const Y=function(){let t=0;return function(){return t++}}();function U(t){return null==t}function X(t){if(Array.isArray&&Array.isArray(t))return!0;const e=Object.prototype.toString.call(t);return"[object"===e.slice(0,7)&&"Array]"===e.slice(-6)}function q(t){return null!==t&&"[object Object]"===Object.prototype.toString.call(t)}const K=t=>("number"==typeof t||t instanceof Number)&&isFinite(+t);function G(t,e){return K(t)?t:e}function Z(t,e){return void 0===t?e:t}const J=(t,e)=>"string"==typeof t&&t.endsWith("%")?parseFloat(t)/100:t/e,Q=(t,e)=>"string"==typeof t&&t.endsWith("%")?parseFloat(t)/100*e:+t;function tt(t,e,i){if(t&&"function"==typeof t.call)return t.apply(i,e)}function et(t,e,i,s){let n,o,a;if(X(t))if(o=t.length,s)for(n=o-1;n>=0;n--)e.call(i,t[n],n);else for(n=0;n<o;n++)e.call(i,t[n],n);else if(q(t))for(a=Object.keys(t),o=a.length,n=0;n<o;n++)e.call(i,t[a[n]],a[n])}function it(t,e){let i,s,n,o;if(!t||!e||t.length!==e.length)return!1;for(i=0,s=t.length;i<s;++i)if(n=t[i],o=e[i],n.datasetIndex!==o.datasetIndex||n.index!==o.index)return!1;return!0}function st(t){if(X(t))return t.map(st);if(q(t)){const e=Object.create(null),i=Object.keys(t),s=i.length;let n=0;for(;n<s;++n)e[i[n]]=st(t[i[n]]);return e}return t}function nt(t){return-1===["__proto__","prototype","constructor"].indexOf(t)}function ot(t,e,i,s){if(!nt(t))return;const n=e[t],o=i[t];q(n)&&q(o)?at(n,o,s):e[t]=st(o)}function at(t,e,i){const s=X(e)?e:[e],n=s.length;if(!q(t))return t;const o=(i=i||{}).merger||ot;for(let a=0;a<n;++a){if(!q(e=s[a]))continue;const n=Object.keys(e);for(let s=0,a=n.length;s<a;++s)o(n[s],t,e,i)}return t}function rt(t,e){return at(t,e,{merger:lt})}function lt(t,e,i){if(!nt(t))return;const s=e[t],n=i[t];q(s)&&q(n)?rt(s,n):Object.prototype.hasOwnProperty.call(e,t)||(e[t]=st(n))}function ht(t,e){const i=t.indexOf(".",e);return-1===i?t.length:i}function ct(t,e){if(""===e)return t;let i=0,s=ht(e,i);for(;t&&s>i;)t=t[e.slice(i,s)],i=s+1,s=ht(e,i);return t}function dt(t){return t.charAt(0).toUpperCase()+t.slice(1)}const ut=t=>void 0!==t,ft=t=>"function"==typeof t,gt=(t,e)=>{if(t.size!==e.size)return!1;for(const i of t)if(!e.has(i))return!1;return!0};function pt(t){return"mouseup"===t.type||"click"===t.type||"contextmenu"===t.type}const mt=Object.create(null),bt=Object.create(null);function xt(t,e){if(!e)return t;const i=e.split(".");for(let e=0,s=i.length;e<s;++e){const s=i[e];t=t[s]||(t[s]=Object.create(null))}return t}function _t(t,e,i){return"string"==typeof e?at(xt(t,e),i):at(xt(t,""),e)}var yt=new class{constructor(t){this.animation=void 0,this.backgroundColor="rgba(0,0,0,0.1)",this.borderColor="rgba(0,0,0,0.1)",this.color="#666",this.datasets={},this.devicePixelRatio=t=>t.chart.platform.getDevicePixelRatio(),this.elements={},this.events=["mousemove","mouseout","click","touchstart","touchmove"],this.font={family:"'Helvetica Neue', 'Helvetica', 'Arial', sans-serif",size:12,style:"normal",lineHeight:1.2,weight:null},this.hover={},this.hoverBackgroundColor=(t,e)=>j(e.backgroundColor),this.hoverBorderColor=(t,e)=>j(e.borderColor),this.hoverColor=(t,e)=>j(e.color),this.indexAxis="x",this.interaction={mode:"nearest",intersect:!0,includeInvisible:!1},this.maintainAspectRatio=!0,this.onHover=null,this.onClick=null,this.parsing=!0,this.plugins={},this.responsive=!0,this.scale=void 0,this.scales={},this.showLine=!0,this.drawActiveElementsOnTop=!0,this.describe(t)}set(t,e){return _t(this,t,e)}get(t){return xt(this,t)}describe(t,e){return _t(bt,t,e)}override(t,e){return _t(mt,t,e)}route(t,e,i,s){const n=xt(this,t),o=xt(this,i),a="_"+e;Object.defineProperties(n,{[a]:{value:n[e],writable:!0},[e]:{enumerable:!0,get(){const t=this[a],e=o[s];return q(t)?Object.assign({},e,t):Z(t,e)},set(t){this[a]=t}}})}}({_scriptable:t=>!t.startsWith("on"),_indexable:t=>"events"!==t,hover:{_fallback:"interaction"},interaction:{_scriptable:!1,_indexable:!1}});function vt(t,e,i){i=i||(i=>t[i]<e);let s,n=t.length-1,o=0;for(;n-o>1;)s=o+n>>1,i(s)?o=s:n=s;return{lo:o,hi:n}}const wt=(t,e,i)=>vt(t,i,(s=>t[s][e]<i)),Mt=(t,e,i)=>vt(t,i,(s=>t[s][e]>=i));function kt(t,e,i){let s=0,n=t.length;for(;s<n&&t[s]<e;)s++;for(;n>s&&t[n-1]>i;)n--;return s>0||n<t.length?t.slice(s,n):t}const St=["push","pop","shift","splice","unshift"];function Pt(t,e){t._chartjs?t._chartjs.listeners.push(e):(Object.defineProperty(t,"_chartjs",{configurable:!0,enumerable:!1,value:{listeners:[e]}}),St.forEach((e=>{const i="_onData"+dt(e),s=t[e];Object.defineProperty(t,e,{configurable:!0,enumerable:!1,value(...e){const n=s.apply(this,e);return t._chartjs.listeners.forEach((t=>{"function"==typeof t[i]&&t[i](...e)})),n}})})))}function Dt(t,e){const i=t._chartjs;if(!i)return;const s=i.listeners,n=s.indexOf(e);-1!==n&&s.splice(n,1),s.length>0||(St.forEach((e=>{delete t[e]})),delete t._chartjs)}function Ct(t){const e=new Set;let i,s;for(i=0,s=t.length;i<s;++i)e.add(t[i]);return e.size===s?t:Array.from(e)}const Ot=Math.PI,At=2*Ot,Tt=At+Ot,Lt=Number.POSITIVE_INFINITY,Rt=Ot/180,Et=Ot/2,It=Ot/4,zt=2*Ot/3,Ft=Math.log10,Bt=Math.sign;function Vt(t){const e=Math.round(t);t=Ht(t,e,t/1e3)?e:t;const i=Math.pow(10,Math.floor(Ft(t))),s=t/i;return(s<=1?1:s<=2?2:s<=5?5:10)*i}function Nt(t){const e=[],i=Math.sqrt(t);let s;for(s=1;s<i;s++)t%s==0&&(e.push(s),e.push(t/s));return i===(0|i)&&e.push(i),e.sort(((t,e)=>t-e)).pop(),e}function Wt(t){return!isNaN(parseFloat(t))&&isFinite(t)}function Ht(t,e,i){return Math.abs(t-e)<i}function jt(t,e){const i=Math.round(t);return i-e<=t&&i+e>=t}function $t(t,e,i){let s,n,o;for(s=0,n=t.length;s<n;s++)o=t[s][i],isNaN(o)||(e.min=Math.min(e.min,o),e.max=Math.max(e.max,o))}function Yt(t){return t*(Ot/180)}function Ut(t){return t*(180/Ot)}function Xt(t){if(!K(t))return;let e=1,i=0;for(;Math.round(t*e)/e!==t;)e*=10,i++;return i}function qt(t,e){const i=e.x-t.x,s=e.y-t.y,n=Math.sqrt(i*i+s*s);let o=Math.atan2(s,i);return o<-.5*Ot&&(o+=At),{angle:o,distance:n}}function Kt(t,e){return Math.sqrt(Math.pow(e.x-t.x,2)+Math.pow(e.y-t.y,2))}function Gt(t,e){return(t-e+Tt)%At-Ot}function Zt(t){return(t%At+At)%At}function Jt(t,e,i,s){const n=Zt(t),o=Zt(e),a=Zt(i),r=Zt(o-n),l=Zt(a-n),h=Zt(n-o),c=Zt(n-a);return n===o||n===a||s&&o===a||r>l&&h<c}function Qt(t,e,i){return Math.max(e,Math.min(i,t))}function te(t){return Qt(t,-32768,32767)}function ee(t,e,i,s=1e-6){return t>=Math.min(e,i)-s&&t<=Math.max(e,i)+s}function ie(){return"undefined"!=typeof window&&"undefined"!=typeof document}function se(t){let e=t.parentNode;return e&&"[object ShadowRoot]"===e.toString()&&(e=e.host),e}function ne(t,e,i){let s;return"string"==typeof t?(s=parseInt(t,10),-1!==t.indexOf("%")&&(s=s/100*e.parentNode[i])):s=t,s}const oe=t=>window.getComputedStyle(t,null);function ae(t,e){return oe(t).getPropertyValue(e)}const re=["top","right","bottom","left"];function le(t,e,i){const s={};i=i?"-"+i:"";for(let n=0;n<4;n++){const o=re[n];s[o]=parseFloat(t[e+"-"+o+i])||0}return s.width=s.left+s.right,s.height=s.top+s.bottom,s}function he(t,e){if("native"in t)return t;const{canvas:i,currentDevicePixelRatio:s}=e,n=oe(i),o="border-box"===n.boxSizing,a=le(n,"padding"),r=le(n,"border","width"),{x:l,y:h,box:c}=function(t,e){const i=t.touches,s=i&&i.length?i[0]:t,{offsetX:n,offsetY:o}=s;let a,r,l=!1;if(((t,e,i)=>(t>0||e>0)&&(!i||!i.shadowRoot))(n,o,t.target))a=n,r=o;else{const t=e.getBoundingClientRect();a=s.clientX-t.left,r=s.clientY-t.top,l=!0}return{x:a,y:r,box:l}}(t,i),d=a.left+(c&&r.left),u=a.top+(c&&r.top);let{width:f,height:g}=e;return o&&(f-=a.width+r.width,g-=a.height+r.height),{x:Math.round((l-d)/f*i.width/s),y:Math.round((h-u)/g*i.height/s)}}const ce=t=>Math.round(10*t)/10;function de(t,e,i,s){const n=oe(t),o=le(n,"margin"),a=ne(n.maxWidth,t,"clientWidth")||Lt,r=ne(n.maxHeight,t,"clientHeight")||Lt,l=function(t,e,i){let s,n;if(void 0===e||void 0===i){const o=se(t);if(o){const t=o.getBoundingClientRect(),a=oe(o),r=le(a,"border","width"),l=le(a,"padding");e=t.width-l.width-r.width,i=t.height-l.height-r.height,s=ne(a.maxWidth,o,"clientWidth"),n=ne(a.maxHeight,o,"clientHeight")}else e=t.clientWidth,i=t.clientHeight}return{width:e,height:i,maxWidth:s||Lt,maxHeight:n||Lt}}(t,e,i);let{width:h,height:c}=l;if("content-box"===n.boxSizing){const t=le(n,"border","width"),e=le(n,"padding");h-=e.width+t.width,c-=e.height+t.height}return h=Math.max(0,h-o.width),c=Math.max(0,s?Math.floor(h/s):c-o.height),h=ce(Math.min(h,a,l.maxWidth)),c=ce(Math.min(c,r,l.maxHeight)),h&&!c&&(c=ce(h/2)),{width:h,height:c}}function ue(t,e,i){const s=e||1,n=Math.floor(t.height*s),o=Math.floor(t.width*s);t.height=n/s,t.width=o/s;const a=t.canvas;return a.style&&(i||!a.style.height&&!a.style.width)&&(a.style.height=`${t.height}px`,a.style.width=`${t.width}px`),(t.currentDevicePixelRatio!==s||a.height!==n||a.width!==o)&&(t.currentDevicePixelRatio=s,a.height=n,a.width=o,t.ctx.setTransform(s,0,0,s,0,0),!0)}const fe=function(){let t=!1;try{const e={get passive(){return t=!0,!1}};window.addEventListener("test",null,e),window.removeEventListener("test",null,e)}catch(t){}return t}();function ge(t,e){const i=ae(t,e),s=i&&i.match(/^(\d+)(\.\d+)?px$/);return s?+s[1]:void 0}function pe(t){return!t||U(t.size)||U(t.family)?null:(t.style?t.style+" ":"")+(t.weight?t.weight+" ":"")+t.size+"px "+t.family}function me(t,e,i,s,n){let o=e[n];return o||(o=e[n]=t.measureText(n).width,i.push(n)),o>s&&(s=o),s}function be(t,e,i,s){let n=(s=s||{}).data=s.data||{},o=s.garbageCollect=s.garbageCollect||[];s.font!==e&&(n=s.data={},o=s.garbageCollect=[],s.font=e),t.save(),t.font=e;let a=0;const r=i.length;let l,h,c,d,u;for(l=0;l<r;l++)if(d=i[l],null!=d&&!0!==X(d))a=me(t,n,o,a,d);else if(X(d))for(h=0,c=d.length;h<c;h++)u=d[h],null==u||X(u)||(a=me(t,n,o,a,u));t.restore();const f=o.length/2;if(f>i.length){for(l=0;l<f;l++)delete n[o[l]];o.splice(0,f)}return a}function xe(t,e,i){const s=t.currentDevicePixelRatio,n=0!==i?Math.max(i/2,.5):0;return Math.round((e-n)*s)/s+n}function _e(t,e){(e=e||t.getContext("2d")).save(),e.resetTransform(),e.clearRect(0,0,t.width,t.height),e.restore()}function ye(t,e,i,s){let n,o,a,r,l;const h=e.pointStyle,c=e.rotation,d=e.radius;let u=(c||0)*Rt;if(h&&"object"==typeof h&&(n=h.toString(),"[object HTMLImageElement]"===n||"[object HTMLCanvasElement]"===n))return t.save(),t.translate(i,s),t.rotate(u),t.drawImage(h,-h.width/2,-h.height/2,h.width,h.height),void t.restore();if(!(isNaN(d)||d<=0)){switch(t.beginPath(),h){default:t.arc(i,s,d,0,At),t.closePath();break;case"triangle":t.moveTo(i+Math.sin(u)*d,s-Math.cos(u)*d),u+=zt,t.lineTo(i+Math.sin(u)*d,s-Math.cos(u)*d),u+=zt,t.lineTo(i+Math.sin(u)*d,s-Math.cos(u)*d),t.closePath();break;case"rectRounded":l=.516*d,r=d-l,o=Math.cos(u+It)*r,a=Math.sin(u+It)*r,t.arc(i-o,s-a,l,u-Ot,u-Et),t.arc(i+a,s-o,l,u-Et,u),t.arc(i+o,s+a,l,u,u+Et),t.arc(i-a,s+o,l,u+Et,u+Ot),t.closePath();break;case"rect":if(!c){r=Math.SQRT1_2*d,t.rect(i-r,s-r,2*r,2*r);break}u+=It;case"rectRot":o=Math.cos(u)*d,a=Math.sin(u)*d,t.moveTo(i-o,s-a),t.lineTo(i+a,s-o),t.lineTo(i+o,s+a),t.lineTo(i-a,s+o),t.closePath();break;case"crossRot":u+=It;case"cross":o=Math.cos(u)*d,a=Math.sin(u)*d,t.moveTo(i-o,s-a),t.lineTo(i+o,s+a),t.moveTo(i+a,s-o),t.lineTo(i-a,s+o);break;case"star":o=Math.cos(u)*d,a=Math.sin(u)*d,t.moveTo(i-o,s-a),t.lineTo(i+o,s+a),t.moveTo(i+a,s-o),t.lineTo(i-a,s+o),u+=It,o=Math.cos(u)*d,a=Math.sin(u)*d,t.moveTo(i-o,s-a),t.lineTo(i+o,s+a),t.moveTo(i+a,s-o),t.lineTo(i-a,s+o);break;case"line":o=Math.cos(u)*d,a=Math.sin(u)*d,t.moveTo(i-o,s-a),t.lineTo(i+o,s+a);break;case"dash":t.moveTo(i,s),t.lineTo(i+Math.cos(u)*d,s+Math.sin(u)*d)}t.fill(),e.borderWidth>0&&t.stroke()}}function ve(t,e,i){return i=i||.5,!e||t&&t.x>e.left-i&&t.x<e.right+i&&t.y>e.top-i&&t.y<e.bottom+i}function we(t,e){t.save(),t.beginPath(),t.rect(e.left,e.top,e.right-e.left,e.bottom-e.top),t.clip()}function Me(t){t.restore()}function ke(t,e,i,s,n){if(!e)return t.lineTo(i.x,i.y);if("middle"===n){const s=(e.x+i.x)/2;t.lineTo(s,e.y),t.lineTo(s,i.y)}else"after"===n!=!!s?t.lineTo(e.x,i.y):t.lineTo(i.x,e.y);t.lineTo(i.x,i.y)}function Se(t,e,i,s){if(!e)return t.lineTo(i.x,i.y);t.bezierCurveTo(s?e.cp1x:e.cp2x,s?e.cp1y:e.cp2y,s?i.cp2x:i.cp1x,s?i.cp2y:i.cp1y,i.x,i.y)}function Pe(t,e,i,s,n,o={}){const a=X(e)?e:[e],r=o.strokeWidth>0&&""!==o.strokeColor;let l,h;for(t.save(),t.font=n.string,function(t,e){e.translation&&t.translate(e.translation[0],e.translation[1]);U(e.rotation)||t.rotate(e.rotation);e.color&&(t.fillStyle=e.color);e.textAlign&&(t.textAlign=e.textAlign);e.textBaseline&&(t.textBaseline=e.textBaseline)}(t,o),l=0;l<a.length;++l)h=a[l],r&&(o.strokeColor&&(t.strokeStyle=o.strokeColor),U(o.strokeWidth)||(t.lineWidth=o.strokeWidth),t.strokeText(h,i,s,o.maxWidth)),t.fillText(h,i,s,o.maxWidth),De(t,i,s,h,o),s+=n.lineHeight;t.restore()}function De(t,e,i,s,n){if(n.strikethrough||n.underline){const o=t.measureText(s),a=e-o.actualBoundingBoxLeft,r=e+o.actualBoundingBoxRight,l=i-o.actualBoundingBoxAscent,h=i+o.actualBoundingBoxDescent,c=n.strikethrough?(l+h)/2:h;t.strokeStyle=t.fillStyle,t.beginPath(),t.lineWidth=n.decorationWidth||2,t.moveTo(a,c),t.lineTo(r,c),t.stroke()}}function Ce(t,e){const{x:i,y:s,w:n,h:o,radius:a}=e;t.arc(i+a.topLeft,s+a.topLeft,a.topLeft,-Et,Ot,!0),t.lineTo(i,s+o-a.bottomLeft),t.arc(i+a.bottomLeft,s+o-a.bottomLeft,a.bottomLeft,Ot,Et,!0),t.lineTo(i+n-a.bottomRight,s+o),t.arc(i+n-a.bottomRight,s+o-a.bottomRight,a.bottomRight,Et,0,!0),t.lineTo(i+n,s+a.topRight),t.arc(i+n-a.topRight,s+a.topRight,a.topRight,0,-Et,!0),t.lineTo(i+a.topLeft,s)}function Oe(t,e=[""],i=t,s,n=(()=>t[0])){ut(s)||(s=Ne("_fallback",t));const o={[Symbol.toStringTag]:"Object",_cacheable:!0,_scopes:t,_rootScopes:i,_fallback:s,_getTarget:n,override:n=>Oe([n,...t],e,i,s)};return new Proxy(o,{deleteProperty:(e,i)=>(delete e[i],delete e._keys,delete t[0][i],!0),get:(i,s)=>Ee(i,s,(()=>function(t,e,i,s){let n;for(const o of e)if(n=Ne(Le(o,t),i),ut(n))return Re(t,n)?Be(i,s,t,n):n}(s,e,t,i))),getOwnPropertyDescriptor:(t,e)=>Reflect.getOwnPropertyDescriptor(t._scopes[0],e),getPrototypeOf:()=>Reflect.getPrototypeOf(t[0]),has:(t,e)=>We(t).includes(e),ownKeys:t=>We(t),set(t,e,i){const s=t._storage||(t._storage=n());return t[e]=s[e]=i,delete t._keys,!0}})}function Ae(t,e,i,s){const n={_cacheable:!1,_proxy:t,_context:e,_subProxy:i,_stack:new Set,_descriptors:Te(t,s),setContext:e=>Ae(t,e,i,s),override:n=>Ae(t.override(n),e,i,s)};return new Proxy(n,{deleteProperty:(e,i)=>(delete e[i],delete t[i],!0),get:(t,e,i)=>Ee(t,e,(()=>function(t,e,i){const{_proxy:s,_context:n,_subProxy:o,_descriptors:a}=t;let r=s[e];ft(r)&&a.isScriptable(e)&&(r=function(t,e,i,s){const{_proxy:n,_context:o,_subProxy:a,_stack:r}=i;if(r.has(t))throw new Error("Recursion detected: "+Array.from(r).join("->")+"->"+t);r.add(t),e=e(o,a||s),r.delete(t),Re(t,e)&&(e=Be(n._scopes,n,t,e));return e}(e,r,t,i));X(r)&&r.length&&(r=function(t,e,i,s){const{_proxy:n,_context:o,_subProxy:a,_descriptors:r}=i;if(ut(o.index)&&s(t))e=e[o.index%e.length];else if(q(e[0])){const i=e,s=n._scopes.filter((t=>t!==i));e=[];for(const l of i){const i=Be(s,n,t,l);e.push(Ae(i,o,a&&a[t],r))}}return e}(e,r,t,a.isIndexable));Re(e,r)&&(r=Ae(r,n,o&&o[e],a));return r}(t,e,i))),getOwnPropertyDescriptor:(e,i)=>e._descriptors.allKeys?Reflect.has(t,i)?{enumerable:!0,configurable:!0}:void 0:Reflect.getOwnPropertyDescriptor(t,i),getPrototypeOf:()=>Reflect.getPrototypeOf(t),has:(e,i)=>Reflect.has(t,i),ownKeys:()=>Reflect.ownKeys(t),set:(e,i,s)=>(t[i]=s,delete e[i],!0)})}function Te(t,e={scriptable:!0,indexable:!0}){const{_scriptable:i=e.scriptable,_indexable:s=e.indexable,_allKeys:n=e.allKeys}=t;return{allKeys:n,scriptable:i,indexable:s,isScriptable:ft(i)?i:()=>i,isIndexable:ft(s)?s:()=>s}}const Le=(t,e)=>t?t+dt(e):e,Re=(t,e)=>q(e)&&"adapters"!==t&&(null===Object.getPrototypeOf(e)||e.constructor===Object);function Ee(t,e,i){if(Object.prototype.hasOwnProperty.call(t,e))return t[e];const s=i();return t[e]=s,s}function Ie(t,e,i){return ft(t)?t(e,i):t}const ze=(t,e)=>!0===t?e:"string"==typeof t?ct(e,t):void 0;function Fe(t,e,i,s,n){for(const o of e){const e=ze(i,o);if(e){t.add(e);const o=Ie(e._fallback,i,n);if(ut(o)&&o!==i&&o!==s)return o}else if(!1===e&&ut(s)&&i!==s)return null}return!1}function Be(t,e,i,s){const n=e._rootScopes,o=Ie(e._fallback,i,s),a=[...t,...n],r=new Set;r.add(s);let l=Ve(r,a,i,o||i,s);return null!==l&&((!ut(o)||o===i||(l=Ve(r,a,o,l,s),null!==l))&&Oe(Array.from(r),[""],n,o,(()=>function(t,e,i){const s=t._getTarget();e in s||(s[e]={});const n=s[e];if(X(n)&&q(i))return i;return n}(e,i,s))))}function Ve(t,e,i,s,n){for(;i;)i=Fe(t,e,i,s,n);return i}function Ne(t,e){for(const i of e){if(!i)continue;const e=i[t];if(ut(e))return e}}function We(t){let e=t._keys;return e||(e=t._keys=function(t){const e=new Set;for(const i of t)for(const t of Object.keys(i).filter((t=>!t.startsWith("_"))))e.add(t);return Array.from(e)}(t._scopes)),e}function He(t,e,i,s){const{iScale:n}=t,{key:o="r"}=this._parsing,a=new Array(s);let r,l,h,c;for(r=0,l=s;r<l;++r)h=r+i,c=e[h],a[r]={r:n.parse(ct(c,o),h)};return a}const je=Number.EPSILON||1e-14,$e=(t,e)=>e<t.length&&!t[e].skip&&t[e],Ye=t=>"x"===t?"y":"x";function Ue(t,e,i,s){const n=t.skip?e:t,o=e,a=i.skip?e:i,r=Kt(o,n),l=Kt(a,o);let h=r/(r+l),c=l/(r+l);h=isNaN(h)?0:h,c=isNaN(c)?0:c;const d=s*h,u=s*c;return{previous:{x:o.x-d*(a.x-n.x),y:o.y-d*(a.y-n.y)},next:{x:o.x+u*(a.x-n.x),y:o.y+u*(a.y-n.y)}}}function Xe(t,e="x"){const i=Ye(e),s=t.length,n=Array(s).fill(0),o=Array(s);let a,r,l,h=$e(t,0);for(a=0;a<s;++a)if(r=l,l=h,h=$e(t,a+1),l){if(h){const t=h[e]-l[e];n[a]=0!==t?(h[i]-l[i])/t:0}o[a]=r?h?Bt(n[a-1])!==Bt(n[a])?0:(n[a-1]+n[a])/2:n[a-1]:n[a]}!function(t,e,i){const s=t.length;let n,o,a,r,l,h=$e(t,0);for(let c=0;c<s-1;++c)l=h,h=$e(t,c+1),l&&h&&(Ht(e[c],0,je)?i[c]=i[c+1]=0:(n=i[c]/e[c],o=i[c+1]/e[c],r=Math.pow(n,2)+Math.pow(o,2),r<=9||(a=3/Math.sqrt(r),i[c]=n*a*e[c],i[c+1]=o*a*e[c])))}(t,n,o),function(t,e,i="x"){const s=Ye(i),n=t.length;let o,a,r,l=$e(t,0);for(let h=0;h<n;++h){if(a=r,r=l,l=$e(t,h+1),!r)continue;const n=r[i],c=r[s];a&&(o=(n-a[i])/3,r[`cp1${i}`]=n-o,r[`cp1${s}`]=c-o*e[h]),l&&(o=(l[i]-n)/3,r[`cp2${i}`]=n+o,r[`cp2${s}`]=c+o*e[h])}}(t,o,e)}function qe(t,e,i){return Math.max(Math.min(t,i),e)}function Ke(t,e,i,s,n){let o,a,r,l;if(e.spanGaps&&(t=t.filter((t=>!t.skip))),"monotone"===e.cubicInterpolationMode)Xe(t,n);else{let i=s?t[t.length-1]:t[0];for(o=0,a=t.length;o<a;++o)r=t[o],l=Ue(i,r,t[Math.min(o+1,a-(s?0:1))%a],e.tension),r.cp1x=l.previous.x,r.cp1y=l.previous.y,r.cp2x=l.next.x,r.cp2y=l.next.y,i=r}e.capBezierPoints&&function(t,e){let i,s,n,o,a,r=ve(t[0],e);for(i=0,s=t.length;i<s;++i)a=o,o=r,r=i<s-1&&ve(t[i+1],e),o&&(n=t[i],a&&(n.cp1x=qe(n.cp1x,e.left,e.right),n.cp1y=qe(n.cp1y,e.top,e.bottom)),r&&(n.cp2x=qe(n.cp2x,e.left,e.right),n.cp2y=qe(n.cp2y,e.top,e.bottom)))}(t,i)}const Ge=t=>0===t||1===t,Ze=(t,e,i)=>-Math.pow(2,10*(t-=1))*Math.sin((t-e)*At/i),Je=(t,e,i)=>Math.pow(2,-10*t)*Math.sin((t-e)*At/i)+1,Qe={linear:t=>t,easeInQuad:t=>t*t,easeOutQuad:t=>-t*(t-2),easeInOutQuad:t=>(t/=.5)<1?.5*t*t:-.5*(--t*(t-2)-1),easeInCubic:t=>t*t*t,easeOutCubic:t=>(t-=1)*t*t+1,easeInOutCubic:t=>(t/=.5)<1?.5*t*t*t:.5*((t-=2)*t*t+2),easeInQuart:t=>t*t*t*t,easeOutQuart:t=>-((t-=1)*t*t*t-1),easeInOutQuart:t=>(t/=.5)<1?.5*t*t*t*t:-.5*((t-=2)*t*t*t-2),easeInQuint:t=>t*t*t*t*t,easeOutQuint:t=>(t-=1)*t*t*t*t+1,easeInOutQuint:t=>(t/=.5)<1?.5*t*t*t*t*t:.5*((t-=2)*t*t*t*t+2),easeInSine:t=>1-Math.cos(t*Et),easeOutSine:t=>Math.sin(t*Et),easeInOutSine:t=>-.5*(Math.cos(Ot*t)-1),easeInExpo:t=>0===t?0:Math.pow(2,10*(t-1)),easeOutExpo:t=>1===t?1:1-Math.pow(2,-10*t),easeInOutExpo:t=>Ge(t)?t:t<.5?.5*Math.pow(2,10*(2*t-1)):.5*(2-Math.pow(2,-10*(2*t-1))),easeInCirc:t=>t>=1?t:-(Math.sqrt(1-t*t)-1),easeOutCirc:t=>Math.sqrt(1-(t-=1)*t),easeInOutCirc:t=>(t/=.5)<1?-.5*(Math.sqrt(1-t*t)-1):.5*(Math.sqrt(1-(t-=2)*t)+1),easeInElastic:t=>Ge(t)?t:Ze(t,.075,.3),easeOutElastic:t=>Ge(t)?t:Je(t,.075,.3),easeInOutElastic(t){const e=.1125;return Ge(t)?t:t<.5?.5*Ze(2*t,e,.45):.5+.5*Je(2*t-1,e,.45)},easeInBack(t){const e=1.70158;return t*t*((e+1)*t-e)},easeOutBack(t){const e=1.70158;return(t-=1)*t*((e+1)*t+e)+1},easeInOutBack(t){let e=1.70158;return(t/=.5)<1?t*t*((1+(e*=1.525))*t-e)*.5:.5*((t-=2)*t*((1+(e*=1.525))*t+e)+2)},easeInBounce:t=>1-Qe.easeOutBounce(1-t),easeOutBounce(t){const e=7.5625,i=2.75;return t<1/i?e*t*t:t<2/i?e*(t-=1.5/i)*t+.75:t<2.5/i?e*(t-=2.25/i)*t+.9375:e*(t-=2.625/i)*t+.984375},easeInOutBounce:t=>t<.5?.5*Qe.easeInBounce(2*t):.5*Qe.easeOutBounce(2*t-1)+.5};function ti(t,e,i,s){return{x:t.x+i*(e.x-t.x),y:t.y+i*(e.y-t.y)}}function ei(t,e,i,s){return{x:t.x+i*(e.x-t.x),y:"middle"===s?i<.5?t.y:e.y:"after"===s?i<1?t.y:e.y:i>0?e.y:t.y}}function ii(t,e,i,s){const n={x:t.cp2x,y:t.cp2y},o={x:e.cp1x,y:e.cp1y},a=ti(t,n,i),r=ti(n,o,i),l=ti(o,e,i),h=ti(a,r,i),c=ti(r,l,i);return ti(h,c,i)}const si=new Map;function ni(t,e,i){return function(t,e){e=e||{};const i=t+JSON.stringify(e);let s=si.get(i);return s||(s=new Intl.NumberFormat(t,e),si.set(i,s)),s}(e,i).format(t)}const oi=new RegExp(/^(normal|(\d+(?:\.\d+)?)(px|em|%)?)$/),ai=new RegExp(/^(normal|italic|initial|inherit|unset|(oblique( -?[0-9]?[0-9]deg)?))$/);function ri(t,e){const i=(""+t).match(oi);if(!i||"normal"===i[1])return 1.2*e;switch(t=+i[2],i[3]){case"px":return t;case"%":t/=100}return e*t}function li(t,e){const i={},s=q(e),n=s?Object.keys(e):e,o=q(t)?s?i=>Z(t[i],t[e[i]]):e=>t[e]:()=>t;for(const t of n)i[t]=+o(t)||0;return i}function hi(t){return li(t,{top:"y",right:"x",bottom:"y",left:"x"})}function ci(t){return li(t,["topLeft","topRight","bottomLeft","bottomRight"])}function di(t){const e=hi(t);return e.width=e.left+e.right,e.height=e.top+e.bottom,e}function ui(t,e){t=t||{},e=e||yt.font;let i=Z(t.size,e.size);"string"==typeof i&&(i=parseInt(i,10));let s=Z(t.style,e.style);s&&!(""+s).match(ai)&&(console.warn('Invalid font style specified: "'+s+'"'),s="");const n={family:Z(t.family,e.family),lineHeight:ri(Z(t.lineHeight,e.lineHeight),i),size:i,style:s,weight:Z(t.weight,e.weight),string:""};return n.string=pe(n),n}function fi(t,e,i,s){let n,o,a,r=!0;for(n=0,o=t.length;n<o;++n)if(a=t[n],void 0!==a&&(void 0!==e&&"function"==typeof a&&(a=a(e),r=!1),void 0!==i&&X(a)&&(a=a[i%a.length],r=!1),void 0!==a))return s&&!r&&(s.cacheable=!1),a}function gi(t,e,i){const{min:s,max:n}=t,o=Q(e,(n-s)/2),a=(t,e)=>i&&0===t?0:t+e;return{min:a(s,-Math.abs(o)),max:a(n,o)}}function pi(t,e){return Object.assign(Object.create(t),e)}function mi(t,e,i){return t?function(t,e){return{x:i=>t+t+e-i,setWidth(t){e=t},textAlign:t=>"center"===t?t:"right"===t?"left":"right",xPlus:(t,e)=>t-e,leftForLtr:(t,e)=>t-e}}(e,i):{x:t=>t,setWidth(t){},textAlign:t=>t,xPlus:(t,e)=>t+e,leftForLtr:(t,e)=>t}}function bi(t,e){let i,s;"ltr"!==e&&"rtl"!==e||(i=t.canvas.style,s=[i.getPropertyValue("direction"),i.getPropertyPriority("direction")],i.setProperty("direction",e,"important"),t.prevTextDirection=s)}function xi(t,e){void 0!==e&&(delete t.prevTextDirection,t.canvas.style.setProperty("direction",e[0],e[1]))}function _i(t){return"angle"===t?{between:Jt,compare:Gt,normalize:Zt}:{between:ee,compare:(t,e)=>t-e,normalize:t=>t}}function yi({start:t,end:e,count:i,loop:s,style:n}){return{start:t%i,end:e%i,loop:s&&(e-t+1)%i==0,style:n}}function vi(t,e,i){if(!i)return[t];const{property:s,start:n,end:o}=i,a=e.length,{compare:r,between:l,normalize:h}=_i(s),{start:c,end:d,loop:u,style:f}=function(t,e,i){const{property:s,start:n,end:o}=i,{between:a,normalize:r}=_i(s),l=e.length;let h,c,{start:d,end:u,loop:f}=t;if(f){for(d+=l,u+=l,h=0,c=l;h<c&&a(r(e[d%l][s]),n,o);++h)d--,u--;d%=l,u%=l}return u<d&&(u+=l),{start:d,end:u,loop:f,style:t.style}}(t,e,i),g=[];let p,m,b,x=!1,_=null;const y=()=>x||l(n,b,p)&&0!==r(n,b),v=()=>!x||0===r(o,p)||l(o,b,p);for(let t=c,i=c;t<=d;++t)m=e[t%a],m.skip||(p=h(m[s]),p!==b&&(x=l(p,n,o),null===_&&y()&&(_=0===r(p,n)?t:i),null!==_&&v()&&(g.push(yi({start:_,end:t,loop:u,count:a,style:f})),_=null),i=t,b=p));return null!==_&&g.push(yi({start:_,end:d,loop:u,count:a,style:f})),g}function wi(t,e){const i=[],s=t.segments;for(let n=0;n<s.length;n++){const o=vi(s[n],t.points,e);o.length&&i.push(...o)}return i}function Mi(t,e){const i=t.points,s=t.options.spanGaps,n=i.length;if(!n)return[];const o=!!t._loop,{start:a,end:r}=function(t,e,i,s){let n=0,o=e-1;if(i&&!s)for(;n<e&&!t[n].skip;)n++;for(;n<e&&t[n].skip;)n++;for(n%=e,i&&(o+=n);o>n&&t[o%e].skip;)o--;return o%=e,{start:n,end:o}}(i,n,o,s);if(!0===s)return ki(t,[{start:a,end:r,loop:o}],i,e);return ki(t,function(t,e,i,s){const n=t.length,o=[];let a,r=e,l=t[e];for(a=e+1;a<=i;++a){const i=t[a%n];i.skip||i.stop?l.skip||(s=!1,o.push({start:e%n,end:(a-1)%n,loop:s}),e=r=i.stop?a:null):(r=a,l.skip&&(e=a)),l=i}return null!==r&&o.push({start:e%n,end:r%n,loop:s}),o}(i,a,r<a?r+n:r,!!t._fullLoop&&0===a&&r===n-1),i,e)}function ki(t,e,i,s){return s&&s.setContext&&i?function(t,e,i,s){const n=t._chart.getContext(),o=Si(t.options),{_datasetIndex:a,options:{spanGaps:r}}=t,l=i.length,h=[];let c=o,d=e[0].start,u=d;function f(t,e,s,n){const o=r?-1:1;if(t!==e){for(t+=l;i[t%l].skip;)t-=o;for(;i[e%l].skip;)e+=o;t%l!=e%l&&(h.push({start:t%l,end:e%l,loop:s,style:n}),c=n,d=e%l)}}for(const t of e){d=r?d:t.start;let e,o=i[d%l];for(u=d+1;u<=t.end;u++){const r=i[u%l];e=Si(s.setContext(pi(n,{type:"segment",p0:o,p1:r,p0DataIndex:(u-1)%l,p1DataIndex:u%l,datasetIndex:a}))),Pi(e,c)&&f(d,u-1,t.loop,c),o=r,c=e}d<u-1&&f(d,u-1,t.loop,c)}return h}(t,e,i,s):e}function Si(t){return{backgroundColor:t.backgroundColor,borderCapStyle:t.borderCapStyle,borderDash:t.borderDash,borderDashOffset:t.borderDashOffset,borderJoinStyle:t.borderJoinStyle,borderWidth:t.borderWidth,borderColor:t.borderColor}}function Pi(t,e){return e&&JSON.stringify(t)!==JSON.stringify(e)}var Di=Object.freeze({__proto__:null,easingEffects:Qe,isPatternOrGradient:W,color:H,getHoverColor:j,noop:$,uid:Y,isNullOrUndef:U,isArray:X,isObject:q,isFinite:K,finiteOrDefault:G,valueOrDefault:Z,toPercentage:J,toDimension:Q,callback:tt,each:et,_elementsEqual:it,clone:st,_merger:ot,merge:at,mergeIf:rt,_mergerIf:lt,_deprecated:function(t,e,i,s){void 0!==e&&console.warn(t+': "'+i+'" is deprecated. Please use "'+s+'" instead')},resolveObjectKey:ct,_capitalize:dt,defined:ut,isFunction:ft,setsEqual:gt,_isClickEvent:pt,toFontString:pe,_measureText:me,_longestText:be,_alignPixel:xe,clearCanvas:_e,drawPoint:ye,_isPointInArea:ve,clipArea:we,unclipArea:Me,_steppedLineTo:ke,_bezierCurveTo:Se,renderText:Pe,addRoundedRectPath:Ce,_lookup:vt,_lookupByKey:wt,_rlookupByKey:Mt,_filterBetween:kt,listenArrayEvents:Pt,unlistenArrayEvents:Dt,_arrayUnique:Ct,_createResolver:Oe,_attachContext:Ae,_descriptors:Te,_parseObjectDataRadialScale:He,splineCurve:Ue,splineCurveMonotone:Xe,_updateBezierControlPoints:Ke,_isDomSupported:ie,_getParentNode:se,getStyle:ae,getRelativePosition:he,getMaximumSize:de,retinaScale:ue,supportsEventListenerOptions:fe,readUsedSize:ge,fontString:function(t,e,i){return e+" "+t+"px "+i},requestAnimFrame:t,throttled:e,debounce:i,_toLeftRightCenter:s,_alignStartEnd:n,_textX:o,_pointInLine:ti,_steppedInterpolation:ei,_bezierInterpolation:ii,formatNumber:ni,toLineHeight:ri,_readValueToProps:li,toTRBL:hi,toTRBLCorners:ci,toPadding:di,toFont:ui,resolve:fi,_addGrace:gi,createContext:pi,PI:Ot,TAU:At,PITAU:Tt,INFINITY:Lt,RAD_PER_DEG:Rt,HALF_PI:Et,QUARTER_PI:It,TWO_THIRDS_PI:zt,log10:Ft,sign:Bt,niceNum:Vt,_factorize:Nt,isNumber:Wt,almostEquals:Ht,almostWhole:jt,_setMinAndMaxByKey:$t,toRadians:Yt,toDegrees:Ut,_decimalPlaces:Xt,getAngleFromPoint:qt,distanceBetweenPoints:Kt,_angleDiff:Gt,_normalizeAngle:Zt,_angleBetween:Jt,_limitValue:Qt,_int16Range:te,_isBetween:ee,getRtlAdapter:mi,overrideTextDirection:bi,restoreTextDirection:xi,_boundSegment:vi,_boundSegments:wi,_computeSegments:Mi});function Ci(t,e,i,s){const{controller:n,data:o,_sorted:a}=t,r=n._cachedMeta.iScale;if(r&&e===r.axis&&"r"!==e&&a&&o.length){const t=r._reversePixels?Mt:wt;if(!s)return t(o,e,i);if(n._sharedOptions){const s=o[0],n="function"==typeof s.getRange&&s.getRange(e);if(n){const s=t(o,e,i-n),a=t(o,e,i+n);return{lo:s.lo,hi:a.hi}}}}return{lo:0,hi:o.length-1}}function Oi(t,e,i,s,n){const o=t.getSortedVisibleDatasetMetas(),a=i[e];for(let t=0,i=o.length;t<i;++t){const{index:i,data:r}=o[t],{lo:l,hi:h}=Ci(o[t],e,a,n);for(let t=l;t<=h;++t){const e=r[t];e.skip||s(e,i,t)}}}function Ai(t,e,i,s,n){const o=[];if(!n&&!t.isPointInArea(e))return o;return Oi(t,i,e,(function(i,a,r){(n||ve(i,t.chartArea,0))&&i.inRange(e.x,e.y,s)&&o.push({element:i,datasetIndex:a,index:r})}),!0),o}function Ti(t,e,i,s,n,o){let a=[];const r=function(t){const e=-1!==t.indexOf("x"),i=-1!==t.indexOf("y");return function(t,s){const n=e?Math.abs(t.x-s.x):0,o=i?Math.abs(t.y-s.y):0;return Math.sqrt(Math.pow(n,2)+Math.pow(o,2))}}(i);let l=Number.POSITIVE_INFINITY;return Oi(t,i,e,(function(i,h,c){const d=i.inRange(e.x,e.y,n);if(s&&!d)return;const u=i.getCenterPoint(n);if(!(!!o||t.isPointInArea(u))&&!d)return;const f=r(e,u);f<l?(a=[{element:i,datasetIndex:h,index:c}],l=f):f===l&&a.push({element:i,datasetIndex:h,index:c})})),a}function Li(t,e,i,s,n,o){return o||t.isPointInArea(e)?"r"!==i||s?Ti(t,e,i,s,n,o):function(t,e,i,s){let n=[];return Oi(t,i,e,(function(t,i,o){const{startAngle:a,endAngle:r}=t.getProps(["startAngle","endAngle"],s),{angle:l}=qt(t,{x:e.x,y:e.y});Jt(l,a,r)&&n.push({element:t,datasetIndex:i,index:o})})),n}(t,e,i,n):[]}function Ri(t,e,i,s,n){const o=[],a="x"===i?"inXRange":"inYRange";let r=!1;return Oi(t,i,e,((t,s,l)=>{t[a](e[i],n)&&(o.push({element:t,datasetIndex:s,index:l}),r=r||t.inRange(e.x,e.y,n))})),s&&!r?[]:o}var Ei={evaluateInteractionItems:Oi,modes:{index(t,e,i,s){const n=he(e,t),o=i.axis||"x",a=i.includeInvisible||!1,r=i.intersect?Ai(t,n,o,s,a):Li(t,n,o,!1,s,a),l=[];return r.length?(t.getSortedVisibleDatasetMetas().forEach((t=>{const e=r[0].index,i=t.data[e];i&&!i.skip&&l.push({element:i,datasetIndex:t.index,index:e})})),l):[]},dataset(t,e,i,s){const n=he(e,t),o=i.axis||"xy",a=i.includeInvisible||!1;let r=i.intersect?Ai(t,n,o,s,a):Li(t,n,o,!1,s,a);if(r.length>0){const e=r[0].datasetIndex,i=t.getDatasetMeta(e).data;r=[];for(let t=0;t<i.length;++t)r.push({element:i[t],datasetIndex:e,index:t})}return r},point:(t,e,i,s)=>Ai(t,he(e,t),i.axis||"xy",s,i.includeInvisible||!1),nearest(t,e,i,s){const n=he(e,t),o=i.axis||"xy",a=i.includeInvisible||!1;return Li(t,n,o,i.intersect,s,a)},x:(t,e,i,s)=>Ri(t,he(e,t),"x",i.intersect,s),y:(t,e,i,s)=>Ri(t,he(e,t),"y",i.intersect,s)}};const Ii=["left","top","right","bottom"];function zi(t,e){return t.filter((t=>t.pos===e))}function Fi(t,e){return t.filter((t=>-1===Ii.indexOf(t.pos)&&t.box.axis===e))}function Bi(t,e){return t.sort(((t,i)=>{const s=e?i:t,n=e?t:i;return s.weight===n.weight?s.index-n.index:s.weight-n.weight}))}function Vi(t,e){const i=function(t){const e={};for(const i of t){const{stack:t,pos:s,stackWeight:n}=i;if(!t||!Ii.includes(s))continue;const o=e[t]||(e[t]={count:0,placed:0,weight:0,size:0});o.count++,o.weight+=n}return e}(t),{vBoxMaxWidth:s,hBoxMaxHeight:n}=e;let o,a,r;for(o=0,a=t.length;o<a;++o){r=t[o];const{fullSize:a}=r.box,l=i[r.stack],h=l&&r.stackWeight/l.weight;r.horizontal?(r.width=h?h*s:a&&e.availableWidth,r.height=n):(r.width=s,r.height=h?h*n:a&&e.availableHeight)}return i}function Ni(t,e,i,s){return Math.max(t[i],e[i])+Math.max(t[s],e[s])}function Wi(t,e){t.top=Math.max(t.top,e.top),t.left=Math.max(t.left,e.left),t.bottom=Math.max(t.bottom,e.bottom),t.right=Math.max(t.right,e.right)}function Hi(t,e,i,s){const{pos:n,box:o}=i,a=t.maxPadding;if(!q(n)){i.size&&(t[n]-=i.size);const e=s[i.stack]||{size:0,count:1};e.size=Math.max(e.size,i.horizontal?o.height:o.width),i.size=e.size/e.count,t[n]+=i.size}o.getPadding&&Wi(a,o.getPadding());const r=Math.max(0,e.outerWidth-Ni(a,t,"left","right")),l=Math.max(0,e.outerHeight-Ni(a,t,"top","bottom")),h=r!==t.w,c=l!==t.h;return t.w=r,t.h=l,i.horizontal?{same:h,other:c}:{same:c,other:h}}function ji(t,e){const i=e.maxPadding;function s(t){const s={left:0,top:0,right:0,bottom:0};return t.forEach((t=>{s[t]=Math.max(e[t],i[t])})),s}return s(t?["left","right"]:["top","bottom"])}function $i(t,e,i,s){const n=[];let o,a,r,l,h,c;for(o=0,a=t.length,h=0;o<a;++o){r=t[o],l=r.box,l.update(r.width||e.w,r.height||e.h,ji(r.horizontal,e));const{same:a,other:d}=Hi(e,i,r,s);h|=a&&n.length,c=c||d,l.fullSize||n.push(r)}return h&&$i(n,e,i,s)||c}function Yi(t,e,i,s,n){t.top=i,t.left=e,t.right=e+s,t.bottom=i+n,t.width=s,t.height=n}function Ui(t,e,i,s){const n=i.padding;let{x:o,y:a}=e;for(const r of t){const t=r.box,l=s[r.stack]||{count:1,placed:0,weight:1},h=r.stackWeight/l.weight||1;if(r.horizontal){const s=e.w*h,o=l.size||t.height;ut(l.start)&&(a=l.start),t.fullSize?Yi(t,n.left,a,i.outerWidth-n.right-n.left,o):Yi(t,e.left+l.placed,a,s,o),l.start=a,l.placed+=s,a=t.bottom}else{const s=e.h*h,a=l.size||t.width;ut(l.start)&&(o=l.start),t.fullSize?Yi(t,o,n.top,a,i.outerHeight-n.bottom-n.top):Yi(t,o,e.top+l.placed,a,s),l.start=o,l.placed+=s,o=t.right}}e.x=o,e.y=a}yt.set("layout",{autoPadding:!0,padding:{top:0,right:0,bottom:0,left:0}});var Xi={addBox(t,e){t.boxes||(t.boxes=[]),e.fullSize=e.fullSize||!1,e.position=e.position||"top",e.weight=e.weight||0,e._layers=e._layers||function(){return[{z:0,draw(t){e.draw(t)}}]},t.boxes.push(e)},removeBox(t,e){const i=t.boxes?t.boxes.indexOf(e):-1;-1!==i&&t.boxes.splice(i,1)},configure(t,e,i){e.fullSize=i.fullSize,e.position=i.position,e.weight=i.weight},update(t,e,i,s){if(!t)return;const n=di(t.options.layout.padding),o=Math.max(e-n.width,0),a=Math.max(i-n.height,0),r=function(t){const e=function(t){const e=[];let i,s,n,o,a,r;for(i=0,s=(t||[]).length;i<s;++i)n=t[i],({position:o,options:{stack:a,stackWeight:r=1}}=n),e.push({index:i,box:n,pos:o,horizontal:n.isHorizontal(),weight:n.weight,stack:a&&o+a,stackWeight:r});return e}(t),i=Bi(e.filter((t=>t.box.fullSize)),!0),s=Bi(zi(e,"left"),!0),n=Bi(zi(e,"right")),o=Bi(zi(e,"top"),!0),a=Bi(zi(e,"bottom")),r=Fi(e,"x"),l=Fi(e,"y");return{fullSize:i,leftAndTop:s.concat(o),rightAndBottom:n.concat(l).concat(a).concat(r),chartArea:zi(e,"chartArea"),vertical:s.concat(n).concat(l),horizontal:o.concat(a).concat(r)}}(t.boxes),l=r.vertical,h=r.horizontal;et(t.boxes,(t=>{"function"==typeof t.beforeLayout&&t.beforeLayout()}));const c=l.reduce(((t,e)=>e.box.options&&!1===e.box.options.display?t:t+1),0)||1,d=Object.freeze({outerWidth:e,outerHeight:i,padding:n,availableWidth:o,availableHeight:a,vBoxMaxWidth:o/2/c,hBoxMaxHeight:a/2}),u=Object.assign({},n);Wi(u,di(s));const f=Object.assign({maxPadding:u,w:o,h:a,x:n.left,y:n.top},n),g=Vi(l.concat(h),d);$i(r.fullSize,f,d,g),$i(l,f,d,g),$i(h,f,d,g)&&$i(l,f,d,g),function(t){const e=t.maxPadding;function i(i){const s=Math.max(e[i]-t[i],0);return t[i]+=s,s}t.y+=i("top"),t.x+=i("left"),i("right"),i("bottom")}(f),Ui(r.leftAndTop,f,d,g),f.x+=f.w,f.y+=f.h,Ui(r.rightAndBottom,f,d,g),t.chartArea={left:f.left,top:f.top,right:f.left+f.w,bottom:f.top+f.h,height:f.h,width:f.w},et(r.chartArea,(e=>{const i=e.box;Object.assign(i,t.chartArea),i.update(f.w,f.h,{left:0,top:0,right:0,bottom:0})}))}};class qi{acquireContext(t,e){}releaseContext(t){return!1}addEventListener(t,e,i){}removeEventListener(t,e,i){}getDevicePixelRatio(){return 1}getMaximumSize(t,e,i,s){return e=Math.max(0,e||t.width),i=i||t.height,{width:e,height:Math.max(0,s?Math.floor(e/s):i)}}isAttached(t){return!0}updateConfig(t){}}class Ki extends qi{acquireContext(t){return t&&t.getContext&&t.getContext("2d")||null}updateConfig(t){t.options.animation=!1}}const Gi={touchstart:"mousedown",touchmove:"mousemove",touchend:"mouseup",pointerenter:"mouseenter",pointerdown:"mousedown",pointermove:"mousemove",pointerup:"mouseup",pointerleave:"mouseout",pointerout:"mouseout"},Zi=t=>null===t||""===t;const Ji=!!fe&&{passive:!0};function Qi(t,e,i){t.canvas.removeEventListener(e,i,Ji)}function ts(t,e){for(const i of t)if(i===e||i.contains(e))return!0}function es(t,e,i){const s=t.canvas,n=new MutationObserver((t=>{let e=!1;for(const i of t)e=e||ts(i.addedNodes,s),e=e&&!ts(i.removedNodes,s);e&&i()}));return n.observe(document,{childList:!0,subtree:!0}),n}function is(t,e,i){const s=t.canvas,n=new MutationObserver((t=>{let e=!1;for(const i of t)e=e||ts(i.removedNodes,s),e=e&&!ts(i.addedNodes,s);e&&i()}));return n.observe(document,{childList:!0,subtree:!0}),n}const ss=new Map;let ns=0;function os(){const t=window.devicePixelRatio;t!==ns&&(ns=t,ss.forEach(((e,i)=>{i.currentDevicePixelRatio!==t&&e()})))}function as(t,i,s){const n=t.canvas,o=n&&se(n);if(!o)return;const a=e(((t,e)=>{const i=o.clientWidth;s(t,e),i<o.clientWidth&&s()}),window),r=new ResizeObserver((t=>{const e=t[0],i=e.contentRect.width,s=e.contentRect.height;0===i&&0===s||a(i,s)}));return r.observe(o),function(t,e){ss.size||window.addEventListener("resize",os),ss.set(t,e)}(t,a),r}function rs(t,e,i){i&&i.disconnect(),"resize"===e&&function(t){ss.delete(t),ss.size||window.removeEventListener("resize",os)}(t)}function ls(t,i,s){const n=t.canvas,o=e((e=>{null!==t.ctx&&s(function(t,e){const i=Gi[t.type]||t.type,{x:s,y:n}=he(t,e);return{type:i,chart:e,native:t,x:void 0!==s?s:null,y:void 0!==n?n:null}}(e,t))}),t,(t=>{const e=t[0];return[e,e.offsetX,e.offsetY]}));return function(t,e,i){t.addEventListener(e,i,Ji)}(n,i,o),o}class hs extends qi{acquireContext(t,e){const i=t&&t.getContext&&t.getContext("2d");return i&&i.canvas===t?(function(t,e){const i=t.style,s=t.getAttribute("height"),n=t.getAttribute("width");if(t.$chartjs={initial:{height:s,width:n,style:{display:i.display,height:i.height,width:i.width}}},i.display=i.display||"block",i.boxSizing=i.boxSizing||"border-box",Zi(n)){const e=ge(t,"width");void 0!==e&&(t.width=e)}if(Zi(s))if(""===t.style.height)t.height=t.width/(e||2);else{const e=ge(t,"height");void 0!==e&&(t.height=e)}}(t,e),i):null}releaseContext(t){const e=t.canvas;if(!e.$chartjs)return!1;const i=e.$chartjs.initial;["height","width"].forEach((t=>{const s=i[t];U(s)?e.removeAttribute(t):e.setAttribute(t,s)}));const s=i.style||{};return Object.keys(s).forEach((t=>{e.style[t]=s[t]})),e.width=e.width,delete e.$chartjs,!0}addEventListener(t,e,i){this.removeEventListener(t,e);const s=t.$proxies||(t.$proxies={}),n={attach:es,detach:is,resize:as}[e]||ls;s[e]=n(t,e,i)}removeEventListener(t,e){const i=t.$proxies||(t.$proxies={}),s=i[e];if(!s)return;({attach:rs,detach:rs,resize:rs}[e]||Qi)(t,e,s),i[e]=void 0}getDevicePixelRatio(){return window.devicePixelRatio}getMaximumSize(t,e,i,s){return de(t,e,i,s)}isAttached(t){const e=se(t);return!(!e||!e.isConnected)}}function cs(t){return!ie()||"undefined"!=typeof OffscreenCanvas&&t instanceof OffscreenCanvas?Ki:hs}var ds=Object.freeze({__proto__:null,_detectPlatform:cs,BasePlatform:qi,BasicPlatform:Ki,DomPlatform:hs});const us="transparent",fs={boolean:(t,e,i)=>i>.5?e:t,color(t,e,i){const s=H(t||us),n=s.valid&&H(e||us);return n&&n.valid?n.mix(s,i).hexString():e},number:(t,e,i)=>t+(e-t)*i};class gs{constructor(t,e,i,s){const n=e[i];s=fi([t.to,s,n,t.from]);const o=fi([t.from,n,s]);this._active=!0,this._fn=t.fn||fs[t.type||typeof o],this._easing=Qe[t.easing]||Qe.linear,this._start=Math.floor(Date.now()+(t.delay||0)),this._duration=this._total=Math.floor(t.duration),this._loop=!!t.loop,this._target=e,this._prop=i,this._from=o,this._to=s,this._promises=void 0}active(){return this._active}update(t,e,i){if(this._active){this._notify(!1);const s=this._target[this._prop],n=i-this._start,o=this._duration-n;this._start=i,this._duration=Math.floor(Math.max(o,t.duration)),this._total+=n,this._loop=!!t.loop,this._to=fi([t.to,e,s,t.from]),this._from=fi([t.from,s,e])}}cancel(){this._active&&(this.tick(Date.now()),this._active=!1,this._notify(!1))}tick(t){const e=t-this._start,i=this._duration,s=this._prop,n=this._from,o=this._loop,a=this._to;let r;if(this._active=n!==a&&(o||e<i),!this._active)return this._target[s]=a,void this._notify(!0);e<0?this._target[s]=n:(r=e/i%2,r=o&&r>1?2-r:r,r=this._easing(Math.min(1,Math.max(0,r))),this._target[s]=this._fn(n,a,r))}wait(){const t=this._promises||(this._promises=[]);return new Promise(((e,i)=>{t.push({res:e,rej:i})}))}_notify(t){const e=t?"res":"rej",i=this._promises||[];for(let t=0;t<i.length;t++)i[t][e]()}}yt.set("animation",{delay:void 0,duration:1e3,easing:"easeOutQuart",fn:void 0,from:void 0,loop:void 0,to:void 0,type:void 0});const ps=Object.keys(yt.animation);yt.describe("animation",{_fallback:!1,_indexable:!1,_scriptable:t=>"onProgress"!==t&&"onComplete"!==t&&"fn"!==t}),yt.set("animations",{colors:{type:"color",properties:["color","borderColor","backgroundColor"]},numbers:{type:"number",properties:["x","y","borderWidth","radius","tension"]}}),yt.describe("animations",{_fallback:"animation"}),yt.set("transitions",{active:{animation:{duration:400}},resize:{animation:{duration:0}},show:{animations:{colors:{from:"transparent"},visible:{type:"boolean",duration:0}}},hide:{animations:{colors:{to:"transparent"},visible:{type:"boolean",easing:"linear",fn:t=>0|t}}}});class ms{constructor(t,e){this._chart=t,this._properties=new Map,this.configure(e)}configure(t){if(!q(t))return;const e=this._properties;Object.getOwnPropertyNames(t).forEach((i=>{const s=t[i];if(!q(s))return;const n={};for(const t of ps)n[t]=s[t];(X(s.properties)&&s.properties||[i]).forEach((t=>{t!==i&&e.has(t)||e.set(t,n)}))}))}_animateOptions(t,e){const i=e.options,s=function(t,e){if(!e)return;let i=t.options;if(!i)return void(t.options=e);i.$shared&&(t.options=i=Object.assign({},i,{$shared:!1,$animations:{}}));return i}(t,i);if(!s)return[];const n=this._createAnimations(s,i);return i.$shared&&function(t,e){const i=[],s=Object.keys(e);for(let e=0;e<s.length;e++){const n=t[s[e]];n&&n.active()&&i.push(n.wait())}return Promise.all(i)}(t.options.$animations,i).then((()=>{t.options=i}),(()=>{})),n}_createAnimations(t,e){const i=this._properties,s=[],n=t.$animations||(t.$animations={}),o=Object.keys(e),a=Date.now();let r;for(r=o.length-1;r>=0;--r){const l=o[r];if("$"===l.charAt(0))continue;if("options"===l){s.push(...this._animateOptions(t,e));continue}const h=e[l];let c=n[l];const d=i.get(l);if(c){if(d&&c.active()){c.update(d,h,a);continue}c.cancel()}d&&d.duration?(n[l]=c=new gs(d,t,l,h),s.push(c)):t[l]=h}return s}update(t,e){if(0===this._properties.size)return void Object.assign(t,e);const i=this._createAnimations(t,e);return i.length?(a.add(this._chart,i),!0):void 0}}function bs(t,e){const i=t&&t.options||{},s=i.reverse,n=void 0===i.min?e:0,o=void 0===i.max?e:0;return{start:s?o:n,end:s?n:o}}function xs(t,e){const i=[],s=t._getSortedDatasetMetas(e);let n,o;for(n=0,o=s.length;n<o;++n)i.push(s[n].index);return i}function _s(t,e,i,s={}){const n=t.keys,o="single"===s.mode;let a,r,l,h;if(null!==e){for(a=0,r=n.length;a<r;++a){if(l=+n[a],l===i){if(s.all)continue;break}h=t.values[l],K(h)&&(o||0===e||Bt(e)===Bt(h))&&(e+=h)}return e}}function ys(t,e){const i=t&&t.options.stacked;return i||void 0===i&&void 0!==e.stack}function vs(t,e,i){const s=t[e]||(t[e]={});return s[i]||(s[i]={})}function ws(t,e,i,s){for(const n of e.getMatchingVisibleMetas(s).reverse()){const e=t[n.index];if(i&&e>0||!i&&e<0)return n.index}return null}function Ms(t,e){const{chart:i,_cachedMeta:s}=t,n=i._stacks||(i._stacks={}),{iScale:o,vScale:a,index:r}=s,l=o.axis,h=a.axis,c=function(t,e,i){return`${t.id}.${e.id}.${i.stack||i.type}`}(o,a,s),d=e.length;let u;for(let t=0;t<d;++t){const i=e[t],{[l]:o,[h]:d}=i;u=(i._stacks||(i._stacks={}))[h]=vs(n,c,o),u[r]=d,u._top=ws(u,a,!0,s.type),u._bottom=ws(u,a,!1,s.type)}}function ks(t,e){const i=t.scales;return Object.keys(i).filter((t=>i[t].axis===e)).shift()}function Ss(t,e){const i=t.controller.index,s=t.vScale&&t.vScale.axis;if(s){e=e||t._parsed;for(const t of e){const e=t._stacks;if(!e||void 0===e[s]||void 0===e[s][i])return;delete e[s][i]}}}const Ps=t=>"reset"===t||"none"===t,Ds=(t,e)=>e?t:Object.assign({},t);class Cs{constructor(t,e){this.chart=t,this._ctx=t.ctx,this.index=e,this._cachedDataOpts={},this._cachedMeta=this.getMeta(),this._type=this._cachedMeta.type,this.options=void 0,this._parsing=!1,this._data=void 0,this._objectData=void 0,this._sharedOptions=void 0,this._drawStart=void 0,this._drawCount=void 0,this.enableOptionSharing=!1,this.supportsDecimation=!1,this.$context=void 0,this._syncList=[],this.initialize()}initialize(){const t=this._cachedMeta;this.configure(),this.linkScales(),t._stacked=ys(t.vScale,t),this.addElements()}updateIndex(t){this.index!==t&&Ss(this._cachedMeta),this.index=t}linkScales(){const t=this.chart,e=this._cachedMeta,i=this.getDataset(),s=(t,e,i,s)=>"x"===t?e:"r"===t?s:i,n=e.xAxisID=Z(i.xAxisID,ks(t,"x")),o=e.yAxisID=Z(i.yAxisID,ks(t,"y")),a=e.rAxisID=Z(i.rAxisID,ks(t,"r")),r=e.indexAxis,l=e.iAxisID=s(r,n,o,a),h=e.vAxisID=s(r,o,n,a);e.xScale=this.getScaleForId(n),e.yScale=this.getScaleForId(o),e.rScale=this.getScaleForId(a),e.iScale=this.getScaleForId(l),e.vScale=this.getScaleForId(h)}getDataset(){return this.chart.data.datasets[this.index]}getMeta(){return this.chart.getDatasetMeta(this.index)}getScaleForId(t){return this.chart.scales[t]}_getOtherScale(t){const e=this._cachedMeta;return t===e.iScale?e.vScale:e.iScale}reset(){this._update("reset")}_destroy(){const t=this._cachedMeta;this._data&&Dt(this._data,this),t._stacked&&Ss(t)}_dataCheck(){const t=this.getDataset(),e=t.data||(t.data=[]),i=this._data;if(q(e))this._data=function(t){const e=Object.keys(t),i=new Array(e.length);let s,n,o;for(s=0,n=e.length;s<n;++s)o=e[s],i[s]={x:o,y:t[o]};return i}(e);else if(i!==e){if(i){Dt(i,this);const t=this._cachedMeta;Ss(t),t._parsed=[]}e&&Object.isExtensible(e)&&Pt(e,this),this._syncList=[],this._data=e}}addElements(){const t=this._cachedMeta;this._dataCheck(),this.datasetElementType&&(t.dataset=new this.datasetElementType)}buildOrUpdateElements(t){const e=this._cachedMeta,i=this.getDataset();let s=!1;this._dataCheck();const n=e._stacked;e._stacked=ys(e.vScale,e),e.stack!==i.stack&&(s=!0,Ss(e),e.stack=i.stack),this._resyncElements(t),(s||n!==e._stacked)&&Ms(this,e._parsed)}configure(){const t=this.chart.config,e=t.datasetScopeKeys(this._type),i=t.getOptionScopes(this.getDataset(),e,!0);this.options=t.createResolver(i,this.getContext()),this._parsing=this.options.parsing,this._cachedDataOpts={}}parse(t,e){const{_cachedMeta:i,_data:s}=this,{iScale:n,_stacked:o}=i,a=n.axis;let r,l,h,c=0===t&&e===s.length||i._sorted,d=t>0&&i._parsed[t-1];if(!1===this._parsing)i._parsed=s,i._sorted=!0,h=s;else{h=X(s[t])?this.parseArrayData(i,s,t,e):q(s[t])?this.parseObjectData(i,s,t,e):this.parsePrimitiveData(i,s,t,e);const n=()=>null===l[a]||d&&l[a]<d[a];for(r=0;r<e;++r)i._parsed[r+t]=l=h[r],c&&(n()&&(c=!1),d=l);i._sorted=c}o&&Ms(this,h)}parsePrimitiveData(t,e,i,s){const{iScale:n,vScale:o}=t,a=n.axis,r=o.axis,l=n.getLabels(),h=n===o,c=new Array(s);let d,u,f;for(d=0,u=s;d<u;++d)f=d+i,c[d]={[a]:h||n.parse(l[f],f),[r]:o.parse(e[f],f)};return c}parseArrayData(t,e,i,s){const{xScale:n,yScale:o}=t,a=new Array(s);let r,l,h,c;for(r=0,l=s;r<l;++r)h=r+i,c=e[h],a[r]={x:n.parse(c[0],h),y:o.parse(c[1],h)};return a}parseObjectData(t,e,i,s){const{xScale:n,yScale:o}=t,{xAxisKey:a="x",yAxisKey:r="y"}=this._parsing,l=new Array(s);let h,c,d,u;for(h=0,c=s;h<c;++h)d=h+i,u=e[d],l[h]={x:n.parse(ct(u,a),d),y:o.parse(ct(u,r),d)};return l}getParsed(t){return this._cachedMeta._parsed[t]}getDataElement(t){return this._cachedMeta.data[t]}applyStack(t,e,i){const s=this.chart,n=this._cachedMeta,o=e[t.axis];return _s({keys:xs(s,!0),values:e._stacks[t.axis]},o,n.index,{mode:i})}updateRangeFromParsed(t,e,i,s){const n=i[e.axis];let o=null===n?NaN:n;const a=s&&i._stacks[e.axis];s&&a&&(s.values=a,o=_s(s,n,this._cachedMeta.index)),t.min=Math.min(t.min,o),t.max=Math.max(t.max,o)}getMinMax(t,e){const i=this._cachedMeta,s=i._parsed,n=i._sorted&&t===i.iScale,o=s.length,a=this._getOtherScale(t),r=((t,e,i)=>t&&!e.hidden&&e._stacked&&{keys:xs(i,!0),values:null})(e,i,this.chart),l={min:Number.POSITIVE_INFINITY,max:Number.NEGATIVE_INFINITY},{min:h,max:c}=function(t){const{min:e,max:i,minDefined:s,maxDefined:n}=t.getUserBounds();return{min:s?e:Number.NEGATIVE_INFINITY,max:n?i:Number.POSITIVE_INFINITY}}(a);let d,u;function f(){u=s[d];const e=u[a.axis];return!K(u[t.axis])||h>e||c<e}for(d=0;d<o&&(f()||(this.updateRangeFromParsed(l,t,u,r),!n));++d);if(n)for(d=o-1;d>=0;--d)if(!f()){this.updateRangeFromParsed(l,t,u,r);break}return l}getAllParsedValues(t){const e=this._cachedMeta._parsed,i=[];let s,n,o;for(s=0,n=e.length;s<n;++s)o=e[s][t.axis],K(o)&&i.push(o);return i}getMaxOverflow(){return!1}getLabelAndValue(t){const e=this._cachedMeta,i=e.iScale,s=e.vScale,n=this.getParsed(t);return{label:i?""+i.getLabelForValue(n[i.axis]):"",value:s?""+s.getLabelForValue(n[s.axis]):""}}_update(t){const e=this._cachedMeta;this.update(t||"default"),e._clip=function(t){let e,i,s,n;return q(t)?(e=t.top,i=t.right,s=t.bottom,n=t.left):e=i=s=n=t,{top:e,right:i,bottom:s,left:n,disabled:!1===t}}(Z(this.options.clip,function(t,e,i){if(!1===i)return!1;const s=bs(t,i),n=bs(e,i);return{top:n.end,right:s.end,bottom:n.start,left:s.start}}(e.xScale,e.yScale,this.getMaxOverflow())))}update(t){}draw(){const t=this._ctx,e=this.chart,i=this._cachedMeta,s=i.data||[],n=e.chartArea,o=[],a=this._drawStart||0,r=this._drawCount||s.length-a,l=this.options.drawActiveElementsOnTop;let h;for(i.dataset&&i.dataset.draw(t,n,a,r),h=a;h<a+r;++h){const e=s[h];e.hidden||(e.active&&l?o.push(e):e.draw(t,n))}for(h=0;h<o.length;++h)o[h].draw(t,n)}getStyle(t,e){const i=e?"active":"default";return void 0===t&&this._cachedMeta.dataset?this.resolveDatasetElementOptions(i):this.resolveDataElementOptions(t||0,i)}getContext(t,e,i){const s=this.getDataset();let n;if(t>=0&&t<this._cachedMeta.data.length){const e=this._cachedMeta.data[t];n=e.$context||(e.$context=function(t,e,i){return pi(t,{active:!1,dataIndex:e,parsed:void 0,raw:void 0,element:i,index:e,mode:"default",type:"data"})}(this.getContext(),t,e)),n.parsed=this.getParsed(t),n.raw=s.data[t],n.index=n.dataIndex=t}else n=this.$context||(this.$context=function(t,e){return pi(t,{active:!1,dataset:void 0,datasetIndex:e,index:e,mode:"default",type:"dataset"})}(this.chart.getContext(),this.index)),n.dataset=s,n.index=n.datasetIndex=this.index;return n.active=!!e,n.mode=i,n}resolveDatasetElementOptions(t){return this._resolveElementOptions(this.datasetElementType.id,t)}resolveDataElementOptions(t,e){return this._resolveElementOptions(this.dataElementType.id,e,t)}_resolveElementOptions(t,e="default",i){const s="active"===e,n=this._cachedDataOpts,o=t+"-"+e,a=n[o],r=this.enableOptionSharing&&ut(i);if(a)return Ds(a,r);const l=this.chart.config,h=l.datasetElementScopeKeys(this._type,t),c=s?[`${t}Hover`,"hover",t,""]:[t,""],d=l.getOptionScopes(this.getDataset(),h),u=Object.keys(yt.elements[t]),f=l.resolveNamedOptions(d,u,(()=>this.getContext(i,s)),c);return f.$shared&&(f.$shared=r,n[o]=Object.freeze(Ds(f,r))),f}_resolveAnimations(t,e,i){const s=this.chart,n=this._cachedDataOpts,o=`animation-${e}`,a=n[o];if(a)return a;let r;if(!1!==s.options.animation){const s=this.chart.config,n=s.datasetAnimationScopeKeys(this._type,e),o=s.getOptionScopes(this.getDataset(),n);r=s.createResolver(o,this.getContext(t,i,e))}const l=new ms(s,r&&r.animations);return r&&r._cacheable&&(n[o]=Object.freeze(l)),l}getSharedOptions(t){if(t.$shared)return this._sharedOptions||(this._sharedOptions=Object.assign({},t))}includeOptions(t,e){return!e||Ps(t)||this.chart._animationsDisabled}updateElement(t,e,i,s){Ps(s)?Object.assign(t,i):this._resolveAnimations(e,s).update(t,i)}updateSharedOptions(t,e,i){t&&!Ps(e)&&this._resolveAnimations(void 0,e).update(t,i)}_setStyle(t,e,i,s){t.active=s;const n=this.getStyle(e,s);this._resolveAnimations(e,i,s).update(t,{options:!s&&this.getSharedOptions(n)||n})}removeHoverStyle(t,e,i){this._setStyle(t,i,"active",!1)}setHoverStyle(t,e,i){this._setStyle(t,i,"active",!0)}_removeDatasetHoverStyle(){const t=this._cachedMeta.dataset;t&&this._setStyle(t,void 0,"active",!1)}_setDatasetHoverStyle(){const t=this._cachedMeta.dataset;t&&this._setStyle(t,void 0,"active",!0)}_resyncElements(t){const e=this._data,i=this._cachedMeta.data;for(const[t,e,i]of this._syncList)this[t](e,i);this._syncList=[];const s=i.length,n=e.length,o=Math.min(n,s);o&&this.parse(0,o),n>s?this._insertElements(s,n-s,t):n<s&&this._removeElements(n,s-n)}_insertElements(t,e,i=!0){const s=this._cachedMeta,n=s.data,o=t+e;let a;const r=t=>{for(t.length+=e,a=t.length-1;a>=o;a--)t[a]=t[a-e]};for(r(n),a=t;a<o;++a)n[a]=new this.dataElementType;this._parsing&&r(s._parsed),this.parse(t,e),i&&this.updateElements(n,t,e,"reset")}updateElements(t,e,i,s){}_removeElements(t,e){const i=this._cachedMeta;if(this._parsing){const s=i._parsed.splice(t,e);i._stacked&&Ss(i,s)}i.data.splice(t,e)}_sync(t){if(this._parsing)this._syncList.push(t);else{const[e,i,s]=t;this[e](i,s)}this.chart._dataChanges.push([this.index,...t])}_onDataPush(){const t=arguments.length;this._sync(["_insertElements",this.getDataset().data.length-t,t])}_onDataPop(){this._sync(["_removeElements",this._cachedMeta.data.length-1,1])}_onDataShift(){this._sync(["_removeElements",0,1])}_onDataSplice(t,e){e&&this._sync(["_removeElements",t,e]);const i=arguments.length-2;i&&this._sync(["_insertElements",t,i])}_onDataUnshift(){this._sync(["_insertElements",0,arguments.length])}}Cs.defaults={},Cs.prototype.datasetElementType=null,Cs.prototype.dataElementType=null;class Os{constructor(){this.x=void 0,this.y=void 0,this.active=!1,this.options=void 0,this.$animations=void 0}tooltipPosition(t){const{x:e,y:i}=this.getProps(["x","y"],t);return{x:e,y:i}}hasValue(){return Wt(this.x)&&Wt(this.y)}getProps(t,e){const i=this.$animations;if(!e||!i)return this;const s={};return t.forEach((t=>{s[t]=i[t]&&i[t].active()?i[t]._to:this[t]})),s}}Os.defaults={},Os.defaultRoutes=void 0;const As={values:t=>X(t)?t:""+t,numeric(t,e,i){if(0===t)return"0";const s=this.chart.options.locale;let n,o=t;if(i.length>1){const e=Math.max(Math.abs(i[0].value),Math.abs(i[i.length-1].value));(e<1e-4||e>1e15)&&(n="scientific"),o=function(t,e){let i=e.length>3?e[2].value-e[1].value:e[1].value-e[0].value;Math.abs(i)>=1&&t!==Math.floor(t)&&(i=t-Math.floor(t));return i}(t,i)}const a=Ft(Math.abs(o)),r=Math.max(Math.min(-1*Math.floor(a),20),0),l={notation:n,minimumFractionDigits:r,maximumFractionDigits:r};return Object.assign(l,this.options.ticks.format),ni(t,s,l)},logarithmic(t,e,i){if(0===t)return"0";const s=t/Math.pow(10,Math.floor(Ft(t)));return 1===s||2===s||5===s?As.numeric.call(this,t,e,i):""}};var Ts={formatters:As};function Ls(t,e){const i=t.options.ticks,s=i.maxTicksLimit||function(t){const e=t.options.offset,i=t._tickSize(),s=t._length/i+(e?0:1),n=t._maxLength/i;return Math.floor(Math.min(s,n))}(t),n=i.major.enabled?function(t){const e=[];let i,s;for(i=0,s=t.length;i<s;i++)t[i].major&&e.push(i);return e}(e):[],o=n.length,a=n[0],r=n[o-1],l=[];if(o>s)return function(t,e,i,s){let n,o=0,a=i[0];for(s=Math.ceil(s),n=0;n<t.length;n++)n===a&&(e.push(t[n]),o++,a=i[o*s])}(e,l,n,o/s),l;const h=function(t,e,i){const s=function(t){const e=t.length;let i,s;if(e<2)return!1;for(s=t[0],i=1;i<e;++i)if(t[i]-t[i-1]!==s)return!1;return s}(t),n=e.length/i;if(!s)return Math.max(n,1);const o=Nt(s);for(let t=0,e=o.length-1;t<e;t++){const e=o[t];if(e>n)return e}return Math.max(n,1)}(n,e,s);if(o>0){let t,i;const s=o>1?Math.round((r-a)/(o-1)):null;for(Rs(e,l,h,U(s)?0:a-s,a),t=0,i=o-1;t<i;t++)Rs(e,l,h,n[t],n[t+1]);return Rs(e,l,h,r,U(s)?e.length:r+s),l}return Rs(e,l,h),l}function Rs(t,e,i,s,n){const o=Z(s,0),a=Math.min(Z(n,t.length),t.length);let r,l,h,c=0;for(i=Math.ceil(i),n&&(r=n-s,i=r/Math.floor(r/i)),h=o;h<0;)c++,h=Math.round(o+c*i);for(l=Math.max(o,0);l<a;l++)l===h&&(e.push(t[l]),c++,h=Math.round(o+c*i))}yt.set("scale",{display:!0,offset:!1,reverse:!1,beginAtZero:!1,bounds:"ticks",grace:0,grid:{display:!0,lineWidth:1,drawBorder:!0,drawOnChartArea:!0,drawTicks:!0,tickLength:8,tickWidth:(t,e)=>e.lineWidth,tickColor:(t,e)=>e.color,offset:!1,borderDash:[],borderDashOffset:0,borderWidth:1},title:{display:!1,text:"",padding:{top:4,bottom:4}},ticks:{minRotation:0,maxRotation:50,mirror:!1,textStrokeWidth:0,textStrokeColor:"",padding:3,display:!0,autoSkip:!0,autoSkipPadding:3,labelOffset:0,callback:Ts.formatters.values,minor:{},major:{},align:"center",crossAlign:"near",showLabelBackdrop:!1,backdropColor:"rgba(255, 255, 255, 0.75)",backdropPadding:2}}),yt.route("scale.ticks","color","","color"),yt.route("scale.grid","color","","borderColor"),yt.route("scale.grid","borderColor","","borderColor"),yt.route("scale.title","color","","color"),yt.describe("scale",{_fallback:!1,_scriptable:t=>!t.startsWith("before")&&!t.startsWith("after")&&"callback"!==t&&"parser"!==t,_indexable:t=>"borderDash"!==t&&"tickBorderDash"!==t}),yt.describe("scales",{_fallback:"scale"}),yt.describe("scale.ticks",{_scriptable:t=>"backdropPadding"!==t&&"callback"!==t,_indexable:t=>"backdropPadding"!==t});const Es=(t,e,i)=>"top"===e||"left"===e?t[e]+i:t[e]-i;function Is(t,e){const i=[],s=t.length/e,n=t.length;let o=0;for(;o<n;o+=s)i.push(t[Math.floor(o)]);return i}function zs(t,e,i){const s=t.ticks.length,n=Math.min(e,s-1),o=t._startPixel,a=t._endPixel,r=1e-6;let l,h=t.getPixelForTick(n);if(!(i&&(l=1===s?Math.max(h-o,a-h):0===e?(t.getPixelForTick(1)-h)/2:(h-t.getPixelForTick(n-1))/2,h+=n<e?l:-l,h<o-r||h>a+r)))return h}function Fs(t){return t.drawTicks?t.tickLength:0}function Bs(t,e){if(!t.display)return 0;const i=ui(t.font,e),s=di(t.padding);return(X(t.text)?t.text.length:1)*i.lineHeight+s.height}function Vs(t,e,i){let n=s(t);return(i&&"right"!==e||!i&&"right"===e)&&(n=(t=>"left"===t?"right":"right"===t?"left":t)(n)),n}class Ns extends Os{constructor(t){super(),this.id=t.id,this.type=t.type,this.options=void 0,this.ctx=t.ctx,this.chart=t.chart,this.top=void 0,this.bottom=void 0,this.left=void 0,this.right=void 0,this.width=void 0,this.height=void 0,this._margins={left:0,right:0,top:0,bottom:0},this.maxWidth=void 0,this.maxHeight=void 0,this.paddingTop=void 0,this.paddingBottom=void 0,this.paddingLeft=void 0,this.paddingRight=void 0,this.axis=void 0,this.labelRotation=void 0,this.min=void 0,this.max=void 0,this._range=void 0,this.ticks=[],this._gridLineItems=null,this._labelItems=null,this._labelSizes=null,this._length=0,this._maxLength=0,this._longestTextCache={},this._startPixel=void 0,this._endPixel=void 0,this._reversePixels=!1,this._userMax=void 0,this._userMin=void 0,this._suggestedMax=void 0,this._suggestedMin=void 0,this._ticksLength=0,this._borderValue=0,this._cache={},this._dataLimitsCached=!1,this.$context=void 0}init(t){this.options=t.setContext(this.getContext()),this.axis=t.axis,this._userMin=this.parse(t.min),this._userMax=this.parse(t.max),this._suggestedMin=this.parse(t.suggestedMin),this._suggestedMax=this.parse(t.suggestedMax)}parse(t,e){return t}getUserBounds(){let{_userMin:t,_userMax:e,_suggestedMin:i,_suggestedMax:s}=this;return t=G(t,Number.POSITIVE_INFINITY),e=G(e,Number.NEGATIVE_INFINITY),i=G(i,Number.POSITIVE_INFINITY),s=G(s,Number.NEGATIVE_INFINITY),{min:G(t,i),max:G(e,s),minDefined:K(t),maxDefined:K(e)}}getMinMax(t){let e,{min:i,max:s,minDefined:n,maxDefined:o}=this.getUserBounds();if(n&&o)return{min:i,max:s};const a=this.getMatchingVisibleMetas();for(let r=0,l=a.length;r<l;++r)e=a[r].controller.getMinMax(this,t),n||(i=Math.min(i,e.min)),o||(s=Math.max(s,e.max));return i=o&&i>s?s:i,s=n&&i>s?i:s,{min:G(i,G(s,i)),max:G(s,G(i,s))}}getPadding(){return{left:this.paddingLeft||0,top:this.paddingTop||0,right:this.paddingRight||0,bottom:this.paddingBottom||0}}getTicks(){return this.ticks}getLabels(){const t=this.chart.data;return this.options.labels||(this.isHorizontal()?t.xLabels:t.yLabels)||t.labels||[]}beforeLayout(){this._cache={},this._dataLimitsCached=!1}beforeUpdate(){tt(this.options.beforeUpdate,[this])}update(t,e,i){const{beginAtZero:s,grace:n,ticks:o}=this.options,a=o.sampleSize;this.beforeUpdate(),this.maxWidth=t,this.maxHeight=e,this._margins=i=Object.assign({left:0,right:0,top:0,bottom:0},i),this.ticks=null,this._labelSizes=null,this._gridLineItems=null,this._labelItems=null,this.beforeSetDimensions(),this.setDimensions(),this.afterSetDimensions(),this._maxLength=this.isHorizontal()?this.width+i.left+i.right:this.height+i.top+i.bottom,this._dataLimitsCached||(this.beforeDataLimits(),this.determineDataLimits(),this.afterDataLimits(),this._range=gi(this,n,s),this._dataLimitsCached=!0),this.beforeBuildTicks(),this.ticks=this.buildTicks()||[],this.afterBuildTicks();const r=a<this.ticks.length;this._convertTicksToLabels(r?Is(this.ticks,a):this.ticks),this.configure(),this.beforeCalculateLabelRotation(),this.calculateLabelRotation(),this.afterCalculateLabelRotation(),o.display&&(o.autoSkip||"auto"===o.source)&&(this.ticks=Ls(this,this.ticks),this._labelSizes=null,this.afterAutoSkip()),r&&this._convertTicksToLabels(this.ticks),this.beforeFit(),this.fit(),this.afterFit(),this.afterUpdate()}configure(){let t,e,i=this.options.reverse;this.isHorizontal()?(t=this.left,e=this.right):(t=this.top,e=this.bottom,i=!i),this._startPixel=t,this._endPixel=e,this._reversePixels=i,this._length=e-t,this._alignToPixels=this.options.alignToPixels}afterUpdate(){tt(this.options.afterUpdate,[this])}beforeSetDimensions(){tt(this.options.beforeSetDimensions,[this])}setDimensions(){this.isHorizontal()?(this.width=this.maxWidth,this.left=0,this.right=this.width):(this.height=this.maxHeight,this.top=0,this.bottom=this.height),this.paddingLeft=0,this.paddingTop=0,this.paddingRight=0,this.paddingBottom=0}afterSetDimensions(){tt(this.options.afterSetDimensions,[this])}_callHooks(t){this.chart.notifyPlugins(t,this.getContext()),tt(this.options[t],[this])}beforeDataLimits(){this._callHooks("beforeDataLimits")}determineDataLimits(){}afterDataLimits(){this._callHooks("afterDataLimits")}beforeBuildTicks(){this._callHooks("beforeBuildTicks")}buildTicks(){return[]}afterBuildTicks(){this._callHooks("afterBuildTicks")}beforeTickToLabelConversion(){tt(this.options.beforeTickToLabelConversion,[this])}generateTickLabels(t){const e=this.options.ticks;let i,s,n;for(i=0,s=t.length;i<s;i++)n=t[i],n.label=tt(e.callback,[n.value,i,t],this)}afterTickToLabelConversion(){tt(this.options.afterTickToLabelConversion,[this])}beforeCalculateLabelRotation(){tt(this.options.beforeCalculateLabelRotation,[this])}calculateLabelRotation(){const t=this.options,e=t.ticks,i=this.ticks.length,s=e.minRotation||0,n=e.maxRotation;let o,a,r,l=s;if(!this._isVisible()||!e.display||s>=n||i<=1||!this.isHorizontal())return void(this.labelRotation=s);const h=this._getLabelSizes(),c=h.widest.width,d=h.highest.height,u=Qt(this.chart.width-c,0,this.maxWidth);o=t.offset?this.maxWidth/i:u/(i-1),c+6>o&&(o=u/(i-(t.offset?.5:1)),a=this.maxHeight-Fs(t.grid)-e.padding-Bs(t.title,this.chart.options.font),r=Math.sqrt(c*c+d*d),l=Ut(Math.min(Math.asin(Qt((h.highest.height+6)/o,-1,1)),Math.asin(Qt(a/r,-1,1))-Math.asin(Qt(d/r,-1,1)))),l=Math.max(s,Math.min(n,l))),this.labelRotation=l}afterCalculateLabelRotation(){tt(this.options.afterCalculateLabelRotation,[this])}afterAutoSkip(){}beforeFit(){tt(this.options.beforeFit,[this])}fit(){const t={width:0,height:0},{chart:e,options:{ticks:i,title:s,grid:n}}=this,o=this._isVisible(),a=this.isHorizontal();if(o){const o=Bs(s,e.options.font);if(a?(t.width=this.maxWidth,t.height=Fs(n)+o):(t.height=this.maxHeight,t.width=Fs(n)+o),i.display&&this.ticks.length){const{first:e,last:s,widest:n,highest:o}=this._getLabelSizes(),r=2*i.padding,l=Yt(this.labelRotation),h=Math.cos(l),c=Math.sin(l);if(a){const e=i.mirror?0:c*n.width+h*o.height;t.height=Math.min(this.maxHeight,t.height+e+r)}else{const e=i.mirror?0:h*n.width+c*o.height;t.width=Math.min(this.maxWidth,t.width+e+r)}this._calculatePadding(e,s,c,h)}}this._handleMargins(),a?(this.width=this._length=e.width-this._margins.left-this._margins.right,this.height=t.height):(this.width=t.width,this.height=this._length=e.height-this._margins.top-this._margins.bottom)}_calculatePadding(t,e,i,s){const{ticks:{align:n,padding:o},position:a}=this.options,r=0!==this.labelRotation,l="top"!==a&&"x"===this.axis;if(this.isHorizontal()){const a=this.getPixelForTick(0)-this.left,h=this.right-this.getPixelForTick(this.ticks.length-1);let c=0,d=0;r?l?(c=s*t.width,d=i*e.height):(c=i*t.height,d=s*e.width):"start"===n?d=e.width:"end"===n?c=t.width:"inner"!==n&&(c=t.width/2,d=e.width/2),this.paddingLeft=Math.max((c-a+o)*this.width/(this.width-a),0),this.paddingRight=Math.max((d-h+o)*this.width/(this.width-h),0)}else{let i=e.height/2,s=t.height/2;"start"===n?(i=0,s=t.height):"end"===n&&(i=e.height,s=0),this.paddingTop=i+o,this.paddingBottom=s+o}}_handleMargins(){this._margins&&(this._margins.left=Math.max(this.paddingLeft,this._margins.left),this._margins.top=Math.max(this.paddingTop,this._margins.top),this._margins.right=Math.max(this.paddingRight,this._margins.right),this._margins.bottom=Math.max(this.paddingBottom,this._margins.bottom))}afterFit(){tt(this.options.afterFit,[this])}isHorizontal(){const{axis:t,position:e}=this.options;return"top"===e||"bottom"===e||"x"===t}isFullSize(){return this.options.fullSize}_convertTicksToLabels(t){let e,i;for(this.beforeTickToLabelConversion(),this.generateTickLabels(t),e=0,i=t.length;e<i;e++)U(t[e].label)&&(t.splice(e,1),i--,e--);this.afterTickToLabelConversion()}_getLabelSizes(){let t=this._labelSizes;if(!t){const e=this.options.ticks.sampleSize;let i=this.ticks;e<i.length&&(i=Is(i,e)),this._labelSizes=t=this._computeLabelSizes(i,i.length)}return t}_computeLabelSizes(t,e){const{ctx:i,_longestTextCache:s}=this,n=[],o=[];let a,r,l,h,c,d,u,f,g,p,m,b=0,x=0;for(a=0;a<e;++a){if(h=t[a].label,c=this._resolveTickFontOptions(a),i.font=d=c.string,u=s[d]=s[d]||{data:{},gc:[]},f=c.lineHeight,g=p=0,U(h)||X(h)){if(X(h))for(r=0,l=h.length;r<l;++r)m=h[r],U(m)||X(m)||(g=me(i,u.data,u.gc,g,m),p+=f)}else g=me(i,u.data,u.gc,g,h),p=f;n.push(g),o.push(p),b=Math.max(g,b),x=Math.max(p,x)}!function(t,e){et(t,(t=>{const i=t.gc,s=i.length/2;let n;if(s>e){for(n=0;n<s;++n)delete t.data[i[n]];i.splice(0,s)}}))}(s,e);const _=n.indexOf(b),y=o.indexOf(x),v=t=>({width:n[t]||0,height:o[t]||0});return{first:v(0),last:v(e-1),widest:v(_),highest:v(y),widths:n,heights:o}}getLabelForValue(t){return t}getPixelForValue(t,e){return NaN}getValueForPixel(t){}getPixelForTick(t){const e=this.ticks;return t<0||t>e.length-1?null:this.getPixelForValue(e[t].value)}getPixelForDecimal(t){this._reversePixels&&(t=1-t);const e=this._startPixel+t*this._length;return te(this._alignToPixels?xe(this.chart,e,0):e)}getDecimalForPixel(t){const e=(t-this._startPixel)/this._length;return this._reversePixels?1-e:e}getBasePixel(){return this.getPixelForValue(this.getBaseValue())}getBaseValue(){const{min:t,max:e}=this;return t<0&&e<0?e:t>0&&e>0?t:0}getContext(t){const e=this.ticks||[];if(t>=0&&t<e.length){const i=e[t];return i.$context||(i.$context=function(t,e,i){return pi(t,{tick:i,index:e,type:"tick"})}(this.getContext(),t,i))}return this.$context||(this.$context=pi(this.chart.getContext(),{scale:this,type:"scale"}))}_tickSize(){const t=this.options.ticks,e=Yt(this.labelRotation),i=Math.abs(Math.cos(e)),s=Math.abs(Math.sin(e)),n=this._getLabelSizes(),o=t.autoSkipPadding||0,a=n?n.widest.width+o:0,r=n?n.highest.height+o:0;return this.isHorizontal()?r*i>a*s?a/i:r/s:r*s<a*i?r/i:a/s}_isVisible(){const t=this.options.display;return"auto"!==t?!!t:this.getMatchingVisibleMetas().length>0}_computeGridLineItems(t){const e=this.axis,i=this.chart,s=this.options,{grid:n,position:o}=s,a=n.offset,r=this.isHorizontal(),l=this.ticks.length+(a?1:0),h=Fs(n),c=[],d=n.setContext(this.getContext()),u=d.drawBorder?d.borderWidth:0,f=u/2,g=function(t){return xe(i,t,u)};let p,m,b,x,_,y,v,w,M,k,S,P;if("top"===o)p=g(this.bottom),y=this.bottom-h,w=p-f,k=g(t.top)+f,P=t.bottom;else if("bottom"===o)p=g(this.top),k=t.top,P=g(t.bottom)-f,y=p+f,w=this.top+h;else if("left"===o)p=g(this.right),_=this.right-h,v=p-f,M=g(t.left)+f,S=t.right;else if("right"===o)p=g(this.left),M=t.left,S=g(t.right)-f,_=p+f,v=this.left+h;else if("x"===e){if("center"===o)p=g((t.top+t.bottom)/2+.5);else if(q(o)){const t=Object.keys(o)[0],e=o[t];p=g(this.chart.scales[t].getPixelForValue(e))}k=t.top,P=t.bottom,y=p+f,w=y+h}else if("y"===e){if("center"===o)p=g((t.left+t.right)/2);else if(q(o)){const t=Object.keys(o)[0],e=o[t];p=g(this.chart.scales[t].getPixelForValue(e))}_=p-f,v=_-h,M=t.left,S=t.right}const D=Z(s.ticks.maxTicksLimit,l),C=Math.max(1,Math.ceil(l/D));for(m=0;m<l;m+=C){const t=n.setContext(this.getContext(m)),e=t.lineWidth,s=t.color,o=n.borderDash||[],l=t.borderDashOffset,h=t.tickWidth,d=t.tickColor,u=t.tickBorderDash||[],f=t.tickBorderDashOffset;b=zs(this,m,a),void 0!==b&&(x=xe(i,b,e),r?_=v=M=S=x:y=w=k=P=x,c.push({tx1:_,ty1:y,tx2:v,ty2:w,x1:M,y1:k,x2:S,y2:P,width:e,color:s,borderDash:o,borderDashOffset:l,tickWidth:h,tickColor:d,tickBorderDash:u,tickBorderDashOffset:f}))}return this._ticksLength=l,this._borderValue=p,c}_computeLabelItems(t){const e=this.axis,i=this.options,{position:s,ticks:n}=i,o=this.isHorizontal(),a=this.ticks,{align:r,crossAlign:l,padding:h,mirror:c}=n,d=Fs(i.grid),u=d+h,f=c?-h:u,g=-Yt(this.labelRotation),p=[];let m,b,x,_,y,v,w,M,k,S,P,D,C="middle";if("top"===s)v=this.bottom-f,w=this._getXAxisLabelAlignment();else if("bottom"===s)v=this.top+f,w=this._getXAxisLabelAlignment();else if("left"===s){const t=this._getYAxisLabelAlignment(d);w=t.textAlign,y=t.x}else if("right"===s){const t=this._getYAxisLabelAlignment(d);w=t.textAlign,y=t.x}else if("x"===e){if("center"===s)v=(t.top+t.bottom)/2+u;else if(q(s)){const t=Object.keys(s)[0],e=s[t];v=this.chart.scales[t].getPixelForValue(e)+u}w=this._getXAxisLabelAlignment()}else if("y"===e){if("center"===s)y=(t.left+t.right)/2-u;else if(q(s)){const t=Object.keys(s)[0],e=s[t];y=this.chart.scales[t].getPixelForValue(e)}w=this._getYAxisLabelAlignment(d).textAlign}"y"===e&&("start"===r?C="top":"end"===r&&(C="bottom"));const O=this._getLabelSizes();for(m=0,b=a.length;m<b;++m){x=a[m],_=x.label;const t=n.setContext(this.getContext(m));M=this.getPixelForTick(m)+n.labelOffset,k=this._resolveTickFontOptions(m),S=k.lineHeight,P=X(_)?_.length:1;const e=P/2,i=t.color,r=t.textStrokeColor,h=t.textStrokeWidth;let d,u=w;if(o?(y=M,"inner"===w&&(u=m===b-1?this.options.reverse?"left":"right":0===m?this.options.reverse?"right":"left":"center"),D="top"===s?"near"===l||0!==g?-P*S+S/2:"center"===l?-O.highest.height/2-e*S+S:-O.highest.height+S/2:"near"===l||0!==g?S/2:"center"===l?O.highest.height/2-e*S:O.highest.height-P*S,c&&(D*=-1)):(v=M,D=(1-P)*S/2),t.showLabelBackdrop){const e=di(t.backdropPadding),i=O.heights[m],s=O.widths[m];let n=v+D-e.top,o=y-e.left;switch(C){case"middle":n-=i/2;break;case"bottom":n-=i}switch(w){case"center":o-=s/2;break;case"right":o-=s}d={left:o,top:n,width:s+e.width,height:i+e.height,color:t.backdropColor}}p.push({rotation:g,label:_,font:k,color:i,strokeColor:r,strokeWidth:h,textOffset:D,textAlign:u,textBaseline:C,translation:[y,v],backdrop:d})}return p}_getXAxisLabelAlignment(){const{position:t,ticks:e}=this.options;if(-Yt(this.labelRotation))return"top"===t?"left":"right";let i="center";return"start"===e.align?i="left":"end"===e.align?i="right":"inner"===e.align&&(i="inner"),i}_getYAxisLabelAlignment(t){const{position:e,ticks:{crossAlign:i,mirror:s,padding:n}}=this.options,o=t+n,a=this._getLabelSizes().widest.width;let r,l;return"left"===e?s?(l=this.right+n,"near"===i?r="left":"center"===i?(r="center",l+=a/2):(r="right",l+=a)):(l=this.right-o,"near"===i?r="right":"center"===i?(r="center",l-=a/2):(r="left",l=this.left)):"right"===e?s?(l=this.left+n,"near"===i?r="right":"center"===i?(r="center",l-=a/2):(r="left",l-=a)):(l=this.left+o,"near"===i?r="left":"center"===i?(r="center",l+=a/2):(r="right",l=this.right)):r="right",{textAlign:r,x:l}}_computeLabelArea(){if(this.options.ticks.mirror)return;const t=this.chart,e=this.options.position;return"left"===e||"right"===e?{top:0,left:this.left,bottom:t.height,right:this.right}:"top"===e||"bottom"===e?{top:this.top,left:0,bottom:this.bottom,right:t.width}:void 0}drawBackground(){const{ctx:t,options:{backgroundColor:e},left:i,top:s,width:n,height:o}=this;e&&(t.save(),t.fillStyle=e,t.fillRect(i,s,n,o),t.restore())}getLineWidthForValue(t){const e=this.options.grid;if(!this._isVisible()||!e.display)return 0;const i=this.ticks.findIndex((e=>e.value===t));if(i>=0){return e.setContext(this.getContext(i)).lineWidth}return 0}drawGrid(t){const e=this.options.grid,i=this.ctx,s=this._gridLineItems||(this._gridLineItems=this._computeGridLineItems(t));let n,o;const a=(t,e,s)=>{s.width&&s.color&&(i.save(),i.lineWidth=s.width,i.strokeStyle=s.color,i.setLineDash(s.borderDash||[]),i.lineDashOffset=s.borderDashOffset,i.beginPath(),i.moveTo(t.x,t.y),i.lineTo(e.x,e.y),i.stroke(),i.restore())};if(e.display)for(n=0,o=s.length;n<o;++n){const t=s[n];e.drawOnChartArea&&a({x:t.x1,y:t.y1},{x:t.x2,y:t.y2},t),e.drawTicks&&a({x:t.tx1,y:t.ty1},{x:t.tx2,y:t.ty2},{color:t.tickColor,width:t.tickWidth,borderDash:t.tickBorderDash,borderDashOffset:t.tickBorderDashOffset})}}drawBorder(){const{chart:t,ctx:e,options:{grid:i}}=this,s=i.setContext(this.getContext()),n=i.drawBorder?s.borderWidth:0;if(!n)return;const o=i.setContext(this.getContext(0)).lineWidth,a=this._borderValue;let r,l,h,c;this.isHorizontal()?(r=xe(t,this.left,n)-n/2,l=xe(t,this.right,o)+o/2,h=c=a):(h=xe(t,this.top,n)-n/2,c=xe(t,this.bottom,o)+o/2,r=l=a),e.save(),e.lineWidth=s.borderWidth,e.strokeStyle=s.borderColor,e.beginPath(),e.moveTo(r,h),e.lineTo(l,c),e.stroke(),e.restore()}drawLabels(t){if(!this.options.ticks.display)return;const e=this.ctx,i=this._computeLabelArea();i&&we(e,i);const s=this._labelItems||(this._labelItems=this._computeLabelItems(t));let n,o;for(n=0,o=s.length;n<o;++n){const t=s[n],i=t.font,o=t.label;t.backdrop&&(e.fillStyle=t.backdrop.color,e.fillRect(t.backdrop.left,t.backdrop.top,t.backdrop.width,t.backdrop.height)),Pe(e,o,0,t.textOffset,i,t)}i&&Me(e)}drawTitle(){const{ctx:t,options:{position:e,title:i,reverse:s}}=this;if(!i.display)return;const o=ui(i.font),a=di(i.padding),r=i.align;let l=o.lineHeight/2;"bottom"===e||"center"===e||q(e)?(l+=a.bottom,X(i.text)&&(l+=o.lineHeight*(i.text.length-1))):l+=a.top;const{titleX:h,titleY:c,maxWidth:d,rotation:u}=function(t,e,i,s){const{top:o,left:a,bottom:r,right:l,chart:h}=t,{chartArea:c,scales:d}=h;let u,f,g,p=0;const m=r-o,b=l-a;if(t.isHorizontal()){if(f=n(s,a,l),q(i)){const t=Object.keys(i)[0],s=i[t];g=d[t].getPixelForValue(s)+m-e}else g="center"===i?(c.bottom+c.top)/2+m-e:Es(t,i,e);u=l-a}else{if(q(i)){const t=Object.keys(i)[0],s=i[t];f=d[t].getPixelForValue(s)-b+e}else f="center"===i?(c.left+c.right)/2-b+e:Es(t,i,e);g=n(s,r,o),p="left"===i?-Et:Et}return{titleX:f,titleY:g,maxWidth:u,rotation:p}}(this,l,e,r);Pe(t,i.text,0,0,o,{color:i.color,maxWidth:d,rotation:u,textAlign:Vs(r,e,s),textBaseline:"middle",translation:[h,c]})}draw(t){this._isVisible()&&(this.drawBackground(),this.drawGrid(t),this.drawBorder(),this.drawTitle(),this.drawLabels(t))}_layers(){const t=this.options,e=t.ticks&&t.ticks.z||0,i=Z(t.grid&&t.grid.z,-1);return this._isVisible()&&this.draw===Ns.prototype.draw?[{z:i,draw:t=>{this.drawBackground(),this.drawGrid(t),this.drawTitle()}},{z:i+1,draw:()=>{this.drawBorder()}},{z:e,draw:t=>{this.drawLabels(t)}}]:[{z:e,draw:t=>{this.draw(t)}}]}getMatchingVisibleMetas(t){const e=this.chart.getSortedVisibleDatasetMetas(),i=this.axis+"AxisID",s=[];let n,o;for(n=0,o=e.length;n<o;++n){const o=e[n];o[i]!==this.id||t&&o.type!==t||s.push(o)}return s}_resolveTickFontOptions(t){return ui(this.options.ticks.setContext(this.getContext(t)).font)}_maxDigits(){const t=this._resolveTickFontOptions(0).lineHeight;return(this.isHorizontal()?this.width:this.height)/t}}class Ws{constructor(t,e,i){this.type=t,this.scope=e,this.override=i,this.items=Object.create(null)}isForType(t){return Object.prototype.isPrototypeOf.call(this.type.prototype,t.prototype)}register(t){const e=Object.getPrototypeOf(t);let i;(function(t){return"id"in t&&"defaults"in t})(e)&&(i=this.register(e));const s=this.items,n=t.id,o=this.scope+"."+n;if(!n)throw new Error("class does not have id: "+t);return n in s||(s[n]=t,function(t,e,i){const s=at(Object.create(null),[i?yt.get(i):{},yt.get(e),t.defaults]);yt.set(e,s),t.defaultRoutes&&function(t,e){Object.keys(e).forEach((i=>{const s=i.split("."),n=s.pop(),o=[t].concat(s).join("."),a=e[i].split("."),r=a.pop(),l=a.join(".");yt.route(o,n,l,r)}))}(e,t.defaultRoutes);t.descriptors&&yt.describe(e,t.descriptors)}(t,o,i),this.override&&yt.override(t.id,t.overrides)),o}get(t){return this.items[t]}unregister(t){const e=this.items,i=t.id,s=this.scope;i in e&&delete e[i],s&&i in yt[s]&&(delete yt[s][i],this.override&&delete mt[i])}}var Hs=new class{constructor(){this.controllers=new Ws(Cs,"datasets",!0),this.elements=new Ws(Os,"elements"),this.plugins=new Ws(Object,"plugins"),this.scales=new Ws(Ns,"scales"),this._typedRegistries=[this.controllers,this.scales,this.elements]}add(...t){this._each("register",t)}remove(...t){this._each("unregister",t)}addControllers(...t){this._each("register",t,this.controllers)}addElements(...t){this._each("register",t,this.elements)}addPlugins(...t){this._each("register",t,this.plugins)}addScales(...t){this._each("register",t,this.scales)}getController(t){return this._get(t,this.controllers,"controller")}getElement(t){return this._get(t,this.elements,"element")}getPlugin(t){return this._get(t,this.plugins,"plugin")}getScale(t){return this._get(t,this.scales,"scale")}removeControllers(...t){this._each("unregister",t,this.controllers)}removeElements(...t){this._each("unregister",t,this.elements)}removePlugins(...t){this._each("unregister",t,this.plugins)}removeScales(...t){this._each("unregister",t,this.scales)}_each(t,e,i){[...e].forEach((e=>{const s=i||this._getRegistryForType(e);i||s.isForType(e)||s===this.plugins&&e.id?this._exec(t,s,e):et(e,(e=>{const s=i||this._getRegistryForType(e);this._exec(t,s,e)}))}))}_exec(t,e,i){const s=dt(t);tt(i["before"+s],[],i),e[t](i),tt(i["after"+s],[],i)}_getRegistryForType(t){for(let e=0;e<this._typedRegistries.length;e++){const i=this._typedRegistries[e];if(i.isForType(t))return i}return this.plugins}_get(t,e,i){const s=e.get(t);if(void 0===s)throw new Error('"'+t+'" is not a registered '+i+".");return s}};class js{constructor(){this._init=[]}notify(t,e,i,s){"beforeInit"===e&&(this._init=this._createDescriptors(t,!0),this._notify(this._init,t,"install"));const n=s?this._descriptors(t).filter(s):this._descriptors(t),o=this._notify(n,t,e,i);return"afterDestroy"===e&&(this._notify(n,t,"stop"),this._notify(this._init,t,"uninstall")),o}_notify(t,e,i,s){s=s||{};for(const n of t){const t=n.plugin;if(!1===tt(t[i],[e,s,n.options],t)&&s.cancelable)return!1}return!0}invalidate(){U(this._cache)||(this._oldCache=this._cache,this._cache=void 0)}_descriptors(t){if(this._cache)return this._cache;const e=this._cache=this._createDescriptors(t);return this._notifyStateChanges(t),e}_createDescriptors(t,e){const i=t&&t.config,s=Z(i.options&&i.options.plugins,{}),n=function(t){const e=[],i=Object.keys(Hs.plugins.items);for(let t=0;t<i.length;t++)e.push(Hs.getPlugin(i[t]));const s=t.plugins||[];for(let t=0;t<s.length;t++){const i=s[t];-1===e.indexOf(i)&&e.push(i)}return e}(i);return!1!==s||e?function(t,e,i,s){const n=[],o=t.getContext();for(let a=0;a<e.length;a++){const r=e[a],l=$s(i[r.id],s);null!==l&&n.push({plugin:r,options:Ys(t.config,r,l,o)})}return n}(t,n,s,e):[]}_notifyStateChanges(t){const e=this._oldCache||[],i=this._cache,s=(t,e)=>t.filter((t=>!e.some((e=>t.plugin.id===e.plugin.id))));this._notify(s(e,i),t,"stop"),this._notify(s(i,e),t,"start")}}function $s(t,e){return e||!1!==t?!0===t?{}:t:null}function Ys(t,e,i,s){const n=t.pluginScopeKeys(e),o=t.getOptionScopes(i,n);return t.createResolver(o,s,[""],{scriptable:!1,indexable:!1,allKeys:!0})}function Us(t,e){const i=yt.datasets[t]||{};return((e.datasets||{})[t]||{}).indexAxis||e.indexAxis||i.indexAxis||"x"}function Xs(t,e){return"x"===t||"y"===t?t:e.axis||("top"===(i=e.position)||"bottom"===i?"x":"left"===i||"right"===i?"y":void 0)||t.charAt(0).toLowerCase();var i}function qs(t){const e=t.options||(t.options={});e.plugins=Z(e.plugins,{}),e.scales=function(t,e){const i=mt[t.type]||{scales:{}},s=e.scales||{},n=Us(t.type,e),o=Object.create(null),a=Object.create(null);return Object.keys(s).forEach((t=>{const e=s[t];if(!q(e))return console.error(`Invalid scale configuration for scale: ${t}`);if(e._proxy)return console.warn(`Ignoring resolver passed as options for scale: ${t}`);const r=Xs(t,e),l=function(t,e){return t===e?"_index_":"_value_"}(r,n),h=i.scales||{};o[r]=o[r]||t,a[t]=rt(Object.create(null),[{axis:r},e,h[r],h[l]])})),t.data.datasets.forEach((i=>{const n=i.type||t.type,r=i.indexAxis||Us(n,e),l=(mt[n]||{}).scales||{};Object.keys(l).forEach((t=>{const e=function(t,e){let i=t;return"_index_"===t?i=e:"_value_"===t&&(i="x"===e?"y":"x"),i}(t,r),n=i[e+"AxisID"]||o[e]||e;a[n]=a[n]||Object.create(null),rt(a[n],[{axis:e},s[n],l[t]])}))})),Object.keys(a).forEach((t=>{const e=a[t];rt(e,[yt.scales[e.type],yt.scale])})),a}(t,e)}function Ks(t){return(t=t||{}).datasets=t.datasets||[],t.labels=t.labels||[],t}const Gs=new Map,Zs=new Set;function Js(t,e){let i=Gs.get(t);return i||(i=e(),Gs.set(t,i),Zs.add(i)),i}const Qs=(t,e,i)=>{const s=ct(e,i);void 0!==s&&t.add(s)};class tn{constructor(t){this._config=function(t){return(t=t||{}).data=Ks(t.data),qs(t),t}(t),this._scopeCache=new Map,this._resolverCache=new Map}get platform(){return this._config.platform}get type(){return this._config.type}set type(t){this._config.type=t}get data(){return this._config.data}set data(t){this._config.data=Ks(t)}get options(){return this._config.options}set options(t){this._config.options=t}get plugins(){return this._config.plugins}update(){const t=this._config;this.clearCache(),qs(t)}clearCache(){this._scopeCache.clear(),this._resolverCache.clear()}datasetScopeKeys(t){return Js(t,(()=>[[`datasets.${t}`,""]]))}datasetAnimationScopeKeys(t,e){return Js(`${t}.transition.${e}`,(()=>[[`datasets.${t}.transitions.${e}`,`transitions.${e}`],[`datasets.${t}`,""]]))}datasetElementScopeKeys(t,e){return Js(`${t}-${e}`,(()=>[[`datasets.${t}.elements.${e}`,`datasets.${t}`,`elements.${e}`,""]]))}pluginScopeKeys(t){const e=t.id;return Js(`${this.type}-plugin-${e}`,(()=>[[`plugins.${e}`,...t.additionalOptionScopes||[]]]))}_cachedScopes(t,e){const i=this._scopeCache;let s=i.get(t);return s&&!e||(s=new Map,i.set(t,s)),s}getOptionScopes(t,e,i){const{options:s,type:n}=this,o=this._cachedScopes(t,i),a=o.get(e);if(a)return a;const r=new Set;e.forEach((e=>{t&&(r.add(t),e.forEach((e=>Qs(r,t,e)))),e.forEach((t=>Qs(r,s,t))),e.forEach((t=>Qs(r,mt[n]||{},t))),e.forEach((t=>Qs(r,yt,t))),e.forEach((t=>Qs(r,bt,t)))}));const l=Array.from(r);return 0===l.length&&l.push(Object.create(null)),Zs.has(e)&&o.set(e,l),l}chartOptionScopes(){const{options:t,type:e}=this;return[t,mt[e]||{},yt.datasets[e]||{},{type:e},yt,bt]}resolveNamedOptions(t,e,i,s=[""]){const n={$shared:!0},{resolver:o,subPrefixes:a}=en(this._resolverCache,t,s);let r=o;if(function(t,e){const{isScriptable:i,isIndexable:s}=Te(t);for(const n of e){const e=i(n),o=s(n),a=(o||e)&&t[n];if(e&&(ft(a)||sn(a))||o&&X(a))return!0}return!1}(o,e)){n.$shared=!1;r=Ae(o,i=ft(i)?i():i,this.createResolver(t,i,a))}for(const t of e)n[t]=r[t];return n}createResolver(t,e,i=[""],s){const{resolver:n}=en(this._resolverCache,t,i);return q(e)?Ae(n,e,void 0,s):n}}function en(t,e,i){let s=t.get(e);s||(s=new Map,t.set(e,s));const n=i.join();let o=s.get(n);if(!o){o={resolver:Oe(e,i),subPrefixes:i.filter((t=>!t.toLowerCase().includes("hover")))},s.set(n,o)}return o}const sn=t=>q(t)&&Object.getOwnPropertyNames(t).reduce(((e,i)=>e||ft(t[i])),!1);const nn=["top","bottom","left","right","chartArea"];function on(t,e){return"top"===t||"bottom"===t||-1===nn.indexOf(t)&&"x"===e}function an(t,e){return function(i,s){return i[t]===s[t]?i[e]-s[e]:i[t]-s[t]}}function rn(t){const e=t.chart,i=e.options.animation;e.notifyPlugins("afterRender"),tt(i&&i.onComplete,[t],e)}function ln(t){const e=t.chart,i=e.options.animation;tt(i&&i.onProgress,[t],e)}function hn(t){return ie()&&"string"==typeof t?t=document.getElementById(t):t&&t.length&&(t=t[0]),t&&t.canvas&&(t=t.canvas),t}const cn={},dn=t=>{const e=hn(t);return Object.values(cn).filter((t=>t.canvas===e)).pop()};function un(t,e,i){const s=Object.keys(t);for(const n of s){const s=+n;if(s>=e){const o=t[n];delete t[n],(i>0||s>e)&&(t[s+i]=o)}}}class fn{constructor(t,e){const s=this.config=new tn(e),n=hn(t),o=dn(n);if(o)throw new Error("Canvas is already in use. Chart with ID '"+o.id+"' must be destroyed before the canvas can be reused.");const r=s.createResolver(s.chartOptionScopes(),this.getContext());this.platform=new(s.platform||cs(n)),this.platform.updateConfig(s);const l=this.platform.acquireContext(n,r.aspectRatio),h=l&&l.canvas,c=h&&h.height,d=h&&h.width;this.id=Y(),this.ctx=l,this.canvas=h,this.width=d,this.height=c,this._options=r,this._aspectRatio=this.aspectRatio,this._layers=[],this._metasets=[],this._stacks=void 0,this.boxes=[],this.currentDevicePixelRatio=void 0,this.chartArea=void 0,this._active=[],this._lastEvent=void 0,this._listeners={},this._responsiveListeners=void 0,this._sortedMetasets=[],this.scales={},this._plugins=new js,this.$proxies={},this._hiddenIndices={},this.attached=!1,this._animationsDisabled=void 0,this.$context=void 0,this._doResize=i((t=>this.update(t)),r.resizeDelay||0),this._dataChanges=[],cn[this.id]=this,l&&h?(a.listen(this,"complete",rn),a.listen(this,"progress",ln),this._initialize(),this.attached&&this.update()):console.error("Failed to create chart: can't acquire context from the given item")}get aspectRatio(){const{options:{aspectRatio:t,maintainAspectRatio:e},width:i,height:s,_aspectRatio:n}=this;return U(t)?e&&n?n:s?i/s:null:t}get data(){return this.config.data}set data(t){this.config.data=t}get options(){return this._options}set options(t){this.config.options=t}_initialize(){return this.notifyPlugins("beforeInit"),this.options.responsive?this.resize():ue(this,this.options.devicePixelRatio),this.bindEvents(),this.notifyPlugins("afterInit"),this}clear(){return _e(this.canvas,this.ctx),this}stop(){return a.stop(this),this}resize(t,e){a.running(this)?this._resizeBeforeDraw={width:t,height:e}:this._resize(t,e)}_resize(t,e){const i=this.options,s=this.canvas,n=i.maintainAspectRatio&&this.aspectRatio,o=this.platform.getMaximumSize(s,t,e,n),a=i.devicePixelRatio||this.platform.getDevicePixelRatio(),r=this.width?"resize":"attach";this.width=o.width,this.height=o.height,this._aspectRatio=this.aspectRatio,ue(this,a,!0)&&(this.notifyPlugins("resize",{size:o}),tt(i.onResize,[this,o],this),this.attached&&this._doResize(r)&&this.render())}ensureScalesHaveIDs(){et(this.options.scales||{},((t,e)=>{t.id=e}))}buildOrUpdateScales(){const t=this.options,e=t.scales,i=this.scales,s=Object.keys(i).reduce(((t,e)=>(t[e]=!1,t)),{});let n=[];e&&(n=n.concat(Object.keys(e).map((t=>{const i=e[t],s=Xs(t,i),n="r"===s,o="x"===s;return{options:i,dposition:n?"chartArea":o?"bottom":"left",dtype:n?"radialLinear":o?"category":"linear"}})))),et(n,(e=>{const n=e.options,o=n.id,a=Xs(o,n),r=Z(n.type,e.dtype);void 0!==n.position&&on(n.position,a)===on(e.dposition)||(n.position=e.dposition),s[o]=!0;let l=null;if(o in i&&i[o].type===r)l=i[o];else{l=new(Hs.getScale(r))({id:o,type:r,ctx:this.ctx,chart:this}),i[l.id]=l}l.init(n,t)})),et(s,((t,e)=>{t||delete i[e]})),et(i,(t=>{Xi.configure(this,t,t.options),Xi.addBox(this,t)}))}_updateMetasets(){const t=this._metasets,e=this.data.datasets.length,i=t.length;if(t.sort(((t,e)=>t.index-e.index)),i>e){for(let t=e;t<i;++t)this._destroyDatasetMeta(t);t.splice(e,i-e)}this._sortedMetasets=t.slice(0).sort(an("order","index"))}_removeUnreferencedMetasets(){const{_metasets:t,data:{datasets:e}}=this;t.length>e.length&&delete this._stacks,t.forEach(((t,i)=>{0===e.filter((e=>e===t._dataset)).length&&this._destroyDatasetMeta(i)}))}buildOrUpdateControllers(){const t=[],e=this.data.datasets;let i,s;for(this._removeUnreferencedMetasets(),i=0,s=e.length;i<s;i++){const s=e[i];let n=this.getDatasetMeta(i);const o=s.type||this.config.type;if(n.type&&n.type!==o&&(this._destroyDatasetMeta(i),n=this.getDatasetMeta(i)),n.type=o,n.indexAxis=s.indexAxis||Us(o,this.options),n.order=s.order||0,n.index=i,n.label=""+s.label,n.visible=this.isDatasetVisible(i),n.controller)n.controller.updateIndex(i),n.controller.linkScales();else{const e=Hs.getController(o),{datasetElementType:s,dataElementType:a}=yt.datasets[o];Object.assign(e.prototype,{dataElementType:Hs.getElement(a),datasetElementType:s&&Hs.getElement(s)}),n.controller=new e(this,i),t.push(n.controller)}}return this._updateMetasets(),t}_resetElements(){et(this.data.datasets,((t,e)=>{this.getDatasetMeta(e).controller.reset()}),this)}reset(){this._resetElements(),this.notifyPlugins("reset")}update(t){const e=this.config;e.update();const i=this._options=e.createResolver(e.chartOptionScopes(),this.getContext()),s=this._animationsDisabled=!i.animation;if(this._updateScales(),this._checkEventBindings(),this._updateHiddenIndices(),this._plugins.invalidate(),!1===this.notifyPlugins("beforeUpdate",{mode:t,cancelable:!0}))return;const n=this.buildOrUpdateControllers();this.notifyPlugins("beforeElementsUpdate");let o=0;for(let t=0,e=this.data.datasets.length;t<e;t++){const{controller:e}=this.getDatasetMeta(t),i=!s&&-1===n.indexOf(e);e.buildOrUpdateElements(i),o=Math.max(+e.getMaxOverflow(),o)}o=this._minPadding=i.layout.autoPadding?o:0,this._updateLayout(o),s||et(n,(t=>{t.reset()})),this._updateDatasets(t),this.notifyPlugins("afterUpdate",{mode:t}),this._layers.sort(an("z","_idx"));const{_active:a,_lastEvent:r}=this;r?this._eventHandler(r,!0):a.length&&this._updateHoverStyles(a,a,!0),this.render()}_updateScales(){et(this.scales,(t=>{Xi.removeBox(this,t)})),this.ensureScalesHaveIDs(),this.buildOrUpdateScales()}_checkEventBindings(){const t=this.options,e=new Set(Object.keys(this._listeners)),i=new Set(t.events);gt(e,i)&&!!this._responsiveListeners===t.responsive||(this.unbindEvents(),this.bindEvents())}_updateHiddenIndices(){const{_hiddenIndices:t}=this,e=this._getUniformDataChanges()||[];for(const{method:i,start:s,count:n}of e){un(t,s,"_removeElements"===i?-n:n)}}_getUniformDataChanges(){const t=this._dataChanges;if(!t||!t.length)return;this._dataChanges=[];const e=this.data.datasets.length,i=e=>new Set(t.filter((t=>t[0]===e)).map(((t,e)=>e+","+t.splice(1).join(",")))),s=i(0);for(let t=1;t<e;t++)if(!gt(s,i(t)))return;return Array.from(s).map((t=>t.split(","))).map((t=>({method:t[1],start:+t[2],count:+t[3]})))}_updateLayout(t){if(!1===this.notifyPlugins("beforeLayout",{cancelable:!0}))return;Xi.update(this,this.width,this.height,t);const e=this.chartArea,i=e.width<=0||e.height<=0;this._layers=[],et(this.boxes,(t=>{i&&"chartArea"===t.position||(t.configure&&t.configure(),this._layers.push(...t._layers()))}),this),this._layers.forEach(((t,e)=>{t._idx=e})),this.notifyPlugins("afterLayout")}_updateDatasets(t){if(!1!==this.notifyPlugins("beforeDatasetsUpdate",{mode:t,cancelable:!0})){for(let t=0,e=this.data.datasets.length;t<e;++t)this.getDatasetMeta(t).controller.configure();for(let e=0,i=this.data.datasets.length;e<i;++e)this._updateDataset(e,ft(t)?t({datasetIndex:e}):t);this.notifyPlugins("afterDatasetsUpdate",{mode:t})}}_updateDataset(t,e){const i=this.getDatasetMeta(t),s={meta:i,index:t,mode:e,cancelable:!0};!1!==this.notifyPlugins("beforeDatasetUpdate",s)&&(i.controller._update(e),s.cancelable=!1,this.notifyPlugins("afterDatasetUpdate",s))}render(){!1!==this.notifyPlugins("beforeRender",{cancelable:!0})&&(a.has(this)?this.attached&&!a.running(this)&&a.start(this):(this.draw(),rn({chart:this})))}draw(){let t;if(this._resizeBeforeDraw){const{width:t,height:e}=this._resizeBeforeDraw;this._resize(t,e),this._resizeBeforeDraw=null}if(this.clear(),this.width<=0||this.height<=0)return;if(!1===this.notifyPlugins("beforeDraw",{cancelable:!0}))return;const e=this._layers;for(t=0;t<e.length&&e[t].z<=0;++t)e[t].draw(this.chartArea);for(this._drawDatasets();t<e.length;++t)e[t].draw(this.chartArea);this.notifyPlugins("afterDraw")}_getSortedDatasetMetas(t){const e=this._sortedMetasets,i=[];let s,n;for(s=0,n=e.length;s<n;++s){const n=e[s];t&&!n.visible||i.push(n)}return i}getSortedVisibleDatasetMetas(){return this._getSortedDatasetMetas(!0)}_drawDatasets(){if(!1===this.notifyPlugins("beforeDatasetsDraw",{cancelable:!0}))return;const t=this.getSortedVisibleDatasetMetas();for(let e=t.length-1;e>=0;--e)this._drawDataset(t[e]);this.notifyPlugins("afterDatasetsDraw")}_drawDataset(t){const e=this.ctx,i=t._clip,s=!i.disabled,n=this.chartArea,o={meta:t,index:t.index,cancelable:!0};!1!==this.notifyPlugins("beforeDatasetDraw",o)&&(s&&we(e,{left:!1===i.left?0:n.left-i.left,right:!1===i.right?this.width:n.right+i.right,top:!1===i.top?0:n.top-i.top,bottom:!1===i.bottom?this.height:n.bottom+i.bottom}),t.controller.draw(),s&&Me(e),o.cancelable=!1,this.notifyPlugins("afterDatasetDraw",o))}isPointInArea(t){return ve(t,this.chartArea,this._minPadding)}getElementsAtEventForMode(t,e,i,s){const n=Ei.modes[e];return"function"==typeof n?n(this,t,i,s):[]}getDatasetMeta(t){const e=this.data.datasets[t],i=this._metasets;let s=i.filter((t=>t&&t._dataset===e)).pop();return s||(s={type:null,data:[],dataset:null,controller:null,hidden:null,xAxisID:null,yAxisID:null,order:e&&e.order||0,index:t,_dataset:e,_parsed:[],_sorted:!1},i.push(s)),s}getContext(){return this.$context||(this.$context=pi(null,{chart:this,type:"chart"}))}getVisibleDatasetCount(){return this.getSortedVisibleDatasetMetas().length}isDatasetVisible(t){const e=this.data.datasets[t];if(!e)return!1;const i=this.getDatasetMeta(t);return"boolean"==typeof i.hidden?!i.hidden:!e.hidden}setDatasetVisibility(t,e){this.getDatasetMeta(t).hidden=!e}toggleDataVisibility(t){this._hiddenIndices[t]=!this._hiddenIndices[t]}getDataVisibility(t){return!this._hiddenIndices[t]}_updateVisibility(t,e,i){const s=i?"show":"hide",n=this.getDatasetMeta(t),o=n.controller._resolveAnimations(void 0,s);ut(e)?(n.data[e].hidden=!i,this.update()):(this.setDatasetVisibility(t,i),o.update(n,{visible:i}),this.update((e=>e.datasetIndex===t?s:void 0)))}hide(t,e){this._updateVisibility(t,e,!1)}show(t,e){this._updateVisibility(t,e,!0)}_destroyDatasetMeta(t){const e=this._metasets[t];e&&e.controller&&e.controller._destroy(),delete this._metasets[t]}_stop(){let t,e;for(this.stop(),a.remove(this),t=0,e=this.data.datasets.length;t<e;++t)this._destroyDatasetMeta(t)}destroy(){this.notifyPlugins("beforeDestroy");const{canvas:t,ctx:e}=this;this._stop(),this.config.clearCache(),t&&(this.unbindEvents(),_e(t,e),this.platform.releaseContext(e),this.canvas=null,this.ctx=null),this.notifyPlugins("destroy"),delete cn[this.id],this.notifyPlugins("afterDestroy")}toBase64Image(...t){return this.canvas.toDataURL(...t)}bindEvents(){this.bindUserEvents(),this.options.responsive?this.bindResponsiveEvents():this.attached=!0}bindUserEvents(){const t=this._listeners,e=this.platform,i=(i,s)=>{e.addEventListener(this,i,s),t[i]=s},s=(t,e,i)=>{t.offsetX=e,t.offsetY=i,this._eventHandler(t)};et(this.options.events,(t=>i(t,s)))}bindResponsiveEvents(){this._responsiveListeners||(this._responsiveListeners={});const t=this._responsiveListeners,e=this.platform,i=(i,s)=>{e.addEventListener(this,i,s),t[i]=s},s=(i,s)=>{t[i]&&(e.removeEventListener(this,i,s),delete t[i])},n=(t,e)=>{this.canvas&&this.resize(t,e)};let o;const a=()=>{s("attach",a),this.attached=!0,this.resize(),i("resize",n),i("detach",o)};o=()=>{this.attached=!1,s("resize",n),this._stop(),this._resize(0,0),i("attach",a)},e.isAttached(this.canvas)?a():o()}unbindEvents(){et(this._listeners,((t,e)=>{this.platform.removeEventListener(this,e,t)})),this._listeners={},et(this._responsiveListeners,((t,e)=>{this.platform.removeEventListener(this,e,t)})),this._responsiveListeners=void 0}updateHoverStyle(t,e,i){const s=i?"set":"remove";let n,o,a,r;for("dataset"===e&&(n=this.getDatasetMeta(t[0].datasetIndex),n.controller["_"+s+"DatasetHoverStyle"]()),a=0,r=t.length;a<r;++a){o=t[a];const e=o&&this.getDatasetMeta(o.datasetIndex).controller;e&&e[s+"HoverStyle"](o.element,o.datasetIndex,o.index)}}getActiveElements(){return this._active||[]}setActiveElements(t){const e=this._active||[],i=t.map((({datasetIndex:t,index:e})=>{const i=this.getDatasetMeta(t);if(!i)throw new Error("No dataset found at index "+t);return{datasetIndex:t,element:i.data[e],index:e}}));!it(i,e)&&(this._active=i,this._lastEvent=null,this._updateHoverStyles(i,e))}notifyPlugins(t,e,i){return this._plugins.notify(this,t,e,i)}_updateHoverStyles(t,e,i){const s=this.options.hover,n=(t,e)=>t.filter((t=>!e.some((e=>t.datasetIndex===e.datasetIndex&&t.index===e.index)))),o=n(e,t),a=i?t:n(t,e);o.length&&this.updateHoverStyle(o,s.mode,!1),a.length&&s.mode&&this.updateHoverStyle(a,s.mode,!0)}_eventHandler(t,e){const i={event:t,replay:e,cancelable:!0,inChartArea:this.isPointInArea(t)},s=e=>(e.options.events||this.options.events).includes(t.native.type);if(!1===this.notifyPlugins("beforeEvent",i,s))return;const n=this._handleEvent(t,e,i.inChartArea);return i.cancelable=!1,this.notifyPlugins("afterEvent",i,s),(n||i.changed)&&this.render(),this}_handleEvent(t,e,i){const{_active:s=[],options:n}=this,o=e,a=this._getActiveElements(t,s,i,o),r=pt(t),l=function(t,e,i,s){return i&&"mouseout"!==t.type?s?e:t:null}(t,this._lastEvent,i,r);i&&(this._lastEvent=null,tt(n.onHover,[t,a,this],this),r&&tt(n.onClick,[t,a,this],this));const h=!it(a,s);return(h||e)&&(this._active=a,this._updateHoverStyles(a,s,e)),this._lastEvent=l,h}_getActiveElements(t,e,i,s){if("mouseout"===t.type)return[];if(!i)return e;const n=this.options.hover;return this.getElementsAtEventForMode(t,n.mode,n,s)}}const gn=()=>et(fn.instances,(t=>t._plugins.invalidate())),pn=!0;function mn(){throw new Error("This method is not implemented: Check that a complete date adapter is provided.")}Object.defineProperties(fn,{defaults:{enumerable:pn,value:yt},instances:{enumerable:pn,value:cn},overrides:{enumerable:pn,value:mt},registry:{enumerable:pn,value:Hs},version:{enumerable:pn,value:"3.8.0"},getChart:{enumerable:pn,value:dn},register:{enumerable:pn,value:(...t)=>{Hs.add(...t),gn()}},unregister:{enumerable:pn,value:(...t)=>{Hs.remove(...t),gn()}}});class bn{constructor(t){this.options=t||{}}formats(){return mn()}parse(t,e){return mn()}format(t,e){return mn()}add(t,e,i){return mn()}diff(t,e,i){return mn()}startOf(t,e,i){return mn()}endOf(t,e){return mn()}}bn.override=function(t){Object.assign(bn.prototype,t)};var xn={_date:bn};function _n(t){const e=t.iScale,i=function(t,e){if(!t._cache.$bar){const i=t.getMatchingVisibleMetas(e);let s=[];for(let e=0,n=i.length;e<n;e++)s=s.concat(i[e].controller.getAllParsedValues(t));t._cache.$bar=Ct(s.sort(((t,e)=>t-e)))}return t._cache.$bar}(e,t.type);let s,n,o,a,r=e._length;const l=()=>{32767!==o&&-32768!==o&&(ut(a)&&(r=Math.min(r,Math.abs(o-a)||r)),a=o)};for(s=0,n=i.length;s<n;++s)o=e.getPixelForValue(i[s]),l();for(a=void 0,s=0,n=e.ticks.length;s<n;++s)o=e.getPixelForTick(s),l();return r}function yn(t,e,i,s){return X(t)?function(t,e,i,s){const n=i.parse(t[0],s),o=i.parse(t[1],s),a=Math.min(n,o),r=Math.max(n,o);let l=a,h=r;Math.abs(a)>Math.abs(r)&&(l=r,h=a),e[i.axis]=h,e._custom={barStart:l,barEnd:h,start:n,end:o,min:a,max:r}}(t,e,i,s):e[i.axis]=i.parse(t,s),e}function vn(t,e,i,s){const n=t.iScale,o=t.vScale,a=n.getLabels(),r=n===o,l=[];let h,c,d,u;for(h=i,c=i+s;h<c;++h)u=e[h],d={},d[n.axis]=r||n.parse(a[h],h),l.push(yn(u,d,o,h));return l}function wn(t){return t&&void 0!==t.barStart&&void 0!==t.barEnd}function Mn(t,e,i,s){let n=e.borderSkipped;const o={};if(!n)return void(t.borderSkipped=o);const{start:a,end:r,reverse:l,top:h,bottom:c}=function(t){let e,i,s,n,o;return t.horizontal?(e=t.base>t.x,i="left",s="right"):(e=t.base<t.y,i="bottom",s="top"),e?(n="end",o="start"):(n="start",o="end"),{start:i,end:s,reverse:e,top:n,bottom:o}}(t);"middle"===n&&i&&(t.enableBorderRadius=!0,(i._top||0)===s?n=h:(i._bottom||0)===s?n=c:(o[kn(c,a,r,l)]=!0,n=h)),o[kn(n,a,r,l)]=!0,t.borderSkipped=o}function kn(t,e,i,s){var n,o,a;return s?(a=i,t=Sn(t=(n=t)===(o=e)?a:n===a?o:n,i,e)):t=Sn(t,e,i),t}function Sn(t,e,i){return"start"===t?e:"end"===t?i:t}function Pn(t,{inflateAmount:e},i){t.inflateAmount="auto"===e?1===i?.33:0:e}class Dn extends Cs{parsePrimitiveData(t,e,i,s){return vn(t,e,i,s)}parseArrayData(t,e,i,s){return vn(t,e,i,s)}parseObjectData(t,e,i,s){const{iScale:n,vScale:o}=t,{xAxisKey:a="x",yAxisKey:r="y"}=this._parsing,l="x"===n.axis?a:r,h="x"===o.axis?a:r,c=[];let d,u,f,g;for(d=i,u=i+s;d<u;++d)g=e[d],f={},f[n.axis]=n.parse(ct(g,l),d),c.push(yn(ct(g,h),f,o,d));return c}updateRangeFromParsed(t,e,i,s){super.updateRangeFromParsed(t,e,i,s);const n=i._custom;n&&e===this._cachedMeta.vScale&&(t.min=Math.min(t.min,n.min),t.max=Math.max(t.max,n.max))}getMaxOverflow(){return 0}getLabelAndValue(t){const e=this._cachedMeta,{iScale:i,vScale:s}=e,n=this.getParsed(t),o=n._custom,a=wn(o)?"["+o.start+", "+o.end+"]":""+s.getLabelForValue(n[s.axis]);return{label:""+i.getLabelForValue(n[i.axis]),value:a}}initialize(){this.enableOptionSharing=!0,super.initialize();this._cachedMeta.stack=this.getDataset().stack}update(t){const e=this._cachedMeta;this.updateElements(e.data,0,e.data.length,t)}updateElements(t,e,i,s){const n="reset"===s,{index:o,_cachedMeta:{vScale:a}}=this,r=a.getBasePixel(),l=a.isHorizontal(),h=this._getRuler(),c=this.resolveDataElementOptions(e,s),d=this.getSharedOptions(c),u=this.includeOptions(s,d);this.updateSharedOptions(d,s,c);for(let c=e;c<e+i;c++){const e=this.getParsed(c),i=n||U(e[a.axis])?{base:r,head:r}:this._calculateBarValuePixels(c),f=this._calculateBarIndexPixels(c,h),g=(e._stacks||{})[a.axis],p={horizontal:l,base:i.base,enableBorderRadius:!g||wn(e._custom)||o===g._top||o===g._bottom,x:l?i.head:f.center,y:l?f.center:i.head,height:l?f.size:Math.abs(i.size),width:l?Math.abs(i.size):f.size};u&&(p.options=d||this.resolveDataElementOptions(c,t[c].active?"active":s));const m=p.options||t[c].options;Mn(p,m,g,o),Pn(p,m,h.ratio),this.updateElement(t[c],c,p,s)}}_getStacks(t,e){const i=this._cachedMeta.iScale,s=i.getMatchingVisibleMetas(this._type),n=i.options.stacked,o=s.length,a=[];let r,l;for(r=0;r<o;++r)if(l=s[r],l.controller.options.grouped){if(void 0!==e){const t=l.controller.getParsed(e)[l.controller._cachedMeta.vScale.axis];if(U(t)||isNaN(t))continue}if((!1===n||-1===a.indexOf(l.stack)||void 0===n&&void 0===l.stack)&&a.push(l.stack),l.index===t)break}return a.length||a.push(void 0),a}_getStackCount(t){return this._getStacks(void 0,t).length}_getStackIndex(t,e,i){const s=this._getStacks(t,i),n=void 0!==e?s.indexOf(e):-1;return-1===n?s.length-1:n}_getRuler(){const t=this.options,e=this._cachedMeta,i=e.iScale,s=[];let n,o;for(n=0,o=e.data.length;n<o;++n)s.push(i.getPixelForValue(this.getParsed(n)[i.axis],n));const a=t.barThickness;return{min:a||_n(e),pixels:s,start:i._startPixel,end:i._endPixel,stackCount:this._getStackCount(),scale:i,grouped:t.grouped,ratio:a?1:t.categoryPercentage*t.barPercentage}}_calculateBarValuePixels(t){const{_cachedMeta:{vScale:e,_stacked:i},options:{base:s,minBarLength:n}}=this,o=s||0,a=this.getParsed(t),r=a._custom,l=wn(r);let h,c,d=a[e.axis],u=0,f=i?this.applyStack(e,a,i):d;f!==d&&(u=f-d,f=d),l&&(d=r.barStart,f=r.barEnd-r.barStart,0!==d&&Bt(d)!==Bt(r.barEnd)&&(u=0),u+=d);const g=U(s)||l?u:s;let p=e.getPixelForValue(g);if(h=this.chart.getDataVisibility(t)?e.getPixelForValue(u+f):p,c=h-p,Math.abs(c)<n){c=function(t,e,i){return 0!==t?Bt(t):(e.isHorizontal()?1:-1)*(e.min>=i?1:-1)}(c,e,o)*n,d===o&&(p-=c/2);const t=e.getPixelForDecimal(0),i=e.getPixelForDecimal(1),s=Math.min(t,i),a=Math.max(t,i);p=Math.max(Math.min(p,a),s),h=p+c}if(p===e.getPixelForValue(o)){const t=Bt(c)*e.getLineWidthForValue(o)/2;p+=t,c-=t}return{size:c,base:p,head:h,center:h+c/2}}_calculateBarIndexPixels(t,e){const i=e.scale,s=this.options,n=s.skipNull,o=Z(s.maxBarThickness,1/0);let a,r;if(e.grouped){const i=n?this._getStackCount(t):e.stackCount,l="flex"===s.barThickness?function(t,e,i,s){const n=e.pixels,o=n[t];let a=t>0?n[t-1]:null,r=t<n.length-1?n[t+1]:null;const l=i.categoryPercentage;null===a&&(a=o-(null===r?e.end-e.start:r-o)),null===r&&(r=o+o-a);const h=o-(o-Math.min(a,r))/2*l;return{chunk:Math.abs(r-a)/2*l/s,ratio:i.barPercentage,start:h}}(t,e,s,i):function(t,e,i,s){const n=i.barThickness;let o,a;return U(n)?(o=e.min*i.categoryPercentage,a=i.barPercentage):(o=n*s,a=1),{chunk:o/s,ratio:a,start:e.pixels[t]-o/2}}(t,e,s,i),h=this._getStackIndex(this.index,this._cachedMeta.stack,n?t:void 0);a=l.start+l.chunk*h+l.chunk/2,r=Math.min(o,l.chunk*l.ratio)}else a=i.getPixelForValue(this.getParsed(t)[i.axis],t),r=Math.min(o,e.min*e.ratio);return{base:a-r/2,head:a+r/2,center:a,size:r}}draw(){const t=this._cachedMeta,e=t.vScale,i=t.data,s=i.length;let n=0;for(;n<s;++n)null!==this.getParsed(n)[e.axis]&&i[n].draw(this._ctx)}}Dn.id="bar",Dn.defaults={datasetElementType:!1,dataElementType:"bar",categoryPercentage:.8,barPercentage:.9,grouped:!0,animations:{numbers:{type:"number",properties:["x","y","base","width","height"]}}},Dn.overrides={scales:{_index_:{type:"category",offset:!0,grid:{offset:!0}},_value_:{type:"linear",beginAtZero:!0}}};class Cn extends Cs{initialize(){this.enableOptionSharing=!0,super.initialize()}parsePrimitiveData(t,e,i,s){const n=super.parsePrimitiveData(t,e,i,s);for(let t=0;t<n.length;t++)n[t]._custom=this.resolveDataElementOptions(t+i).radius;return n}parseArrayData(t,e,i,s){const n=super.parseArrayData(t,e,i,s);for(let t=0;t<n.length;t++){const s=e[i+t];n[t]._custom=Z(s[2],this.resolveDataElementOptions(t+i).radius)}return n}parseObjectData(t,e,i,s){const n=super.parseObjectData(t,e,i,s);for(let t=0;t<n.length;t++){const s=e[i+t];n[t]._custom=Z(s&&s.r&&+s.r,this.resolveDataElementOptions(t+i).radius)}return n}getMaxOverflow(){const t=this._cachedMeta.data;let e=0;for(let i=t.length-1;i>=0;--i)e=Math.max(e,t[i].size(this.resolveDataElementOptions(i))/2);return e>0&&e}getLabelAndValue(t){const e=this._cachedMeta,{xScale:i,yScale:s}=e,n=this.getParsed(t),o=i.getLabelForValue(n.x),a=s.getLabelForValue(n.y),r=n._custom;return{label:e.label,value:"("+o+", "+a+(r?", "+r:"")+")"}}update(t){const e=this._cachedMeta.data;this.updateElements(e,0,e.length,t)}updateElements(t,e,i,s){const n="reset"===s,{iScale:o,vScale:a}=this._cachedMeta,r=this.resolveDataElementOptions(e,s),l=this.getSharedOptions(r),h=this.includeOptions(s,l),c=o.axis,d=a.axis;for(let r=e;r<e+i;r++){const e=t[r],i=!n&&this.getParsed(r),l={},u=l[c]=n?o.getPixelForDecimal(.5):o.getPixelForValue(i[c]),f=l[d]=n?a.getBasePixel():a.getPixelForValue(i[d]);l.skip=isNaN(u)||isNaN(f),h&&(l.options=this.resolveDataElementOptions(r,e.active?"active":s),n&&(l.options.radius=0)),this.updateElement(e,r,l,s)}this.updateSharedOptions(l,s,r)}resolveDataElementOptions(t,e){const i=this.getParsed(t);let s=super.resolveDataElementOptions(t,e);s.$shared&&(s=Object.assign({},s,{$shared:!1}));const n=s.radius;return"active"!==e&&(s.radius=0),s.radius+=Z(i&&i._custom,n),s}}Cn.id="bubble",Cn.defaults={datasetElementType:!1,dataElementType:"point",animations:{numbers:{type:"number",properties:["x","y","borderWidth","radius"]}}},Cn.overrides={scales:{x:{type:"linear"},y:{type:"linear"}},plugins:{tooltip:{callbacks:{title:()=>""}}}};class On extends Cs{constructor(t,e){super(t,e),this.enableOptionSharing=!0,this.innerRadius=void 0,this.outerRadius=void 0,this.offsetX=void 0,this.offsetY=void 0}linkScales(){}parse(t,e){const i=this.getDataset().data,s=this._cachedMeta;if(!1===this._parsing)s._parsed=i;else{let n,o,a=t=>+i[t];if(q(i[t])){const{key:t="value"}=this._parsing;a=e=>+ct(i[e],t)}for(n=t,o=t+e;n<o;++n)s._parsed[n]=a(n)}}_getRotation(){return Yt(this.options.rotation-90)}_getCircumference(){return Yt(this.options.circumference)}_getRotationExtents(){let t=At,e=-At;for(let i=0;i<this.chart.data.datasets.length;++i)if(this.chart.isDatasetVisible(i)){const s=this.chart.getDatasetMeta(i).controller,n=s._getRotation(),o=s._getCircumference();t=Math.min(t,n),e=Math.max(e,n+o)}return{rotation:t,circumference:e-t}}update(t){const e=this.chart,{chartArea:i}=e,s=this._cachedMeta,n=s.data,o=this.getMaxBorderWidth()+this.getMaxOffset(n)+this.options.spacing,a=Math.max((Math.min(i.width,i.height)-o)/2,0),r=Math.min(J(this.options.cutout,a),1),l=this._getRingWeight(this.index),{circumference:h,rotation:c}=this._getRotationExtents(),{ratioX:d,ratioY:u,offsetX:f,offsetY:g}=function(t,e,i){let s=1,n=1,o=0,a=0;if(e<At){const r=t,l=r+e,h=Math.cos(r),c=Math.sin(r),d=Math.cos(l),u=Math.sin(l),f=(t,e,s)=>Jt(t,r,l,!0)?1:Math.max(e,e*i,s,s*i),g=(t,e,s)=>Jt(t,r,l,!0)?-1:Math.min(e,e*i,s,s*i),p=f(0,h,d),m=f(Et,c,u),b=g(Ot,h,d),x=g(Ot+Et,c,u);s=(p-b)/2,n=(m-x)/2,o=-(p+b)/2,a=-(m+x)/2}return{ratioX:s,ratioY:n,offsetX:o,offsetY:a}}(c,h,r),p=(i.width-o)/d,m=(i.height-o)/u,b=Math.max(Math.min(p,m)/2,0),x=Q(this.options.radius,b),_=(x-Math.max(x*r,0))/this._getVisibleDatasetWeightTotal();this.offsetX=f*x,this.offsetY=g*x,s.total=this.calculateTotal(),this.outerRadius=x-_*this._getRingWeightOffset(this.index),this.innerRadius=Math.max(this.outerRadius-_*l,0),this.updateElements(n,0,n.length,t)}_circumference(t,e){const i=this.options,s=this._cachedMeta,n=this._getCircumference();return e&&i.animation.animateRotate||!this.chart.getDataVisibility(t)||null===s._parsed[t]||s.data[t].hidden?0:this.calculateCircumference(s._parsed[t]*n/At)}updateElements(t,e,i,s){const n="reset"===s,o=this.chart,a=o.chartArea,r=o.options.animation,l=(a.left+a.right)/2,h=(a.top+a.bottom)/2,c=n&&r.animateScale,d=c?0:this.innerRadius,u=c?0:this.outerRadius,f=this.resolveDataElementOptions(e,s),g=this.getSharedOptions(f),p=this.includeOptions(s,g);let m,b=this._getRotation();for(m=0;m<e;++m)b+=this._circumference(m,n);for(m=e;m<e+i;++m){const e=this._circumference(m,n),i=t[m],o={x:l+this.offsetX,y:h+this.offsetY,startAngle:b,endAngle:b+e,circumference:e,outerRadius:u,innerRadius:d};p&&(o.options=g||this.resolveDataElementOptions(m,i.active?"active":s)),b+=e,this.updateElement(i,m,o,s)}this.updateSharedOptions(g,s,f)}calculateTotal(){const t=this._cachedMeta,e=t.data;let i,s=0;for(i=0;i<e.length;i++){const n=t._parsed[i];null===n||isNaN(n)||!this.chart.getDataVisibility(i)||e[i].hidden||(s+=Math.abs(n))}return s}calculateCircumference(t){const e=this._cachedMeta.total;return e>0&&!isNaN(t)?At*(Math.abs(t)/e):0}getLabelAndValue(t){const e=this._cachedMeta,i=this.chart,s=i.data.labels||[],n=ni(e._parsed[t],i.options.locale);return{label:s[t]||"",value:n}}getMaxBorderWidth(t){let e=0;const i=this.chart;let s,n,o,a,r;if(!t)for(s=0,n=i.data.datasets.length;s<n;++s)if(i.isDatasetVisible(s)){o=i.getDatasetMeta(s),t=o.data,a=o.controller;break}if(!t)return 0;for(s=0,n=t.length;s<n;++s)r=a.resolveDataElementOptions(s),"inner"!==r.borderAlign&&(e=Math.max(e,r.borderWidth||0,r.hoverBorderWidth||0));return e}getMaxOffset(t){let e=0;for(let i=0,s=t.length;i<s;++i){const t=this.resolveDataElementOptions(i);e=Math.max(e,t.offset||0,t.hoverOffset||0)}return e}_getRingWeightOffset(t){let e=0;for(let i=0;i<t;++i)this.chart.isDatasetVisible(i)&&(e+=this._getRingWeight(i));return e}_getRingWeight(t){return Math.max(Z(this.chart.data.datasets[t].weight,1),0)}_getVisibleDatasetWeightTotal(){return this._getRingWeightOffset(this.chart.data.datasets.length)||1}}On.id="doughnut",On.defaults={datasetElementType:!1,dataElementType:"arc",animation:{animateRotate:!0,animateScale:!1},animations:{numbers:{type:"number",properties:["circumference","endAngle","innerRadius","outerRadius","startAngle","x","y","offset","borderWidth","spacing"]}},cutout:"50%",rotation:0,circumference:360,radius:"100%",spacing:0,indexAxis:"r"},On.descriptors={_scriptable:t=>"spacing"!==t,_indexable:t=>"spacing"!==t},On.overrides={aspectRatio:1,plugins:{legend:{labels:{generateLabels(t){const e=t.data;if(e.labels.length&&e.datasets.length){const{labels:{pointStyle:i}}=t.legend.options;return e.labels.map(((e,s)=>{const n=t.getDatasetMeta(0).controller.getStyle(s);return{text:e,fillStyle:n.backgroundColor,strokeStyle:n.borderColor,lineWidth:n.borderWidth,pointStyle:i,hidden:!t.getDataVisibility(s),index:s}}))}return[]}},onClick(t,e,i){i.chart.toggleDataVisibility(e.index),i.chart.update()}},tooltip:{callbacks:{title:()=>"",label(t){let e=t.label;const i=": "+t.formattedValue;return X(e)?(e=e.slice(),e[0]+=i):e+=i,e}}}}};class An extends Cs{initialize(){this.enableOptionSharing=!0,this.supportsDecimation=!0,super.initialize()}update(t){const e=this._cachedMeta,{dataset:i,data:s=[],_dataset:n}=e,o=this.chart._animationsDisabled;let{start:a,count:r}=function(t,e,i){const s=e.length;let n=0,o=s;if(t._sorted){const{iScale:a,_parsed:r}=t,l=a.axis,{min:h,max:c,minDefined:d,maxDefined:u}=a.getUserBounds();d&&(n=Qt(Math.min(wt(r,a.axis,h).lo,i?s:wt(e,l,a.getPixelForValue(h)).lo),0,s-1)),o=u?Qt(Math.max(wt(r,a.axis,c).hi+1,i?0:wt(e,l,a.getPixelForValue(c)).hi+1),n,s)-n:s-n}return{start:n,count:o}}(e,s,o);this._drawStart=a,this._drawCount=r,function(t){const{xScale:e,yScale:i,_scaleRanges:s}=t,n={xmin:e.min,xmax:e.max,ymin:i.min,ymax:i.max};if(!s)return t._scaleRanges=n,!0;const o=s.xmin!==e.min||s.xmax!==e.max||s.ymin!==i.min||s.ymax!==i.max;return Object.assign(s,n),o}(e)&&(a=0,r=s.length),i._chart=this.chart,i._datasetIndex=this.index,i._decimated=!!n._decimated,i.points=s;const l=this.resolveDatasetElementOptions(t);this.options.showLine||(l.borderWidth=0),l.segment=this.options.segment,this.updateElement(i,void 0,{animated:!o,options:l},t),this.updateElements(s,a,r,t)}updateElements(t,e,i,s){const n="reset"===s,{iScale:o,vScale:a,_stacked:r,_dataset:l}=this._cachedMeta,h=this.resolveDataElementOptions(e,s),c=this.getSharedOptions(h),d=this.includeOptions(s,c),u=o.axis,f=a.axis,{spanGaps:g,segment:p}=this.options,m=Wt(g)?g:Number.POSITIVE_INFINITY,b=this.chart._animationsDisabled||n||"none"===s;let x=e>0&&this.getParsed(e-1);for(let h=e;h<e+i;++h){const e=t[h],i=this.getParsed(h),g=b?e:{},_=U(i[f]),y=g[u]=o.getPixelForValue(i[u],h),v=g[f]=n||_?a.getBasePixel():a.getPixelForValue(r?this.applyStack(a,i,r):i[f],h);g.skip=isNaN(y)||isNaN(v)||_,g.stop=h>0&&Math.abs(i[u]-x[u])>m,p&&(g.parsed=i,g.raw=l.data[h]),d&&(g.options=c||this.resolveDataElementOptions(h,e.active?"active":s)),b||this.updateElement(e,h,g,s),x=i}this.updateSharedOptions(c,s,h)}getMaxOverflow(){const t=this._cachedMeta,e=t.dataset,i=e.options&&e.options.borderWidth||0,s=t.data||[];if(!s.length)return i;const n=s[0].size(this.resolveDataElementOptions(0)),o=s[s.length-1].size(this.resolveDataElementOptions(s.length-1));return Math.max(i,n,o)/2}draw(){const t=this._cachedMeta;t.dataset.updateControlPoints(this.chart.chartArea,t.iScale.axis),super.draw()}}An.id="line",An.defaults={datasetElementType:"line",dataElementType:"point",showLine:!0,spanGaps:!1},An.overrides={scales:{_index_:{type:"category"},_value_:{type:"linear"}}};class Tn extends Cs{constructor(t,e){super(t,e),this.innerRadius=void 0,this.outerRadius=void 0}getLabelAndValue(t){const e=this._cachedMeta,i=this.chart,s=i.data.labels||[],n=ni(e._parsed[t].r,i.options.locale);return{label:s[t]||"",value:n}}parseObjectData(t,e,i,s){return He.bind(this)(t,e,i,s)}update(t){const e=this._cachedMeta.data;this._updateRadius(),this.updateElements(e,0,e.length,t)}getMinMax(){const t=this._cachedMeta,e={min:Number.POSITIVE_INFINITY,max:Number.NEGATIVE_INFINITY};return t.data.forEach(((t,i)=>{const s=this.getParsed(i).r;!isNaN(s)&&this.chart.getDataVisibility(i)&&(s<e.min&&(e.min=s),s>e.max&&(e.max=s))})),e}_updateRadius(){const t=this.chart,e=t.chartArea,i=t.options,s=Math.min(e.right-e.left,e.bottom-e.top),n=Math.max(s/2,0),o=(n-Math.max(i.cutoutPercentage?n/100*i.cutoutPercentage:1,0))/t.getVisibleDatasetCount();this.outerRadius=n-o*this.index,this.innerRadius=this.outerRadius-o}updateElements(t,e,i,s){const n="reset"===s,o=this.chart,a=o.options.animation,r=this._cachedMeta.rScale,l=r.xCenter,h=r.yCenter,c=r.getIndexAngle(0)-.5*Ot;let d,u=c;const f=360/this.countVisibleElements();for(d=0;d<e;++d)u+=this._computeAngle(d,s,f);for(d=e;d<e+i;d++){const e=t[d];let i=u,g=u+this._computeAngle(d,s,f),p=o.getDataVisibility(d)?r.getDistanceFromCenterForValue(this.getParsed(d).r):0;u=g,n&&(a.animateScale&&(p=0),a.animateRotate&&(i=g=c));const m={x:l,y:h,innerRadius:0,outerRadius:p,startAngle:i,endAngle:g,options:this.resolveDataElementOptions(d,e.active?"active":s)};this.updateElement(e,d,m,s)}}countVisibleElements(){const t=this._cachedMeta;let e=0;return t.data.forEach(((t,i)=>{!isNaN(this.getParsed(i).r)&&this.chart.getDataVisibility(i)&&e++})),e}_computeAngle(t,e,i){return this.chart.getDataVisibility(t)?Yt(this.resolveDataElementOptions(t,e).angle||i):0}}Tn.id="polarArea",Tn.defaults={dataElementType:"arc",animation:{animateRotate:!0,animateScale:!0},animations:{numbers:{type:"number",properties:["x","y","startAngle","endAngle","innerRadius","outerRadius"]}},indexAxis:"r",startAngle:0},Tn.overrides={aspectRatio:1,plugins:{legend:{labels:{generateLabels(t){const e=t.data;if(e.labels.length&&e.datasets.length){const{labels:{pointStyle:i}}=t.legend.options;return e.labels.map(((e,s)=>{const n=t.getDatasetMeta(0).controller.getStyle(s);return{text:e,fillStyle:n.backgroundColor,strokeStyle:n.borderColor,lineWidth:n.borderWidth,pointStyle:i,hidden:!t.getDataVisibility(s),index:s}}))}return[]}},onClick(t,e,i){i.chart.toggleDataVisibility(e.index),i.chart.update()}},tooltip:{callbacks:{title:()=>"",label:t=>t.chart.data.labels[t.dataIndex]+": "+t.formattedValue}}},scales:{r:{type:"radialLinear",angleLines:{display:!1},beginAtZero:!0,grid:{circular:!0},pointLabels:{display:!1},startAngle:0}}};class Ln extends On{}Ln.id="pie",Ln.defaults={cutout:0,rotation:0,circumference:360,radius:"100%"};class Rn extends Cs{getLabelAndValue(t){const e=this._cachedMeta.vScale,i=this.getParsed(t);return{label:e.getLabels()[t],value:""+e.getLabelForValue(i[e.axis])}}parseObjectData(t,e,i,s){return He.bind(this)(t,e,i,s)}update(t){const e=this._cachedMeta,i=e.dataset,s=e.data||[],n=e.iScale.getLabels();if(i.points=s,"resize"!==t){const e=this.resolveDatasetElementOptions(t);this.options.showLine||(e.borderWidth=0);const o={_loop:!0,_fullLoop:n.length===s.length,options:e};this.updateElement(i,void 0,o,t)}this.updateElements(s,0,s.length,t)}updateElements(t,e,i,s){const n=this._cachedMeta.rScale,o="reset"===s;for(let a=e;a<e+i;a++){const e=t[a],i=this.resolveDataElementOptions(a,e.active?"active":s),r=n.getPointPositionForValue(a,this.getParsed(a).r),l=o?n.xCenter:r.x,h=o?n.yCenter:r.y,c={x:l,y:h,angle:r.angle,skip:isNaN(l)||isNaN(h),options:i};this.updateElement(e,a,c,s)}}}Rn.id="radar",Rn.defaults={datasetElementType:"line",dataElementType:"point",indexAxis:"r",showLine:!0,elements:{line:{fill:"start"}}},Rn.overrides={aspectRatio:1,scales:{r:{type:"radialLinear"}}};class En extends An{}En.id="scatter",En.defaults={showLine:!1,fill:!1},En.overrides={interaction:{mode:"point"},plugins:{tooltip:{callbacks:{title:()=>"",label:t=>"("+t.label+", "+t.formattedValue+")"}}},scales:{x:{type:"linear"},y:{type:"linear"}}};var In=Object.freeze({__proto__:null,BarController:Dn,BubbleController:Cn,DoughnutController:On,LineController:An,PolarAreaController:Tn,PieController:Ln,RadarController:Rn,ScatterController:En});function zn(t,e,i){const{startAngle:s,pixelMargin:n,x:o,y:a,outerRadius:r,innerRadius:l}=e;let h=n/r;t.beginPath(),t.arc(o,a,r,s-h,i+h),l>n?(h=n/l,t.arc(o,a,l,i+h,s-h,!0)):t.arc(o,a,n,i+Et,s-Et),t.closePath(),t.clip()}function Fn(t,e,i,s){const n=li(t.options.borderRadius,["outerStart","outerEnd","innerStart","innerEnd"]);const o=(i-e)/2,a=Math.min(o,s*e/2),r=t=>{const e=(i-Math.min(o,t))*s/2;return Qt(t,0,Math.min(o,e))};return{outerStart:r(n.outerStart),outerEnd:r(n.outerEnd),innerStart:Qt(n.innerStart,0,a),innerEnd:Qt(n.innerEnd,0,a)}}function Bn(t,e,i,s){return{x:i+t*Math.cos(e),y:s+t*Math.sin(e)}}function Vn(t,e,i,s,n){const{x:o,y:a,startAngle:r,pixelMargin:l,innerRadius:h}=e,c=Math.max(e.outerRadius+s+i-l,0),d=h>0?h+s+i+l:0;let u=0;const f=n-r;if(s){const t=((h>0?h-s:0)+(c>0?c-s:0))/2;u=(f-(0!==t?f*t/(t+s):f))/2}const g=(f-Math.max(.001,f*c-i/Ot)/c)/2,p=r+g+u,m=n-g-u,{outerStart:b,outerEnd:x,innerStart:_,innerEnd:y}=Fn(e,d,c,m-p),v=c-b,w=c-x,M=p+b/v,k=m-x/w,S=d+_,P=d+y,D=p+_/S,C=m-y/P;if(t.beginPath(),t.arc(o,a,c,M,k),x>0){const e=Bn(w,k,o,a);t.arc(e.x,e.y,x,k,m+Et)}const O=Bn(P,m,o,a);if(t.lineTo(O.x,O.y),y>0){const e=Bn(P,C,o,a);t.arc(e.x,e.y,y,m+Et,C+Math.PI)}if(t.arc(o,a,d,m-y/d,p+_/d,!0),_>0){const e=Bn(S,D,o,a);t.arc(e.x,e.y,_,D+Math.PI,p-Et)}const A=Bn(v,p,o,a);if(t.lineTo(A.x,A.y),b>0){const e=Bn(v,M,o,a);t.arc(e.x,e.y,b,p-Et,M)}t.closePath()}function Nn(t,e,i,s,n){const{options:o}=e,{borderWidth:a,borderJoinStyle:r}=o,l="inner"===o.borderAlign;a&&(l?(t.lineWidth=2*a,t.lineJoin=r||"round"):(t.lineWidth=a,t.lineJoin=r||"bevel"),e.fullCircles&&function(t,e,i){const{x:s,y:n,startAngle:o,pixelMargin:a,fullCircles:r}=e,l=Math.max(e.outerRadius-a,0),h=e.innerRadius+a;let c;for(i&&zn(t,e,o+At),t.beginPath(),t.arc(s,n,h,o+At,o,!0),c=0;c<r;++c)t.stroke();for(t.beginPath(),t.arc(s,n,l,o,o+At),c=0;c<r;++c)t.stroke()}(t,e,l),l&&zn(t,e,n),Vn(t,e,i,s,n),t.stroke())}class Wn extends Os{constructor(t){super(),this.options=void 0,this.circumference=void 0,this.startAngle=void 0,this.endAngle=void 0,this.innerRadius=void 0,this.outerRadius=void 0,this.pixelMargin=0,this.fullCircles=0,t&&Object.assign(this,t)}inRange(t,e,i){const s=this.getProps(["x","y"],i),{angle:n,distance:o}=qt(s,{x:t,y:e}),{startAngle:a,endAngle:r,innerRadius:l,outerRadius:h,circumference:c}=this.getProps(["startAngle","endAngle","innerRadius","outerRadius","circumference"],i),d=this.options.spacing/2,u=Z(c,r-a)>=At||Jt(n,a,r),f=ee(o,l+d,h+d);return u&&f}getCenterPoint(t){const{x:e,y:i,startAngle:s,endAngle:n,innerRadius:o,outerRadius:a}=this.getProps(["x","y","startAngle","endAngle","innerRadius","outerRadius","circumference"],t),{offset:r,spacing:l}=this.options,h=(s+n)/2,c=(o+a+l+r)/2;return{x:e+Math.cos(h)*c,y:i+Math.sin(h)*c}}tooltipPosition(t){return this.getCenterPoint(t)}draw(t){const{options:e,circumference:i}=this,s=(e.offset||0)/2,n=(e.spacing||0)/2;if(this.pixelMargin="inner"===e.borderAlign?.33:0,this.fullCircles=i>At?Math.floor(i/At):0,0===i||this.innerRadius<0||this.outerRadius<0)return;t.save();let o=0;if(s){o=s/2;const e=(this.startAngle+this.endAngle)/2;t.translate(Math.cos(e)*o,Math.sin(e)*o),this.circumference>=Ot&&(o=s)}t.fillStyle=e.backgroundColor,t.strokeStyle=e.borderColor;const a=function(t,e,i,s){const{fullCircles:n,startAngle:o,circumference:a}=e;let r=e.endAngle;if(n){Vn(t,e,i,s,o+At);for(let e=0;e<n;++e)t.fill();isNaN(a)||(r=o+a%At,a%At==0&&(r+=At))}return Vn(t,e,i,s,r),t.fill(),r}(t,this,o,n);Nn(t,this,o,n,a),t.restore()}}function Hn(t,e,i=e){t.lineCap=Z(i.borderCapStyle,e.borderCapStyle),t.setLineDash(Z(i.borderDash,e.borderDash)),t.lineDashOffset=Z(i.borderDashOffset,e.borderDashOffset),t.lineJoin=Z(i.borderJoinStyle,e.borderJoinStyle),t.lineWidth=Z(i.borderWidth,e.borderWidth),t.strokeStyle=Z(i.borderColor,e.borderColor)}function jn(t,e,i){t.lineTo(i.x,i.y)}function $n(t,e,i={}){const s=t.length,{start:n=0,end:o=s-1}=i,{start:a,end:r}=e,l=Math.max(n,a),h=Math.min(o,r),c=n<a&&o<a||n>r&&o>r;return{count:s,start:l,loop:e.loop,ilen:h<l&&!c?s+h-l:h-l}}function Yn(t,e,i,s){const{points:n,options:o}=e,{count:a,start:r,loop:l,ilen:h}=$n(n,i,s),c=function(t){return t.stepped?ke:t.tension||"monotone"===t.cubicInterpolationMode?Se:jn}(o);let d,u,f,{move:g=!0,reverse:p}=s||{};for(d=0;d<=h;++d)u=n[(r+(p?h-d:d))%a],u.skip||(g?(t.moveTo(u.x,u.y),g=!1):c(t,f,u,p,o.stepped),f=u);return l&&(u=n[(r+(p?h:0))%a],c(t,f,u,p,o.stepped)),!!l}function Un(t,e,i,s){const n=e.points,{count:o,start:a,ilen:r}=$n(n,i,s),{move:l=!0,reverse:h}=s||{};let c,d,u,f,g,p,m=0,b=0;const x=t=>(a+(h?r-t:t))%o,_=()=>{f!==g&&(t.lineTo(m,g),t.lineTo(m,f),t.lineTo(m,p))};for(l&&(d=n[x(0)],t.moveTo(d.x,d.y)),c=0;c<=r;++c){if(d=n[x(c)],d.skip)continue;const e=d.x,i=d.y,s=0|e;s===u?(i<f?f=i:i>g&&(g=i),m=(b*m+e)/++b):(_(),t.lineTo(e,i),u=s,b=0,f=g=i),p=i}_()}function Xn(t){const e=t.options,i=e.borderDash&&e.borderDash.length;return!(t._decimated||t._loop||e.tension||"monotone"===e.cubicInterpolationMode||e.stepped||i)?Un:Yn}Wn.id="arc",Wn.defaults={borderAlign:"center",borderColor:"#fff",borderJoinStyle:void 0,borderRadius:0,borderWidth:2,offset:0,spacing:0,angle:void 0},Wn.defaultRoutes={backgroundColor:"backgroundColor"};const qn="function"==typeof Path2D;function Kn(t,e,i,s){qn&&!e.options.segment?function(t,e,i,s){let n=e._path;n||(n=e._path=new Path2D,e.path(n,i,s)&&n.closePath()),Hn(t,e.options),t.stroke(n)}(t,e,i,s):function(t,e,i,s){const{segments:n,options:o}=e,a=Xn(e);for(const r of n)Hn(t,o,r.style),t.beginPath(),a(t,e,r,{start:i,end:i+s-1})&&t.closePath(),t.stroke()}(t,e,i,s)}class Gn extends Os{constructor(t){super(),this.animated=!0,this.options=void 0,this._chart=void 0,this._loop=void 0,this._fullLoop=void 0,this._path=void 0,this._points=void 0,this._segments=void 0,this._decimated=!1,this._pointsUpdated=!1,this._datasetIndex=void 0,t&&Object.assign(this,t)}updateControlPoints(t,e){const i=this.options;if((i.tension||"monotone"===i.cubicInterpolationMode)&&!i.stepped&&!this._pointsUpdated){const s=i.spanGaps?this._loop:this._fullLoop;Ke(this._points,i,t,s,e),this._pointsUpdated=!0}}set points(t){this._points=t,delete this._segments,delete this._path,this._pointsUpdated=!1}get points(){return this._points}get segments(){return this._segments||(this._segments=Mi(this,this.options.segment))}first(){const t=this.segments,e=this.points;return t.length&&e[t[0].start]}last(){const t=this.segments,e=this.points,i=t.length;return i&&e[t[i-1].end]}interpolate(t,e){const i=this.options,s=t[e],n=this.points,o=wi(this,{property:e,start:s,end:s});if(!o.length)return;const a=[],r=function(t){return t.stepped?ei:t.tension||"monotone"===t.cubicInterpolationMode?ii:ti}(i);let l,h;for(l=0,h=o.length;l<h;++l){const{start:h,end:c}=o[l],d=n[h],u=n[c];if(d===u){a.push(d);continue}const f=r(d,u,Math.abs((s-d[e])/(u[e]-d[e])),i.stepped);f[e]=t[e],a.push(f)}return 1===a.length?a[0]:a}pathSegment(t,e,i){return Xn(this)(t,this,e,i)}path(t,e,i){const s=this.segments,n=Xn(this);let o=this._loop;e=e||0,i=i||this.points.length-e;for(const a of s)o&=n(t,this,a,{start:e,end:e+i-1});return!!o}draw(t,e,i,s){const n=this.options||{};(this.points||[]).length&&n.borderWidth&&(t.save(),Kn(t,this,i,s),t.restore()),this.animated&&(this._pointsUpdated=!1,this._path=void 0)}}function Zn(t,e,i,s){const n=t.options,{[i]:o}=t.getProps([i],s);return Math.abs(e-o)<n.radius+n.hitRadius}Gn.id="line",Gn.defaults={borderCapStyle:"butt",borderDash:[],borderDashOffset:0,borderJoinStyle:"miter",borderWidth:3,capBezierPoints:!0,cubicInterpolationMode:"default",fill:!1,spanGaps:!1,stepped:!1,tension:0},Gn.defaultRoutes={backgroundColor:"backgroundColor",borderColor:"borderColor"},Gn.descriptors={_scriptable:!0,_indexable:t=>"borderDash"!==t&&"fill"!==t};class Jn extends Os{constructor(t){super(),this.options=void 0,this.parsed=void 0,this.skip=void 0,this.stop=void 0,t&&Object.assign(this,t)}inRange(t,e,i){const s=this.options,{x:n,y:o}=this.getProps(["x","y"],i);return Math.pow(t-n,2)+Math.pow(e-o,2)<Math.pow(s.hitRadius+s.radius,2)}inXRange(t,e){return Zn(this,t,"x",e)}inYRange(t,e){return Zn(this,t,"y",e)}getCenterPoint(t){const{x:e,y:i}=this.getProps(["x","y"],t);return{x:e,y:i}}size(t){let e=(t=t||this.options||{}).radius||0;e=Math.max(e,e&&t.hoverRadius||0);return 2*(e+(e&&t.borderWidth||0))}draw(t,e){const i=this.options;this.skip||i.radius<.1||!ve(this,e,this.size(i)/2)||(t.strokeStyle=i.borderColor,t.lineWidth=i.borderWidth,t.fillStyle=i.backgroundColor,ye(t,i,this.x,this.y))}getRange(){const t=this.options||{};return t.radius+t.hitRadius}}function Qn(t,e){const{x:i,y:s,base:n,width:o,height:a}=t.getProps(["x","y","base","width","height"],e);let r,l,h,c,d;return t.horizontal?(d=a/2,r=Math.min(i,n),l=Math.max(i,n),h=s-d,c=s+d):(d=o/2,r=i-d,l=i+d,h=Math.min(s,n),c=Math.max(s,n)),{left:r,top:h,right:l,bottom:c}}function to(t,e,i,s){return t?0:Qt(e,i,s)}function eo(t){const e=Qn(t),i=e.right-e.left,s=e.bottom-e.top,n=function(t,e,i){const s=t.options.borderWidth,n=t.borderSkipped,o=hi(s);return{t:to(n.top,o.top,0,i),r:to(n.right,o.right,0,e),b:to(n.bottom,o.bottom,0,i),l:to(n.left,o.left,0,e)}}(t,i/2,s/2),o=function(t,e,i){const{enableBorderRadius:s}=t.getProps(["enableBorderRadius"]),n=t.options.borderRadius,o=ci(n),a=Math.min(e,i),r=t.borderSkipped,l=s||q(n);return{topLeft:to(!l||r.top||r.left,o.topLeft,0,a),topRight:to(!l||r.top||r.right,o.topRight,0,a),bottomLeft:to(!l||r.bottom||r.left,o.bottomLeft,0,a),bottomRight:to(!l||r.bottom||r.right,o.bottomRight,0,a)}}(t,i/2,s/2);return{outer:{x:e.left,y:e.top,w:i,h:s,radius:o},inner:{x:e.left+n.l,y:e.top+n.t,w:i-n.l-n.r,h:s-n.t-n.b,radius:{topLeft:Math.max(0,o.topLeft-Math.max(n.t,n.l)),topRight:Math.max(0,o.topRight-Math.max(n.t,n.r)),bottomLeft:Math.max(0,o.bottomLeft-Math.max(n.b,n.l)),bottomRight:Math.max(0,o.bottomRight-Math.max(n.b,n.r))}}}}function io(t,e,i,s){const n=null===e,o=null===i,a=t&&!(n&&o)&&Qn(t,s);return a&&(n||ee(e,a.left,a.right))&&(o||ee(i,a.top,a.bottom))}function so(t,e){t.rect(e.x,e.y,e.w,e.h)}function no(t,e,i={}){const s=t.x!==i.x?-e:0,n=t.y!==i.y?-e:0,o=(t.x+t.w!==i.x+i.w?e:0)-s,a=(t.y+t.h!==i.y+i.h?e:0)-n;return{x:t.x+s,y:t.y+n,w:t.w+o,h:t.h+a,radius:t.radius}}Jn.id="point",Jn.defaults={borderWidth:1,hitRadius:1,hoverBorderWidth:1,hoverRadius:4,pointStyle:"circle",radius:3,rotation:0},Jn.defaultRoutes={backgroundColor:"backgroundColor",borderColor:"borderColor"};class oo extends Os{constructor(t){super(),this.options=void 0,this.horizontal=void 0,this.base=void 0,this.width=void 0,this.height=void 0,this.inflateAmount=void 0,t&&Object.assign(this,t)}draw(t){const{inflateAmount:e,options:{borderColor:i,backgroundColor:s}}=this,{inner:n,outer:o}=eo(this),a=(r=o.radius).topLeft||r.topRight||r.bottomLeft||r.bottomRight?Ce:so;var r;t.save(),o.w===n.w&&o.h===n.h||(t.beginPath(),a(t,no(o,e,n)),t.clip(),a(t,no(n,-e,o)),t.fillStyle=i,t.fill("evenodd")),t.beginPath(),a(t,no(n,e)),t.fillStyle=s,t.fill(),t.restore()}inRange(t,e,i){return io(this,t,e,i)}inXRange(t,e){return io(this,t,null,e)}inYRange(t,e){return io(this,null,t,e)}getCenterPoint(t){const{x:e,y:i,base:s,horizontal:n}=this.getProps(["x","y","base","horizontal"],t);return{x:n?(e+s)/2:e,y:n?i:(i+s)/2}}getRange(t){return"x"===t?this.width/2:this.height/2}}oo.id="bar",oo.defaults={borderSkipped:"start",borderWidth:0,borderRadius:0,inflateAmount:"auto",pointStyle:void 0},oo.defaultRoutes={backgroundColor:"backgroundColor",borderColor:"borderColor"};var ao=Object.freeze({__proto__:null,ArcElement:Wn,LineElement:Gn,PointElement:Jn,BarElement:oo});function ro(t){if(t._decimated){const e=t._data;delete t._decimated,delete t._data,Object.defineProperty(t,"data",{value:e})}}function lo(t){t.data.datasets.forEach((t=>{ro(t)}))}var ho={id:"decimation",defaults:{algorithm:"min-max",enabled:!1},beforeElementsUpdate:(t,e,i)=>{if(!i.enabled)return void lo(t);const s=t.width;t.data.datasets.forEach(((e,n)=>{const{_data:o,indexAxis:a}=e,r=t.getDatasetMeta(n),l=o||e.data;if("y"===fi([a,t.options.indexAxis]))return;if(!r.controller.supportsDecimation)return;const h=t.scales[r.xAxisID];if("linear"!==h.type&&"time"!==h.type)return;if(t.options.parsing)return;let{start:c,count:d}=function(t,e){const i=e.length;let s,n=0;const{iScale:o}=t,{min:a,max:r,minDefined:l,maxDefined:h}=o.getUserBounds();return l&&(n=Qt(wt(e,o.axis,a).lo,0,i-1)),s=h?Qt(wt(e,o.axis,r).hi+1,n,i)-n:i-n,{start:n,count:s}}(r,l);if(d<=(i.threshold||4*s))return void ro(e);let u;switch(U(o)&&(e._data=l,delete e.data,Object.defineProperty(e,"data",{configurable:!0,enumerable:!0,get:function(){return this._decimated},set:function(t){this._data=t}})),i.algorithm){case"lttb":u=function(t,e,i,s,n){const o=n.samples||s;if(o>=i)return t.slice(e,e+i);const a=[],r=(i-2)/(o-2);let l=0;const h=e+i-1;let c,d,u,f,g,p=e;for(a[l++]=t[p],c=0;c<o-2;c++){let s,n=0,o=0;const h=Math.floor((c+1)*r)+1+e,m=Math.min(Math.floor((c+2)*r)+1,i)+e,b=m-h;for(s=h;s<m;s++)n+=t[s].x,o+=t[s].y;n/=b,o/=b;const x=Math.floor(c*r)+1+e,_=Math.min(Math.floor((c+1)*r)+1,i)+e,{x:y,y:v}=t[p];for(u=f=-1,s=x;s<_;s++)f=.5*Math.abs((y-n)*(t[s].y-v)-(y-t[s].x)*(o-v)),f>u&&(u=f,d=t[s],g=s);a[l++]=d,p=g}return a[l++]=t[h],a}(l,c,d,s,i);break;case"min-max":u=function(t,e,i,s){let n,o,a,r,l,h,c,d,u,f,g=0,p=0;const m=[],b=e+i-1,x=t[e].x,_=t[b].x-x;for(n=e;n<e+i;++n){o=t[n],a=(o.x-x)/_*s,r=o.y;const e=0|a;if(e===l)r<u?(u=r,h=n):r>f&&(f=r,c=n),g=(p*g+o.x)/++p;else{const i=n-1;if(!U(h)&&!U(c)){const e=Math.min(h,c),s=Math.max(h,c);e!==d&&e!==i&&m.push({...t[e],x:g}),s!==d&&s!==i&&m.push({...t[s],x:g})}n>0&&i!==d&&m.push(t[i]),m.push(o),l=e,p=0,u=f=r,h=c=d=n}}return m}(l,c,d,s);break;default:throw new Error(`Unsupported decimation algorithm '${i.algorithm}'`)}e._decimated=u}))},destroy(t){lo(t)}};function co(t,e,i,s){if(s)return;let n=e[t],o=i[t];return"angle"===t&&(n=Zt(n),o=Zt(o)),{property:t,start:n,end:o}}function uo(t,e,i){for(;e>t;e--){const t=i[e];if(!isNaN(t.x)&&!isNaN(t.y))break}return e}function fo(t,e,i,s){return t&&e?s(t[i],e[i]):t?t[i]:e?e[i]:0}function go(t,e){let i=[],s=!1;return X(t)?(s=!0,i=t):i=function(t,e){const{x:i=null,y:s=null}=t||{},n=e.points,o=[];return e.segments.forEach((({start:t,end:e})=>{e=uo(t,e,n);const a=n[t],r=n[e];null!==s?(o.push({x:a.x,y:s}),o.push({x:r.x,y:s})):null!==i&&(o.push({x:i,y:a.y}),o.push({x:i,y:r.y}))})),o}(t,e),i.length?new Gn({points:i,options:{tension:0},_loop:s,_fullLoop:s}):null}function po(t,e,i){let s=t[e].fill;const n=[e];let o;if(!i)return s;for(;!1!==s&&-1===n.indexOf(s);){if(!K(s))return s;if(o=t[s],!o)return!1;if(o.visible)return s;n.push(s),s=o.fill}return!1}function mo(t,e,i){const s=function(t){const e=t.options,i=e.fill;let s=Z(i&&i.target,i);void 0===s&&(s=!!e.backgroundColor);if(!1===s||null===s)return!1;if(!0===s)return"origin";return s}(t);if(q(s))return!isNaN(s.value)&&s;let n=parseFloat(s);return K(n)&&Math.floor(n)===n?function(t,e,i,s){"-"!==t&&"+"!==t||(i=e+i);if(i===e||i<0||i>=s)return!1;return i}(s[0],e,n,i):["origin","start","end","stack","shape"].indexOf(s)>=0&&s}function bo(t,e,i){const s=[];for(let n=0;n<i.length;n++){const o=i[n],{first:a,last:r,point:l}=xo(o,e,"x");if(!(!l||a&&r))if(a)s.unshift(l);else if(t.push(l),!r)break}t.push(...s)}function xo(t,e,i){const s=t.interpolate(e,i);if(!s)return{};const n=s[i],o=t.segments,a=t.points;let r=!1,l=!1;for(let t=0;t<o.length;t++){const e=o[t],s=a[e.start][i],h=a[e.end][i];if(ee(n,s,h)){r=n===s,l=n===h;break}}return{first:r,last:l,point:s}}class _o{constructor(t){this.x=t.x,this.y=t.y,this.radius=t.radius}pathSegment(t,e,i){const{x:s,y:n,radius:o}=this;return e=e||{start:0,end:At},t.arc(s,n,o,e.end,e.start,!0),!i.bounds}interpolate(t){const{x:e,y:i,radius:s}=this,n=t.angle;return{x:e+Math.cos(n)*s,y:i+Math.sin(n)*s,angle:n}}}function yo(t){const{chart:e,fill:i,line:s}=t;if(K(i))return function(t,e){const i=t.getDatasetMeta(e);return i&&t.isDatasetVisible(e)?i.dataset:null}(e,i);if("stack"===i)return function(t){const{scale:e,index:i,line:s}=t,n=[],o=s.segments,a=s.points,r=function(t,e){const i=[],s=t.getMatchingVisibleMetas("line");for(let t=0;t<s.length;t++){const n=s[t];if(n.index===e)break;n.hidden||i.unshift(n.dataset)}return i}(e,i);r.push(go({x:null,y:e.bottom},s));for(let t=0;t<o.length;t++){const e=o[t];for(let t=e.start;t<=e.end;t++)bo(n,a[t],r)}return new Gn({points:n,options:{}})}(t);if("shape"===i)return!0;const n=function(t){if((t.scale||{}).getPointPositionForValue)return function(t){const{scale:e,fill:i}=t,s=e.options,n=e.getLabels().length,o=s.reverse?e.max:e.min,a=function(t,e,i){let s;return s="start"===t?i:"end"===t?e.options.reverse?e.min:e.max:q(t)?t.value:e.getBaseValue(),s}(i,e,o),r=[];if(s.grid.circular){const t=e.getPointPositionForValue(0,o);return new _o({x:t.x,y:t.y,radius:e.getDistanceFromCenterForValue(a)})}for(let t=0;t<n;++t)r.push(e.getPointPositionForValue(t,a));return r}(t);return function(t){const{scale:e={},fill:i}=t,s=function(t,e){let i=null;return"start"===t?i=e.bottom:"end"===t?i=e.top:q(t)?i=e.getPixelForValue(t.value):e.getBasePixel&&(i=e.getBasePixel()),i}(i,e);if(K(s)){const t=e.isHorizontal();return{x:t?s:null,y:t?null:s}}return null}(t)}(t);return n instanceof _o?n:go(n,s)}function vo(t,e,i){const s=yo(e),{line:n,scale:o,axis:a}=e,r=n.options,l=r.fill,h=r.backgroundColor,{above:c=h,below:d=h}=l||{};s&&n.points.length&&(we(t,i),function(t,e){const{line:i,target:s,above:n,below:o,area:a,scale:r}=e,l=i._loop?"angle":e.axis;t.save(),"x"===l&&o!==n&&(wo(t,s,a.top),Mo(t,{line:i,target:s,color:n,scale:r,property:l}),t.restore(),t.save(),wo(t,s,a.bottom));Mo(t,{line:i,target:s,color:o,scale:r,property:l}),t.restore()}(t,{line:n,target:s,above:c,below:d,area:i,scale:o,axis:a}),Me(t))}function wo(t,e,i){const{segments:s,points:n}=e;let o=!0,a=!1;t.beginPath();for(const r of s){const{start:s,end:l}=r,h=n[s],c=n[uo(s,l,n)];o?(t.moveTo(h.x,h.y),o=!1):(t.lineTo(h.x,i),t.lineTo(h.x,h.y)),a=!!e.pathSegment(t,r,{move:a}),a?t.closePath():t.lineTo(c.x,i)}t.lineTo(e.first().x,i),t.closePath(),t.clip()}function Mo(t,e){const{line:i,target:s,property:n,color:o,scale:a}=e,r=function(t,e,i){const s=t.segments,n=t.points,o=e.points,a=[];for(const t of s){let{start:s,end:r}=t;r=uo(s,r,n);const l=co(i,n[s],n[r],t.loop);if(!e.segments){a.push({source:t,target:l,start:n[s],end:n[r]});continue}const h=wi(e,l);for(const e of h){const s=co(i,o[e.start],o[e.end],e.loop),r=vi(t,n,s);for(const t of r)a.push({source:t,target:e,start:{[i]:fo(l,s,"start",Math.max)},end:{[i]:fo(l,s,"end",Math.min)}})}}return a}(i,s,n);for(const{source:e,target:l,start:h,end:c}of r){const{style:{backgroundColor:r=o}={}}=e,d=!0!==s;t.save(),t.fillStyle=r,ko(t,a,d&&co(n,h,c)),t.beginPath();const u=!!i.pathSegment(t,e);let f;if(d){u?t.closePath():So(t,s,c,n);const e=!!s.pathSegment(t,l,{move:u,reverse:!0});f=u&&e,f||So(t,s,h,n)}t.closePath(),t.fill(f?"evenodd":"nonzero"),t.restore()}}function ko(t,e,i){const{top:s,bottom:n}=e.chart.chartArea,{property:o,start:a,end:r}=i||{};"x"===o&&(t.beginPath(),t.rect(a,s,r-a,n-s),t.clip())}function So(t,e,i,s){const n=e.interpolate(i,s);n&&t.lineTo(n.x,n.y)}var Po={id:"filler",afterDatasetsUpdate(t,e,i){const s=(t.data.datasets||[]).length,n=[];let o,a,r,l;for(a=0;a<s;++a)o=t.getDatasetMeta(a),r=o.dataset,l=null,r&&r.options&&r instanceof Gn&&(l={visible:t.isDatasetVisible(a),index:a,fill:mo(r,a,s),chart:t,axis:o.controller.options.indexAxis,scale:o.vScale,line:r}),o.$filler=l,n.push(l);for(a=0;a<s;++a)l=n[a],l&&!1!==l.fill&&(l.fill=po(n,a,i.propagate))},beforeDraw(t,e,i){const s="beforeDraw"===i.drawTime,n=t.getSortedVisibleDatasetMetas(),o=t.chartArea;for(let e=n.length-1;e>=0;--e){const i=n[e].$filler;i&&(i.line.updateControlPoints(o,i.axis),s&&vo(t.ctx,i,o))}},beforeDatasetsDraw(t,e,i){if("beforeDatasetsDraw"!==i.drawTime)return;const s=t.getSortedVisibleDatasetMetas();for(let e=s.length-1;e>=0;--e){const i=s[e].$filler;i&&vo(t.ctx,i,t.chartArea)}},beforeDatasetDraw(t,e,i){const s=e.meta.$filler;s&&!1!==s.fill&&"beforeDatasetDraw"===i.drawTime&&vo(t.ctx,s,t.chartArea)},defaults:{propagate:!0,drawTime:"beforeDatasetDraw"}};const Do=(t,e)=>{let{boxHeight:i=e,boxWidth:s=e}=t;return t.usePointStyle&&(i=Math.min(i,e),s=Math.min(s,e)),{boxWidth:s,boxHeight:i,itemHeight:Math.max(e,i)}};class Co extends Os{constructor(t){super(),this._added=!1,this.legendHitBoxes=[],this._hoveredItem=null,this.doughnutMode=!1,this.chart=t.chart,this.options=t.options,this.ctx=t.ctx,this.legendItems=void 0,this.columnSizes=void 0,this.lineWidths=void 0,this.maxHeight=void 0,this.maxWidth=void 0,this.top=void 0,this.bottom=void 0,this.left=void 0,this.right=void 0,this.height=void 0,this.width=void 0,this._margins=void 0,this.position=void 0,this.weight=void 0,this.fullSize=void 0}update(t,e,i){this.maxWidth=t,this.maxHeight=e,this._margins=i,this.setDimensions(),this.buildLabels(),this.fit()}setDimensions(){this.isHorizontal()?(this.width=this.maxWidth,this.left=this._margins.left,this.right=this.width):(this.height=this.maxHeight,this.top=this._margins.top,this.bottom=this.height)}buildLabels(){const t=this.options.labels||{};let e=tt(t.generateLabels,[this.chart],this)||[];t.filter&&(e=e.filter((e=>t.filter(e,this.chart.data)))),t.sort&&(e=e.sort(((e,i)=>t.sort(e,i,this.chart.data)))),this.options.reverse&&e.reverse(),this.legendItems=e}fit(){const{options:t,ctx:e}=this;if(!t.display)return void(this.width=this.height=0);const i=t.labels,s=ui(i.font),n=s.size,o=this._computeTitleHeight(),{boxWidth:a,itemHeight:r}=Do(i,n);let l,h;e.font=s.string,this.isHorizontal()?(l=this.maxWidth,h=this._fitRows(o,n,a,r)+10):(h=this.maxHeight,l=this._fitCols(o,n,a,r)+10),this.width=Math.min(l,t.maxWidth||this.maxWidth),this.height=Math.min(h,t.maxHeight||this.maxHeight)}_fitRows(t,e,i,s){const{ctx:n,maxWidth:o,options:{labels:{padding:a}}}=this,r=this.legendHitBoxes=[],l=this.lineWidths=[0],h=s+a;let c=t;n.textAlign="left",n.textBaseline="middle";let d=-1,u=-h;return this.legendItems.forEach(((t,f)=>{const g=i+e/2+n.measureText(t.text).width;(0===f||l[l.length-1]+g+2*a>o)&&(c+=h,l[l.length-(f>0?0:1)]=0,u+=h,d++),r[f]={left:0,top:u,row:d,width:g,height:s},l[l.length-1]+=g+a})),c}_fitCols(t,e,i,s){const{ctx:n,maxHeight:o,options:{labels:{padding:a}}}=this,r=this.legendHitBoxes=[],l=this.columnSizes=[],h=o-t;let c=a,d=0,u=0,f=0,g=0;return this.legendItems.forEach(((t,o)=>{const p=i+e/2+n.measureText(t.text).width;o>0&&u+s+2*a>h&&(c+=d+a,l.push({width:d,height:u}),f+=d+a,g++,d=u=0),r[o]={left:f,top:u,col:g,width:p,height:s},d=Math.max(d,p),u+=s+a})),c+=d,l.push({width:d,height:u}),c}adjustHitBoxes(){if(!this.options.display)return;const t=this._computeTitleHeight(),{legendHitBoxes:e,options:{align:i,labels:{padding:s},rtl:o}}=this,a=mi(o,this.left,this.width);if(this.isHorizontal()){let o=0,r=n(i,this.left+s,this.right-this.lineWidths[o]);for(const l of e)o!==l.row&&(o=l.row,r=n(i,this.left+s,this.right-this.lineWidths[o])),l.top+=this.top+t+s,l.left=a.leftForLtr(a.x(r),l.width),r+=l.width+s}else{let o=0,r=n(i,this.top+t+s,this.bottom-this.columnSizes[o].height);for(const l of e)l.col!==o&&(o=l.col,r=n(i,this.top+t+s,this.bottom-this.columnSizes[o].height)),l.top=r,l.left+=this.left+s,l.left=a.leftForLtr(a.x(l.left),l.width),r+=l.height+s}}isHorizontal(){return"top"===this.options.position||"bottom"===this.options.position}draw(){if(this.options.display){const t=this.ctx;we(t,this),this._draw(),Me(t)}}_draw(){const{options:t,columnSizes:e,lineWidths:i,ctx:s}=this,{align:a,labels:r}=t,l=yt.color,h=mi(t.rtl,this.left,this.width),c=ui(r.font),{color:d,padding:u}=r,f=c.size,g=f/2;let p;this.drawTitle(),s.textAlign=h.textAlign("left"),s.textBaseline="middle",s.lineWidth=.5,s.font=c.string;const{boxWidth:m,boxHeight:b,itemHeight:x}=Do(r,f),_=this.isHorizontal(),y=this._computeTitleHeight();p=_?{x:n(a,this.left+u,this.right-i[0]),y:this.top+u+y,line:0}:{x:this.left+u,y:n(a,this.top+y+u,this.bottom-e[0].height),line:0},bi(this.ctx,t.textDirection);const v=x+u;this.legendItems.forEach(((w,M)=>{s.strokeStyle=w.fontColor||d,s.fillStyle=w.fontColor||d;const k=s.measureText(w.text).width,S=h.textAlign(w.textAlign||(w.textAlign=r.textAlign)),P=m+g+k;let D=p.x,C=p.y;h.setWidth(this.width),_?M>0&&D+P+u>this.right&&(C=p.y+=v,p.line++,D=p.x=n(a,this.left+u,this.right-i[p.line])):M>0&&C+v>this.bottom&&(D=p.x=D+e[p.line].width+u,p.line++,C=p.y=n(a,this.top+y+u,this.bottom-e[p.line].height));!function(t,e,i){if(isNaN(m)||m<=0||isNaN(b)||b<0)return;s.save();const n=Z(i.lineWidth,1);if(s.fillStyle=Z(i.fillStyle,l),s.lineCap=Z(i.lineCap,"butt"),s.lineDashOffset=Z(i.lineDashOffset,0),s.lineJoin=Z(i.lineJoin,"miter"),s.lineWidth=n,s.strokeStyle=Z(i.strokeStyle,l),s.setLineDash(Z(i.lineDash,[])),r.usePointStyle){const o={radius:m*Math.SQRT2/2,pointStyle:i.pointStyle,rotation:i.rotation,borderWidth:n},a=h.xPlus(t,m/2);ye(s,o,a,e+g)}else{const o=e+Math.max((f-b)/2,0),a=h.leftForLtr(t,m),r=ci(i.borderRadius);s.beginPath(),Object.values(r).some((t=>0!==t))?Ce(s,{x:a,y:o,w:m,h:b,radius:r}):s.rect(a,o,m,b),s.fill(),0!==n&&s.stroke()}s.restore()}(h.x(D),C,w),D=o(S,D+m+g,_?D+P:this.right,t.rtl),function(t,e,i){Pe(s,i.text,t,e+x/2,c,{strikethrough:i.hidden,textAlign:h.textAlign(i.textAlign)})}(h.x(D),C,w),_?p.x+=P+u:p.y+=v})),xi(this.ctx,t.textDirection)}drawTitle(){const t=this.options,e=t.title,i=ui(e.font),o=di(e.padding);if(!e.display)return;const a=mi(t.rtl,this.left,this.width),r=this.ctx,l=e.position,h=i.size/2,c=o.top+h;let d,u=this.left,f=this.width;if(this.isHorizontal())f=Math.max(...this.lineWidths),d=this.top+c,u=n(t.align,u,this.right-f);else{const e=this.columnSizes.reduce(((t,e)=>Math.max(t,e.height)),0);d=c+n(t.align,this.top,this.bottom-e-t.labels.padding-this._computeTitleHeight())}const g=n(l,u,u+f);r.textAlign=a.textAlign(s(l)),r.textBaseline="middle",r.strokeStyle=e.color,r.fillStyle=e.color,r.font=i.string,Pe(r,e.text,g,d,i)}_computeTitleHeight(){const t=this.options.title,e=ui(t.font),i=di(t.padding);return t.display?e.lineHeight+i.height:0}_getLegendItemAt(t,e){let i,s,n;if(ee(t,this.left,this.right)&&ee(e,this.top,this.bottom))for(n=this.legendHitBoxes,i=0;i<n.length;++i)if(s=n[i],ee(t,s.left,s.left+s.width)&&ee(e,s.top,s.top+s.height))return this.legendItems[i];return null}handleEvent(t){const e=this.options;if(!function(t,e){if(("mousemove"===t||"mouseout"===t)&&(e.onHover||e.onLeave))return!0;if(e.onClick&&("click"===t||"mouseup"===t))return!0;return!1}(t.type,e))return;const i=this._getLegendItemAt(t.x,t.y);if("mousemove"===t.type||"mouseout"===t.type){const o=this._hoveredItem,a=(n=i,null!==(s=o)&&null!==n&&s.datasetIndex===n.datasetIndex&&s.index===n.index);o&&!a&&tt(e.onLeave,[t,o,this],this),this._hoveredItem=i,i&&!a&&tt(e.onHover,[t,i,this],this)}else i&&tt(e.onClick,[t,i,this],this);var s,n}}var Oo={id:"legend",_element:Co,start(t,e,i){const s=t.legend=new Co({ctx:t.ctx,options:i,chart:t});Xi.configure(t,s,i),Xi.addBox(t,s)},stop(t){Xi.removeBox(t,t.legend),delete t.legend},beforeUpdate(t,e,i){const s=t.legend;Xi.configure(t,s,i),s.options=i},afterUpdate(t){const e=t.legend;e.buildLabels(),e.adjustHitBoxes()},afterEvent(t,e){e.replay||t.legend.handleEvent(e.event)},defaults:{display:!0,position:"top",align:"center",fullSize:!0,reverse:!1,weight:1e3,onClick(t,e,i){const s=e.datasetIndex,n=i.chart;n.isDatasetVisible(s)?(n.hide(s),e.hidden=!0):(n.show(s),e.hidden=!1)},onHover:null,onLeave:null,labels:{color:t=>t.chart.options.color,boxWidth:40,padding:10,generateLabels(t){const e=t.data.datasets,{labels:{usePointStyle:i,pointStyle:s,textAlign:n,color:o}}=t.legend.options;return t._getSortedDatasetMetas().map((t=>{const a=t.controller.getStyle(i?0:void 0),r=di(a.borderWidth);return{text:e[t.index].label,fillStyle:a.backgroundColor,fontColor:o,hidden:!t.visible,lineCap:a.borderCapStyle,lineDash:a.borderDash,lineDashOffset:a.borderDashOffset,lineJoin:a.borderJoinStyle,lineWidth:(r.width+r.height)/4,strokeStyle:a.borderColor,pointStyle:s||a.pointStyle,rotation:a.rotation,textAlign:n||a.textAlign,borderRadius:0,datasetIndex:t.index}}),this)}},title:{color:t=>t.chart.options.color,display:!1,position:"center",text:""}},descriptors:{_scriptable:t=>!t.startsWith("on"),labels:{_scriptable:t=>!["generateLabels","filter","sort"].includes(t)}}};class Ao extends Os{constructor(t){super(),this.chart=t.chart,this.options=t.options,this.ctx=t.ctx,this._padding=void 0,this.top=void 0,this.bottom=void 0,this.left=void 0,this.right=void 0,this.width=void 0,this.height=void 0,this.position=void 0,this.weight=void 0,this.fullSize=void 0}update(t,e){const i=this.options;if(this.left=0,this.top=0,!i.display)return void(this.width=this.height=this.right=this.bottom=0);this.width=this.right=t,this.height=this.bottom=e;const s=X(i.text)?i.text.length:1;this._padding=di(i.padding);const n=s*ui(i.font).lineHeight+this._padding.height;this.isHorizontal()?this.height=n:this.width=n}isHorizontal(){const t=this.options.position;return"top"===t||"bottom"===t}_drawArgs(t){const{top:e,left:i,bottom:s,right:o,options:a}=this,r=a.align;let l,h,c,d=0;return this.isHorizontal()?(h=n(r,i,o),c=e+t,l=o-i):("left"===a.position?(h=i+t,c=n(r,s,e),d=-.5*Ot):(h=o-t,c=n(r,e,s),d=.5*Ot),l=s-e),{titleX:h,titleY:c,maxWidth:l,rotation:d}}draw(){const t=this.ctx,e=this.options;if(!e.display)return;const i=ui(e.font),n=i.lineHeight/2+this._padding.top,{titleX:o,titleY:a,maxWidth:r,rotation:l}=this._drawArgs(n);Pe(t,e.text,0,0,i,{color:e.color,maxWidth:r,rotation:l,textAlign:s(e.align),textBaseline:"middle",translation:[o,a]})}}var To={id:"title",_element:Ao,start(t,e,i){!function(t,e){const i=new Ao({ctx:t.ctx,options:e,chart:t});Xi.configure(t,i,e),Xi.addBox(t,i),t.titleBlock=i}(t,i)},stop(t){const e=t.titleBlock;Xi.removeBox(t,e),delete t.titleBlock},beforeUpdate(t,e,i){const s=t.titleBlock;Xi.configure(t,s,i),s.options=i},defaults:{align:"center",display:!1,font:{weight:"bold"},fullSize:!0,padding:10,position:"top",text:"",weight:2e3},defaultRoutes:{color:"color"},descriptors:{_scriptable:!0,_indexable:!1}};const Lo=new WeakMap;var Ro={id:"subtitle",start(t,e,i){const s=new Ao({ctx:t.ctx,options:i,chart:t});Xi.configure(t,s,i),Xi.addBox(t,s),Lo.set(t,s)},stop(t){Xi.removeBox(t,Lo.get(t)),Lo.delete(t)},beforeUpdate(t,e,i){const s=Lo.get(t);Xi.configure(t,s,i),s.options=i},defaults:{align:"center",display:!1,font:{weight:"normal"},fullSize:!0,padding:0,position:"top",text:"",weight:1500},defaultRoutes:{color:"color"},descriptors:{_scriptable:!0,_indexable:!1}};const Eo={average(t){if(!t.length)return!1;let e,i,s=0,n=0,o=0;for(e=0,i=t.length;e<i;++e){const i=t[e].element;if(i&&i.hasValue()){const t=i.tooltipPosition();s+=t.x,n+=t.y,++o}}return{x:s/o,y:n/o}},nearest(t,e){if(!t.length)return!1;let i,s,n,o=e.x,a=e.y,r=Number.POSITIVE_INFINITY;for(i=0,s=t.length;i<s;++i){const s=t[i].element;if(s&&s.hasValue()){const t=Kt(e,s.getCenterPoint());t<r&&(r=t,n=s)}}if(n){const t=n.tooltipPosition();o=t.x,a=t.y}return{x:o,y:a}}};function Io(t,e){return e&&(X(e)?Array.prototype.push.apply(t,e):t.push(e)),t}function zo(t){return("string"==typeof t||t instanceof String)&&t.indexOf("\n")>-1?t.split("\n"):t}function Fo(t,e){const{element:i,datasetIndex:s,index:n}=e,o=t.getDatasetMeta(s).controller,{label:a,value:r}=o.getLabelAndValue(n);return{chart:t,label:a,parsed:o.getParsed(n),raw:t.data.datasets[s].data[n],formattedValue:r,dataset:o.getDataset(),dataIndex:n,datasetIndex:s,element:i}}function Bo(t,e){const i=t.chart.ctx,{body:s,footer:n,title:o}=t,{boxWidth:a,boxHeight:r}=e,l=ui(e.bodyFont),h=ui(e.titleFont),c=ui(e.footerFont),d=o.length,u=n.length,f=s.length,g=di(e.padding);let p=g.height,m=0,b=s.reduce(((t,e)=>t+e.before.length+e.lines.length+e.after.length),0);if(b+=t.beforeBody.length+t.afterBody.length,d&&(p+=d*h.lineHeight+(d-1)*e.titleSpacing+e.titleMarginBottom),b){p+=f*(e.displayColors?Math.max(r,l.lineHeight):l.lineHeight)+(b-f)*l.lineHeight+(b-1)*e.bodySpacing}u&&(p+=e.footerMarginTop+u*c.lineHeight+(u-1)*e.footerSpacing);let x=0;const _=function(t){m=Math.max(m,i.measureText(t).width+x)};return i.save(),i.font=h.string,et(t.title,_),i.font=l.string,et(t.beforeBody.concat(t.afterBody),_),x=e.displayColors?a+2+e.boxPadding:0,et(s,(t=>{et(t.before,_),et(t.lines,_),et(t.after,_)})),x=0,i.font=c.string,et(t.footer,_),i.restore(),m+=g.width,{width:m,height:p}}function Vo(t,e,i,s){const{x:n,width:o}=i,{width:a,chartArea:{left:r,right:l}}=t;let h="center";return"center"===s?h=n<=(r+l)/2?"left":"right":n<=o/2?h="left":n>=a-o/2&&(h="right"),function(t,e,i,s){const{x:n,width:o}=s,a=i.caretSize+i.caretPadding;return"left"===t&&n+o+a>e.width||"right"===t&&n-o-a<0||void 0}(h,t,e,i)&&(h="center"),h}function No(t,e,i){const s=i.yAlign||e.yAlign||function(t,e){const{y:i,height:s}=e;return i<s/2?"top":i>t.height-s/2?"bottom":"center"}(t,i);return{xAlign:i.xAlign||e.xAlign||Vo(t,e,i,s),yAlign:s}}function Wo(t,e,i,s){const{caretSize:n,caretPadding:o,cornerRadius:a}=t,{xAlign:r,yAlign:l}=i,h=n+o,{topLeft:c,topRight:d,bottomLeft:u,bottomRight:f}=ci(a);let g=function(t,e){let{x:i,width:s}=t;return"right"===e?i-=s:"center"===e&&(i-=s/2),i}(e,r);const p=function(t,e,i){let{y:s,height:n}=t;return"top"===e?s+=i:s-="bottom"===e?n+i:n/2,s}(e,l,h);return"center"===l?"left"===r?g+=h:"right"===r&&(g-=h):"left"===r?g-=Math.max(c,u)+n:"right"===r&&(g+=Math.max(d,f)+n),{x:Qt(g,0,s.width-e.width),y:Qt(p,0,s.height-e.height)}}function Ho(t,e,i){const s=di(i.padding);return"center"===e?t.x+t.width/2:"right"===e?t.x+t.width-s.right:t.x+s.left}function jo(t){return Io([],zo(t))}function $o(t,e){const i=e&&e.dataset&&e.dataset.tooltip&&e.dataset.tooltip.callbacks;return i?t.override(i):t}class Yo extends Os{constructor(t){super(),this.opacity=0,this._active=[],this._eventPosition=void 0,this._size=void 0,this._cachedAnimations=void 0,this._tooltipItems=[],this.$animations=void 0,this.$context=void 0,this.chart=t.chart||t._chart,this._chart=this.chart,this.options=t.options,this.dataPoints=void 0,this.title=void 0,this.beforeBody=void 0,this.body=void 0,this.afterBody=void 0,this.footer=void 0,this.xAlign=void 0,this.yAlign=void 0,this.x=void 0,this.y=void 0,this.height=void 0,this.width=void 0,this.caretX=void 0,this.caretY=void 0,this.labelColors=void 0,this.labelPointStyles=void 0,this.labelTextColors=void 0}initialize(t){this.options=t,this._cachedAnimations=void 0,this.$context=void 0}_resolveAnimations(){const t=this._cachedAnimations;if(t)return t;const e=this.chart,i=this.options.setContext(this.getContext()),s=i.enabled&&e.options.animation&&i.animations,n=new ms(this.chart,s);return s._cacheable&&(this._cachedAnimations=Object.freeze(n)),n}getContext(){return this.$context||(this.$context=(t=this.chart.getContext(),e=this,i=this._tooltipItems,pi(t,{tooltip:e,tooltipItems:i,type:"tooltip"})));var t,e,i}getTitle(t,e){const{callbacks:i}=e,s=i.beforeTitle.apply(this,[t]),n=i.title.apply(this,[t]),o=i.afterTitle.apply(this,[t]);let a=[];return a=Io(a,zo(s)),a=Io(a,zo(n)),a=Io(a,zo(o)),a}getBeforeBody(t,e){return jo(e.callbacks.beforeBody.apply(this,[t]))}getBody(t,e){const{callbacks:i}=e,s=[];return et(t,(t=>{const e={before:[],lines:[],after:[]},n=$o(i,t);Io(e.before,zo(n.beforeLabel.call(this,t))),Io(e.lines,n.label.call(this,t)),Io(e.after,zo(n.afterLabel.call(this,t))),s.push(e)})),s}getAfterBody(t,e){return jo(e.callbacks.afterBody.apply(this,[t]))}getFooter(t,e){const{callbacks:i}=e,s=i.beforeFooter.apply(this,[t]),n=i.footer.apply(this,[t]),o=i.afterFooter.apply(this,[t]);let a=[];return a=Io(a,zo(s)),a=Io(a,zo(n)),a=Io(a,zo(o)),a}_createItems(t){const e=this._active,i=this.chart.data,s=[],n=[],o=[];let a,r,l=[];for(a=0,r=e.length;a<r;++a)l.push(Fo(this.chart,e[a]));return t.filter&&(l=l.filter(((e,s,n)=>t.filter(e,s,n,i)))),t.itemSort&&(l=l.sort(((e,s)=>t.itemSort(e,s,i)))),et(l,(e=>{const i=$o(t.callbacks,e);s.push(i.labelColor.call(this,e)),n.push(i.labelPointStyle.call(this,e)),o.push(i.labelTextColor.call(this,e))})),this.labelColors=s,this.labelPointStyles=n,this.labelTextColors=o,this.dataPoints=l,l}update(t,e){const i=this.options.setContext(this.getContext()),s=this._active;let n,o=[];if(s.length){const t=Eo[i.position].call(this,s,this._eventPosition);o=this._createItems(i),this.title=this.getTitle(o,i),this.beforeBody=this.getBeforeBody(o,i),this.body=this.getBody(o,i),this.afterBody=this.getAfterBody(o,i),this.footer=this.getFooter(o,i);const e=this._size=Bo(this,i),a=Object.assign({},t,e),r=No(this.chart,i,a),l=Wo(i,a,r,this.chart);this.xAlign=r.xAlign,this.yAlign=r.yAlign,n={opacity:1,x:l.x,y:l.y,width:e.width,height:e.height,caretX:t.x,caretY:t.y}}else 0!==this.opacity&&(n={opacity:0});this._tooltipItems=o,this.$context=void 0,n&&this._resolveAnimations().update(this,n),t&&i.external&&i.external.call(this,{chart:this.chart,tooltip:this,replay:e})}drawCaret(t,e,i,s){const n=this.getCaretPosition(t,i,s);e.lineTo(n.x1,n.y1),e.lineTo(n.x2,n.y2),e.lineTo(n.x3,n.y3)}getCaretPosition(t,e,i){const{xAlign:s,yAlign:n}=this,{caretSize:o,cornerRadius:a}=i,{topLeft:r,topRight:l,bottomLeft:h,bottomRight:c}=ci(a),{x:d,y:u}=t,{width:f,height:g}=e;let p,m,b,x,_,y;return"center"===n?(_=u+g/2,"left"===s?(p=d,m=p-o,x=_+o,y=_-o):(p=d+f,m=p+o,x=_-o,y=_+o),b=p):(m="left"===s?d+Math.max(r,h)+o:"right"===s?d+f-Math.max(l,c)-o:this.caretX,"top"===n?(x=u,_=x-o,p=m-o,b=m+o):(x=u+g,_=x+o,p=m+o,b=m-o),y=x),{x1:p,x2:m,x3:b,y1:x,y2:_,y3:y}}drawTitle(t,e,i){const s=this.title,n=s.length;let o,a,r;if(n){const l=mi(i.rtl,this.x,this.width);for(t.x=Ho(this,i.titleAlign,i),e.textAlign=l.textAlign(i.titleAlign),e.textBaseline="middle",o=ui(i.titleFont),a=i.titleSpacing,e.fillStyle=i.titleColor,e.font=o.string,r=0;r<n;++r)e.fillText(s[r],l.x(t.x),t.y+o.lineHeight/2),t.y+=o.lineHeight+a,r+1===n&&(t.y+=i.titleMarginBottom-a)}}_drawColorBox(t,e,i,s,n){const o=this.labelColors[i],a=this.labelPointStyles[i],{boxHeight:r,boxWidth:l,boxPadding:h}=n,c=ui(n.bodyFont),d=Ho(this,"left",n),u=s.x(d),f=r<c.lineHeight?(c.lineHeight-r)/2:0,g=e.y+f;if(n.usePointStyle){const e={radius:Math.min(l,r)/2,pointStyle:a.pointStyle,rotation:a.rotation,borderWidth:1},i=s.leftForLtr(u,l)+l/2,h=g+r/2;t.strokeStyle=n.multiKeyBackground,t.fillStyle=n.multiKeyBackground,ye(t,e,i,h),t.strokeStyle=o.borderColor,t.fillStyle=o.backgroundColor,ye(t,e,i,h)}else{t.lineWidth=o.borderWidth||1,t.strokeStyle=o.borderColor,t.setLineDash(o.borderDash||[]),t.lineDashOffset=o.borderDashOffset||0;const e=s.leftForLtr(u,l-h),i=s.leftForLtr(s.xPlus(u,1),l-h-2),a=ci(o.borderRadius);Object.values(a).some((t=>0!==t))?(t.beginPath(),t.fillStyle=n.multiKeyBackground,Ce(t,{x:e,y:g,w:l,h:r,radius:a}),t.fill(),t.stroke(),t.fillStyle=o.backgroundColor,t.beginPath(),Ce(t,{x:i,y:g+1,w:l-2,h:r-2,radius:a}),t.fill()):(t.fillStyle=n.multiKeyBackground,t.fillRect(e,g,l,r),t.strokeRect(e,g,l,r),t.fillStyle=o.backgroundColor,t.fillRect(i,g+1,l-2,r-2))}t.fillStyle=this.labelTextColors[i]}drawBody(t,e,i){const{body:s}=this,{bodySpacing:n,bodyAlign:o,displayColors:a,boxHeight:r,boxWidth:l,boxPadding:h}=i,c=ui(i.bodyFont);let d=c.lineHeight,u=0;const f=mi(i.rtl,this.x,this.width),g=function(i){e.fillText(i,f.x(t.x+u),t.y+d/2),t.y+=d+n},p=f.textAlign(o);let m,b,x,_,y,v,w;for(e.textAlign=o,e.textBaseline="middle",e.font=c.string,t.x=Ho(this,p,i),e.fillStyle=i.bodyColor,et(this.beforeBody,g),u=a&&"right"!==p?"center"===o?l/2+h:l+2+h:0,_=0,v=s.length;_<v;++_){for(m=s[_],b=this.labelTextColors[_],e.fillStyle=b,et(m.before,g),x=m.lines,a&&x.length&&(this._drawColorBox(e,t,_,f,i),d=Math.max(c.lineHeight,r)),y=0,w=x.length;y<w;++y)g(x[y]),d=c.lineHeight;et(m.after,g)}u=0,d=c.lineHeight,et(this.afterBody,g),t.y-=n}drawFooter(t,e,i){const s=this.footer,n=s.length;let o,a;if(n){const r=mi(i.rtl,this.x,this.width);for(t.x=Ho(this,i.footerAlign,i),t.y+=i.footerMarginTop,e.textAlign=r.textAlign(i.footerAlign),e.textBaseline="middle",o=ui(i.footerFont),e.fillStyle=i.footerColor,e.font=o.string,a=0;a<n;++a)e.fillText(s[a],r.x(t.x),t.y+o.lineHeight/2),t.y+=o.lineHeight+i.footerSpacing}}drawBackground(t,e,i,s){const{xAlign:n,yAlign:o}=this,{x:a,y:r}=t,{width:l,height:h}=i,{topLeft:c,topRight:d,bottomLeft:u,bottomRight:f}=ci(s.cornerRadius);e.fillStyle=s.backgroundColor,e.strokeStyle=s.borderColor,e.lineWidth=s.borderWidth,e.beginPath(),e.moveTo(a+c,r),"top"===o&&this.drawCaret(t,e,i,s),e.lineTo(a+l-d,r),e.quadraticCurveTo(a+l,r,a+l,r+d),"center"===o&&"right"===n&&this.drawCaret(t,e,i,s),e.lineTo(a+l,r+h-f),e.quadraticCurveTo(a+l,r+h,a+l-f,r+h),"bottom"===o&&this.drawCaret(t,e,i,s),e.lineTo(a+u,r+h),e.quadraticCurveTo(a,r+h,a,r+h-u),"center"===o&&"left"===n&&this.drawCaret(t,e,i,s),e.lineTo(a,r+c),e.quadraticCurveTo(a,r,a+c,r),e.closePath(),e.fill(),s.borderWidth>0&&e.stroke()}_updateAnimationTarget(t){const e=this.chart,i=this.$animations,s=i&&i.x,n=i&&i.y;if(s||n){const i=Eo[t.position].call(this,this._active,this._eventPosition);if(!i)return;const o=this._size=Bo(this,t),a=Object.assign({},i,this._size),r=No(e,t,a),l=Wo(t,a,r,e);s._to===l.x&&n._to===l.y||(this.xAlign=r.xAlign,this.yAlign=r.yAlign,this.width=o.width,this.height=o.height,this.caretX=i.x,this.caretY=i.y,this._resolveAnimations().update(this,l))}}_willRender(){return!!this.opacity}draw(t){const e=this.options.setContext(this.getContext());let i=this.opacity;if(!i)return;this._updateAnimationTarget(e);const s={width:this.width,height:this.height},n={x:this.x,y:this.y};i=Math.abs(i)<.001?0:i;const o=di(e.padding),a=this.title.length||this.beforeBody.length||this.body.length||this.afterBody.length||this.footer.length;e.enabled&&a&&(t.save(),t.globalAlpha=i,this.drawBackground(n,t,s,e),bi(t,e.textDirection),n.y+=o.top,this.drawTitle(n,t,e),this.drawBody(n,t,e),this.drawFooter(n,t,e),xi(t,e.textDirection),t.restore())}getActiveElements(){return this._active||[]}setActiveElements(t,e){const i=this._active,s=t.map((({datasetIndex:t,index:e})=>{const i=this.chart.getDatasetMeta(t);if(!i)throw new Error("Cannot find a dataset at index "+t);return{datasetIndex:t,element:i.data[e],index:e}})),n=!it(i,s),o=this._positionChanged(s,e);(n||o)&&(this._active=s,this._eventPosition=e,this._ignoreReplayEvents=!0,this.update(!0))}handleEvent(t,e,i=!0){if(e&&this._ignoreReplayEvents)return!1;this._ignoreReplayEvents=!1;const s=this.options,n=this._active||[],o=this._getActiveElements(t,n,e,i),a=this._positionChanged(o,t),r=e||!it(o,n)||a;return r&&(this._active=o,(s.enabled||s.external)&&(this._eventPosition={x:t.x,y:t.y},this.update(!0,e))),r}_getActiveElements(t,e,i,s){const n=this.options;if("mouseout"===t.type)return[];if(!s)return e;const o=this.chart.getElementsAtEventForMode(t,n.mode,n,i);return n.reverse&&o.reverse(),o}_positionChanged(t,e){const{caretX:i,caretY:s,options:n}=this,o=Eo[n.position].call(this,t,e);return!1!==o&&(i!==o.x||s!==o.y)}}Yo.positioners=Eo;var Uo={id:"tooltip",_element:Yo,positioners:Eo,afterInit(t,e,i){i&&(t.tooltip=new Yo({chart:t,options:i}))},beforeUpdate(t,e,i){t.tooltip&&t.tooltip.initialize(i)},reset(t,e,i){t.tooltip&&t.tooltip.initialize(i)},afterDraw(t){const e=t.tooltip;if(e&&e._willRender()){const i={tooltip:e};if(!1===t.notifyPlugins("beforeTooltipDraw",i))return;e.draw(t.ctx),t.notifyPlugins("afterTooltipDraw",i)}},afterEvent(t,e){if(t.tooltip){const i=e.replay;t.tooltip.handleEvent(e.event,i,e.inChartArea)&&(e.changed=!0)}},defaults:{enabled:!0,external:null,position:"average",backgroundColor:"rgba(0,0,0,0.8)",titleColor:"#fff",titleFont:{weight:"bold"},titleSpacing:2,titleMarginBottom:6,titleAlign:"left",bodyColor:"#fff",bodySpacing:2,bodyFont:{},bodyAlign:"left",footerColor:"#fff",footerSpacing:2,footerMarginTop:6,footerFont:{weight:"bold"},footerAlign:"left",padding:6,caretPadding:2,caretSize:5,cornerRadius:6,boxHeight:(t,e)=>e.bodyFont.size,boxWidth:(t,e)=>e.bodyFont.size,multiKeyBackground:"#fff",displayColors:!0,boxPadding:0,borderColor:"rgba(0,0,0,0)",borderWidth:0,animation:{duration:400,easing:"easeOutQuart"},animations:{numbers:{type:"number",properties:["x","y","width","height","caretX","caretY"]},opacity:{easing:"linear",duration:200}},callbacks:{beforeTitle:$,title(t){if(t.length>0){const e=t[0],i=e.chart.data.labels,s=i?i.length:0;if(this&&this.options&&"dataset"===this.options.mode)return e.dataset.label||"";if(e.label)return e.label;if(s>0&&e.dataIndex<s)return i[e.dataIndex]}return""},afterTitle:$,beforeBody:$,beforeLabel:$,label(t){if(this&&this.options&&"dataset"===this.options.mode)return t.label+": "+t.formattedValue||t.formattedValue;let e=t.dataset.label||"";e&&(e+=": ");const i=t.formattedValue;return U(i)||(e+=i),e},labelColor(t){const e=t.chart.getDatasetMeta(t.datasetIndex).controller.getStyle(t.dataIndex);return{borderColor:e.borderColor,backgroundColor:e.backgroundColor,borderWidth:e.borderWidth,borderDash:e.borderDash,borderDashOffset:e.borderDashOffset,borderRadius:0}},labelTextColor(){return this.options.bodyColor},labelPointStyle(t){const e=t.chart.getDatasetMeta(t.datasetIndex).controller.getStyle(t.dataIndex);return{pointStyle:e.pointStyle,rotation:e.rotation}},afterLabel:$,afterBody:$,beforeFooter:$,footer:$,afterFooter:$}},defaultRoutes:{bodyFont:"font",footerFont:"font",titleFont:"font"},descriptors:{_scriptable:t=>"filter"!==t&&"itemSort"!==t&&"external"!==t,_indexable:!1,callbacks:{_scriptable:!1,_indexable:!1},animation:{_fallback:!1},animations:{_fallback:"animation"}},additionalOptionScopes:["interaction"]},Xo=Object.freeze({__proto__:null,Decimation:ho,Filler:Po,Legend:Oo,SubTitle:Ro,Title:To,Tooltip:Uo});function qo(t,e,i,s){const n=t.indexOf(e);if(-1===n)return((t,e,i,s)=>("string"==typeof e?(i=t.push(e)-1,s.unshift({index:i,label:e})):isNaN(e)&&(i=null),i))(t,e,i,s);return n!==t.lastIndexOf(e)?i:n}class Ko extends Ns{constructor(t){super(t),this._startValue=void 0,this._valueRange=0,this._addedLabels=[]}init(t){const e=this._addedLabels;if(e.length){const t=this.getLabels();for(const{index:i,label:s}of e)t[i]===s&&t.splice(i,1);this._addedLabels=[]}super.init(t)}parse(t,e){if(U(t))return null;const i=this.getLabels();return((t,e)=>null===t?null:Qt(Math.round(t),0,e))(e=isFinite(e)&&i[e]===t?e:qo(i,t,Z(e,t),this._addedLabels),i.length-1)}determineDataLimits(){const{minDefined:t,maxDefined:e}=this.getUserBounds();let{min:i,max:s}=this.getMinMax(!0);"ticks"===this.options.bounds&&(t||(i=0),e||(s=this.getLabels().length-1)),this.min=i,this.max=s}buildTicks(){const t=this.min,e=this.max,i=this.options.offset,s=[];let n=this.getLabels();n=0===t&&e===n.length-1?n:n.slice(t,e+1),this._valueRange=Math.max(n.length-(i?0:1),1),this._startValue=this.min-(i?.5:0);for(let i=t;i<=e;i++)s.push({value:i});return s}getLabelForValue(t){const e=this.getLabels();return t>=0&&t<e.length?e[t]:t}configure(){super.configure(),this.isHorizontal()||(this._reversePixels=!this._reversePixels)}getPixelForValue(t){return"number"!=typeof t&&(t=this.parse(t)),null===t?NaN:this.getPixelForDecimal((t-this._startValue)/this._valueRange)}getPixelForTick(t){const e=this.ticks;return t<0||t>e.length-1?null:this.getPixelForValue(e[t].value)}getValueForPixel(t){return Math.round(this._startValue+this.getDecimalForPixel(t)*this._valueRange)}getBasePixel(){return this.bottom}}function Go(t,e,{horizontal:i,minRotation:s}){const n=Yt(s),o=(i?Math.sin(n):Math.cos(n))||.001,a=.75*e*(""+t).length;return Math.min(e/o,a)}Ko.id="category",Ko.defaults={ticks:{callback:Ko.prototype.getLabelForValue}};class Zo extends Ns{constructor(t){super(t),this.start=void 0,this.end=void 0,this._startValue=void 0,this._endValue=void 0,this._valueRange=0}parse(t,e){return U(t)||("number"==typeof t||t instanceof Number)&&!isFinite(+t)?null:+t}handleTickRangeOptions(){const{beginAtZero:t}=this.options,{minDefined:e,maxDefined:i}=this.getUserBounds();let{min:s,max:n}=this;const o=t=>s=e?s:t,a=t=>n=i?n:t;if(t){const t=Bt(s),e=Bt(n);t<0&&e<0?a(0):t>0&&e>0&&o(0)}if(s===n){let e=1;(n>=Number.MAX_SAFE_INTEGER||s<=Number.MIN_SAFE_INTEGER)&&(e=Math.abs(.05*n)),a(n+e),t||o(s-e)}this.min=s,this.max=n}getTickLimit(){const t=this.options.ticks;let e,{maxTicksLimit:i,stepSize:s}=t;return s?(e=Math.ceil(this.max/s)-Math.floor(this.min/s)+1,e>1e3&&(console.warn(`scales.${this.id}.ticks.stepSize: ${s} would result generating up to ${e} ticks. Limiting to 1000.`),e=1e3)):(e=this.computeTickLimit(),i=i||11),i&&(e=Math.min(i,e)),e}computeTickLimit(){return Number.POSITIVE_INFINITY}buildTicks(){const t=this.options,e=t.ticks;let i=this.getTickLimit();i=Math.max(2,i);const s=function(t,e){const i=[],{bounds:s,step:n,min:o,max:a,precision:r,count:l,maxTicks:h,maxDigits:c,includeBounds:d}=t,u=n||1,f=h-1,{min:g,max:p}=e,m=!U(o),b=!U(a),x=!U(l),_=(p-g)/(c+1);let y,v,w,M,k=Vt((p-g)/f/u)*u;if(k<1e-14&&!m&&!b)return[{value:g},{value:p}];M=Math.ceil(p/k)-Math.floor(g/k),M>f&&(k=Vt(M*k/f/u)*u),U(r)||(y=Math.pow(10,r),k=Math.ceil(k*y)/y),"ticks"===s?(v=Math.floor(g/k)*k,w=Math.ceil(p/k)*k):(v=g,w=p),m&&b&&n&&jt((a-o)/n,k/1e3)?(M=Math.round(Math.min((a-o)/k,h)),k=(a-o)/M,v=o,w=a):x?(v=m?o:v,w=b?a:w,M=l-1,k=(w-v)/M):(M=(w-v)/k,M=Ht(M,Math.round(M),k/1e3)?Math.round(M):Math.ceil(M));const S=Math.max(Xt(k),Xt(v));y=Math.pow(10,U(r)?S:r),v=Math.round(v*y)/y,w=Math.round(w*y)/y;let P=0;for(m&&(d&&v!==o?(i.push({value:o}),v<o&&P++,Ht(Math.round((v+P*k)*y)/y,o,Go(o,_,t))&&P++):v<o&&P++);P<M;++P)i.push({value:Math.round((v+P*k)*y)/y});return b&&d&&w!==a?i.length&&Ht(i[i.length-1].value,a,Go(a,_,t))?i[i.length-1].value=a:i.push({value:a}):b&&w!==a||i.push({value:w}),i}({maxTicks:i,bounds:t.bounds,min:t.min,max:t.max,precision:e.precision,step:e.stepSize,count:e.count,maxDigits:this._maxDigits(),horizontal:this.isHorizontal(),minRotation:e.minRotation||0,includeBounds:!1!==e.includeBounds},this._range||this);return"ticks"===t.bounds&&$t(s,this,"value"),t.reverse?(s.reverse(),this.start=this.max,this.end=this.min):(this.start=this.min,this.end=this.max),s}configure(){const t=this.ticks;let e=this.min,i=this.max;if(super.configure(),this.options.offset&&t.length){const s=(i-e)/Math.max(t.length-1,1)/2;e-=s,i+=s}this._startValue=e,this._endValue=i,this._valueRange=i-e}getLabelForValue(t){return ni(t,this.chart.options.locale,this.options.ticks.format)}}class Jo extends Zo{determineDataLimits(){const{min:t,max:e}=this.getMinMax(!0);this.min=K(t)?t:0,this.max=K(e)?e:1,this.handleTickRangeOptions()}computeTickLimit(){const t=this.isHorizontal(),e=t?this.width:this.height,i=Yt(this.options.ticks.minRotation),s=(t?Math.sin(i):Math.cos(i))||.001,n=this._resolveTickFontOptions(0);return Math.ceil(e/Math.min(40,n.lineHeight/s))}getPixelForValue(t){return null===t?NaN:this.getPixelForDecimal((t-this._startValue)/this._valueRange)}getValueForPixel(t){return this._startValue+this.getDecimalForPixel(t)*this._valueRange}}function Qo(t){return 1===t/Math.pow(10,Math.floor(Ft(t)))}Jo.id="linear",Jo.defaults={ticks:{callback:Ts.formatters.numeric}};class ta extends Ns{constructor(t){super(t),this.start=void 0,this.end=void 0,this._startValue=void 0,this._valueRange=0}parse(t,e){const i=Zo.prototype.parse.apply(this,[t,e]);if(0!==i)return K(i)&&i>0?i:null;this._zero=!0}determineDataLimits(){const{min:t,max:e}=this.getMinMax(!0);this.min=K(t)?Math.max(0,t):null,this.max=K(e)?Math.max(0,e):null,this.options.beginAtZero&&(this._zero=!0),this.handleTickRangeOptions()}handleTickRangeOptions(){const{minDefined:t,maxDefined:e}=this.getUserBounds();let i=this.min,s=this.max;const n=e=>i=t?i:e,o=t=>s=e?s:t,a=(t,e)=>Math.pow(10,Math.floor(Ft(t))+e);i===s&&(i<=0?(n(1),o(10)):(n(a(i,-1)),o(a(s,1)))),i<=0&&n(a(s,-1)),s<=0&&o(a(i,1)),this._zero&&this.min!==this._suggestedMin&&i===a(this.min,0)&&n(a(i,-1)),this.min=i,this.max=s}buildTicks(){const t=this.options,e=function(t,e){const i=Math.floor(Ft(e.max)),s=Math.ceil(e.max/Math.pow(10,i)),n=[];let o=G(t.min,Math.pow(10,Math.floor(Ft(e.min)))),a=Math.floor(Ft(o)),r=Math.floor(o/Math.pow(10,a)),l=a<0?Math.pow(10,Math.abs(a)):1;do{n.push({value:o,major:Qo(o)}),++r,10===r&&(r=1,++a,l=a>=0?1:l),o=Math.round(r*Math.pow(10,a)*l)/l}while(a<i||a===i&&r<s);const h=G(t.max,o);return n.push({value:h,major:Qo(o)}),n}({min:this._userMin,max:this._userMax},this);return"ticks"===t.bounds&&$t(e,this,"value"),t.reverse?(e.reverse(),this.start=this.max,this.end=this.min):(this.start=this.min,this.end=this.max),e}getLabelForValue(t){return void 0===t?"0":ni(t,this.chart.options.locale,this.options.ticks.format)}configure(){const t=this.min;super.configure(),this._startValue=Ft(t),this._valueRange=Ft(this.max)-Ft(t)}getPixelForValue(t){return void 0!==t&&0!==t||(t=this.min),null===t||isNaN(t)?NaN:this.getPixelForDecimal(t===this.min?0:(Ft(t)-this._startValue)/this._valueRange)}getValueForPixel(t){const e=this.getDecimalForPixel(t);return Math.pow(10,this._startValue+e*this._valueRange)}}function ea(t){const e=t.ticks;if(e.display&&t.display){const t=di(e.backdropPadding);return Z(e.font&&e.font.size,yt.font.size)+t.height}return 0}function ia(t,e,i,s,n){return t===s||t===n?{start:e-i/2,end:e+i/2}:t<s||t>n?{start:e-i,end:e}:{start:e,end:e+i}}function sa(t){const e={l:t.left+t._padding.left,r:t.right-t._padding.right,t:t.top+t._padding.top,b:t.bottom-t._padding.bottom},i=Object.assign({},e),s=[],n=[],o=t._pointLabels.length,a=t.options.pointLabels,r=a.centerPointLabels?Ot/o:0;for(let d=0;d<o;d++){const o=a.setContext(t.getPointLabelContext(d));n[d]=o.padding;const u=t.getPointPosition(d,t.drawingArea+n[d],r),f=ui(o.font),g=(l=t.ctx,h=f,c=X(c=t._pointLabels[d])?c:[c],{w:be(l,h.string,c),h:c.length*h.lineHeight});s[d]=g;const p=Zt(t.getIndexAngle(d)+r),m=Math.round(Ut(p));na(i,e,p,ia(m,u.x,g.w,0,180),ia(m,u.y,g.h,90,270))}var l,h,c;t.setCenterPoint(e.l-i.l,i.r-e.r,e.t-i.t,i.b-e.b),t._pointLabelItems=function(t,e,i){const s=[],n=t._pointLabels.length,o=t.options,a=ea(o)/2,r=t.drawingArea,l=o.pointLabels.centerPointLabels?Ot/n:0;for(let o=0;o<n;o++){const n=t.getPointPosition(o,r+a+i[o],l),h=Math.round(Ut(Zt(n.angle+Et))),c=e[o],d=ra(n.y,c.h,h),u=oa(h),f=aa(n.x,c.w,u);s.push({x:n.x,y:d,textAlign:u,left:f,top:d,right:f+c.w,bottom:d+c.h})}return s}(t,s,n)}function na(t,e,i,s,n){const o=Math.abs(Math.sin(i)),a=Math.abs(Math.cos(i));let r=0,l=0;s.start<e.l?(r=(e.l-s.start)/o,t.l=Math.min(t.l,e.l-r)):s.end>e.r&&(r=(s.end-e.r)/o,t.r=Math.max(t.r,e.r+r)),n.start<e.t?(l=(e.t-n.start)/a,t.t=Math.min(t.t,e.t-l)):n.end>e.b&&(l=(n.end-e.b)/a,t.b=Math.max(t.b,e.b+l))}function oa(t){return 0===t||180===t?"center":t<180?"left":"right"}function aa(t,e,i){return"right"===i?t-=e:"center"===i&&(t-=e/2),t}function ra(t,e,i){return 90===i||270===i?t-=e/2:(i>270||i<90)&&(t-=e),t}function la(t,e,i,s){const{ctx:n}=t;if(i)n.arc(t.xCenter,t.yCenter,e,0,At);else{let i=t.getPointPosition(0,e);n.moveTo(i.x,i.y);for(let o=1;o<s;o++)i=t.getPointPosition(o,e),n.lineTo(i.x,i.y)}}ta.id="logarithmic",ta.defaults={ticks:{callback:Ts.formatters.logarithmic,major:{enabled:!0}}};class ha extends Zo{constructor(t){super(t),this.xCenter=void 0,this.yCenter=void 0,this.drawingArea=void 0,this._pointLabels=[],this._pointLabelItems=[]}setDimensions(){const t=this._padding=di(ea(this.options)/2),e=this.width=this.maxWidth-t.width,i=this.height=this.maxHeight-t.height;this.xCenter=Math.floor(this.left+e/2+t.left),this.yCenter=Math.floor(this.top+i/2+t.top),this.drawingArea=Math.floor(Math.min(e,i)/2)}determineDataLimits(){const{min:t,max:e}=this.getMinMax(!1);this.min=K(t)&&!isNaN(t)?t:0,this.max=K(e)&&!isNaN(e)?e:0,this.handleTickRangeOptions()}computeTickLimit(){return Math.ceil(this.drawingArea/ea(this.options))}generateTickLabels(t){Zo.prototype.generateTickLabels.call(this,t),this._pointLabels=this.getLabels().map(((t,e)=>{const i=tt(this.options.pointLabels.callback,[t,e],this);return i||0===i?i:""})).filter(((t,e)=>this.chart.getDataVisibility(e)))}fit(){const t=this.options;t.display&&t.pointLabels.display?sa(this):this.setCenterPoint(0,0,0,0)}setCenterPoint(t,e,i,s){this.xCenter+=Math.floor((t-e)/2),this.yCenter+=Math.floor((i-s)/2),this.drawingArea-=Math.min(this.drawingArea/2,Math.max(t,e,i,s))}getIndexAngle(t){return Zt(t*(At/(this._pointLabels.length||1))+Yt(this.options.startAngle||0))}getDistanceFromCenterForValue(t){if(U(t))return NaN;const e=this.drawingArea/(this.max-this.min);return this.options.reverse?(this.max-t)*e:(t-this.min)*e}getValueForDistanceFromCenter(t){if(U(t))return NaN;const e=t/(this.drawingArea/(this.max-this.min));return this.options.reverse?this.max-e:this.min+e}getPointLabelContext(t){const e=this._pointLabels||[];if(t>=0&&t<e.length){const i=e[t];return function(t,e,i){return pi(t,{label:i,index:e,type:"pointLabel"})}(this.getContext(),t,i)}}getPointPosition(t,e,i=0){const s=this.getIndexAngle(t)-Et+i;return{x:Math.cos(s)*e+this.xCenter,y:Math.sin(s)*e+this.yCenter,angle:s}}getPointPositionForValue(t,e){return this.getPointPosition(t,this.getDistanceFromCenterForValue(e))}getBasePosition(t){return this.getPointPositionForValue(t||0,this.getBaseValue())}getPointLabelPosition(t){const{left:e,top:i,right:s,bottom:n}=this._pointLabelItems[t];return{left:e,top:i,right:s,bottom:n}}drawBackground(){const{backgroundColor:t,grid:{circular:e}}=this.options;if(t){const i=this.ctx;i.save(),i.beginPath(),la(this,this.getDistanceFromCenterForValue(this._endValue),e,this._pointLabels.length),i.closePath(),i.fillStyle=t,i.fill(),i.restore()}}drawGrid(){const t=this.ctx,e=this.options,{angleLines:i,grid:s}=e,n=this._pointLabels.length;let o,a,r;if(e.pointLabels.display&&function(t,e){const{ctx:i,options:{pointLabels:s}}=t;for(let n=e-1;n>=0;n--){const e=s.setContext(t.getPointLabelContext(n)),o=ui(e.font),{x:a,y:r,textAlign:l,left:h,top:c,right:d,bottom:u}=t._pointLabelItems[n],{backdropColor:f}=e;if(!U(f)){const t=ci(e.borderRadius),s=di(e.backdropPadding);i.fillStyle=f;const n=h-s.left,o=c-s.top,a=d-h+s.width,r=u-c+s.height;Object.values(t).some((t=>0!==t))?(i.beginPath(),Ce(i,{x:n,y:o,w:a,h:r,radius:t}),i.fill()):i.fillRect(n,o,a,r)}Pe(i,t._pointLabels[n],a,r+o.lineHeight/2,o,{color:e.color,textAlign:l,textBaseline:"middle"})}}(this,n),s.display&&this.ticks.forEach(((t,e)=>{if(0!==e){a=this.getDistanceFromCenterForValue(t.value);!function(t,e,i,s){const n=t.ctx,o=e.circular,{color:a,lineWidth:r}=e;!o&&!s||!a||!r||i<0||(n.save(),n.strokeStyle=a,n.lineWidth=r,n.setLineDash(e.borderDash),n.lineDashOffset=e.borderDashOffset,n.beginPath(),la(t,i,o,s),n.closePath(),n.stroke(),n.restore())}(this,s.setContext(this.getContext(e-1)),a,n)}})),i.display){for(t.save(),o=n-1;o>=0;o--){const s=i.setContext(this.getPointLabelContext(o)),{color:n,lineWidth:l}=s;l&&n&&(t.lineWidth=l,t.strokeStyle=n,t.setLineDash(s.borderDash),t.lineDashOffset=s.borderDashOffset,a=this.getDistanceFromCenterForValue(e.ticks.reverse?this.min:this.max),r=this.getPointPosition(o,a),t.beginPath(),t.moveTo(this.xCenter,this.yCenter),t.lineTo(r.x,r.y),t.stroke())}t.restore()}}drawBorder(){}drawLabels(){const t=this.ctx,e=this.options,i=e.ticks;if(!i.display)return;const s=this.getIndexAngle(0);let n,o;t.save(),t.translate(this.xCenter,this.yCenter),t.rotate(s),t.textAlign="center",t.textBaseline="middle",this.ticks.forEach(((s,a)=>{if(0===a&&!e.reverse)return;const r=i.setContext(this.getContext(a)),l=ui(r.font);if(n=this.getDistanceFromCenterForValue(this.ticks[a].value),r.showLabelBackdrop){t.font=l.string,o=t.measureText(s.label).width,t.fillStyle=r.backdropColor;const e=di(r.backdropPadding);t.fillRect(-o/2-e.left,-n-l.size/2-e.top,o+e.width,l.size+e.height)}Pe(t,s.label,0,-n,l,{color:r.color})})),t.restore()}drawTitle(){}}ha.id="radialLinear",ha.defaults={display:!0,animate:!0,position:"chartArea",angleLines:{display:!0,lineWidth:1,borderDash:[],borderDashOffset:0},grid:{circular:!1},startAngle:0,ticks:{showLabelBackdrop:!0,callback:Ts.formatters.numeric},pointLabels:{backdropColor:void 0,backdropPadding:2,display:!0,font:{size:10},callback:t=>t,padding:5,centerPointLabels:!1}},ha.defaultRoutes={"angleLines.color":"borderColor","pointLabels.color":"color","ticks.color":"color"},ha.descriptors={angleLines:{_fallback:"grid"}};const ca={millisecond:{common:!0,size:1,steps:1e3},second:{common:!0,size:1e3,steps:60},minute:{common:!0,size:6e4,steps:60},hour:{common:!0,size:36e5,steps:24},day:{common:!0,size:864e5,steps:30},week:{common:!1,size:6048e5,steps:4},month:{common:!0,size:2628e6,steps:12},quarter:{common:!1,size:7884e6,steps:4},year:{common:!0,size:3154e7}},da=Object.keys(ca);function ua(t,e){return t-e}function fa(t,e){if(U(e))return null;const i=t._adapter,{parser:s,round:n,isoWeekday:o}=t._parseOpts;let a=e;return"function"==typeof s&&(a=s(a)),K(a)||(a="string"==typeof s?i.parse(a,s):i.parse(a)),null===a?null:(n&&(a="week"!==n||!Wt(o)&&!0!==o?i.startOf(a,n):i.startOf(a,"isoWeek",o)),+a)}function ga(t,e,i,s){const n=da.length;for(let o=da.indexOf(t);o<n-1;++o){const t=ca[da[o]],n=t.steps?t.steps:Number.MAX_SAFE_INTEGER;if(t.common&&Math.ceil((i-e)/(n*t.size))<=s)return da[o]}return da[n-1]}function pa(t,e,i){if(i){if(i.length){const{lo:s,hi:n}=vt(i,e);t[i[s]>=e?i[s]:i[n]]=!0}}else t[e]=!0}function ma(t,e,i){const s=[],n={},o=e.length;let a,r;for(a=0;a<o;++a)r=e[a],n[r]=a,s.push({value:r,major:!1});return 0!==o&&i?function(t,e,i,s){const n=t._adapter,o=+n.startOf(e[0].value,s),a=e[e.length-1].value;let r,l;for(r=o;r<=a;r=+n.add(r,1,s))l=i[r],l>=0&&(e[l].major=!0);return e}(t,s,n,i):s}class ba extends Ns{constructor(t){super(t),this._cache={data:[],labels:[],all:[]},this._unit="day",this._majorUnit=void 0,this._offsets={},this._normalized=!1,this._parseOpts=void 0}init(t,e){const i=t.time||(t.time={}),s=this._adapter=new xn._date(t.adapters.date);rt(i.displayFormats,s.formats()),this._parseOpts={parser:i.parser,round:i.round,isoWeekday:i.isoWeekday},super.init(t),this._normalized=e.normalized}parse(t,e){return void 0===t?null:fa(this,t)}beforeLayout(){super.beforeLayout(),this._cache={data:[],labels:[],all:[]}}determineDataLimits(){const t=this.options,e=this._adapter,i=t.time.unit||"day";let{min:s,max:n,minDefined:o,maxDefined:a}=this.getUserBounds();function r(t){o||isNaN(t.min)||(s=Math.min(s,t.min)),a||isNaN(t.max)||(n=Math.max(n,t.max))}o&&a||(r(this._getLabelBounds()),"ticks"===t.bounds&&"labels"===t.ticks.source||r(this.getMinMax(!1))),s=K(s)&&!isNaN(s)?s:+e.startOf(Date.now(),i),n=K(n)&&!isNaN(n)?n:+e.endOf(Date.now(),i)+1,this.min=Math.min(s,n-1),this.max=Math.max(s+1,n)}_getLabelBounds(){const t=this.getLabelTimestamps();let e=Number.POSITIVE_INFINITY,i=Number.NEGATIVE_INFINITY;return t.length&&(e=t[0],i=t[t.length-1]),{min:e,max:i}}buildTicks(){const t=this.options,e=t.time,i=t.ticks,s="labels"===i.source?this.getLabelTimestamps():this._generate();"ticks"===t.bounds&&s.length&&(this.min=this._userMin||s[0],this.max=this._userMax||s[s.length-1]);const n=this.min,o=kt(s,n,this.max);return this._unit=e.unit||(i.autoSkip?ga(e.minUnit,this.min,this.max,this._getLabelCapacity(n)):function(t,e,i,s,n){for(let o=da.length-1;o>=da.indexOf(i);o--){const i=da[o];if(ca[i].common&&t._adapter.diff(n,s,i)>=e-1)return i}return da[i?da.indexOf(i):0]}(this,o.length,e.minUnit,this.min,this.max)),this._majorUnit=i.major.enabled&&"year"!==this._unit?function(t){for(let e=da.indexOf(t)+1,i=da.length;e<i;++e)if(ca[da[e]].common)return da[e]}(this._unit):void 0,this.initOffsets(s),t.reverse&&o.reverse(),ma(this,o,this._majorUnit)}afterAutoSkip(){this.options.offsetAfterAutoskip&&this.initOffsets(this.ticks.map((t=>+t.value)))}initOffsets(t){let e,i,s=0,n=0;this.options.offset&&t.length&&(e=this.getDecimalForValue(t[0]),s=1===t.length?1-e:(this.getDecimalForValue(t[1])-e)/2,i=this.getDecimalForValue(t[t.length-1]),n=1===t.length?i:(i-this.getDecimalForValue(t[t.length-2]))/2);const o=t.length<3?.5:.25;s=Qt(s,0,o),n=Qt(n,0,o),this._offsets={start:s,end:n,factor:1/(s+1+n)}}_generate(){const t=this._adapter,e=this.min,i=this.max,s=this.options,n=s.time,o=n.unit||ga(n.minUnit,e,i,this._getLabelCapacity(e)),a=Z(n.stepSize,1),r="week"===o&&n.isoWeekday,l=Wt(r)||!0===r,h={};let c,d,u=e;if(l&&(u=+t.startOf(u,"isoWeek",r)),u=+t.startOf(u,l?"day":o),t.diff(i,e,o)>1e5*a)throw new Error(e+" and "+i+" are too far apart with stepSize of "+a+" "+o);const f="data"===s.ticks.source&&this.getDataTimestamps();for(c=u,d=0;c<i;c=+t.add(c,a,o),d++)pa(h,c,f);return c!==i&&"ticks"!==s.bounds&&1!==d||pa(h,c,f),Object.keys(h).sort(((t,e)=>t-e)).map((t=>+t))}getLabelForValue(t){const e=this._adapter,i=this.options.time;return i.tooltipFormat?e.format(t,i.tooltipFormat):e.format(t,i.displayFormats.datetime)}_tickFormatFunction(t,e,i,s){const n=this.options,o=n.time.displayFormats,a=this._unit,r=this._majorUnit,l=a&&o[a],h=r&&o[r],c=i[e],d=r&&h&&c&&c.major,u=this._adapter.format(t,s||(d?h:l)),f=n.ticks.callback;return f?tt(f,[u,e,i],this):u}generateTickLabels(t){let e,i,s;for(e=0,i=t.length;e<i;++e)s=t[e],s.label=this._tickFormatFunction(s.value,e,t)}getDecimalForValue(t){return null===t?NaN:(t-this.min)/(this.max-this.min)}getPixelForValue(t){const e=this._offsets,i=this.getDecimalForValue(t);return this.getPixelForDecimal((e.start+i)*e.factor)}getValueForPixel(t){const e=this._offsets,i=this.getDecimalForPixel(t)/e.factor-e.end;return this.min+i*(this.max-this.min)}_getLabelSize(t){const e=this.options.ticks,i=this.ctx.measureText(t).width,s=Yt(this.isHorizontal()?e.maxRotation:e.minRotation),n=Math.cos(s),o=Math.sin(s),a=this._resolveTickFontOptions(0).size;return{w:i*n+a*o,h:i*o+a*n}}_getLabelCapacity(t){const e=this.options.time,i=e.displayFormats,s=i[e.unit]||i.millisecond,n=this._tickFormatFunction(t,0,ma(this,[t],this._majorUnit),s),o=this._getLabelSize(n),a=Math.floor(this.isHorizontal()?this.width/o.w:this.height/o.h)-1;return a>0?a:1}getDataTimestamps(){let t,e,i=this._cache.data||[];if(i.length)return i;const s=this.getMatchingVisibleMetas();if(this._normalized&&s.length)return this._cache.data=s[0].controller.getAllParsedValues(this);for(t=0,e=s.length;t<e;++t)i=i.concat(s[t].controller.getAllParsedValues(this));return this._cache.data=this.normalize(i)}getLabelTimestamps(){const t=this._cache.labels||[];let e,i;if(t.length)return t;const s=this.getLabels();for(e=0,i=s.length;e<i;++e)t.push(fa(this,s[e]));return this._cache.labels=this._normalized?t:this.normalize(t)}normalize(t){return Ct(t.sort(ua))}}function xa(t,e,i){let s,n,o,a,r=0,l=t.length-1;i?(e>=t[r].pos&&e<=t[l].pos&&({lo:r,hi:l}=wt(t,"pos",e)),({pos:s,time:o}=t[r]),({pos:n,time:a}=t[l])):(e>=t[r].time&&e<=t[l].time&&({lo:r,hi:l}=wt(t,"time",e)),({time:s,pos:o}=t[r]),({time:n,pos:a}=t[l]));const h=n-s;return h?o+(a-o)*(e-s)/h:o}ba.id="time",ba.defaults={bounds:"data",adapters:{},time:{parser:!1,unit:!1,round:!1,isoWeekday:!1,minUnit:"millisecond",displayFormats:{}},ticks:{source:"auto",major:{enabled:!1}}};class _a extends ba{constructor(t){super(t),this._table=[],this._minPos=void 0,this._tableRange=void 0}initOffsets(){const t=this._getTimestampsForTable(),e=this._table=this.buildLookupTable(t);this._minPos=xa(e,this.min),this._tableRange=xa(e,this.max)-this._minPos,super.initOffsets(t)}buildLookupTable(t){const{min:e,max:i}=this,s=[],n=[];let o,a,r,l,h;for(o=0,a=t.length;o<a;++o)l=t[o],l>=e&&l<=i&&s.push(l);if(s.length<2)return[{time:e,pos:0},{time:i,pos:1}];for(o=0,a=s.length;o<a;++o)h=s[o+1],r=s[o-1],l=s[o],Math.round((h+r)/2)!==l&&n.push({time:l,pos:o/(a-1)});return n}_getTimestampsForTable(){let t=this._cache.all||[];if(t.length)return t;const e=this.getDataTimestamps(),i=this.getLabelTimestamps();return t=e.length&&i.length?this.normalize(e.concat(i)):e.length?e:i,t=this._cache.all=t,t}getDecimalForValue(t){return(xa(this._table,t)-this._minPos)/this._tableRange}getValueForPixel(t){const e=this._offsets,i=this.getDecimalForPixel(t)/e.factor-e.end;return xa(this._table,i*this._tableRange+this._minPos,!0)}}_a.id="timeseries",_a.defaults=ba.defaults;var ya=Object.freeze({__proto__:null,CategoryScale:Ko,LinearScale:Jo,LogarithmicScale:ta,RadialLinearScale:ha,TimeScale:ba,TimeSeriesScale:_a});return fn.register(In,ya,ao,Xo),fn.helpers={...Di},fn._adapters=xn,fn.Animation=gs,fn.Animations=ms,fn.animator=a,fn.controllers=Hs.controllers.items,fn.DatasetController=Cs,fn.Element=Os,fn.elements=ao,fn.Interaction=Ei,fn.layouts=Xi,fn.platforms=ds,fn.Scale=Ns,fn.Ticks=Ts,Object.assign(fn,In,ya,ao,Xo,ds),fn.Chart=fn,"undefined"!=typeof window&&(window.Chart=fn),fn}));
diff --git a/admin/survey/script/script.js b/admin/survey/script/script.js
index 494809807..65faa9537 100644
--- a/admin/survey/script/script.js
+++ b/admin/survey/script/script.js
@@ -5638,33 +5638,4 @@ function oneClickArchive(){
 	$('#general_popup').addClass('PopUpNarrow');
 	$('#general_popup').html('').fadeIn('slow');
 	$("#general_popup").load('ajax.php?a=oneClickArchive', {anketa: srv_meta_anketa_id});
-}
-
-function diagnosticsChart(place,display) {
-
-	const data = {
-		datasets: [{
-		  data: display,
-		  backgroundColor: [
-			'rgb(229,229,229)',
-			'rgb(30, 136, 229)',
-		  ],
-		  borderWidth: 0, //spacing between slices
-		}]
-	};
-	
-	  const config = {
-		type: 'doughnut',
-		data: data,
-		options: {
-			events: [], //no hover labels,animations,...
-			cutout: 32, //slice width
-		}
-	};
-
-	  const myChart = new Chart(
-		document.getElementById(place),
-		config
-	  );
-
 }
\ No newline at end of file

From 04fb8d82689c73e075ddbbf067956574ef30f4de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nejc=20Kova=C4=8D?= <nejc.kouko@gmail.com>
Date: Tue, 19 Jul 2022 11:44:59 +0200
Subject: [PATCH 093/110] =?UTF-8?q?Objava-pregled=20=20-=20na=C4=8Dini=20d?=
 =?UTF-8?q?eljenja=20responsive?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/css/admin_new.css                      | 30 ++++++++++-----
 .../pages/survey_objava/pregled.scss          | 38 ++++++++++++++-----
 2 files changed, 49 insertions(+), 19 deletions(-)

diff --git a/public/css/admin_new.css b/public/css/admin_new.css
index 23ab2a1f7..823eae297 100644
--- a/public/css/admin_new.css
+++ b/public/css/admin_new.css
@@ -24911,16 +24911,17 @@ div#vabila div.niceurl span.faicon {
   cursor: pointer;
 }
 div#vabila div.more {
-  display: flex;
-  flex-direction: row;
-  flex-wrap: wrap;
-  gap: 16px;
+  display: grid;
+  grid-template-columns: 1fr 1fr 1fr;
+  column-gap: 32px;
+  row-gap: 14px;
 }
 div#vabila div.more div.more_block {
   height: auto;
-  width: 464px;
+  width: 100%;
+  max-width: 298px;
   background-color: #FFFFFF;
-  border: 1px solid #E5E5E5;
+  border: 1px solid red;
   padding: 16px;
   font-size: 14px;
   cursor: pointer;
@@ -25010,8 +25011,13 @@ div#general_popup div.popup_content.publish.settings div#publish_settings_more {
 }
 
 @media screen and (max-width: 1130px) {
-  .more_block {
-    width: 42% !important;
+  .more {
+    grid-template-columns: 1fr 1fr !important;
+    column-gap: 32px;
+    row-gap: 14px;
+  }
+  .more .more_block {
+    max-width: 92% !important;
   }
 }
 @media screen and (max-width: 1025px) {
@@ -25039,6 +25045,9 @@ div#general_popup div.popup_content.publish.settings div#publish_settings_more {
   .page_vabila #vabila .button_holder #nice_url_holder .buttons {
     margin: 9px 0px 0px 0px !important;
   }
+  div#vabila div.more div.more_block {
+    width: 89% !important;
+  }
 }
 @media screen and (max-width: 725px) {
   h2 {
@@ -25046,9 +25055,12 @@ div#general_popup div.popup_content.publish.settings div#publish_settings_more {
   }
 }
 @media screen and (max-width: 660px) {
+  .page_vabila #vabila .more {
+    grid-template-columns: 1fr !important;
+  }
   .page_vabila #vabila .more .more_block {
-    width: unset !important;
     width: 100% !important;
+    max-width: 93% !important;
   }
   .page_vabila #vabila .more .more_block #text {
     width: 100%;
diff --git a/resources/sass/admin_new/pages/survey_objava/pregled.scss b/resources/sass/admin_new/pages/survey_objava/pregled.scss
index 4efaf9319..9eaed7b32 100644
--- a/resources/sass/admin_new/pages/survey_objava/pregled.scss
+++ b/resources/sass/admin_new/pages/survey_objava/pregled.scss
@@ -185,18 +185,21 @@ div#vabila {
 
 	// Več načinov deljenja ankete
     div.more {
-        display: flex;
-        flex-direction: row;
-        flex-wrap: wrap;
+        display: grid;
+        grid-template-columns: 1fr 1fr 1fr;
+        column-gap: 32px;
+        row-gap: 14px;
 
-        gap: 16px;
+        
 
         div.more_block {
             height: auto;
-            width: 464px;
+            width: 100%;
+            max-width: 298px;
+
 
             background-color: $white;
-            border: 1px solid $gray;
+            border: 1px solid red;
 
             padding: 16px;
 
@@ -259,6 +262,8 @@ div#vabila {
 
         }
 
+
+
         // div.more_block:first-of-type{
         //     .more_title{
         //         color: #FFC700;
@@ -337,10 +342,17 @@ div#general_popup {
 }
 
 
-@media screen and (max-width: 1130px){
+@media screen and (max-width: 1130px) {
 
-    .more_block{
-        width: 42% !important;
+    .more {
+        grid-template-columns: 1fr 1fr !important;
+        column-gap: 32px;
+        row-gap: 14px;
+
+        .more_block{
+            // max-width: 470px !important;
+            max-width: 92% !important;
+        }
     }
 }
 
@@ -413,6 +425,9 @@ div#general_popup {
 
     }
     
+    div#vabila div.more div.more_block {
+        width: 89% !important;
+    }
 
 }
 
@@ -431,9 +446,12 @@ div#general_popup {
 
             .more{
 
+                grid-template-columns: 1fr !important;
+                
+
                 .more_block{
-                    width: unset !important;
                     width: 100% !important;
+                    max-width: 93% !important;
 
                     #text {
                         width: 100%;

From 0044a6150a369fb5c76324d496e52d54f0436b4f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nejc=20Kova=C4=8D?= <nejc.kouko@gmail.com>
Date: Tue, 19 Jul 2022 11:45:59 +0200
Subject: [PATCH 094/110] obajva pregled - border gray

---
 public/css/admin_new.css                                  | 2 +-
 resources/sass/admin_new/pages/survey_objava/pregled.scss | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/public/css/admin_new.css b/public/css/admin_new.css
index 823eae297..f3ca2d031 100644
--- a/public/css/admin_new.css
+++ b/public/css/admin_new.css
@@ -24921,7 +24921,7 @@ div#vabila div.more div.more_block {
   width: 100%;
   max-width: 298px;
   background-color: #FFFFFF;
-  border: 1px solid red;
+  border: 1px solid #E5E5E5;
   padding: 16px;
   font-size: 14px;
   cursor: pointer;
diff --git a/resources/sass/admin_new/pages/survey_objava/pregled.scss b/resources/sass/admin_new/pages/survey_objava/pregled.scss
index 9eaed7b32..1a6029563 100644
--- a/resources/sass/admin_new/pages/survey_objava/pregled.scss
+++ b/resources/sass/admin_new/pages/survey_objava/pregled.scss
@@ -199,7 +199,7 @@ div#vabila {
 
 
             background-color: $white;
-            border: 1px solid red;
+            border: 1px solid $gray;
 
             padding: 16px;
 

From 96f07cbdab961842b8b00b92ac9a03a4dc6a6f13 Mon Sep 17 00:00:00 2001
From: pero1203 <peter.hrvatin@gmail.com>
Date: Tue, 19 Jul 2022 20:10:29 +0200
Subject: [PATCH 095/110] no message

---
 admin/survey/Branching.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/admin/survey/Branching.php b/admin/survey/Branching.php
index 0108e9e76..16095d52f 100644
--- a/admin/survey/Branching.php
+++ b/admin/survey/Branching.php
@@ -2098,7 +2098,7 @@ class Branching {
 		}
 
 		// zadnji spremenljivki v ifu, tudi dodamo PB izven pagebreaka (da se doda, tam kjer se potem prikaže)
-		if ($rows['pagebreak'] == 0 AND (mysqli_num_rows($sqle)>0 || $rowi['parent']==0) ) {
+		if ($rows['pagebreak'] == 0 && (mysqli_num_rows($sqle)>0 || $rowi['parent']==0) ) {
 			echo '<li id="droppable_'.$row1['parent'].'-'.$row1['vrstni_red'].'" class="drop" spr="0" if="'.$if.'" endif="1" spr_pb="'.$spr.'">';
 			echo '  <div class="pb_new" title="'.$lang['srv_add_pagebreak'].'">';
             echo '      <div class="pb_page_hover"><span class="faicon paragraph"></span>'.$lang['srv_add_pagebreak'].'</div>';

From 85d08608a1ad294be48148148676439f082e6149 Mon Sep 17 00:00:00 2001
From: tejagerjovic <teja.gerjovic@fdv.uni-lj.si>
Date: Wed, 20 Jul 2022 03:07:16 +0200
Subject: [PATCH 096/110] [Redizajn 1KA v2] - Testiranje --> Diagnostika v3
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Levi stolpec lastnosti + dodan span class na besedilo pri izpisih časov trajanja za styling
---
 admin/survey/SurveyAdminSettings.php          | 25 +++---
 .../classes/class.SurveyDiagnostics.php       | 45 +++++-----
 lang/1.php                                    |  4 +-
 lang/2.php                                    |  2 +
 public/css/admin_new.css                      | 89 ++++++++++++++++++-
 .../pages/survey_testiranje/diagnostika.scss  | 18 ++++
 6 files changed, 142 insertions(+), 41 deletions(-)

diff --git a/admin/survey/SurveyAdminSettings.php b/admin/survey/SurveyAdminSettings.php
index aff2d3ef7..f50f9f3a7 100644
--- a/admin/survey/SurveyAdminSettings.php
+++ b/admin/survey/SurveyAdminSettings.php
@@ -5920,8 +5920,8 @@ class SurveyAdminSettings {
 			return $total;
 		}
 		
-		$skupni_cas = (bcdiv($total, 60, 0)>0?bcdiv($total, 60, 0).'min ':'').''.round(bcmod($total, 60), 0).'s';
-		$skupni_cas_brez_pogojev = (bcdiv($total_brez_pogojev, 60, 0)>0?bcdiv($total_brez_pogojev, 60, 0).'min ':'').''.round(bcmod($total_brez_pogojev, 60), 0).'s';
+		$skupni_cas = (bcdiv($total, 60, 0)>0?bcdiv($total, 60, 0).'<span class="time_text">min</span> ':'').''.round(bcmod($total, 60), 0).'<span class="time_text">s</span>';
+		$skupni_cas_brez_pogojev = (bcdiv($total_brez_pogojev, 60, 0)>0?bcdiv($total_brez_pogojev, 60, 0).'<span class="time_text">min</span> ':'').''.round(bcmod($total_brez_pogojev, 60), 0).'<span class="time_text">s</span>';
 		
 		if ($samo_izracunaj_skupini_cas == 1)
 			return $skupni_cas;
@@ -5949,7 +5949,7 @@ class SurveyAdminSettings {
 			echo '<td>'.($row['naslov']!=''?$row['naslov']:$lang['srv_intro_label']).'</td>';
 
 			echo '<td class="right time">';
-			echo ($time[0]<60?round($time[0],1).'s ':round($time[0]/60,1).'min ').'/ <span class="gray">'.($time[1]<60?round($time[1],1).'s ':round($time[1]/60,1).'min ').'</span>';
+			echo ($time[0]<60?round($time[0],1).'<span class="time_text">s</span> ':round($time[0]/60,1).'<span class="time_text">min</span> ').'/ <span class="gray">'.($time[1]<60?round($time[1],1).'<span class="time_text">s</span> ':round($time[1]/60,1).'<span class="time_text">min</span> ').'</span>';
 			echo '</td>';
 
 			echo '<td class="graph_cell">';
@@ -6030,7 +6030,7 @@ class SurveyAdminSettings {
 			echo '</tr>';
 			
 		}
-		echo '<tr class="semi-bold"><td>'.$lang['srv_casi_po_vprasanjih_skupaj'].'</td><td class="right">'.(bcdiv($bruto_total, 60, 0)>0?bcdiv($bruto_total, 60, 0).'min ':'').''.round(bcmod($bruto_total, 60), 0).'s</td><td></td><td class="right time">'.(bcdiv($neto_total, 60, 0)>0?bcdiv($neto_total, 60, 0).'min ':'').''.round(bcmod($neto_total, 60), 0).'s / '.(bcdiv($bruto_total, 60, 0)>0?bcdiv($bruto_total, 60, 0).'min ':'').''.round(bcmod($bruto_total, 60), 0).'s</td><td></td></tr>';
+		echo '<tr class="semi-bold"><td>'.$lang['srv_casi_po_vprasanjih_skupaj'].'</td><td class="right">'.(bcdiv($bruto_total, 60, 0)>0?bcdiv($bruto_total, 60, 0).'<span class="time_text">min</span> ':'').''.round(bcmod($bruto_total, 60), 0).'<span class="time_text">s</span></td><td></td><td class="right time">'.(bcdiv($neto_total, 60, 0)>0?bcdiv($neto_total, 60, 0).'<span class="time_text">min</span> ':'').''.round(bcmod($neto_total, 60), 0).'<span class="time_text">s</span> / '.(bcdiv($bruto_total, 60, 0)>0?bcdiv($bruto_total, 60, 0).'<span class="time_text">min</span> ':'').''.round(bcmod($bruto_total, 60), 0).'<span class="time_text">s</span></td><td></td></tr>';
 		echo '</table>';
 
 		echo '<div class="tabela_trajanje_legenda">';
@@ -6063,7 +6063,7 @@ class SurveyAdminSettings {
 					echo '<td class="nowrap">'.$block_labels_by_number[$vrstni_red+1].'</td>';
 
 					echo '<td class="right time">';
-					echo ($time[0]<60?round($time[0],1).'s ':round($time[0]/60,1).'min ').'<span class="gray">/ '.($time[1]<60?round($time[1],1).'s ':round($time[1]/60,1).'min ').'</span>';
+					echo ($time[0]<60?round($time[0],1).'<span class="time_text">s</span> ':round($time[0]/60,1).'<span class="time_text">min</span> ').'<span class="gray">/ '.($time[1]<60?round($time[1],1).'<span class="time_text">s</span> ':round($time[1]/60,1).'<span class="time_text">min</span> ').'</span>';
 					echo '</td>';
 
 					echo '<td class="graph_cell">';
@@ -6076,7 +6076,7 @@ class SurveyAdminSettings {
 
 					echo '</tr>';
 			}
-			echo '<tr class="semi-bold"><td>'.$lang['srv_casi_po_vprasanjih_skupaj'].'</td><td class="right time">'.(bcdiv($totalb, 60, 0)>0?bcdiv($totalb, 60, 0).'min ':'').''.round(bcmod($totalb, 60), 0).'s</td><td></td><td></td><td></td></tr>';
+			echo '<tr class="semi-bold"><td>'.$lang['srv_casi_po_vprasanjih_skupaj'].'</td><td class="right time">'.(bcdiv($totalb, 60, 0)>0?bcdiv($totalb, 60, 0).'<span class="time_text">min</span> ':'').''.round(bcmod($totalb, 60), 0).'<span class="time_text">s</span></td><td></td><td></td><td></td></tr>';
 
 			echo '</table>';
 
@@ -6148,7 +6148,7 @@ class SurveyAdminSettings {
 				}
 				
 			}
-			echo '<tr class="semi-bold"><td>'.$lang['srv_casi_po_vprasanjih_skupaj'].'</td><td class="right">'.(bcdiv($bruto_total, 60, 0)>0?bcdiv($bruto_total, 60, 0).'min ':'').''.round(bcmod($bruto_total, 60), 0).'s</td><td></td><td class="right time">'.(bcdiv($neto_total, 60, 0)>0?bcdiv($neto_total, 60, 0).'min ':'').''.round(bcmod($neto_total, 60), 0).'s / '.(bcdiv($bruto_total, 60, 0)>0?bcdiv($bruto_total, 60, 0).'min ':'').''.round(bcmod($bruto_total, 60), 0).'s</td><td></td></tr>';
+			echo '<tr class="semi-bold"><td>'.$lang['srv_casi_po_vprasanjih_skupaj'].'</td><td class="right">'.(bcdiv($bruto_total, 60, 0)>0?bcdiv($bruto_total, 60, 0).'<span class="time_text">min</span> ':'').''.round(bcmod($bruto_total, 60), 0).'<span class="time_text">s</span></td><td></td><td class="right time">'.(bcdiv($neto_total, 60, 0)>0?bcdiv($neto_total, 60, 0).'<span class="time_text">min</span> ':'').''.round(bcmod($neto_total, 60), 0).'<span class="time_text">s</span> / '.(bcdiv($bruto_total, 60, 0)>0?bcdiv($bruto_total, 60, 0).'<span class="time_text">min</span> ':'').''.round(bcmod($bruto_total, 60), 0).'<span class="time_text">s</span></td><td></td></tr>';
 			echo '</table>';
 
 			echo '<div class="tabela_trajanje_legenda">';
@@ -6641,12 +6641,12 @@ class SurveyAdminSettings {
 		if ($max == 0) return;
 		
 		if ($samo_izracunaj_skupini_cas == 1)
-			return (bcdiv($total, 60, 0)>0?bcdiv($total, 60, 0).'min ':'').''.round(bcmod($total, 60), 0).'s';
+			return (bcdiv($total, 60, 0)>0?bcdiv($total, 60, 0).'<span class="time_text">min</span> ':'').''.round(bcmod($total, 60), 0).'<span class="time_text">s</span>';
 		
 		
 		// izpis
-		$skupni_cas = (bcdiv($total, 60, 0)>0?bcdiv($total, 60, 0).'min ':'').''.round(bcmod($total, 60), 0).'s';
-		$predviden_cas = (bcdiv($total_predvideni, 60, 0)>0?bcdiv($total_predvideni, 60, 0).'min ':'').''.round(bcmod($total_predvideni, 60), 0);
+		$skupni_cas = (bcdiv($total, 60, 0)>0?bcdiv($total, 60, 0).'<span class="time_text">min</span> ':'').''.round(bcmod($total, 60), 0).'<span class="time_text">s</span>';
+		$predviden_cas = (bcdiv($total_predvideni, 60, 0)>0?bcdiv($total_predvideni, 60, 0).'<span class="time_text">min</span> ':'').''.round(bcmod($total_predvideni, 60), 0);
 
 		echo '<fieldset><legend>'.$lang['srv_total_trajanje'].'</legend>';
 		echo '<p class="semi-bold">'.$lang['srv_dejansko_trajanje_real'].':</p>';
@@ -6661,6 +6661,7 @@ class SurveyAdminSettings {
 		echo '<tr>';
 		echo '<th>'.$lang['srv_casi_po_straneh_stran'].'</th>';
 		echo '<th colspan="2">'.$lang['srv_neto_v_cas'];
+		
 		if	($_GET['predvideni'] == 1) {
 			echo ' / '.$lang['srv_testiranje_predvidenicas_1'];
 		}
@@ -6677,14 +6678,14 @@ class SurveyAdminSettings {
 			
 			echo '<tr>';
 			echo '<td>'.($row['naslov']!=''?$row['naslov']:$lang['srv_intro_label']).'</td>';
-			echo '<td class="right time">'.($time<60 ? round($time,1).'s ' : round($time/60,1).'min ');
+			echo '<td class="right time">'.($time<60 ? round($time,1).'<span class="time_text">s</span> ' : round($time/60,1).'<span class="time_text">min</span> ');
 			if	($_GET['predvideni'] == 1) {
 				if ($rezanje_preskocene == 1)
 					$time = $expected_time[$vrstni_red][0];
 				else
 					$time = $expected_time[$vrstni_red][1];
 
-				echo '<span class="gray"> / '.($time<60 ? round($time,1).'s ' : round($time/60,1).'min ').'</span>';
+				echo '<span class="gray"> / '.($time<60 ? round($time,1).'<span class="time_text">s</span> ' : round($time/60,1).'<span class="time_text">min</span> ').'</span>';
 			}
 			echo '</td>';
 			
diff --git a/admin/survey/classes/class.SurveyDiagnostics.php b/admin/survey/classes/class.SurveyDiagnostics.php
index 4f058e48f..fca05c0ee 100644
--- a/admin/survey/classes/class.SurveyDiagnostics.php
+++ b/admin/survey/classes/class.SurveyDiagnostics.php
@@ -472,6 +472,24 @@ class SurveyDiagnostics
 		echo '<div class="lastnosti_wrapper">';
 
 		echo '<div class="lastnosti_left">';
+
+		echo '<div class="box">';
+		echo '<div class="title">'.$lang['srv_neto_v_cas'].'</div>';
+
+		// Dejansko trajanje
+		$sas = new SurveyAdminSettings();
+		$dejanski_cas = ($sas->testiranje_cas(1) == null) ? '-' : $sas->testiranje_cas(1);
+		echo '<p class="time">'.$dejanski_cas.'</p>';
+		echo '<a href="index.php?anketa=' . $this->sid . '&amp;a='.A_TESTIRANJE.'&amp;m='.M_TESTIRANJE_CAS.'">'.$lang['srv_testiranje_cas_info'].'</a>';
+		echo '</div>'; #box
+
+		//Ocena trajanja
+		echo '<div class="box">';
+		echo '<div class="title">'.$lang['srv_testiranje_predvidenicas'].'</div>';
+		echo '<p class="time">'.$skupni_cas.'</p>';
+		echo '<a href="index.php?anketa=' . $this->sid . '&amp;a='.A_TESTIRANJE.'&amp;m=predvidenicas">'.$lang['srv_testiranje_predvidenicas_info'].'</a>';
+		echo '</div>'; #box
+
 		echo '</div>'; #lastnosti_left
 
 		echo '<div class="lastnosti_middle">';
@@ -524,6 +542,7 @@ class SurveyDiagnostics
 		
 		echo '</div>'; #lastnosti_middle
 
+		//Ostale lastnosti ankete
 		echo '<div class="lastnosti_right">';
 		echo '</div>'; #lastnosti_right
 
@@ -599,31 +618,7 @@ class SurveyDiagnostics
 		echo '</div>';
 
 		
-		echo '<div class="lastnosti_right">';
-		# Trajanje - linki
-		echo '<table class="srv_diagnostic_results">';
-		echo '<tr>';
-		echo '<th>'.$lang['srv_info_duration'].'</th>';
-		echo '<th></th>';
-		echo '<th class="center">'.$lang['srv_diagnostika_table_title2'].'</th>';
-		echo '</tr>';
-
-		echo '<tr>';
-		echo '<td>'.$lang['srv_testiranje_predvidenicas'].'</td>';
-		echo '<td>'.$skupni_cas.'</td>';
-		echo '<td class="center"><a class="noline faicon open_icon" href="index.php?anketa=' . $this->sid . '&amp;a='.A_TESTIRANJE.'&amp;m=predvidenicas" title="'.$lang['srv_testiranje_predvidenicas'].'"></a></td>';
-		echo '</tr>';
 		
-		$sas = new SurveyAdminSettings();
-		$dejanski_cas = ($sas->testiranje_cas(1) == null) ? '-' : $sas->testiranje_cas(1);
-		echo '<tr>';
-		echo '<td>'.$lang['srv_testiranje_cas'].'</td>';
-		echo '<td>'.$dejanski_cas.'</td>';
-		echo '<td class="center"><a class="noline faicon open_icon" href="index.php?anketa=' . $this->sid . '&amp;a='.A_TESTIRANJE.'&amp;m='.M_TESTIRANJE_CAS.'" title="'.$lang['srv_testiranje_cas'].'"></a></td>';
-		echo '</tr>';
-		
-		echo '</table>';
-		echo '</div>';
 
 		echo '</div>';
 
@@ -807,7 +802,7 @@ class SurveyDiagnostics
 		$sas = new SurveyAdminSettings();
 		$total = $sas->testiranje_predvidenicas(2);
 		$this->time = array( $total,
-							 (bcdiv($total, 60, 0)>0?bcdiv($total, 60, 0).'min ':'').''.round(bcmod($total, 60), 0).'s'
+							 (bcdiv($total, 60, 0)>0?bcdiv($total, 60, 0).'<span class="time_text">min</span> ':'').''.round(bcmod($total, 60), 0).'<span class="time_text">s</span>'
 							);
 		
 		if ($total >= TIME_SOFT_LIMIT) {
diff --git a/lang/1.php b/lang/1.php
index e20f2ab9d..bc94f6aa6 100644
--- a/lang/1.php
+++ b/lang/1.php
@@ -4019,8 +4019,10 @@ $lang = array (
 	"srv_lang_rem_confirm"				=>	"Ali ste prepri&#269;ani, da &#382;elite odstraniti ta prevod?",
 	"srv_testiranje"					=>	"Testiranje",			
 	"srv_testiranje_oblivanje"			=>	"Testni podatki",			
-	"srv_testiranje_cas"				=>	"Dejanski &#269;asi",			
+	"srv_testiranje_cas"				=>	"Dejanski časi",			
+	"srv_testiranje_cas_info"				=>	"Več informacij o dejanskem trajanju",			
 	"srv_testiranje_predvidenicas"		=>	"Ocenjevanje trajanja",			
+	"srv_testiranje_predvidenicas_info"		=>	"Več informacij o ocenjevanju trajanja",			
 	"srv_testiranje_predvidenicas_1"	=>	"Predvideno trajanje",			
 	"srv_collectData"					=>	"Priprava podatkov",			
 	"srv_testiranje_komentarji"			=>	"Komentarji",			
diff --git a/lang/2.php b/lang/2.php
index 79ef91eca..12a0b3d0a 100644
--- a/lang/2.php
+++ b/lang/2.php
@@ -3990,7 +3990,9 @@ $lang = array (
 	"srv_testiranje"					=>	"Test",			// ime glavne navigacije 3. nivoja (gc 8.3.2012)
 	"srv_testiranje_oblivanje"			=>	"Test data",			
 	"srv_testiranje_cas"				=>	"Actual time",			
+	"srv_testiranje_cas_info"				=>	"More info about actual time",			
 	"srv_testiranje_predvidenicas"		=>	"Estimated duration",
+	"srv_testiranje_predvidenicas_info"		=>	"More info about estimated duration",
 	"srv_testiranje_predvidenicas_1"	=>	"Expected duration",
 	"srv_collectData"					=>	"Data preparation",			
 	"srv_testiranje_komentarji"			=>	"Comments",		
diff --git a/public/css/admin_new.css b/public/css/admin_new.css
index f3ca2d031..f8eb2e3f8 100644
--- a/public/css/admin_new.css
+++ b/public/css/admin_new.css
@@ -24238,6 +24238,8 @@ div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_right .box {
   padding: 16px;
   display: flex;
   flex-direction: column;
+  box-sizing: border-box;
+  height: 160px;
 }
 div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_left .box .title,
 div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_middle .box .title,
@@ -24275,6 +24277,24 @@ div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_right .box .diagnostic_gr
   font-size: 14px !important;
   white-space: nowrap;
 }
+div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_left .box .time,
+div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_middle .box .time,
+div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_right .box .time {
+  font-size: 40px;
+  margin-bottom: 12px;
+}
+div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_left .box .time span.time_text,
+div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_middle .box .time span.time_text,
+div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_right .box .time span.time_text {
+  font-size: 14px !important;
+}
+div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_left .box a,
+div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_middle .box a,
+div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_right .box a {
+  text-decoration: none;
+  font-size: 14px !important;
+  white-space: nowrap;
+}
 div#srv_diagnostic div.input_box {
   display: flex;
   width: 300px;
@@ -25045,6 +25065,7 @@ div#general_popup div.popup_content.publish.settings div#publish_settings_more {
   .page_vabila #vabila .button_holder #nice_url_holder .buttons {
     margin: 9px 0px 0px 0px !important;
   }
+
   div#vabila div.more div.more_block {
     width: 89% !important;
   }
@@ -29417,15 +29438,15 @@ iframe#ifmcontentstoprint {
 }
 
 .rsdl_bck1 {
-  background-color: rgb(250, 226, 226) !important;
+  background-color: #fae2e2 !important;
 }
 
 .rsdl_bck2 {
-  background-color: rgb(255, 157, 157) !important;
+  background-color: #ff9d9d !important;
 }
 
 .rsdl_bck3 {
-  background-color: rgb(248, 66, 66) !important;
+  background-color: #f84242 !important;
 }
 
 .rsdl_bck4 {
@@ -32854,19 +32875,24 @@ table.dataTable td:not(:first-of-type), table.dataTable th:not(:first-of-type) {
   #quick_comments_link.newCss {
     display: none;
   }
+
   #firstNavigation ol.right-side {
     display: none;
   }
+
   div.status_advanced {
     flex-direction: column;
   }
+
   div.status_advanced_box {
     width: 100%;
     box-sizing: border-box;
   }
+
   a.status_advanced_link {
     width: 95%;
   }
+
   .content_div_normalmode {
     overflow-x: auto;
   }
@@ -32934,6 +32960,7 @@ body #main_holder #main .wide {
     width: 100%;
     margin: 0;
   }
+
   fieldset {
     width: 100% !important;
     box-sizing: border-box !important;
@@ -32963,36 +32990,44 @@ fieldset textarea {
   fieldset .setting {
     height: auto !important;
   }
+
   .setting_horizontal_wrapper {
     flex-direction: column !important;
   }
+
   #vnosi_paginacija div select {
     display: inline-block;
     width: fit-content;
     margin: 0 5px;
     text-align: center;
   }
+
   div.breadcrumbs {
     display: block;
     padding: 15px;
     color: #1e88e5;
     font-weight: 600;
   }
+
   button.small, submit.small {
     min-width: auto;
     padding: 5px 16px;
   }
+
   button.medium, submit.medium {
     min-width: auto;
     padding: 10px 24px;
   }
+
   button.large, submit.large {
     min-width: auto;
     padding: 12px 32px;
   }
+
   .top_note {
     padding: 8px 16px;
   }
+
   header {
     /* Mobile meni */
     /* Mobile meni - NASTAVITVE V UREJANJU ANKETE*/
@@ -33248,6 +33283,7 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
   header .mobile_settings .mobile_settings_content a .setting_text {
     width: auto;
   }
+
   footer#srv_footer {
     display: flex;
     flex-direction: column;
@@ -33269,6 +33305,7 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
     padding: 0;
     border: 0;
   }
+
   /* Popup za vprasajcke */
   .qtip {
     position: fixed !important;
@@ -33279,6 +33316,7 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
     left: 10% !important;
     box-shadow: 0 0 15px 15px rgba(0, 0, 0, 0.34) !important;
   }
+
   .divPopUp {
     width: calc(100% - 32px) !important;
     max-width: calc(100% - 32px) !important;
@@ -33289,10 +33327,12 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
     width: calc(100% - 32px) !important;
     max-width: calc(100% - 32px) !important;
   }
+
   /* Vse povezano s paketi in placili */
   .dt-buttons {
     display: none;
   }
+
   #main #moje_ankete_edit #anketa_edit {
     padding: 0 !important;
   }
@@ -33370,6 +33410,7 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
   #main #moje_ankete_edit fieldset div.setting {
     margin-bottom: 10px;
   }
+
   #new_anketa_div {
     display: flex;
     flex-direction: column;
@@ -33453,6 +33494,7 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
     border: 1px solid #c8e3f8 !important;
     border-radius: 1px;
   }
+
   .dashboard_top_settings {
     flex-direction: column;
   }
@@ -33465,16 +33507,19 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
     margin-left: 0;
     margin-right: 16px;
   }
+
   .dashboard_boxes {
     flex-direction: column;
   }
   .dashboard_boxes .dashboard_box {
     margin: 0 0 32px 0;
   }
+
   .locked .add-variable-mobile,
 .spremenljivka_content .add-variable {
     display: none !important;
   }
+
   #branching {
     width: 100%;
     margin: 0;
@@ -33579,9 +33624,11 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
     margin: 0;
     padding: 0 12px;
   }
+
   .toolbox_holder {
     display: none;
   }
+
   .mobile_add_question {
     display: block;
     position: fixed;
@@ -33601,6 +33648,7 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
     line-height: 15px;
     font-weight: 600;
   }
+
   .mobile_add_question_popup {
     z-index: 9999;
     position: fixed;
@@ -33654,6 +33702,7 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
     font-size: 14px;
     font-weight: 500;
   }
+
   #vprasanje_float_editing .vprasanje_edit_holder {
     position: fixed;
     z-index: 99999;
@@ -33706,6 +33755,7 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
     margin-left: 0 !important;
     text-align: center;
   }
+
   #main #anketa #globalSetingsList {
     max-width: 100% !important;
     width: 100% !important;
@@ -33718,6 +33768,7 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
 #main #anketa #globalSetingsList fieldset span.charalimit#anketa_note_chars {
     width: 100%;
   }
+
   /* NASTAVITVE in ARHIVI */
   /* OBLIKA */
   #main #anketa #anketa_edit.page_tema #div_theme_group_holder {
@@ -33733,15 +33784,18 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
     width: 100%;
     height: auto;
   }
+
   #theme-editor {
     width: 100% !important;
     float: none !important;
   }
+
   #theme-preview {
     width: 100% !important;
     float: none !important;
     margin-top: 80px !important;
   }
+
   /* ARHIVI */
   #main #anketa #anketa_edit.page_arhivi {
     flex-direction: column-reverse;
@@ -33759,6 +33813,7 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
   #main #anketa #anketa_edit.page_arhivi #div_archive_content fieldset input {
     width: 100% !important;
   }
+
   div.page_tema .theme_list {
     flex-wrap: wrap;
   }
@@ -33785,6 +33840,7 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
   div.page_tema div#theme_grid_holder div.div_theme_group div.theme_label .theme_label_options .button {
     margin-right: 8px;
   }
+
   .page_theme-editor #theme-preview {
     display: none;
   }
@@ -33792,6 +33848,7 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
     width: 100% !important;
     flex-wrap: wrap;
   }
+
   #srv_diagnostic br {
     display: none;
   }
@@ -33812,6 +33869,7 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
 #srv_diagnostic #srv_diagnostic_results_right table td + td {
     width: auto !important;
   }
+
   .subpage_testnipodatki {
     line-height: 20px;
   }
@@ -33825,6 +33883,7 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
   .subpage_testnipodatki form label input {
     vertical-align: bottom;
   }
+
   .lastnosti_wrapper {
     flex-direction: column !important;
   }
@@ -33832,6 +33891,7 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
 .lastnosti_wrapper .lastnosti_right {
     width: 100% !important;
   }
+
   .page_vabila #vabila .button_holder {
     flex-direction: column;
     align-items: flex-start;
@@ -33856,6 +33916,7 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
   .page_vabila #vabila .more_block {
     width: 100%;
   }
+
   .page_invitations #inv_top_navi {
     flex-direction: column;
     align-items: flex-start;
@@ -33923,6 +33984,7 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
   .page_invitations .button_holder button {
     margin-bottom: 8px;
   }
+
   #vabila > table,
 table.invitations_settings,
 #inv_msg_preview table,
@@ -34006,6 +34068,7 @@ table.invitations_settings p label input[type=password],
     width: 100% !important;
     box-sizing: border-box;
   }
+
   #surveyInvitationSetting,
 #surveyInvitationSettingServer {
     min-width: 100% !important;
@@ -34013,6 +34076,7 @@ table.invitations_settings p label input[type=password],
     margin: 10px 0 !important;
     box-sizing: border-box !important;
   }
+
   #inv_top_navi {
     display: flex;
     flex-direction: column;
@@ -34051,6 +34115,7 @@ table.invitations_settings p label input[type=password],
   #inv_top_navi > #inv_step_nav.yellow .inv_step_space {
     display: none;
   }
+
   #inv_recipients_profiles_holder,
 #inv_import_list_container,
 #inv_messages_profiles_holder,
@@ -34071,6 +34136,7 @@ table.invitations_settings p label input[type=password],
 #inv_select_mail_preview textarea {
     width: 100%;
   }
+
   #inv_msg_preview table th {
     height: auto !important;
     width: 100% !important;
@@ -34082,6 +34148,7 @@ table.invitations_settings p label input[type=password],
     width: 100%;
     box-sizing: border-box;
   }
+
   .addthis_toolbox {
     line-height: 24px;
   }
@@ -34096,9 +34163,11 @@ table.invitations_settings p label input[type=password],
   .addthis_toolbox .addthis_separator {
     font-size: 16px;
   }
+
   #inv_field_container ul li {
     width: 45%;
   }
+
   /* grafika ko ni podatkov */
   div.no_data_alert img {
     width: 100%;
@@ -34110,6 +34179,7 @@ table.invitations_settings p label input[type=password],
     flex-direction: column;
     align-items: center;
   }
+
   .page_data .data_table_top_holder {
     flex-direction: column;
     align-items: flex-start;
@@ -34180,9 +34250,11 @@ table.invitations_settings p label input[type=password],
     width: 100%;
     margin-bottom: 16px;
   }
+
   body.data_fullscreen #analiza_data {
     top: 68px;
   }
+
   .subpage_append .anketa_edit_main,
 .subpage_merge .anketa_edit_main,
 .subpage_calculation .anketa_edit_main,
@@ -34223,6 +34295,7 @@ table.invitations_settings p label input[type=password],
     clear: both;
     margin: 40px 0 0 0 !important;
   }
+
   .subpage_quick_edit #quick_edit_top_line {
     flex-direction: column-reverse;
   }
@@ -34242,6 +34315,7 @@ table.invitations_settings p label input[type=password],
   .subpage_quick_edit .quick_edit_container .quick_edit_bottom_line {
     justify-content: center;
   }
+
   .analysis_bottom_settings {
     flex-wrap: wrap;
   }
@@ -34251,13 +34325,16 @@ table.invitations_settings p label input[type=password],
     margin: 0 0 16px 0 !important;
     border: 0;
   }
+
   .div_analiza_icons,
 .div_analiza_scale {
     opacity: 1 !important;
   }
+
   .analysis_icons_holder {
     display: none;
   }
+
   .chart_holder {
     width: 100%;
     box-sizing: border-box;
@@ -34280,6 +34357,7 @@ table.invitations_settings p label input[type=password],
     display: block;
     clear: both;
   }
+
   table.analysis_reports {
     border-spacing: 0px;
   }
@@ -34296,12 +34374,14 @@ table.analysis_reports > tbody > tr > td {
   table.analysis_reports fieldset {
     margin-bottom: 0 !important;
   }
+
   .reports_holder {
     flex-direction: column;
   }
   .reports_holder fieldset {
     width: 100%;
   }
+
   .noSurvey_sequence {
     padding: 0;
   }
@@ -34323,11 +34403,13 @@ table.analysis_reports > tbody > tr > td {
   .noSurvey_sequence .buttons_holder a .button {
     margin: 10px 30px;
   }
+
   #table-horizontal-scroll-wrapper1-userchanges {
     display: table;
     table-layout: fixed;
     width: 100%;
   }
+
   #table-horizontal-scroll-wrapper2-userchanges {
     display: table-cell;
     overflow-x: auto;
@@ -34338,6 +34420,7 @@ table.analysis_reports > tbody > tr > td {
     border-collapse: collapse;
     white-space: nowrap;
   }
+
   .page_arhivi .anketa_edit_left,
 .page_tracking .anketa_edit_left,
 .subpage_anal_arch .anketa_edit_left,
diff --git a/resources/sass/admin_new/pages/survey_testiranje/diagnostika.scss b/resources/sass/admin_new/pages/survey_testiranje/diagnostika.scss
index c039c4015..a36782dbe 100644
--- a/resources/sass/admin_new/pages/survey_testiranje/diagnostika.scss
+++ b/resources/sass/admin_new/pages/survey_testiranje/diagnostika.scss
@@ -80,7 +80,10 @@ div#srv_diagnostic {
 
                 display: flex;
                 flex-direction: column;
+                box-sizing: border-box;
 
+                height: 160px;
+                
                 .title {
                     text-transform: uppercase;
                     font-weight: $semi-bold;
@@ -111,6 +114,21 @@ div#srv_diagnostic {
                         }
                     }
                 }
+
+                .time {
+                    font-size: 40px;
+                    margin-bottom: 12px;
+                    
+                    span.time_text {
+                        font-size: 14px !important;
+                    }
+                }
+
+                a {
+                    text-decoration: none;
+                    font-size: 14px !important;
+                    white-space: nowrap;
+                }
             }
         }
         

From 308b11fa3e6e0a41d7c65ea78b849d220b40749a Mon Sep 17 00:00:00 2001
From: tejagerjovic <teja.gerjovic@fdv.uni-lj.si>
Date: Wed, 20 Jul 2022 04:14:06 +0200
Subject: [PATCH 097/110] [Redizajn 1KA v2] - Testiranje --> Diagnostika v4

Ostale lastnosti ankete na desni
---
 .../classes/class.SurveyDiagnostics.php       | 91 +++++--------------
 admin/survey/script/Chartjs.js                |  2 +-
 lang/1.php                                    | 28 ++++--
 lang/2.php                                    | 28 ++++--
 public/css/admin_new.css                      | 67 +++++++++-----
 .../pages/survey_testiranje/diagnostika.scss  | 51 +++++++++--
 6 files changed, 154 insertions(+), 113 deletions(-)

diff --git a/admin/survey/classes/class.SurveyDiagnostics.php b/admin/survey/classes/class.SurveyDiagnostics.php
index fca05c0ee..46699149b 100644
--- a/admin/survey/classes/class.SurveyDiagnostics.php
+++ b/admin/survey/classes/class.SurveyDiagnostics.php
@@ -544,82 +544,35 @@ class SurveyDiagnostics
 
 		//Ostale lastnosti ankete
 		echo '<div class="lastnosti_right">';
+		
+		echo '<div class="box">';
+		echo '<div class="vertical_section">';
+		echo '<div class="item">'.$lang['srv_diagnostic_4_element_9'].':</div>';
+		echo '<div class="item">'.$lang['srv_diagnostic_4_element_5'].':</div>';
+		echo '<div class="item">'.$lang['srv_diagnostic_4_element_5a'].':</div>';
+		echo '<div class="item">'.$lang['srv_diagnostic_4_element_8'].':</div>';
+		echo '<div class="item">'.$lang['srv_diagnostic_4_element_2'].':</div>';
+		echo '<div class="item">'.$lang['srv_diagnostic_4_element_3'].':</div>';
+		echo '<div class="item">'.$lang['srv_diagnostic_4_element_4'].':</div>';
+		echo '</div>';
+		echo '<div class="vertical_section second">';
+		echo '<div class="item">'.(int)SurveyInfo::getSurveyGroupCount() . ' ' . ((int)SurveyInfo::getSurveyGroupCount() == 1 ? $lang['srv_page']: $lang['srv_diagnostics_strani']).'</div>';
+		echo '<div class="item">'.(int)$this->cnt_spremenljivka . ' ' . ((int)$this->cnt_spremenljivka == 1 ? $lang['srv_casi_po_vprasanjih_vprasanje'] : ((int)$this->cnt_spremenljivka == 2 ? $lang['srv_info_questions2'] : ((int)$this->cnt_spremenljivka < 5 ? $lang['srv_info_questions3'] : $lang['srv_info_questions1']) )).'</div>';
+		echo '<div class="item">'.(int)$this->cnt_hidden . ' '. ((int)$this->cnt_hidden == 1 ? $lang['srv_hidden_text'] : ((int)$this->cnt_hidden == 2 ? $lang['srv_hidden_text2'] : ((int)$this->cnt_hidden < 5 ? $lang['srv_hidden_text3'] : $lang['srv_hidden_text4']) )). ' ' . ((int)$this->cnt_hidden == 1 ? $lang['srv_casi_po_vprasanjih_vprasanje'] : ((int)$this->cnt_hidden == 2 ? $lang['srv_info_questions2'] : ((int)$this->cnt_hidden < 5 ? $lang['srv_info_questions3'] : $lang['srv_info_questions1']) )).'</div>';
+		echo '<div class="item">'.(int)SurveyInfo::getSurveyVariableCount() . ' ' . ((int)SurveyInfo::getSurveyVariableCount() == 1 ? $lang['srv_spremenljivka'] : ((int)SurveyInfo::getSurveyVariableCount() == 2 ? $lang['srv_spremenljivka2'] : ((int)SurveyInfo::getSurveyVariableCount() < 5 ? $lang['srv_spremenljivka3'] : $lang['srv_spremenljivka4']) )).'</div>';
+		echo '<div class="item">'.(int)$this->cnt_conditions . ' ' . ((int)$this->cnt_conditions == 1 ? $lang['srv_pogoj'] : ((int)$this->cnt_conditions == 2 ? $lang['srv_pogoj2'] : ((int)$this->cnt_conditions < 5 ? $lang['srv_pogoj3'] : $lang['srv_pogoj4']) )).'</div>';
+		echo '<div class="item">'.(int)$this->cnt_blocks . ' ' . ((int)$this->cnt_blocks == 1 ? $lang['srv_blok'] : ((int)$this->cnt_blocks == 2 ? $lang['srv_blok2'] : ((int)$this->cnt_blocks < 5 ? $lang['srv_blok3'] : $lang['srv_blok4']) )).'</div>';
+		echo '<div class="item">'.(int)$this->globina.'</div>';
+		echo '</div>';
+		echo '</div>'; #box
+
 		echo '</div>'; #lastnosti_right
 
 		echo '</div>'; #lastnosti_wrapper
 
 
-
-
 		/////////////////////////////////////////////////////////////////////// Lastnosti staro
 
-		echo '<div class="lastnosti_wrapper">';
-		
-		echo '<div class="lastnosti_left">';
-		echo '<table class="srv_diagnostic_results">';
-		echo '<tr>';
-		echo '<th>'.$lang['srv_diagnostika_table_title4'].'</th>';
-		echo '<th>'.$lang['srv_diagnostika_table_title'].'</th>';
-		echo '</tr>';
-		
-		echo '<tr>';
-		echo '<td>'.$lang['srv_diagnostic_1_element_5'].'</td>';
-        echo '<td>';
-		echo $time.'&nbsp&nbsp';
-        if($lang['id'] == '1')
-			$link_status = 'href="https://www.1ka.si/d/sl/spletne-ankete/osnovna-priporocila/kako-dolga-naj-bo-moja-anketa?from1ka=1" target="_blank"';
-        else
-			$link_status = 'href="https://www.1ka.si/d/en/web-surveys/basic-recommendations/how-long-should-my-survey-be?from1ka=1" target="_blank"';
-		echo '<a class="noline faicon open_icon" '.$link_status.'></a>';
-		echo '</tr>';
-		echo '<tr>';
-		echo '<td>'.$lang['srv_diagnostic_4_element_9'].'</td>';
-		echo '<td>'.(int)SurveyInfo::getSurveyGroupCount().'</td>';
-		echo '</tr>';
-		echo '<tr>';
-		echo '<td>'.$lang['srv_diagnostic_4_element_5'].'</td>';
-		echo '<td>'.(int)$this->cnt_spremenljivka.'</td>';
-		echo '</tr>';
-		echo '<tr>';
-		echo '<td>'.$lang['srv_diagnostic_4_element_5a'].'</td>';
-		echo '<td>'.(int)$this->cnt_hidden.'</td>';
-		echo '</tr>';
-		echo '<tr>';
-		echo '<td>'.$lang['srv_diagnostic_4_element_8'].'</td>';
-		echo '<td>'.(int)SurveyInfo::getSurveyVariableCount().'</td>';
-		echo '</tr>';
-		echo '<tr>';
-		echo '<td>'.$lang['srv_diagnostic_4_element_2'].'</td>';
-		echo '<td>'.(int)$this->cnt_conditions.'</td>';
-		echo '</tr>';
-		echo '<tr>';
-		echo '<td>'.$lang['srv_diagnostic_4_element_3'].'</td>';
-		echo '<td>'.(int)$this->cnt_blocks.'</td>';
-		echo '</tr>';
-		echo '<tr>';
-		echo '<td>'.$lang['srv_diagnostic_4_element_4'].'</td>';
-		echo '<td>'.(int)$this->globina.'</td>';
-		echo '</tr>';
-		echo '<tr>';
-		echo '<td>'.$lang['srv_diagnostic_1_element_4'].'</td>';
-		echo '<td>';
-		echo $kompleksnost.'&nbsp&nbsp';
-        
-		if($lang['id'] == '1')
-			$link_status = 'href="https://www.1ka.si/d/sl/spletne-ankete/osnovna-priporocila/kaj-pomeni-kompleksnost-ankete?from1ka=1" target="_blank"';
-        else
-			$link_status = 'href="https://www.1ka.si/d/en/web-surveys/basic-recommendations/what-does-survey-complexity-mean?from1ka=1" target="_blank"';
-        
-		echo '<a class="noline faicon open_icon" '.$link_status.'></a>';
-		echo '</a>';
-		echo '</tr>';
-		
-		echo '</table>';
-		echo '</div>';
-
-		
-		
-
 		echo '</div>';
 
 		// KOMENATRJI
diff --git a/admin/survey/script/Chartjs.js b/admin/survey/script/Chartjs.js
index 20b1f89ec..dbda4e8ad 100644
--- a/admin/survey/script/Chartjs.js
+++ b/admin/survey/script/Chartjs.js
@@ -16,7 +16,7 @@ function diagnosticsChart(place,display) {
 		data: data,
 		options: {
 			events: [], //no hover labels,animations,...
-			cutout: 32, //slice width
+			cutout: 30, //slice width
 		}
 	};
 
diff --git a/lang/1.php b/lang/1.php
index bc94f6aa6..7aeb94f63 100644
--- a/lang/1.php
+++ b/lang/1.php
@@ -2183,6 +2183,9 @@ $lang = array (
 	"srv_visible_on"		=>	"Vidno",
 	"srv_visible_off"		=>	"Skrito",
 	"srv_hidden_text"		=>	 "Skrito",
+	"srv_hidden_text2"		=>	 "Skriti",
+	"srv_hidden_text3"		=>	 "Skrita",
+	"srv_hidden_text4"		=>	 "Skritih",
 	"srv_system_text"		=>	 "Sistemsko",
 	"srv_visible_dostop"	=>	"Vprašanje je vidno",
 	"srv_previewalert"		=>	"Trenutno ste v predogledu ankete!<br>Odgovori se <b class=\"red\">ne bodo shranili</b> v bazo!",
@@ -3538,8 +3541,10 @@ $lang = array (
 	"srv_bottom_archive"			=>	"Arhiviranje",
 	"srv_info_name"					=>	"Ime ankete",
 	"srv_info_note"					=>	"Opomba",
-	"srv_info_questions"			=>	"Vpra&#353;anj",
+	"srv_info_questions"			=>	"Vprašanj",
 	"srv_info_questions1"			=>	"Vprašanj",
+	"srv_info_questions2"			=>	"Vprašanji",
+	"srv_info_questions3"			=>	"Vprašanja",
 	"srv_info_variables"			=>	"Spremenljivk",
 	"srv_info_pages"				=>	"Strani", 
 	"srv_info_answers"				=>	"Odgovorov",
@@ -4293,7 +4298,13 @@ $lang = array (
 	"srv_basic"							=>	"Osnovno",
 	"srv_advanced"						=>	"Napredne mo&#382;nosti",
 	"srv_pogoj"							=>	"Pogoj",
+	"srv_pogoj2"							=>	"Pogoja",
+	"srv_pogoj3"							=>	"Pogoji",
+	"srv_pogoj4"							=>	"Pogojev",
 	"srv_blok"							=>	"Blok",
+	"srv_blok2"							=>	"Bloka",
+	"srv_blok3"							=>	"Bloki",
+	"srv_blok4"							=>	"Blokov",
 	"srv_calc"							=>	"Kalkulacija",
 	"srv_quota"							=>	"Kvota",
 	"srv_zanka"							=>	"Zanka",
@@ -4405,6 +4416,9 @@ $lang = array (
 	"srv_export_replace1"				=>	"Znak:",
 	"srv_export_replace2"				=>	" v tekstu zamenjaj z:",
 	"srv_spremenljivka"					=>	"Spremenljivka",
+	"srv_spremenljivka2"					=>	"Spremenljivki",
+	"srv_spremenljivka3"					=>	"Spremenljivke",
+	"srv_spremenljivka4"					=>	"Spremenljivk",
 	"srv_vrednost"						=>	"Vrednost",
 	"srv_vrednost_default"				=>	"Prednastavljena vrednost",
 	"srv_your_base_lang"				=>	"Va&#353; osnovni jezik je",
@@ -5421,13 +5435,13 @@ $lang = array (
 	"srv_diagnostic_4_element_0" 				=> 'Komentarji',
 	"srv_diagnostic_4_element_1" 				=> 'na anketo',
 	"srv_diagnostic_4_element_1a" 				=> 'respondentov na anketo',
-	"srv_diagnostic_4_element_2" 				=> 'Število pogojev',
-	"srv_diagnostic_4_element_3" 				=> 'Število blokov',
+	"srv_diagnostic_4_element_2" 				=> 'Pogojev',
+	"srv_diagnostic_4_element_3" 				=> 'Blokov',
 	"srv_diagnostic_4_element_4" 				=> 'Nivo gnezdenja',
-	"srv_diagnostic_4_element_9" 				=> 'Število strani',
-	"srv_diagnostic_4_element_5" 				=> 'Število vprašanj',
-	"srv_diagnostic_4_element_5a" 				=> 'Število skritih vprašanj',
-	"srv_diagnostic_4_element_8" 				=> 'Število spremenljivk',
+	"srv_diagnostic_4_element_9" 				=> 'Strani',
+	"srv_diagnostic_4_element_5" 				=> 'Vprašanj',
+	"srv_diagnostic_4_element_5a" 				=> 'Skritih vprašanj',
+	"srv_diagnostic_4_element_8" 				=> 'Spremenljivk',
 	"srv_diagnostic_4_element_6" 				=> 'na vprašanja',	
 	"srv_diagnostic_4_element_7" 				=> 'respondetov na vprašanja',
 	"srv_diagnostic_5_element_1" 				=> 'Preverjanje pogojev, kalkulacij in zank',
diff --git a/lang/2.php b/lang/2.php
index 12a0b3d0a..3e0cacf74 100644
--- a/lang/2.php
+++ b/lang/2.php
@@ -2170,6 +2170,9 @@ $lang = array (
 	"srv_visible_on"		=>	"Visible",
 	"srv_visible_off"		=>	"Not visible",
 	"srv_hidden_text"		=>  "hidden",
+	"srv_hidden_text2"		=>  "hidden",
+	"srv_hidden_text3"		=>  "hidden",
+	"srv_hidden_text4"		=>  "hidden",
 	"srv_system_text"		=>  "system",
 	"srv_visible_dostop"	=>	"Question is visible",
 	"srv_previewalert"		=>	"You are currently in survey preview mode! Answers will not be saved!",
@@ -3508,7 +3511,9 @@ $lang = array (
 	"srv_info_name"					=>	"Survey name",
 	"srv_info_note"					=>	"Note",
 	"srv_info_questions"			=>	"Questions",
-	"srv_info_questions1"			=>	"N. of questions",
+	"srv_info_questions1"			=>	"Questions",
+	"srv_info_questions2"			=>	"Questions",
+	"srv_info_questions3"			=>	"Questions",
 	"srv_info_variables"			=>	"Variables",
 	"srv_info_pages"				=>	"Pages",
 	"srv_info_answers"				=>	"Answers",
@@ -4272,7 +4277,13 @@ $lang = array (
 	"srv_basic"							=>	"Basic",
 	"srv_advanced"						=>	"Advanced options",
 	"srv_pogoj"							=>	"Condition",
+	"srv_pogoj2"							=>	"Conditions",
+	"srv_pogoj3"							=>	"Conditions",
+	"srv_pogoj4"							=>	"Conditions",
 	"srv_blok"							=>	"Block",
+	"srv_blok2"							=>	"Blocks",
+	"srv_blok3"							=>	"Blocks",
+	"srv_blok4"							=>	"Blocks",
 	"srv_calc"							=>	"Calculation",
 	"srv_quota"							=>	"Quota",
 	"srv_zanka"							=>	"Loop",
@@ -4383,6 +4394,9 @@ $lang = array (
 	"srv_export_replace1"				=>	"Character:",
 	"srv_export_replace2"				=>	" in text replaced by:",
 	"srv_spremenljivka"					=>	"Variable",
+	"srv_spremenljivka2"					=>	"Variables",
+	"srv_spremenljivka3"					=>	"Variables",
+	"srv_spremenljivka4"					=>	"Variables",
 	"srv_vrednost"						=>	"Value",
 	"srv_vrednost_default"				=>	"Preset value",
 	"srv_your_base_lang"				=>	"Your basic language is",
@@ -5402,13 +5416,13 @@ $lang = array (
 	"srv_diagnostic_4_element_0" 				=> 'Comments',
 	"srv_diagnostic_4_element_1" 				=> 'Number of editor survey comments',
 	"srv_diagnostic_4_element_1a" 				=> 'Number of respondent survey comments',
-	"srv_diagnostic_4_element_2" 				=> 'Number of conditions',
-	"srv_diagnostic_4_element_3" 				=> 'Number of blocks',
+	"srv_diagnostic_4_element_2" 				=> 'Conditions',
+	"srv_diagnostic_4_element_3" 				=> 'Blocks',
 	"srv_diagnostic_4_element_4" 				=> 'Levels of nesting',
-	"srv_diagnostic_4_element_9" 				=> 'Number of pages',
-	"srv_diagnostic_4_element_5" 				=> 'Number of questions',
-	"srv_diagnostic_4_element_5a" 				=> 'Number of hidden questions',
-	"srv_diagnostic_4_element_8" 				=> 'Number of variables',
+	"srv_diagnostic_4_element_9" 				=> 'Pages',
+	"srv_diagnostic_4_element_5" 				=> 'Questions',
+	"srv_diagnostic_4_element_5a" 				=> 'Hidden questions',
+	"srv_diagnostic_4_element_8" 				=> 'Variables',
 	"srv_diagnostic_4_element_6" 				=> 'Number of editors in a questionnaire',
 	"srv_diagnostic_4_element_7" 				=> 'Number of respondents in a questionnaire',
 	"srv_diagnostic_5_element_1" 				=> 'Error in conditions, calculations and loops',
diff --git a/public/css/admin_new.css b/public/css/admin_new.css
index f8eb2e3f8..4c68862ed 100644
--- a/public/css/admin_new.css
+++ b/public/css/admin_new.css
@@ -24223,78 +24223,99 @@ div#srv_diagnostic div.lastnosti_wrapper {
   gap: 32px;
 }
 div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_left,
-div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_middle,
-div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_right {
+div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_middle {
   width: 33%;
   display: flex;
   flex-direction: column;
   gap: 16px;
 }
 div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_left .box,
-div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_middle .box,
-div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_right .box {
+div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_middle .box {
   border: 1px solid #E5E5E5;
   border-radius: 2px;
   padding: 16px;
   display: flex;
   flex-direction: column;
   box-sizing: border-box;
-  height: 160px;
 }
 div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_left .box .title,
-div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_middle .box .title,
-div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_right .box .title {
+div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_middle .box .title {
   text-transform: uppercase;
   font-weight: 600;
   margin-bottom: 16px;
 }
 div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_left .box .diagnostic_graph,
-div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_middle .box .diagnostic_graph,
-div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_right .box .diagnostic_graph {
+div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_middle .box .diagnostic_graph {
   display: flex;
   flex-direction: row;
   margin-top: -8px;
 }
 div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_left .box .diagnostic_graph .circle,
-div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_middle .box .diagnostic_graph .circle,
-div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_right .box .diagnostic_graph .circle {
-  height: 100px;
-  width: 100px;
+div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_middle .box .diagnostic_graph .circle {
+  height: 88px;
+  width: 88px;
   margin-right: 16px;
 }
 div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_left .box .diagnostic_graph .other_text,
-div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_middle .box .diagnostic_graph .other_text,
-div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_right .box .diagnostic_graph .other_text {
+div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_middle .box .diagnostic_graph .other_text {
   display: flex;
   flex-direction: column;
   justify-content: center;
   gap: 16px;
 }
 div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_left .box .diagnostic_graph .other_text a,
-div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_middle .box .diagnostic_graph .other_text a,
-div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_right .box .diagnostic_graph .other_text a {
+div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_middle .box .diagnostic_graph .other_text a {
   text-decoration: none;
   font-size: 14px !important;
   white-space: nowrap;
 }
 div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_left .box .time,
-div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_middle .box .time,
-div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_right .box .time {
+div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_middle .box .time {
   font-size: 40px;
   margin-bottom: 12px;
 }
 div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_left .box .time span.time_text,
-div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_middle .box .time span.time_text,
-div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_right .box .time span.time_text {
+div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_middle .box .time span.time_text {
   font-size: 14px !important;
 }
 div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_left .box a,
-div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_middle .box a,
-div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_right .box a {
+div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_middle .box a {
   text-decoration: none;
   font-size: 14px !important;
   white-space: nowrap;
 }
+div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_right {
+  width: 33%;
+}
+div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_right .box {
+  border: 1px solid #E5E5E5;
+  border-radius: 2px;
+  display: flex;
+  flex-direction: row;
+  box-sizing: border-box;
+  height: 100%;
+}
+div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_right .box .vertical_section {
+  display: flex;
+  flex-direction: column;
+  box-sizing: border-box;
+  justify-content: space-between;
+}
+div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_right .box .vertical_section .item {
+  font-size: 14px !important;
+  padding: 13px 16px;
+  white-space: nowrap;
+}
+div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_right .box .vertical_section .item:not(:last-of-type) {
+  border-bottom: 1px solid #E5E5E5;
+}
+div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_right .box .vertical_section.second {
+  width: 100%;
+}
+div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_right .box .vertical_section.second .item {
+  font-weight: 600;
+  text-transform: lowercase;
+}
 div#srv_diagnostic div.input_box {
   display: flex;
   width: 300px;
diff --git a/resources/sass/admin_new/pages/survey_testiranje/diagnostika.scss b/resources/sass/admin_new/pages/survey_testiranje/diagnostika.scss
index a36782dbe..0b24d24a2 100644
--- a/resources/sass/admin_new/pages/survey_testiranje/diagnostika.scss
+++ b/resources/sass/admin_new/pages/survey_testiranje/diagnostika.scss
@@ -66,8 +66,7 @@ div#srv_diagnostic {
         gap: 32px;
 
         div.lastnosti_left,
-        div.lastnosti_middle,
-        div.lastnosti_right {
+        div.lastnosti_middle {
             width: 33%;
             display: flex;
             flex-direction: column;
@@ -82,8 +81,6 @@ div#srv_diagnostic {
                 flex-direction: column;
                 box-sizing: border-box;
 
-                height: 160px;
-                
                 .title {
                     text-transform: uppercase;
                     font-weight: $semi-bold;
@@ -96,8 +93,8 @@ div#srv_diagnostic {
                     margin-top: -8px;
 
                     .circle {
-                        height: 100px;
-                        width: 100px;
+                        height: 88px;
+                        width: 88px;
                         margin-right: 16px;
                     }
 
@@ -131,6 +128,48 @@ div#srv_diagnostic {
                 }
             }
         }
+
+        div.lastnosti_right {
+            width: 33%;
+
+            .box {
+                border: 1px solid $gray;
+                border-radius: 2px;
+
+                display: flex;
+                flex-direction: row;
+                box-sizing: border-box;
+
+                height: 100%;
+                
+                .vertical_section {
+                    display: flex;
+                    flex-direction: column;
+                    box-sizing: border-box;
+                    justify-content: space-between;
+                    
+                    .item {
+                        font-size: 14px !important;
+                        padding: 13px 16px;
+                        white-space:nowrap;
+
+                        &:not(:last-of-type) {
+                        border-bottom: 1px solid $gray;
+                        }
+                    }
+
+                    &.second {
+                        width: 100%;
+
+                        .item {
+                            font-weight: $semi-bold;
+                            text-transform: lowercase;
+                        }
+                    }
+                }
+            }
+
+        }
         
     }
     div.input_box {

From 99cf76e1ff40af80ab3da7149b7b4c742eb6e68d Mon Sep 17 00:00:00 2001
From: tejagerjovic <teja.gerjovic@fdv.uni-lj.si>
Date: Wed, 20 Jul 2022 04:57:16 +0200
Subject: [PATCH 098/110] [Redizajn 1KA v2] - Testiranje --> Diagnostika - v5

Komentarji
---
 .../classes/class.SurveyDiagnostics.php       |  80 +++++++------
 lang/1.php                                    |   5 +
 lang/2.php                                    |   3 +
 public/css/admin_new.css                      | 110 ++++++++++++------
 .../pages/survey_testiranje/diagnostika.scss  |  68 +++++++++--
 5 files changed, 192 insertions(+), 74 deletions(-)

diff --git a/admin/survey/classes/class.SurveyDiagnostics.php b/admin/survey/classes/class.SurveyDiagnostics.php
index 46699149b..deb4c1a9c 100644
--- a/admin/survey/classes/class.SurveyDiagnostics.php
+++ b/admin/survey/classes/class.SurveyDiagnostics.php
@@ -571,10 +571,6 @@ class SurveyDiagnostics
 		echo '</div>'; #lastnosti_wrapper
 
 
-		/////////////////////////////////////////////////////////////////////// Lastnosti staro
-
-		echo '</div>';
-
 		// KOMENATRJI
 		# nerazrešeni komentarji uporabnikov $commentsUser,$commentsUserFinished		
 		$commentsUserUnresolved = $commentsUser - $commentsUserFinished;
@@ -586,36 +582,52 @@ class SurveyDiagnostics
 				+(int)$commentsUserFinished
 				) > 0 ) { 
 			
-			echo '<h2>'.$lang['srv_diagnostic_4_element_0'].'</h2>';
-			echo '<table class="srv_diagnostic_results">';
-			echo '<tr>';
-			echo '<th>'.$lang['srv_diagnostic_4_element_0'].'</th>';
-			echo '<th>'.$lang['srv_diagnostic_unresolved'].'</th>';
-			echo '<th>'.$lang['srv_diagnostic_all'].'</th>';
-			echo '</tr>';
-			echo '<tr>';
-			echo '<td>'.$lang['srv_diagnostic_4_element_1'].'</td>';
-			echo '<td>'.(int)$commentsUnresolved.'</td>';
-			echo '<td>'.(int)$commentsAll.'</td>';
-			echo '</tr>';
-			echo '<tr>';
-			echo '<td>'.$lang['srv_diagnostic_4_element_1a'].'</td>';
-			echo '<td>'.(int)$commentsUserSurveyUnresolved.'</td>';
-			echo '<td>'.(int)$commentsUserSurveyAll.'</td>';
-			echo '</tr>';
-			echo '<tr>';
-			echo '<td>'.$lang['srv_diagnostic_4_element_6'].'</td>';
-			echo '<td>'.(int)$commentsQuestionUnresolved.'</td>';
-			echo '<td>'.(int)$commentsQuestionAll.'</td>';
-			echo '</tr>';
-			echo '<tr>';
-			echo '<td>'.$lang['srv_diagnostic_4_element_7'].'</td>';
-			echo '<td>'.(int)$commentsUserUnresolved.'</td>';
-			echo '<td>'.(int)$commentsUser.'</td>';
-			echo '</tr>';
-			echo '</table>';
-		}
-		
+					echo '<h2>'.$lang['srv_diagnostic_4_element_0'].'</h2>';
+
+					echo '<div class="komentarji_wrapper">';
+					
+					echo '<div class="komentarji_left">';
+					echo '<div class="title">'.$lang['srv_testiranje_komentarji_anketa'].'</div>';
+					
+					echo '<div class="comment_count">';
+					echo '<div>'.$lang['srv_admin_comment2'].'</div>';
+					echo '<div><span class="semi-bold">'.(int)$commentsUnresolved.'/'.(int)$commentsAll.'</span> '.$lang['srv_inv_archive_comment2'].'</div>';
+					echo '</div>';
+
+					echo '<div class="comment_count">';
+					echo '<div>'.$lang['srv_repondent_comment2'].'</div>';
+					echo '<div><span class="semi-bold">'.(int)$commentsUserSurveyUnresolved.'/'.(int)$commentsUserSurveyAll.'</span> '.$lang['srv_inv_archive_comment2'].'</div>';
+					echo '</div>';
+
+					$b = new Branching($this->anketa['id']);
+
+					$id = $b->anketa;
+
+					echo '<a href="'.$site_url.'/admin/survey/index.php?anketa='.$id.'&a=komentarji_anketa">'.$lang['srv_testiranje_komentarji_anketa_link'].'</a>';	
+
+					echo '</div>'; #komentarji_left
+					
+					
+					echo '<div class="komentarji_right">';
+					echo '<div class="title">'.$lang['srv_testiranje_komentarji_title'].'</div>';
+
+					echo '<div class="comment_count">';
+					echo '<div>'.$lang['srv_admin_comment2'].'</div>';
+					echo '<div><span class="semi-bold">'.(int)$commentsQuestionUnresolved.'/'.(int)$commentsQuestionAll.'</span> '.$lang['srv_inv_archive_comment2'].'</div>';
+					echo '</div>';
+
+					echo '<div class="comment_count">';
+					echo '<div>'.$lang['srv_repondent_comment2'].'</div>';
+					echo '<div><span class="semi-bold">'.(int)$commentsUserUnresolved.'/'.(int)$commentsUser.'</span> '.$lang['srv_inv_archive_comment2'].'</div>';
+					echo '</div>';
+
+					echo '<a href="'.$site_url.'/admin/survey/index.php?anketa='.$id.'&a=komentarji">'.$lang['srv_testiranje_komentarji_title_link'].'</a>';	
+
+					echo '</div>'; #komentarji_right
+
+					echo '</div>'; #komentarji_wrapper
+				}
+
 		echo '</div>'; # id="srv_diagnostic"
 	}
 	
diff --git a/lang/1.php b/lang/1.php
index 7aeb94f63..670fa9ae6 100644
--- a/lang/1.php
+++ b/lang/1.php
@@ -3593,7 +3593,9 @@ $lang = array (
 	"srv_forum_go"					=>	"Ogled celotne teme v forumu",
 	"srv_forum_back"				=>	"Nazaj na urejanje ankete",
 	"srv_admin_comment"				=>	"Komentarji urednikov",
+	"srv_admin_comment2"				=>	"Urednikov",
 	"srv_repondent_comment"			=>	"Komentarji respondentov",
+	"srv_repondent_comment2"			=>	"Respondentov",
 	"srv_add_comment_toggle"				=>	"Dodaj nov komentar",
 	"srv_add_comment"				=>	"Dodaj komentar",
 	"srv_view_comment"				=>	"Poglej komentarje",
@@ -5146,6 +5148,7 @@ $lang = array (
 	'srv_inv_archive_cnt_succsess' 				=> "Uspešno poslanih",									
 	'srv_inv_archive_cnt_error' 				=> "Napak",									
 	'srv_inv_archive_comment' 					=> "Komentar",									
+	'srv_inv_archive_comment2' 					=> "komentarjev",									
 	'srv_inv_archive_sender' 					=> "Poslal/-a",
 	'srv_inv_archive_email_address' 			=> "Email prejemnika",
 	'srv_inv_archive_status' 					=> "Status",
@@ -5372,7 +5375,9 @@ $lang = array (
 	"srv_testiranje_diagnostika_base"			=>	"Osnovna diagnostika",
 	"srv_testiranje_komentarji"					=>	"Komentarji",
 	"srv_testiranje_komentarji_anketa"			=>	"Komentarji na anketo",
+	"srv_testiranje_komentarji_anketa_link"			=>	"Oglej si komentarje na anketo",
 	"srv_testiranje_komentarji_title"			=>	"Komentarji na vprašanja",			
+	"srv_testiranje_komentarji_title_link"			=>	"Oglej si komentarje na vprašanja",			
 	"srv_testiranje_komentar_q_title"			=>	"Komentar na vprašanje",			
 	"srv_testiranje_komentar_q_all_title"		=>	"Komentarji na vprašanje",			
 	"srv_testiranje_komentar_q_resp_all_title"	=>	"Komentarji respondentov na vprašanje",			
diff --git a/lang/2.php b/lang/2.php
index 3e0cacf74..07a83964a 100644
--- a/lang/2.php
+++ b/lang/2.php
@@ -4002,7 +4002,9 @@ $lang = array (
 	"srv_collectData"					=>	"Data preparation",			
 	"srv_testiranje_komentarji"			=>	"Comments",		
 	"srv_testiranje_komentarji_anketa"	=>	"Survey comments",	
+	"srv_testiranje_komentarji_anketa_link"	=>	"View survey comments",	
 	"srv_testiranje_komentarji_title"			=>	"Question comments",	
+	"srv_testiranje_komentarji_title_link"			=>	"View question comments",	
 	"srv_testiranje_komentar_q_title"			=>	"Question comment",			
 	"srv_testiranje_komentar_q_all_title"		=>	"Question comments",			
 	"srv_testiranje_komentar_q_resp_all_title"	=>	"Respondnet question comments",			
@@ -5115,6 +5117,7 @@ $lang = array (
 	'srv_inv_archive_cnt_succsess' 				=> "Successfully sent",									
 	'srv_inv_archive_cnt_error' 				=> "Errors",									
 	'srv_inv_archive_comment' 					=> "Comment",									
+	'srv_inv_archive_comment2' 					=> "comments",									
 	'srv_inv_archive_sender' 					=> "Sender",
 	'srv_inv_archive_email_address' 			=> "Respondent email",
 	'srv_inv_archive_status' 					=> "Status",
diff --git a/public/css/admin_new.css b/public/css/admin_new.css
index 4c68862ed..b3272c12d 100644
--- a/public/css/admin_new.css
+++ b/public/css/admin_new.css
@@ -24216,78 +24216,79 @@ div#srv_diagnostic table td div.status_wrapper div.status a {
   color: inherit;
   text-decoration: none;
 }
-div#srv_diagnostic div.lastnosti_wrapper {
+div#srv_diagnostic .lastnosti_wrapper {
   display: flex;
   flex-direction: row;
   align-items: space-between;
   gap: 32px;
 }
-div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_left,
-div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_middle {
+div#srv_diagnostic .lastnosti_wrapper .lastnosti_left,
+div#srv_diagnostic .lastnosti_wrapper .lastnosti_middle {
   width: 33%;
   display: flex;
   flex-direction: column;
   gap: 16px;
 }
-div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_left .box,
-div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_middle .box {
+div#srv_diagnostic .lastnosti_wrapper .lastnosti_left .box,
+div#srv_diagnostic .lastnosti_wrapper .lastnosti_middle .box {
   border: 1px solid #E5E5E5;
   border-radius: 2px;
   padding: 16px;
   display: flex;
   flex-direction: column;
   box-sizing: border-box;
+  min-height: 162px;
 }
-div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_left .box .title,
-div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_middle .box .title {
+div#srv_diagnostic .lastnosti_wrapper .lastnosti_left .box .title,
+div#srv_diagnostic .lastnosti_wrapper .lastnosti_middle .box .title {
   text-transform: uppercase;
   font-weight: 600;
   margin-bottom: 16px;
 }
-div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_left .box .diagnostic_graph,
-div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_middle .box .diagnostic_graph {
+div#srv_diagnostic .lastnosti_wrapper .lastnosti_left .box .diagnostic_graph,
+div#srv_diagnostic .lastnosti_wrapper .lastnosti_middle .box .diagnostic_graph {
   display: flex;
   flex-direction: row;
   margin-top: -8px;
 }
-div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_left .box .diagnostic_graph .circle,
-div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_middle .box .diagnostic_graph .circle {
+div#srv_diagnostic .lastnosti_wrapper .lastnosti_left .box .diagnostic_graph .circle,
+div#srv_diagnostic .lastnosti_wrapper .lastnosti_middle .box .diagnostic_graph .circle {
   height: 88px;
   width: 88px;
   margin-right: 16px;
 }
-div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_left .box .diagnostic_graph .other_text,
-div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_middle .box .diagnostic_graph .other_text {
+div#srv_diagnostic .lastnosti_wrapper .lastnosti_left .box .diagnostic_graph .other_text,
+div#srv_diagnostic .lastnosti_wrapper .lastnosti_middle .box .diagnostic_graph .other_text {
   display: flex;
   flex-direction: column;
   justify-content: center;
   gap: 16px;
 }
-div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_left .box .diagnostic_graph .other_text a,
-div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_middle .box .diagnostic_graph .other_text a {
+div#srv_diagnostic .lastnosti_wrapper .lastnosti_left .box .diagnostic_graph .other_text a,
+div#srv_diagnostic .lastnosti_wrapper .lastnosti_middle .box .diagnostic_graph .other_text a {
   text-decoration: none;
   font-size: 14px !important;
   white-space: nowrap;
 }
-div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_left .box .time,
-div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_middle .box .time {
-  font-size: 40px;
+div#srv_diagnostic .lastnosti_wrapper .lastnosti_left .box .time,
+div#srv_diagnostic .lastnosti_wrapper .lastnosti_middle .box .time {
+  font-size: 32px;
   margin-bottom: 12px;
 }
-div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_left .box .time span.time_text,
-div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_middle .box .time span.time_text {
+div#srv_diagnostic .lastnosti_wrapper .lastnosti_left .box .time span.time_text,
+div#srv_diagnostic .lastnosti_wrapper .lastnosti_middle .box .time span.time_text {
   font-size: 14px !important;
 }
-div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_left .box a,
-div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_middle .box a {
+div#srv_diagnostic .lastnosti_wrapper .lastnosti_left .box a,
+div#srv_diagnostic .lastnosti_wrapper .lastnosti_middle .box a {
   text-decoration: none;
   font-size: 14px !important;
   white-space: nowrap;
 }
-div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_right {
+div#srv_diagnostic .lastnosti_wrapper .lastnosti_right {
   width: 33%;
 }
-div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_right .box {
+div#srv_diagnostic .lastnosti_wrapper .lastnosti_right .box {
   border: 1px solid #E5E5E5;
   border-radius: 2px;
   display: flex;
@@ -24295,45 +24296,88 @@ div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_right .box {
   box-sizing: border-box;
   height: 100%;
 }
-div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_right .box .vertical_section {
+div#srv_diagnostic .lastnosti_wrapper .lastnosti_right .box .vertical_section {
   display: flex;
   flex-direction: column;
   box-sizing: border-box;
   justify-content: space-between;
 }
-div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_right .box .vertical_section .item {
+div#srv_diagnostic .lastnosti_wrapper .lastnosti_right .box .vertical_section .item {
   font-size: 14px !important;
   padding: 13px 16px;
   white-space: nowrap;
 }
-div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_right .box .vertical_section .item:not(:last-of-type) {
+div#srv_diagnostic .lastnosti_wrapper .lastnosti_right .box .vertical_section .item:not(:last-of-type) {
   border-bottom: 1px solid #E5E5E5;
 }
-div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_right .box .vertical_section.second {
+div#srv_diagnostic .lastnosti_wrapper .lastnosti_right .box .vertical_section.second {
   width: 100%;
 }
-div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_right .box .vertical_section.second .item {
+div#srv_diagnostic .lastnosti_wrapper .lastnosti_right .box .vertical_section.second .item {
   font-weight: 600;
   text-transform: lowercase;
 }
-div#srv_diagnostic div.input_box {
+div#srv_diagnostic .komentarji_wrapper {
+  display: flex;
+  flex-direction: row;
+  gap: 32px;
+}
+div#srv_diagnostic .komentarji_wrapper .komentarji_left,
+div#srv_diagnostic .komentarji_wrapper .komentarji_right {
+  width: 50%;
+  border: 1px solid #E5E5E5;
+  border-radius: 2px;
+  padding: 16px;
+  display: flex;
+  flex-direction: column;
+  box-sizing: border-box;
+}
+div#srv_diagnostic .komentarji_wrapper .komentarji_left .title,
+div#srv_diagnostic .komentarji_wrapper .komentarji_right .title {
+  text-transform: uppercase;
+  font-weight: 600;
+  margin-bottom: 16px;
+}
+div#srv_diagnostic .komentarji_wrapper .komentarji_left .comment_count,
+div#srv_diagnostic .komentarji_wrapper .komentarji_right .comment_count {
+  width: 100%;
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+  padding-bottom: 8px;
+  border-bottom: 1px solid #E5E5E5;
+  margin-bottom: 8px;
+}
+div#srv_diagnostic .komentarji_wrapper .komentarji_left .comment_count:last-of-type,
+div#srv_diagnostic .komentarji_wrapper .komentarji_right .comment_count:last-of-type {
+  padding-bottom: 0;
+  border-bottom: none;
+  margin-bottom: 16px;
+}
+div#srv_diagnostic .komentarji_wrapper .komentarji_left a,
+div#srv_diagnostic .komentarji_wrapper .komentarji_right a {
+  text-decoration: none;
+  font-size: 14px !important;
+  white-space: nowrap;
+}
+div#srv_diagnostic .input_box {
   display: flex;
   width: 300px;
   padding: 10px 0 10px 8px;
   border: 1px solid #C4C4C4;
 }
-div#srv_diagnostic div.input_box input {
+div#srv_diagnostic .input_box input {
   border: none;
   margin: 0;
   padding: 0;
   font-size: 16px;
   width: 90%;
 }
-div#srv_diagnostic div.button_holder {
+div#srv_diagnostic .button_holder {
   align-items: center;
   margin-bottom: 0;
 }
-div#srv_diagnostic div.button_holder button {
+div#srv_diagnostic .button_holder button {
   margin: 0 0 0 8px;
 }
 
diff --git a/resources/sass/admin_new/pages/survey_testiranje/diagnostika.scss b/resources/sass/admin_new/pages/survey_testiranje/diagnostika.scss
index 0b24d24a2..697b46225 100644
--- a/resources/sass/admin_new/pages/survey_testiranje/diagnostika.scss
+++ b/resources/sass/admin_new/pages/survey_testiranje/diagnostika.scss
@@ -59,14 +59,14 @@ div#srv_diagnostic {
         }
     }
 
-    div.lastnosti_wrapper {
+    .lastnosti_wrapper {
         display: flex;
         flex-direction: row;
         align-items: space-between;
         gap: 32px;
 
-        div.lastnosti_left,
-        div.lastnosti_middle {
+        .lastnosti_left,
+        .lastnosti_middle {
             width: 33%;
             display: flex;
             flex-direction: column;
@@ -81,6 +81,8 @@ div#srv_diagnostic {
                 flex-direction: column;
                 box-sizing: border-box;
 
+                min-height: 162px;
+
                 .title {
                     text-transform: uppercase;
                     font-weight: $semi-bold;
@@ -113,7 +115,7 @@ div#srv_diagnostic {
                 }
 
                 .time {
-                    font-size: 40px;
+                    font-size: 32px;
                     margin-bottom: 12px;
                     
                     span.time_text {
@@ -129,7 +131,7 @@ div#srv_diagnostic {
             }
         }
 
-        div.lastnosti_right {
+        .lastnosti_right {
             width: 33%;
 
             .box {
@@ -172,7 +174,59 @@ div#srv_diagnostic {
         }
         
     }
-    div.input_box {
+
+    .komentarji_wrapper {
+
+        display: flex;
+        flex-direction: row;
+        gap: 32px;
+
+        .komentarji_left,
+        .komentarji_right {
+            
+            width: 50%;
+
+            border: 1px solid $gray;
+            border-radius: 2px;
+            padding: 16px;
+
+            display: flex;
+            flex-direction: column;
+            box-sizing: border-box;
+
+            .title {
+                text-transform: uppercase;
+                font-weight: $semi-bold;
+                margin-bottom: 16px;
+            }
+
+            .comment_count {
+                width: 100%;
+                display: flex;
+                flex-direction: row;
+                justify-content: space-between;
+
+                padding-bottom: 8px;
+                border-bottom: 1px solid $gray;
+                margin-bottom: 8px;
+
+                &:last-of-type {
+                    padding-bottom: 0;
+                    border-bottom: none;
+                    margin-bottom: 16px;
+                }
+            }
+
+            a {
+                text-decoration: none;
+                font-size: 14px !important;
+                white-space: nowrap;
+            }
+        }
+    }
+
+
+    .input_box {
         display: flex;
 
         width: 300px;
@@ -189,7 +243,7 @@ div#srv_diagnostic {
         }
     }
 
-    div.button_holder {
+    .button_holder {
         align-items: center;
         margin-bottom: 0;
         button {

From ab38be7a44cb2f5dbed0b66f7fd7cedd000ecb2d Mon Sep 17 00:00:00 2001
From: tejagerjovic <teja.gerjovic@fdv.uni-lj.si>
Date: Wed, 20 Jul 2022 05:00:33 +0200
Subject: [PATCH 099/110] [Redizajn 1KA v2] - Testiranje --> Diagnostika - v6

Box height popravek
---
 public/css/admin_new.css                                        | 2 +-
 .../sass/admin_new/pages/survey_testiranje/diagnostika.scss     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/public/css/admin_new.css b/public/css/admin_new.css
index b3272c12d..6f72dfe1f 100644
--- a/public/css/admin_new.css
+++ b/public/css/admin_new.css
@@ -24237,7 +24237,7 @@ div#srv_diagnostic .lastnosti_wrapper .lastnosti_middle .box {
   display: flex;
   flex-direction: column;
   box-sizing: border-box;
-  min-height: 162px;
+  min-height: 150px;
 }
 div#srv_diagnostic .lastnosti_wrapper .lastnosti_left .box .title,
 div#srv_diagnostic .lastnosti_wrapper .lastnosti_middle .box .title {
diff --git a/resources/sass/admin_new/pages/survey_testiranje/diagnostika.scss b/resources/sass/admin_new/pages/survey_testiranje/diagnostika.scss
index 697b46225..96d4852e3 100644
--- a/resources/sass/admin_new/pages/survey_testiranje/diagnostika.scss
+++ b/resources/sass/admin_new/pages/survey_testiranje/diagnostika.scss
@@ -81,7 +81,7 @@ div#srv_diagnostic {
                 flex-direction: column;
                 box-sizing: border-box;
 
-                min-height: 162px;
+                min-height: 150px;
 
                 .title {
                     text-transform: uppercase;

From 201f50c506b4ac376948b24ef388fbf9992b4b69 Mon Sep 17 00:00:00 2001
From: tejagerjovic <teja.gerjovic@fdv.uni-lj.si>
Date: Wed, 20 Jul 2022 06:49:12 +0200
Subject: [PATCH 100/110] [Redizajn 1KA v2] - Testiranje --> Diagnostika - v7

---
 .../survey/classes/class.SurveyDiagnostics.php  | 17 ++++++++++-------
 public/css/admin_new.css                        |  3 ++-
 .../pages/survey_testiranje/diagnostika.scss    |  4 +++-
 3 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/admin/survey/classes/class.SurveyDiagnostics.php b/admin/survey/classes/class.SurveyDiagnostics.php
index deb4c1a9c..64b75604d 100644
--- a/admin/survey/classes/class.SurveyDiagnostics.php
+++ b/admin/survey/classes/class.SurveyDiagnostics.php
@@ -480,7 +480,10 @@ class SurveyDiagnostics
 		$sas = new SurveyAdminSettings();
 		$dejanski_cas = ($sas->testiranje_cas(1) == null) ? '-' : $sas->testiranje_cas(1);
 		echo '<p class="time">'.$dejanski_cas.'</p>';
-		echo '<a href="index.php?anketa=' . $this->sid . '&amp;a='.A_TESTIRANJE.'&amp;m='.M_TESTIRANJE_CAS.'">'.$lang['srv_testiranje_cas_info'].'</a>';
+		if ($sas->testiranje_cas(1) == null)
+			echo $lang['srv_data_no_data'];
+		else
+			echo '<a href="index.php?anketa=' . $this->sid . '&amp;a='.A_TESTIRANJE.'&amp;m='.M_TESTIRANJE_CAS.'">'.$lang['srv_testiranje_cas_info'].'</a>';
 		echo '</div>'; #box
 
 		//Ocena trajanja
@@ -556,12 +559,12 @@ class SurveyDiagnostics
 		echo '<div class="item">'.$lang['srv_diagnostic_4_element_4'].':</div>';
 		echo '</div>';
 		echo '<div class="vertical_section second">';
-		echo '<div class="item">'.(int)SurveyInfo::getSurveyGroupCount() . ' ' . ((int)SurveyInfo::getSurveyGroupCount() == 1 ? $lang['srv_page']: $lang['srv_diagnostics_strani']).'</div>';
-		echo '<div class="item">'.(int)$this->cnt_spremenljivka . ' ' . ((int)$this->cnt_spremenljivka == 1 ? $lang['srv_casi_po_vprasanjih_vprasanje'] : ((int)$this->cnt_spremenljivka == 2 ? $lang['srv_info_questions2'] : ((int)$this->cnt_spremenljivka < 5 ? $lang['srv_info_questions3'] : $lang['srv_info_questions1']) )).'</div>';
-		echo '<div class="item">'.(int)$this->cnt_hidden . ' '. ((int)$this->cnt_hidden == 1 ? $lang['srv_hidden_text'] : ((int)$this->cnt_hidden == 2 ? $lang['srv_hidden_text2'] : ((int)$this->cnt_hidden < 5 ? $lang['srv_hidden_text3'] : $lang['srv_hidden_text4']) )). ' ' . ((int)$this->cnt_hidden == 1 ? $lang['srv_casi_po_vprasanjih_vprasanje'] : ((int)$this->cnt_hidden == 2 ? $lang['srv_info_questions2'] : ((int)$this->cnt_hidden < 5 ? $lang['srv_info_questions3'] : $lang['srv_info_questions1']) )).'</div>';
-		echo '<div class="item">'.(int)SurveyInfo::getSurveyVariableCount() . ' ' . ((int)SurveyInfo::getSurveyVariableCount() == 1 ? $lang['srv_spremenljivka'] : ((int)SurveyInfo::getSurveyVariableCount() == 2 ? $lang['srv_spremenljivka2'] : ((int)SurveyInfo::getSurveyVariableCount() < 5 ? $lang['srv_spremenljivka3'] : $lang['srv_spremenljivka4']) )).'</div>';
-		echo '<div class="item">'.(int)$this->cnt_conditions . ' ' . ((int)$this->cnt_conditions == 1 ? $lang['srv_pogoj'] : ((int)$this->cnt_conditions == 2 ? $lang['srv_pogoj2'] : ((int)$this->cnt_conditions < 5 ? $lang['srv_pogoj3'] : $lang['srv_pogoj4']) )).'</div>';
-		echo '<div class="item">'.(int)$this->cnt_blocks . ' ' . ((int)$this->cnt_blocks == 1 ? $lang['srv_blok'] : ((int)$this->cnt_blocks == 2 ? $lang['srv_blok2'] : ((int)$this->cnt_blocks < 5 ? $lang['srv_blok3'] : $lang['srv_blok4']) )).'</div>';
+		echo '<div class="item">'.(int)SurveyInfo::getSurveyGroupCount() . ' ' . ((int)SurveyInfo::getSurveyGroupCount() == 1 ? $lang['page']: $lang['srv_diagnostics_strani']).'</div>';
+		echo '<div class="item">'.(int)$this->cnt_spremenljivka . ' ' . ((int)$this->cnt_spremenljivka == 1 ? $lang['srv_casi_po_vprasanjih_vprasanje'] : ((int)$this->cnt_spremenljivka == 2 ? $lang['srv_info_questions2'] : ((int)$this->cnt_spremenljivka > 4 || (int)$this->cnt_spremenljivka == 0 ? $lang['srv_info_questions1'] : $lang['srv_info_questions3']) )).'</div>';
+		echo '<div class="item">'.(int)$this->cnt_hidden . ' '. ((int)$this->cnt_hidden == 1 ? $lang['srv_hidden_text'] : ((int)$this->cnt_hidden == 2 ? $lang['srv_hidden_text2'] : ((int)$this->cnt_hidden > 4 || (int)$this->cnt_hidden == 0 ? $lang['srv_hidden_text4'] : $lang['srv_hidden_text3']) )). ' ' . ((int)$this->cnt_hidden == 1 ? $lang['srv_casi_po_vprasanjih_vprasanje'] : ((int)$this->cnt_hidden == 2 ? $lang['srv_info_questions2'] : ((int)$this->cnt_hidden > 4 || (int)$this->cnt_hidden == 0 ? $lang['srv_info_questions1'] : $lang['srv_info_questions3']) )).'</div>';
+		echo '<div class="item">'.(int)SurveyInfo::getSurveyVariableCount() . ' ' . ((int)SurveyInfo::getSurveyVariableCount() == 1 ? $lang['srv_spremenljivka'] : ((int)SurveyInfo::getSurveyVariableCount() == 2 ? $lang['srv_spremenljivka2'] : ((int)SurveyInfo::getSurveyVariableCount() > 4 || (int)SurveyInfo::getSurveyVariableCount() == 0 ? $lang['srv_spremenljivka4'] : $lang['srv_spremenljivka3']) )).'</div>';
+		echo '<div class="item">'.(int)$this->cnt_conditions . ' ' . ((int)$this->cnt_conditions == 1 ? $lang['srv_pogoj'] : ((int)$this->cnt_conditions == 2 ? $lang['srv_pogoj2'] : ((int)$this->cnt_conditions > 4 || (int)$this->cnt_conditions == 0 ? $lang['srv_pogoj4'] : $lang['srv_pogoj3']) )).'</div>';
+		echo '<div class="item">'.(int)$this->cnt_blocks . ' ' . ((int)$this->cnt_blocks == 1 ? $lang['srv_blok'] : ((int)$this->cnt_blocks == 2 ? $lang['srv_blok2'] : ((int)$this->cnt_blocks > 4 || (int)$this->cnt_blocks == 0 ? $lang['srv_blok4'] : $lang['srv_blok3']) )).'</div>';
 		echo '<div class="item">'.(int)$this->globina.'</div>';
 		echo '</div>';
 		echo '</div>'; #box
diff --git a/public/css/admin_new.css b/public/css/admin_new.css
index 6f72dfe1f..6f61c76da 100644
--- a/public/css/admin_new.css
+++ b/public/css/admin_new.css
@@ -24238,6 +24238,7 @@ div#srv_diagnostic .lastnosti_wrapper .lastnosti_middle .box {
   flex-direction: column;
   box-sizing: border-box;
   min-height: 150px;
+  font-size: 14px !important;
 }
 div#srv_diagnostic .lastnosti_wrapper .lastnosti_left .box .title,
 div#srv_diagnostic .lastnosti_wrapper .lastnosti_middle .box .title {
@@ -24262,7 +24263,7 @@ div#srv_diagnostic .lastnosti_wrapper .lastnosti_middle .box .diagnostic_graph .
   display: flex;
   flex-direction: column;
   justify-content: center;
-  gap: 16px;
+  gap: 30px;
 }
 div#srv_diagnostic .lastnosti_wrapper .lastnosti_left .box .diagnostic_graph .other_text a,
 div#srv_diagnostic .lastnosti_wrapper .lastnosti_middle .box .diagnostic_graph .other_text a {
diff --git a/resources/sass/admin_new/pages/survey_testiranje/diagnostika.scss b/resources/sass/admin_new/pages/survey_testiranje/diagnostika.scss
index 96d4852e3..cfbe08e7c 100644
--- a/resources/sass/admin_new/pages/survey_testiranje/diagnostika.scss
+++ b/resources/sass/admin_new/pages/survey_testiranje/diagnostika.scss
@@ -83,6 +83,8 @@ div#srv_diagnostic {
 
                 min-height: 150px;
 
+                font-size: 14px !important;
+
                 .title {
                     text-transform: uppercase;
                     font-weight: $semi-bold;
@@ -104,7 +106,7 @@ div#srv_diagnostic {
                         display: flex;
                         flex-direction: column;
                         justify-content: center;
-                        gap: 16px;
+                        gap: 30px;
 
                         a {
                             text-decoration: none;

From 0d556e852d402d813666e4de1c86c30db30e351d Mon Sep 17 00:00:00 2001
From: tejagerjovic <teja.gerjovic@fdv.uni-lj.si>
Date: Wed, 20 Jul 2022 07:17:18 +0200
Subject: [PATCH 101/110] [Redizajn 1KA v2] - Testiranje --> Diagnostika - v8

---
 admin/survey/classes/class.SurveyDiagnostics.php          | 4 ++--
 public/css/admin_new.css                                  | 8 ++++++--
 .../admin_new/pages/survey_testiranje/diagnostika.scss    | 8 ++++++--
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/admin/survey/classes/class.SurveyDiagnostics.php b/admin/survey/classes/class.SurveyDiagnostics.php
index 64b75604d..557f37066 100644
--- a/admin/survey/classes/class.SurveyDiagnostics.php
+++ b/admin/survey/classes/class.SurveyDiagnostics.php
@@ -513,7 +513,7 @@ class SurveyDiagnostics
 		echo '<script type="text/javascript"> diagnosticsChart(\'survey_length\','.$display_length.'); </script>';
 		
 		echo '<div class="other_text">';
-		echo '<p>'.$time.'</p>';
+		echo '<p class="desc">'.$time.'</p>';
 		echo '<a '.$link_time.'>'.$lang['srv_diagnostic_time_extra'].'</a>';
 		echo '</div>';
 		
@@ -536,7 +536,7 @@ class SurveyDiagnostics
 		echo '<script type="text/javascript"> diagnosticsChart(\'survey_complex\','.$display_complex.'); </script>';
 		
 		echo '<div class="other_text">';
-		echo '<p>'.$kompleksnost.'</p>';
+		echo '<p class="desc">'.$kompleksnost.'</p>';
 		echo '<a '.$link_complex.'>'.$lang['srv_diagnostic_complexity_extra'].'</a>';
 		echo '</div>';
 		
diff --git a/public/css/admin_new.css b/public/css/admin_new.css
index 6f61c76da..c60e10f93 100644
--- a/public/css/admin_new.css
+++ b/public/css/admin_new.css
@@ -24262,14 +24262,18 @@ div#srv_diagnostic .lastnosti_wrapper .lastnosti_left .box .diagnostic_graph .ot
 div#srv_diagnostic .lastnosti_wrapper .lastnosti_middle .box .diagnostic_graph .other_text {
   display: flex;
   flex-direction: column;
-  justify-content: center;
-  gap: 30px;
+  justify-content: flex-end;
+}
+div#srv_diagnostic .lastnosti_wrapper .lastnosti_left .box .diagnostic_graph .other_text .desc,
+div#srv_diagnostic .lastnosti_wrapper .lastnosti_middle .box .diagnostic_graph .other_text .desc {
+  margin-bottom: 16px;
 }
 div#srv_diagnostic .lastnosti_wrapper .lastnosti_left .box .diagnostic_graph .other_text a,
 div#srv_diagnostic .lastnosti_wrapper .lastnosti_middle .box .diagnostic_graph .other_text a {
   text-decoration: none;
   font-size: 14px !important;
   white-space: nowrap;
+  margin-bottom: 10px;
 }
 div#srv_diagnostic .lastnosti_wrapper .lastnosti_left .box .time,
 div#srv_diagnostic .lastnosti_wrapper .lastnosti_middle .box .time {
diff --git a/resources/sass/admin_new/pages/survey_testiranje/diagnostika.scss b/resources/sass/admin_new/pages/survey_testiranje/diagnostika.scss
index cfbe08e7c..182539967 100644
--- a/resources/sass/admin_new/pages/survey_testiranje/diagnostika.scss
+++ b/resources/sass/admin_new/pages/survey_testiranje/diagnostika.scss
@@ -105,13 +105,17 @@ div#srv_diagnostic {
                     .other_text {
                         display: flex;
                         flex-direction: column;
-                        justify-content: center;
-                        gap: 30px;
+                        justify-content: flex-end;
+
+                        .desc {
+                            margin-bottom: 16px;
+                        }
 
                         a {
                             text-decoration: none;
                             font-size: 14px !important;
                             white-space: nowrap;
+                            margin-bottom: 10px;
                         }
                     }
                 }

From b3fd6221bce4f1482c541405de5c5e6f7b8d3531 Mon Sep 17 00:00:00 2001
From: pero1203 <peter.hrvatin@gmail.com>
Date: Wed, 20 Jul 2022 08:49:03 +0200
Subject: [PATCH 102/110] Datoteke na strezniku so case sensitive - popravek js
 datoteke chart.js

---
 admin/survey/minify/groupsConfig.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/admin/survey/minify/groupsConfig.php b/admin/survey/minify/groupsConfig.php
index d66d59c19..cb3c70ab3 100644
--- a/admin/survey/minify/groupsConfig.php
+++ b/admin/survey/minify/groupsConfig.php
@@ -97,7 +97,8 @@ return [
         dirname(__FILE__).'/../script/custom_column_label_respondent.js',
         dirname(__FILE__).'/../script/ImageHotSpot/imagemap_question_editor.js',
         dirname(__FILE__).'/../script/ImageHotSpot/imageHotspot.js',
-        dirname(__FILE__).'/../script/Chartjs/Chart.js', //source za chartjs grafe
+
+        dirname(__FILE__).'/../script/Chartjs/chart.js', //source za chartjs grafe
         dirname(__FILE__).'/../script/Chartjs.js',
 
         dirname(__FILE__).'/../script/jquery/jquery.imagemapster.js',

From 166ba313160dbb42b5007c9fcb898debde4b2c19 Mon Sep 17 00:00:00 2001
From: pero1203 <peter.hrvatin@gmail.com>
Date: Wed, 20 Jul 2022 09:05:35 +0200
Subject: [PATCH 103/110] Frontend popravek zakljucka div-a pri oknu za
 registracijo

---
 frontend/simple/classes/DisplayController.php | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/frontend/simple/classes/DisplayController.php b/frontend/simple/classes/DisplayController.php
index d015e05fa..77ad9ebad 100644
--- a/frontend/simple/classes/DisplayController.php
+++ b/frontend/simple/classes/DisplayController.php
@@ -648,8 +648,6 @@ class DisplayController{
 
         echo '<form name="register" id="register_form" class="register_form register_window" action="'.$site_url.'frontend/api/api.php?action=register" method="post">';
         
-        // echo '  <span class="subtitle">'.$lang['cms_register_user_text'].'</span>';
-
 		// Email
 		echo '  <label for="email" '.(isset($error['email']) ? 'class="red"' : '').'>'.$lang['email'].':</label>'; 
 		echo '  <input class="regfield '.(isset($error['email']) ? 'red' : '').'" id="email" name="email" value="'.$email.'" placeholder="" type="text">';
@@ -657,11 +655,7 @@ class DisplayController{
 		// Ime
 		echo '  <label for="ime" '.(isset($error['ime']) ? 'class="red"' : '').'>'.$lang['cms_register_user_nickname'].':</label>';
         echo '  <input class="regfield '.(isset($error['ime']) ? 'red' : '').'" id="ime" name="ime" value="'.$ime.'" placeholder="" type="text">';
-				
-		// // RECAPTCHA
-		// if(AppSettings::getInstance()->getSetting('google-secret_captcha') !== false && AppSettings::getInstance()->getSetting('google-recaptcha_sitekey') !== false)
-		// 	echo '  <div class="g-recaptcha" data-sitekey="'.AppSettings::getInstance()->getSetting('google-recaptcha_sitekey').'" '.(isset($_GET['invalid_recaptcha']) ? ' style="border:1px red solid"' : '').'></div>';	
-		
+						
 		// Geslo
         echo '  <label for="p1" '.(isset($error['password']) ? 'class="red"' : '').'>'.$lang['login_password'].':</label>';
         echo '  <input id="p1" class="text '.(isset($error['password']) ? 'red' : '').'" value="" name="geslo" placeholder="" type="password">';
@@ -671,13 +665,11 @@ class DisplayController{
         echo '  <input id="p2" class="text '.(isset($error['password']) ? 'red' : '').'" value="" name="geslo2" placeholder="" type="password">';
 
 		// Strinjam se s pogoji
-        //echo '				<input id="IAgree" type="hidden" name="agree" value="1">';
         $terms_url = ($lang['id'] == '1') ? 'https://www.1ka.si/d/sl/o-1ka/pogoji-uporabe-storitve-1ka' : 'https://www.1ka.si/d/en/about/terms-of-use';
 		echo '  <div class="form_row agreement '.(isset($_GET['missing_agree']) ? ' red' : '').'">';
-		echo '      <input id="IAgree" type="checkbox" name="agree" value="1"><label for="IAgree">';
-		echo        '<div class="checkbox_text_holder"> '.str_replace('TERMS_URL', $terms_url, $lang['cms_register_user_terms_of_use2']).'</label>';
-		// echo '      <br /><span class="red italic">*'.$lang['cms_register_mandatory_field'].'</span>';
-        echo '</div>';
+		echo '      <input id="IAgree" type="checkbox" name="agree" value="1">';
+		echo '      <label for="IAgree"><div class="checkbox_text_holder"> '.str_replace('TERMS_URL', $terms_url, $lang['cms_register_user_terms_of_use2']).'</div></label>';
+        echo '  </div>';
 
         // RECAPTCHA
 		if(AppSettings::getInstance()->getSetting('google-secret_captcha') !== false && AppSettings::getInstance()->getSetting('google-recaptcha_sitekey') !== false)

From 1db875d2a216edcab084b2f210f048ec17fd5ee0 Mon Sep 17 00:00:00 2001
From: pero1203 <peter.hrvatin@gmail.com>
Date: Wed, 20 Jul 2022 09:07:31 +0200
Subject: [PATCH 104/110] Frontend popravek zakljucka div-a pri oknu za
 registracijo v2

---
 frontend/simple/classes/DisplayController.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/frontend/simple/classes/DisplayController.php b/frontend/simple/classes/DisplayController.php
index 77ad9ebad..571fa1888 100644
--- a/frontend/simple/classes/DisplayController.php
+++ b/frontend/simple/classes/DisplayController.php
@@ -675,8 +675,6 @@ class DisplayController{
 		if(AppSettings::getInstance()->getSetting('google-secret_captcha') !== false && AppSettings::getInstance()->getSetting('google-recaptcha_sitekey') !== false)
         echo '  <div class="g-recaptcha" data-sitekey="'.AppSettings::getInstance()->getSetting('google-recaptcha_sitekey').'" '.(isset($_GET['invalid_recaptcha']) ? ' style="border:1px red solid"' : '').'></div>';	
 
-
-        echo '  </div>';
         
         // Error text
         if(!empty($error)){

From 5dbc69beadba08d52b4f701996cef33a9b558dd6 Mon Sep 17 00:00:00 2001
From: pero1203 <peter.hrvatin@gmail.com>
Date: Wed, 20 Jul 2022 09:23:51 +0200
Subject: [PATCH 105/110] Frontend simple - popravek recaptche

---
 frontend/simple/css/style.css                 | 34 +++++++++++--------
 .../sass/frontend_simple/basic/popravki.scss  | 14 --------
 .../frontend_simple/modules/landing_page.scss |  3 +-
 3 files changed, 21 insertions(+), 30 deletions(-)

diff --git a/frontend/simple/css/style.css b/frontend/simple/css/style.css
index f89329de0..ee0f1e8ef 100644
--- a/frontend/simple/css/style.css
+++ b/frontend/simple/css/style.css
@@ -3,7 +3,8 @@
     Created on : 28.3.2020
     Author     : Peter Hrvatin
 */
-/* BARVE */ /* FONTI */
+/* BARVE */
+/* FONTI */
 @import url("https://fonts.googleapis.com/css?family=Montserrat:300,400,400i,600,700&amp;subset=latin-ext");
 @import url("https://fonts.googleapis.com/css2?family=Source+Sans+Pro:wght@300;400;600;700&display=swap");
 .thin {
@@ -494,8 +495,7 @@ body.landing_page #main .landing_page_window .g-recaptcha,
 body.register #main .landing_page_window .g-recaptcha,
 body.login #main .landing_page_window .g-recaptcha,
 body.login_noEmail #main .landing_page_window .g-recaptcha {
-  width: 304px;
-  margin-top: 20px;
+  margin-top: 16px;
 }
 
 /*body.register{
@@ -730,13 +730,16 @@ body.reset_password_activate div.label {
   #main .main_content {
     min-height: unset;
   }
+
   /* --------------HAMBURGER---------------------------------- */
   .nav-desktop {
     display: none;
   }
+
   .mobile {
     display: block;
   }
+
   #nav-icon3 {
     width: 38px;
     height: 20px;
@@ -780,35 +783,42 @@ body.reset_password_activate div.label {
   #nav-icon3 span:nth-child(4) {
     top: 18px;
   }
+
   #nav-icon3.open span:nth-child(1) {
     top: 9px;
     width: 0%;
     left: 50%;
   }
+
   #nav-icon3.open span:nth-child(2) {
     -webkit-transform: rotate(45deg);
     -moz-transform: rotate(45deg);
     -o-transform: rotate(45deg);
     transform: rotate(45deg);
   }
+
   #nav-icon3.open span:nth-child(3) {
     -webkit-transform: rotate(-45deg);
     -moz-transform: rotate(-45deg);
     -o-transform: rotate(-45deg);
     transform: rotate(-45deg);
   }
+
   #nav-icon3.open span:nth-child(4) {
     top: 9px;
     width: 0%;
     left: 50%;
   }
+
   #links {
     display: none;
   }
+
   /*  */
   .aai a {
     color: #333333;
   }
+
   #links.open {
     position: absolute;
     top: 72px;
@@ -818,8 +828,9 @@ body.reset_password_activate div.label {
     align-items: center;
     width: 100%;
     height: 100vh;
-    background-color: rgb(255, 255, 255);
+    background-color: white;
   }
+
   #links .menu_item {
     font-size: 30px;
     margin-top: 30px;
@@ -831,6 +842,7 @@ body.reset_password_activate div.label {
   #links .menu_item a:hover {
     color: #1E88E5;
   }
+
   body #main .main_content {
     padding: 10px 20px 40px 20px;
   }
@@ -872,6 +884,7 @@ body #main .main_content input[type=button] {
     margin: 0;
     width: 100%;
   }
+
   body.landing_page,
 body.login,
 body.register,
@@ -958,6 +971,7 @@ body.login_noEmail #content.aai #main .main_content .app_subtitle {
     width: 100%;
     box-sizing: border-box;
   }
+
   footer {
     padding: 0 20px;
   }
@@ -988,6 +1002,7 @@ body.login_noEmail #content.aai #main .main_content .app_subtitle {
   footer .footer_content .logo_holder img {
     margin: 20px auto 30px auto;
   }
+
   .cookie_notice {
     flex-direction: column;
   }
@@ -995,6 +1010,7 @@ body.login_noEmail #content.aai #main .main_content .app_subtitle {
     margin: 0 0 20px 0;
     text-align: center;
   }
+
   body #main .main_content .register_holder h1 {
     font-size: 50px;
     font-weight: 300;
@@ -1249,16 +1265,6 @@ footer .footer_content .col3 .social_logo_flex a:first-of-type {
   margin-right: 20px;
 }
 
-iframe {
-  max-width: 304px;
-  width: unset;
-}
-
-.rc-anchor-normal .rc-anchor-checkbox-label {
-  max-width: 152px;
-  width: unset;
-}
-
 body.login_noEmail #main {
   background-image: none;
   background-color: #F8F8F8;
diff --git a/resources/sass/frontend_simple/basic/popravki.scss b/resources/sass/frontend_simple/basic/popravki.scss
index 24592d2c3..c089f8390 100644
--- a/resources/sass/frontend_simple/basic/popravki.scss
+++ b/resources/sass/frontend_simple/basic/popravki.scss
@@ -280,20 +280,6 @@ footer .footer_content .col3 .social_logo_flex a:first-of-type{
 }
   
 
-
-//CAPTCHA
-iframe {
-    max-width: 304px;
-    width: unset;
-}
-
-.rc-anchor-normal .rc-anchor-checkbox-label{
-    max-width: 152px;
-    width: unset;
-}
-
-
-
 //------------- POPRAVKI ( napačno geslo, elektronski naslov etc.)--------------------------
 
 
diff --git a/resources/sass/frontend_simple/modules/landing_page.scss b/resources/sass/frontend_simple/modules/landing_page.scss
index 86c557c40..927101cb6 100644
--- a/resources/sass/frontend_simple/modules/landing_page.scss
+++ b/resources/sass/frontend_simple/modules/landing_page.scss
@@ -184,8 +184,7 @@ body.login_noEmail{
             }
 
             .g-recaptcha{
-                width: 304px;
-                margin-top: 20px;
+                margin-top: 16px;
             }
         }
     }

From 5c18895a8dfe8b58f9274aae4381bcc95b4cd4b7 Mon Sep 17 00:00:00 2001
From: pero1203 <peter.hrvatin@gmail.com>
Date: Wed, 20 Jul 2022 09:25:15 +0200
Subject: [PATCH 106/110] Frontend simple - popravek agreement checkbox margina

---
 frontend/simple/css/style.css                            | 2 +-
 resources/sass/frontend_simple/modules/landing_page.scss | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/simple/css/style.css b/frontend/simple/css/style.css
index ee0f1e8ef..d31eafa58 100644
--- a/frontend/simple/css/style.css
+++ b/frontend/simple/css/style.css
@@ -459,7 +459,7 @@ body.login_noEmail #main .landing_page_window .agreement {
   cursor: pointer;
   display: flex;
   align-items: baseline;
-  margin: 17px 0 5px 0;
+  margin: 16px 0 0 0;
 }
 body.landing_page #main .landing_page_window .agreement input,
 body.register #main .landing_page_window .agreement input,
diff --git a/resources/sass/frontend_simple/modules/landing_page.scss b/resources/sass/frontend_simple/modules/landing_page.scss
index 927101cb6..cbc469a32 100644
--- a/resources/sass/frontend_simple/modules/landing_page.scss
+++ b/resources/sass/frontend_simple/modules/landing_page.scss
@@ -155,7 +155,7 @@ body.login_noEmail{
                 display: flex;
                 align-items: baseline;
 
-                margin: 17px 0 5px 0;
+                margin: 16px 0 0 0;
 
                 input{
                     margin-right: 10px;

From ead4ef132a1b34e5bdaee7895c2d41f54d49beb1 Mon Sep 17 00:00:00 2001
From: pero1203 <peter.hrvatin@gmail.com>
Date: Wed, 20 Jul 2022 11:03:03 +0200
Subject: [PATCH 107/110] Dodan presledek pri gdpr seznamu tipov podatkov, da
 se v analizah vredu prikazejo.

---
 admin/survey/classes/class.GDPR.php | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/admin/survey/classes/class.GDPR.php b/admin/survey/classes/class.GDPR.php
index 0211672c3..d5a9e612a 100644
--- a/admin/survey/classes/class.GDPR.php
+++ b/admin/survey/classes/class.GDPR.php
@@ -1540,20 +1540,20 @@ class GDPR{
 			$naslov = '<h3 style="margin-top: 0;">'.$lang['srv_gdpr_intro_title'].'</h3>';
 			
 			$naslov .= '<p>'.$lang['srv_gdpr_intro'].':</p>';
-			$naslov .= '<ul>';
+			$naslov .= ' <ul>';
 			if($user_settings['name'])
-				$naslov .= '<li>'.$lang['srv_gdpr_intro_name'].'</li>';
+				$naslov .= ' <li>'.$lang['srv_gdpr_intro_name'].'</li> ';
 			if($user_settings['email'])
-				$naslov .= '<li>'.$lang['srv_gdpr_intro_email'].'</li>';
+				$naslov .= ' <li>'.$lang['srv_gdpr_intro_email'].'</li> ';
 			if($user_settings['location'])
-				$naslov .= '<li>'.$lang['srv_gdpr_intro_location'].'</li>';
+				$naslov .= ' <li>'.$lang['srv_gdpr_intro_location'].'</li> ';
 			if($user_settings['phone'])
-				$naslov .= '<li>'.$lang['srv_gdpr_intro_phone'].'</li>';
+				$naslov .= ' <li>'.$lang['srv_gdpr_intro_phone'].'</li> ';
 			if($user_settings['web'])
-				$naslov .= '<li>'.$lang['srv_gdpr_intro_web'].'</li>';
+				$naslov .= ' <li>'.$lang['srv_gdpr_intro_web'].'</li> ';
 			if($user_settings['other'])
-				$naslov .= '<li>'.$lang['srv_gdpr_intro_other'].' - '.$user_settings['other_text'.$translation].'</li>';
-			$naslov .= '</ul>';
+				$naslov .= ' <li>'.$lang['srv_gdpr_intro_other'].' - '.$user_settings['other_text'.$translation].'</li> ';
+			$naslov .= '</ul> ';
 
 			$naslov .= '<p>'.$lang['srv_gdpr_intro2'];
 			$naslov .= ' '.$lang['srv_gdpr_intro3'].'</p>';

From 82f196b2262daf0072a4e55430167345eda66266 Mon Sep 17 00:00:00 2001
From: pero1203 <peter.hrvatin@gmail.com>
Date: Wed, 20 Jul 2022 11:12:31 +0200
Subject: [PATCH 108/110] Omejitev stevila odgovorov - obvestilo adminu se
 poslje ob vsakem veckratniku dosezenega limita (npr. 5000, 10000, 15000...)

---
 admin/survey/classes/class.SurveyCheck.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/admin/survey/classes/class.SurveyCheck.php b/admin/survey/classes/class.SurveyCheck.php
index ba8715fb9..2e81972ae 100644
--- a/admin/survey/classes/class.SurveyCheck.php
+++ b/admin/survey/classes/class.SurveyCheck.php
@@ -84,9 +84,10 @@ class SurveyCheck {
 
         // Dobimo stevilo odgovorov na anketo
         $stevilo_odgovorov = SurveyInfo::getInstance()->getSurveyAnswersCount();
+        $stevilo_odgovorov_limit = AppSettings::getInstance()->getSetting('app_limits-response_count_limit');
 
         // Obvestilo (mail adminu) posljemo pri dosezeni stevilki
-        if($stevilo_odgovorov == AppSettings::getInstance()->getSetting('app_limits-response_count_limit')){
+        if($stevilo_odgovorov > 0 && $stevilo_odgovorov % $stevilo_odgovorov_limit === 0){
             $this->sendAlert($alert_type='limit_responses', $stevilo_odgovorov);
 
             // Deaktiviramo anketo, ce je aktivna ?

From 166f052b75b16b349f64b2360769a43ecc3def3f Mon Sep 17 00:00:00 2001
From: tejagerjovic <teja.gerjovic@fdv.uni-lj.si>
Date: Wed, 20 Jul 2022 11:53:25 +0200
Subject: [PATCH 109/110] =?UTF-8?q?[Redizajn=201KA=20v2]=20Popupi:=20Ureja?=
 =?UTF-8?q?nje=20-->=20Vpra=C5=A1alnik=20-->=20Predogled=20spremenljivke?=
 =?UTF-8?q?=20-=20v2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 admin/survey/SurveyAdminAjax.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/admin/survey/SurveyAdminAjax.php b/admin/survey/SurveyAdminAjax.php
index 5ee721642..c75f561cb 100644
--- a/admin/survey/SurveyAdminAjax.php
+++ b/admin/survey/SurveyAdminAjax.php
@@ -4303,10 +4303,10 @@ class SurveyAdminAjax {
 			}
 			echo '  <div  id="spremenljivka_preview">';
 			if ( $_POST['spremenljivka'] == -1 ) {
-				\App\Controllers\BodyController::getInstance()->displayIntroduction();
+				\App\Controllers\BodyController::getInstance()->displayIntroductionContent();
 			}
 			elseif ( $_POST['spremenljivka'] == -2 ) {
-				\App\Controllers\BodyController::getInstance()->displayKonec();
+				\App\Controllers\BodyController::getInstance()->displayKonecContent();
 			}
 			elseif ( $_POST['spremenljivka'] == -3 ) {
 				\App\Controllers\StatisticController::displayStatistika();

From cb5847fd106aed83624dd3c526fc84894ab9ac26 Mon Sep 17 00:00:00 2001
From: pero1203 <peter.hrvatin@gmail.com>
Date: Wed, 20 Jul 2022 11:56:41 +0200
Subject: [PATCH 110/110] Javna povezava podatkov in analiz - na dnu
 odstranjene ikone za izvoz

---
 .../surveyAnalysis/class.SurveyAnalysis.php   | 12 ------------
 .../surveyData/class.SurveyDataDisplay.php    | 19 ++-----------------
 2 files changed, 2 insertions(+), 29 deletions(-)

diff --git a/admin/survey/classes/surveyAnalysis/class.SurveyAnalysis.php b/admin/survey/classes/surveyAnalysis/class.SurveyAnalysis.php
index f2139e11e..e947912b8 100644
--- a/admin/survey/classes/surveyAnalysis/class.SurveyAnalysis.php
+++ b/admin/survey/classes/surveyAnalysis/class.SurveyAnalysis.php
@@ -7820,18 +7820,6 @@ class SurveyAnalysis {
 		# ponastavimo nastavitve- filter
 		self::Display();
 		echo '</div>';
-			
-		echo '<div id="navigationBottom" class="printHide">';
-	
-		echo '<span class="floatRight spaceRight"><div class="buttonwrapper"><a class="ovalbutton ovalbutton_gray" href="#" onclick="window.print();return false;"><span><img src="'.$site_url.'admin/survey/icons/icons/printer.png" vartical-align="middle" /> '.$lang['hour_print2'].'</span></a></div></span>';
-		echo '<span  class="spaceRight floatRight printHide" style="margin-top:6px;">';
-		echo '<a href="'.$_url1.'" target="_blank"><span class="faicon pdf"></span></a>&nbsp;&nbsp;';
-		echo '<a href="'.$_url2.'" target="_blank"><span class="faicon rtf"></span></a>&nbsp;&nbsp;';
-		echo '<a href="'.$_url3.'" target="_blank"><span class="faicon xls"></span></a>';
-		echo '</span>';
-	
-		echo '<br class="clr" />';
-		echo '</div>';
 	
 		echo '</body>';
 		echo '</html>';
diff --git a/admin/survey/classes/surveyData/class.SurveyDataDisplay.php b/admin/survey/classes/surveyData/class.SurveyDataDisplay.php
index 95ac7c36f..14637c15b 100644
--- a/admin/survey/classes/surveyData/class.SurveyDataDisplay.php
+++ b/admin/survey/classes/surveyData/class.SurveyDataDisplay.php
@@ -3171,7 +3171,7 @@ class SurveyDataDisplay{
 		echo '<link type="text/css" href="'.$site_url.'admin/survey/minify/g=css" media="screen" rel="stylesheet" />';
 		echo '<link type="text/css" href="'.$site_url.'admin/survey/minify/g=cssPrint" media="print" rel="stylesheet" />';
 		echo '<style>';
-		echo '.container {margin-bottom:45px;} #navigationBottom {width: 100%; background-color: #f2f2f2; border-top: 1px solid gray; height:25px; padding: 10px 30px 10px 0px !important; position: fixed; bottom: 0; left: 0; right: 0; z-index: 1000;}';
+		echo '.container {margin-bottom:45px;} #dataTableScroller {display:none;} #navigationBottom {width: 100%; background-color: #f2f2f2; border-top: 1px solid gray; height:25px; padding: 10px 30px 10px 0px !important; position: fixed; bottom: 0; left: 0; right: 0; z-index: 1000;}';
 		echo '</style>';
 		echo '<!--[if lt IE 7]>';
 		echo '<link rel="stylesheet" href="<?=$site_url?>admin/survey/css/ie6hacks.css" type="text/css" />';
@@ -3227,9 +3227,6 @@ class SurveyDataDisplay{
 								'a'=>'list_xls',
 								'anketa'=>$anketa)));
 		echo '<div class="printHide" style="margin-top:6px; margin-bottom:60px;">';
-		echo '<a href="'.$_url1.'" target="_blank"><span class="faicon pdf icon-as_link"></span></a>&nbsp;&nbsp;';
-		echo '<a href="'.$_url2.'" target="_blank"><span class="faicon rtf icon-as_link"></span></a>&nbsp;&nbsp;';
-		echo '<a href="'.$_url3.'" target="_blank"><span class="faicon xls icon-as_link"></span></a>';
 		
 		if (isset($properties['profile_id_status']))
 		{
@@ -3271,19 +3268,7 @@ class SurveyDataDisplay{
 		</script><?php
 		
 		echo '</div>';
-			
-		echo '<div id="navigationBottom" class="printHide">';
-
-		echo '<span class="floatRight spaceRight"><div class="buttonwrapper"><a class="ovalbutton ovalbutton_gray" href="#" onclick="window.print();return false;"><span><img src="'.$site_url.'admin/survey/icons/icons/printer.png" vartical-align="middle" /> '.$lang['hour_print2'].'</span></a></div></span>';
-		echo '<span  class="spaceRight floatRight printHide" style="margin-top:6px;">';
-		echo '<a href="'.$_url1.'" target="_blank"><span class="faicon pdf icon-as_link"></span></a>&nbsp;&nbsp;';
-		echo '<a href="'.$_url2.'" target="_blank"><span class="faicon rtf icon-as_link"></span></a>&nbsp;&nbsp;';
-		echo '<a href="'.$_url3.'" target="_blank"><span class="faicon xls icon-as_link"></span></a>';
-		echo '</span>';
-		
-		echo '<br class="clr" />';
-		echo '</div>';
-		
+					
 		echo '</body>';
 		echo '</html>';
 	}