Merge branch 'master' of https://git.1ka.si:/git/1ka

admin/survey/SurveyAdminAjax.php

@@ -6943,13 +6943,13 @@ class SurveyAdminAjax {
 						echo '</p>';
 					}
 					
-					# Prevod
+					// # Prevod
 
-					echo '<p> <span>Prevod: </span>';
+					// echo '<p> <span>Prevod: </span>';
-					echo '<span><a href="#">Belarussian</a>, </span>';
+					// echo '<span><a href="#">Belarussian</a>, </span>';
-					echo '<span><a href="#">Bulgarian</a></span>';
+					// echo '<span><a href="#">Bulgarian</a></span>';
 
-					echo '</p>';
+					// echo '</p>';
 
 
 

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>';
@@ -2923,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'];
+		// $link1 = $site_url.'a/'.$row['hash'];
-		echo '<div class="grouplang">';
+		// echo '<div class="grouplang">';
-		echo '<a href="'.$link1.'" target="_blank">'.$link1.'</a>'.(count($lang_array) > 0 ? '&nbsp- '.$base_lang_resp : '');
+		// 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 '<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 '<span class="faicon blue copy" onclick="CopyToClipboard(\''.$link1.'\'); actionNotePopup(\'link_copied\', \'success\'); return false;" title="'.$lang['srv_publication_survey_copylink'].'"></span>';
-		echo '</div>';
+		// echo '</div>';
 
-		$link1 = $site_url.'a/'.$row['hash'];
+		// $link1 = $site_url.'a/'.$row['hash'];
-		echo '<div class="grouplang">';
+		// echo '<div class="grouplang">';
-		echo '<a href="'.$link1.'" target="_blank">'.$link1.'</a>'.(count($lang_array) > 0 ? '&nbsp- '.$base_lang_resp : '');
+		// echo '<a href="'.$link1.'" target="_blank">'.$link1.'</a>'.(count($lang_array) > 0 ? '&nbsp- '.$base_lang_resp : '');
-		echo '<div class= "lang_span">- Italian </div>';
+		// 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 '<span class="faicon blue copy" onclick="CopyToClipboard(\''.$link1.'\'); actionNotePopup(\'link_copied\', \'success\'); return false;" title="'.$lang['srv_publication_survey_copylink'].'"></span>';
-		echo '</div>';
+		// echo '</div>';
 
         // Imamo vec linkov za skupine
 		$ss = new SurveySkupine($this->anketa);

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;
@@ -1503,6 +1510,17 @@ 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";
+}
+
+body.reset_password {
+  color: #333;
+}
+body.reset_password input[type=button] {
+  font-family: "Source Sans Pro", "sans-serif";
+}
+
 /* GDPR ZAHTEVEK -------------------------------------- */
 #main {
   background-color: #FFFFFF;

public/css/admin_new.css

@@ -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;
@@ -24504,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;
@@ -24554,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;
@@ -24596,6 +24597,9 @@ 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;
@@ -24646,7 +24650,12 @@ 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: 1130px) {
+  .more_block {
+    width: 42% !important;
+  }
+}
+@media screen and (max-width: 1025px) {
   #vabila .copy_survey_url_holder .input_box {
     width: 300px;
   }
@@ -24658,6 +24667,37 @@ 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 .url {
+    margin-top: 9px;
+  }
+  .page_vabila #vabila .button_holder #nice_url_holder .buttons {
+    margin: 9px 0px 0px 0px !important;
+  }
+}
+@media screen and (max-width: 725px) {
+  h2 {
+    font-size: 20px !important;
+  }
+}
+@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_invitations .invitations_holder.half-half {

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>
+
+
+

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;

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;

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;
@@ -246,6 +245,10 @@ div#vabila {
                     }
                 }
 
+                .mail_yellow{
+                    margin-left: 32px;
+                }
+
                 a.help {
                     color: inherit;
                     text-decoration: none;
@@ -255,6 +258,16 @@ div#vabila {
             }
 
         }
+
+        // div.more_block:first-of-type{
+        //     .more_title{
+        //         color: #FFC700;
+        //     }
+
+        //     span.faicon.empty{
+        //         color: #FFC700;
+        //     }
+        // }
     }
 
 }
@@ -324,7 +337,16 @@ div#general_popup {
 }
 
 
-@media screen and (max-width: 1300px){
+@media screen and (max-width: 1130px){
+
+    .more_block{
+        width: 42% !important;
+    }
+}
+
+
+
+@media screen and (max-width: 1025px){
 
     #vabila{
 
@@ -346,6 +368,9 @@ div#general_popup {
 
             #nice_url_holder {
                 margin: 16px 0px !important;
+                flex-direction: row;
+
+
             }
 
 
@@ -355,7 +380,99 @@ div#general_popup {
 
 
    } 
+        
+}
+
+@media screen and (max-width: 850px) {
+    .page_vabila{
+
+        #vabila{
+
+            .button_holder{
+    
+                #nice_url_holder {
+
+                    flex-direction: row !important;
+
+                    .url{
+                        margin-top: 9px;
+                    }
+
+                    .buttons{
+                        margin: 9px 0px 0px 0px !important;
+                        
+                    }
+
+                }
+
+
+        
+            }
+    
+       } 
+
+    }
     
 
+}
+
+@media screen and (max-width: 725px) {
+
+    h2 {
+        font-size: 20px !important ;
+    }
+}
+
+@media screen and (max-width: 660px) {
+    .page_vabila{
+
+        #vabila{
+
+
+            .more{
+
+                .more_block{
+                    width: unset !important;
+                    width: 100% !important;
+
+                    #text {
+                        width: 100%;
+                    }
+
+
+                }
+
+
+            }
+
     
-}
+       } 
+
+    }
+}
+
+
+@media screen and (max-width: 500px) {
+    .page_vabila{
+
+        #vabila{
+
+            .button_holder{
+    
+                #nice_url_holder {
+
+                    flex-direction: column !important;
+
+
+
+                }
+
+
+        
+            }   
+       } 
+
+    }
+    
+
+}

resources/sass/frontend_simple/basic/popravki.scss

@@ -587,4 +587,19 @@ body.register #main .landing_page_window label:first-of-type {
     margin-top: 0px;
 }
 
-// -----------------------------------------
+// ------REGISTER_EMAIL----------------------------------
+
+.register_email input[type="button"] {
+    font-family: $SansPro_font;
+}
+
+// ------RESET PASSWORD----------------------------------
+
+body.reset_password{
+
+    color: #333;
+
+    input[type="button"]{
+        font-family: $SansPro_font;
+    }
+}

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;