Redesign - popravek diva za dodajanje prvega vprasanja

admin/survey/Branching.php

@@ -1493,7 +1493,7 @@ class Branching {
         echo '<div class="tip_sample">';
         echo '<div class="tip_sample_text">' . $lang['srv_tip_sample_t9'] . ':</div>';
         echo '<div class="tip_sample_option"><input type="text" /></div>';
-        echo '<div><span class="faicon add small icon-blue"></span>' . $lang['srv_add_field'] . '</div>';
+        echo '<div><span class="faicon add"></span>' . $lang['srv_add_field'] . '</div>';
         echo '</div>';
         if(!$userAccess->checkUserAccess($what='social_network')){
             $userAccess->displayNoAccessText($what='social_network');
@@ -1856,10 +1856,11 @@ class Branching {
 
 				echo '<li id="droppable_0-0" class="drop empty_vrivanje" spr="0" if="0" endif="0">';
         
-                echo '  <div class="empty_vrivanje_title">'.$lang['srv_new_survey_success2'].'</div>';
+                echo '  <div class="empty_vrivanje_title">'.$lang['srv_new_survey_success'].'</div>';
                 
-                echo '  <div class="empty_vrivanje_subtitle">';
+                echo '  <div class="empty_vrivanje_buttons">';
-                printf ($lang['srv_new_survey_success3'], 'index.php?anketa='.$this->anketa.'&a=branching&change_mode=1&what=toolbox&value=3');
+                echo '      <button class="medium blue">'.$lang['srv_new_survey_success_button_create'].'</button>';
+                echo '      <button class="medium white-blue">'.$lang['srv_new_survey_success_button_template'].'</button>';
                 echo '  </div>';
 
                 MobileSurveyAdmin::displayNoQuestions($this->anketa);
@@ -2435,7 +2436,7 @@ class Branching {
 
 		if ( in_array($row['tip'], array(1,2,6,16,19,20)) ) {
 			if ($row['enota'] != 10 && $row['orientation'] != 10){
-				echo '<div class="add-variable tip_'.$row['tip'].'"><a href="#" onclick="vprasanje_fullscreen(\''.$spremenljivka.'\'); return false;" title="'.$lang['srv_novavrednost'].'"><span class="faicon add small"></span> '.$lang['srv_novavrednost'].'</a></div>';
+				echo '<div class="add-variable tip_'.$row['tip'].'"><a href="#" onclick="vprasanje_fullscreen(\''.$spremenljivka.'\'); return false;" title="'.$lang['srv_novavrednost'].'"><span class="faicon add"></span> '.$lang['srv_novavrednost'].'</a></div>';
 				
                 MobileSurveyAdmin::displayAddQuestionCategory($this->anketa, $spremenljivka, $row['tip']);
 			}
@@ -3065,7 +3066,7 @@ class Branching {
 			
 			$sizebox = '$("#grids_count option:selected").val()';
 			$display = ($row['tip'] == 6 && $row['enota'] == 8) ? ' style="display:none;"' : '';
-			$grid_plus_minus = '<div class="grid-plus-minus"><a href="#" onclick="change_selectbox_size_1(\'' . $row['id'] . '\', \'' . $lang['srv_select_box_vse'] . '\'); grid_plus_minus(\'1\'); return false;" title="'.$lang['srv_grid_add'].'"><span class="faicon add small '.$spremenljivka.'" '.$display.'></span></a> <a href="#" onclick="grid_plus_minus(\'0\'); return false;" title="'.$lang['srv_grid_remove'].'"><span class="faicon delete_circle"></span></a></div>';
+			$grid_plus_minus = '<div class="grid-plus-minus"><a href="#" onclick="change_selectbox_size_1(\'' . $row['id'] . '\', \'' . $lang['srv_select_box_vse'] . '\'); grid_plus_minus(\'1\'); return false;" title="'.$lang['srv_grid_add'].'"><span class="faicon add '.$spremenljivka.'" '.$display.'></span></a> <a href="#" onclick="grid_plus_minus(\'0\'); return false;" title="'.$lang['srv_grid_remove'].'"><span class="faicon delete_circle"></span></a></div>';
 			
 			//izrisemo multigride z dropdowni in select box
 			if($row['tip'] == 6 && ($row['enota'] == 2 || $row['enota'] == 6)) {
@@ -6337,7 +6338,7 @@ class Branching {
 
 			// prikažemo nastavitve vprasanja
 			$fullscreen = ( isset($_POST['fullscreen']) && $_POST['fullscreen'] != 'undefined') ? (int)$_POST['fullscreen'] : false;
-	        echo '<div id="spr_settings_intro_concl" >'."\n\r";
+	        echo '<div id="spr_settings_intro_concl" class="spr_settings">'."\n\r";
 
 	        if ($id == -1) {
 	            $show = $row['show_intro'];
@@ -6389,9 +6390,8 @@ class Branching {
 
 			// prikažemo nastavitve vprasanja
 			$fullscreen = ( isset($_POST['fullscreen']) && $_POST['fullscreen'] != 'undefined') ? (int)$_POST['fullscreen'] : false;
-	        echo '<div id="spr_settings_intro_concl" >'."\n\r";
+	        echo '<div id="spr_settings_intro_concl"  class="spr_settings">'."\n\r";
 	        echo ' <span id="visible_introconcl_'.$id.'" class="extra_opt">';
-			//$this->introconcl_visible($id);
 	        echo ' </span>'."\n\r";
 			echo '</div>';
 
@@ -7766,7 +7766,7 @@ class Branching {
         // left_bracket
 		if ($row_count['count'] != 1 || $row['left_bracket']>0 || $row['right_bracket']>0) {
             echo '<td class="tbl_ce_lol white" style="width:50px; text-align:center;" >';
-			echo '<a href="#" onclick="javascript:bracket_edit_new(\''.$condition.'\', \''.$vrednost.'\', \'left\', \'plus\' ); return false;" title="'.$lang['srv_oklepaj_add'].'"><span class="faicon add small"></span></a>';
+			echo '<a href="#" onclick="javascript:bracket_edit_new(\''.$condition.'\', \''.$vrednost.'\', \'left\', \'plus\' ); return false;" title="'.$lang['srv_oklepaj_add'].'"><span class="faicon add"></span></a>';
 			if ($row['left_bracket'] > 0)
 				echo '<a href="#" onclick="javascript:bracket_edit_new(\''.$condition.'\', \''.$vrednost.'\', \'left\', \'minus\'); return false;" title="'.$lang['srv_oklepaj_rem'].'"><span class="faicon delete_circle"></span></a>';
 			else
@@ -8052,7 +8052,7 @@ class Branching {
 			else
 				echo '<span class="faicon delete_circle icon-grey_normal"></span>';
 
-			echo '<a href="#" onclick="javascript:bracket_edit_new(\''.$condition.'\', \''.$vrednost.'\', \'right\', \'plus\' ); return false;" title="'.$lang['srv_zaklepaj_add'].'"><span class="faicon add small"></span></a>';
+			echo '<a href="#" onclick="javascript:bracket_edit_new(\''.$condition.'\', \''.$vrednost.'\', \'right\', \'plus\' ); return false;" title="'.$lang['srv_zaklepaj_add'].'"><span class="faicon add"></span></a>';
 		} 
         else {
             echo '<td class="tbl_ce_tb white" style="width:50px; text-align:center" nowrap>';
@@ -8835,7 +8835,7 @@ class Branching {
 		if ($row_count['count'] != 1 || $row['left_bracket']>0 || $row['right_bracket']>0) {
             
             echo '<td class="tbl_ce_lol white" style="width:50px; text-align:center;" >';
-			echo '<a href="#" onclick="javascript:calculation_bracket_edit_new(\''.$calculation.'\', \''.$vrednost.'\', \'left\', \'plus\' ); return false;" title="'.$lang['srv_oklepaj_add'].'"><span class="faicon add small"></span></a>';
+			echo '<a href="#" onclick="javascript:calculation_bracket_edit_new(\''.$calculation.'\', \''.$vrednost.'\', \'left\', \'plus\' ); return false;" title="'.$lang['srv_oklepaj_add'].'"><span class="faicon add"></span></a>';
             
             if ($row['left_bracket'] > 0)
 				echo '<a href="#" onclick="javascript:calculation_bracket_edit_new(\''.$calculation.'\', \''.$vrednost.'\', \'left\', \'minus\'); return false;" title="'.$lang['srv_oklepaj_rem'].'"><span class="faicon delete_circle"></span></a>';
@@ -9024,7 +9024,7 @@ class Branching {
 			else
 				echo '<span class="faicon delete_circle icon-grey_normal"></span>';
 
-			echo '<a href="#" onclick="javascript:calculation_bracket_edit_new(\''.$calculation.'\', \''.$vrednost.'\', \'right\', \'plus\' ); return false;" title="'.$lang['srv_zaklepaj_add'].'"><span class="faicon add small"></span></a>';
+			echo '<a href="#" onclick="javascript:calculation_bracket_edit_new(\''.$calculation.'\', \''.$vrednost.'\', \'right\', \'plus\' ); return false;" title="'.$lang['srv_zaklepaj_add'].'"><span class="faicon add"></span></a>';
 		} else {
             echo '<td class="tbl_ce_lor white" style="width:50px; text-align:center" nowrap>';
 //			echo '<span class="sprites delete_blue_light"></span>';

lang/1.php

@@ -1810,9 +1810,9 @@ $lang = array (
 	"srv_note"				=>	"Opomba",
 	"srv_note2"				=>	"Opomba na vprašanje",
 	"srv_novaanketa"		=>	"Nova anketa: ",
-	"srv_new_survey_success1"		=>	"Anketo lahko za&#269;nete s predlogo iz <a href=\"#\" onclick=\"show_library(2); return false;\">knji&#382;nice</a> ali z vpra&#353;anji iz spodnjega menija.",
+	"srv_new_survey_success"		=>	"V anketi ni še nobenega vprašanja. Vprašanja lahko dodate tudi iz levega menija.",
-	"srv_new_survey_success2"		=>	"Vprašanja dodate iz levega menija.",
+	"srv_new_survey_success_button_create"		=>	"Dodaj vprašanje",
-	"srv_new_survey_success3"		=>	"Uporabite lahko predloge <a href=\"index.php?a=knjiznica\">anket</a> ali <a href=\"%s\" onclick=\"change_mode('toolbox', '3'); return false;\"> vprašanj</a>.",
+	"srv_new_survey_success_button_template"	=>	"Dodaj vprašanje iz knjižnice",
 	"srv_new_question_icon" =>	"S klikom dodajte na konec ali umestite s \"povleci in spusti\"",
 	"srv_new_question"      =>	"Kliknite na izbrano vprašanje ali uporabite \"povleci in spusti\"",
 	"srv_new_question_text" =>	"Z miško izberite želeni tip vprašanja",

lang/2.php

@@ -1793,9 +1793,9 @@ $lang = array (
 	"srv_note"				=>	"Note",
 	"srv_note2"				=>	"Question note",
 	"srv_novaanketa"		=>	"New survey",
-	"srv_new_survey_success1"		=>	"Survey can start with a template from <a href=\"#\" onclick=\"show_library(2); return false;\"> library </a> or add question from the bottom menu.",
+	"srv_new_survey_success"		=>	"Survey does not contain any questions. You can add a question from the left menu.",
-	"srv_new_survey_success2"		=>	"Begin by adding a question from the left menu.",	
+    "srv_new_survey_success_button_create"		=>	"Add question",
-	"srv_new_survey_success3"		=>	"",	
+	"srv_new_survey_success_button_template"	=>	"Add question from library",
 	"srv_new_question_icon"			=>	"Click on the icon to add this at the bottom of the page or use \"drag-and-drop\"",	
 	"srv_new_question"				=>	"Click on the selected question to add it at the bottom of the page or use \"drag-and-drop\"",	
 	"srv_new_question_text"			=>	"Use the mouse to select a question type",	

public/css/admin_new.css

@@ -10719,56 +10719,6 @@ and open the template in the editor.
 /* 
     Specific pages scss
 */
-/* font awesom za admin */
-#variable_holder input[type=checkbox].enka-admin-custom,
-#variable_holder input[type=radio].enka-admin-custom {
-  display: none !important;
-}
-
-#variable_holder input[type=checkbox].enka-admin-custom + span.enka-checkbox-radio:before,
-#variable_holder input[type=radio].enka-admin-custom + span.enka-checkbox-radio:before {
-  font-family: "Font Awesome 5 Free";
-  display: inline-block;
-  font-size: 14px;
-  color: #E5E5E5;
-  font-weight: 400;
-}
-
-#variable_holder input[type=checkbox].enka-admin-custom.enka-inline + span.enka-checkbox-radio:before,
-#variable_holder input[type=radio].enka-admin-custom.enka-inline + span.enka-checkbox-radio:before {
-  display: inline-block;
-  float: left;
-  padding-top: 4px;
-  padding-left: 4px;
-  font-weight: 400;
-}
-
-#variable_holder input[type=checkbox].enka-admin-custom + span.enka-checkbox-radio:before {
-  /*content: "\f096";*/
-  content: "";
-  letter-spacing: 10px;
-}
-
-#variable_holder input[type=radio].enka-admin-custom + span.enka-checkbox-radio:before {
-  /*content: "\f10c";*/
-  content: "";
-  letter-spacing: 8px;
-}
-
-/* select, checked */
-#variable_holder input[type=checkbox].enka-admin-custom:checked + span.enka-checkbox-radio:before {
-  /*content: "\f046";*/
-  content: "";
-  color: #E5E5E5;
-  letter-spacing: 8px;
-}
-
-#variable_holder input[type=radio].enka-admin-custom:checked + span.enka-checkbox-radio:before {
-  /*content: "\f192";*/
-  content: "";
-  color: #E5E5E5;
-}
-
 /*
     Osnova za branching
 */
@@ -10784,6 +10734,9 @@ and open the template in the editor.
   width: calc(100% - 401px - 304px);
   margin: 0 0 0 304px;
   background-color: white;
+  /* font awesom za admin */
+  /* select, checked */
+  /* Okno za drop vprasanja, ko je anketa prazna */
 }
 #branching ul {
   display: flex;
@@ -10884,9 +10837,96 @@ and open the template in the editor.
 }
 #branching .variable_name {
   cursor: move;
+  margin-top: -2px;
+}
+#branching #variable_holder input[type=checkbox].enka-admin-custom,
+#branching #variable_holder input[type=radio].enka-admin-custom {
+  display: none !important;
+}
+#branching #variable_holder input[type=checkbox].enka-admin-custom + span.enka-checkbox-radio:before,
+#branching #variable_holder input[type=radio].enka-admin-custom + span.enka-checkbox-radio:before {
+  font-family: "Font Awesome 5 Free";
+  display: inline-block;
+  font-size: 16px;
+  color: #D3D3D3;
+  font-weight: 400;
+}
+#branching #variable_holder input[type=checkbox].enka-admin-custom.enka-inline + span.enka-checkbox-radio:before,
+#branching #variable_holder input[type=radio].enka-admin-custom.enka-inline + span.enka-checkbox-radio:before {
+  display: inline-block;
+  float: left;
+  padding-top: 4px;
+  padding-left: 4px;
+  font-weight: 400;
+}
+#branching #variable_holder input[type=checkbox].enka-admin-custom + span.enka-checkbox-radio:before {
+  /*content: "\f096";*/
+  content: "";
+  letter-spacing: 10px;
+}
+#branching #variable_holder input[type=radio].enka-admin-custom + span.enka-checkbox-radio:before {
+  /*content: "\f10c";*/
+  content: "";
+  letter-spacing: 8px;
+}
+#branching #variable_holder input[type=checkbox].enka-admin-custom:checked + span.enka-checkbox-radio:before {
+  /*content: "\f046";*/
+  content: "";
+  color: #D3D3D3;
+  letter-spacing: 8px;
+}
+#branching #variable_holder input[type=radio].enka-admin-custom:checked + span.enka-checkbox-radio:before {
+  /*content: "\f192";*/
+  content: "";
+  color: #D3D3D3;
+}
+#branching span.faicon.delete_circle::before {
+  font-size: 14px;
+}
+#branching span.faicon.add::before {
+  font-size: 14px;
+}
+#branching .empty_vrivanje {
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  height: auto !important;
+  box-sizing: border-box;
+  margin: 32px 0 24px 0;
+  padding: 60px 0;
+  text-align: center;
+  font-weight: 400;
+  font-size: 18px;
+  background: #FFFFFF;
+  border: 1px solid #E5E5E5;
+}
+#branching .empty_vrivanje .empty_vrivanje_title {
+  margin: 0 auto 32px auto;
+}
+#branching .empty_vrivanje .empty_vrivanje_buttons {
+  display: flex;
+  justify-content: center;
+}
+#branching .empty_vrivanje .empty_vrivanje_buttons button {
+  margin: 0 8px;
+  font-weight: 400;
+}
+#branching .empty_vrivanje.branchinghover {
+  color: white;
+  background: 0 !important;
+  background-color: #E5E5E5;
+}
+#branching .empty_vrivanje.branchinghover a {
+  display: inline !important;
+  color: white;
+}
+#branching .empty_vrivanje.branchinghover .empty_vrivanje_title {
+  color: white;
+  background-color: #E5E5E5;
+  border-color: white;
 }
 #branching #bottom_icons_holder {
-  display: none;
+  /*display: none;*/
 }
 
 .branchinghover {
@@ -10903,50 +10943,6 @@ and open the template in the editor.
   font-size: 14px;
 }
 
-/* Okno za drop vprasanja, ko je anketa prazna */
-.empty_vrivanje {
-  display: flex;
-  flex-direction: column;
-  align-items: flex-start;
-  margin: 20px 0px 20px 45px !important;
-  padding: 60px 0 !important;
-  text-align: center;
-  font-weight: 600;
-  border: 1px solid #1E88E5;
-}
-.empty_vrivanje .empty_vrivanje_title {
-  margin: 0 auto;
-  padding: 8px 20px;
-  font-size: 16px;
-  font-weight: 500;
-  color: #1E88E5;
-  background-color: #1E88E5;
-  border: 1px solid #1E88E5;
-}
-.empty_vrivanje .empty_vrivanje_subtitle {
-  margin: 15px auto 0 auto;
-  font-size: 14px;
-  font-weight: 400;
-}
-.empty_vrivanje .empty_vrivanje_subtitle a {
-  font-weight: 500;
-}
-
-.empty_vrivanje.branchinghover {
-  color: white;
-  background: 0 !important;
-  background-color: #E5E5E5;
-}
-.empty_vrivanje.branchinghover a {
-  display: inline !important;
-  color: white;
-}
-.empty_vrivanje.branchinghover .empty_vrivanje_title {
-  color: white;
-  background-color: #E5E5E5;
-  border-color: white;
-}
-
 /*
     Levi toolbox v urejanju ankete (dodajanje vprasanj...)
 */
@@ -10962,6 +10958,17 @@ and open the template in the editor.
   cursor: pointer;
   display: flex;
   flex-direction: column;
+  /*&#toolbox_basic {
+
+      .toolbox_item.new_if,
+      .toolbox_item.new_block{
+          background-color: $dark-gray2 !important;
+
+          &:hover{
+              background-color: $dark-gray !important;
+          }
+      }
+  }*/
 }
 .toolbox_holder .toolbox .toolbox_item {
   display: flex;
@@ -11029,8 +11036,8 @@ and open the template in the editor.
   height: 199px;
   padding-top: 85px;
 }
-.toolbox_holder .toolbox#toolbox_advanced_settings {
+.toolbox_holder .toolbox#toolbox_advanced_settings .toolbox_item {
-  background-color: #D3D3D3;
+  background-color: #D3D3D3 !important;
 }
 .toolbox_holder .toolbox#toolbox_advanced_settings .toolbox_item:hover {
   background-color: #C4C4C4 !important;
@@ -11432,13 +11439,6 @@ and open the template in the editor.
   vertical-align: bottom;
 }
 
-.intro_concl {
-  float: left;
-  font-size: 12px;
-  color: #E5E5E5;
-  padding: 4px;
-}
-
 .save_button {
   float: right;
   margin: 10px 0px;
@@ -12042,7 +12042,8 @@ li.spr .spremenljivka_content .spremenljivka_settings .spr_settings {
   display: flex;
   font-size: 14px;
 }
-li.spr .spremenljivka_content .spremenljivka_settings .spr_settings span {
+li.spr .spremenljivka_content .spremenljivka_settings .spr_settings span,
+li.spr .spremenljivka_content .spremenljivka_settings .spr_settings div {
   padding-left: 16px;
   font-size: 14px;
 }
@@ -12129,17 +12130,31 @@ li.spr .spremenljivka_content input {
 }
 li.spr .spremenljivka_content .grid_inline,
 li.spr .spremenljivka_content .vrednost_inline,
-li.spr .spremenljivka_content .naslov {
+li.spr .spremenljivka_content .naslov,
+li.spr .spremenljivka_content .info_inline {
   box-sizing: border-box;
   padding: 4px 8px;
   font-size: 14px;
 }
 li.spr .spremenljivka_content .grid_inline p,
 li.spr .spremenljivka_content .vrednost_inline p,
-li.spr .spremenljivka_content .naslov p {
+li.spr .spremenljivka_content .naslov p,
+li.spr .spremenljivka_content .info_inline p {
   padding: 0;
   font-size: 14px;
 }
+li.spr .spremenljivka_content .grid_inline.info_inline,
+li.spr .spremenljivka_content .vrednost_inline.info_inline,
+li.spr .spremenljivka_content .naslov.info_inline,
+li.spr .spremenljivka_content .info_inline.info_inline {
+  font-size: 12px;
+}
+li.spr .spremenljivka_content .grid_inline.info_inline p,
+li.spr .spremenljivka_content .vrednost_inline.info_inline p,
+li.spr .spremenljivka_content .naslov.info_inline p,
+li.spr .spremenljivka_content .info_inline.info_inline p {
+  font-size: 12px;
+}
 li.spr .spremenljivka_content div[contenteditable] {
   cursor: text;
   min-height: 26px;
@@ -12352,17 +12367,6 @@ li div.spremenljivka_content span.image_upload {
   float: left;
 }
 
-#spr_settings_intro_concl {
-  float: left;
-  width: auto;
-  vertical-align: bottom;
-  padding-left: 10px;
-}
-#spr_settings_intro_concl img {
-  padding-left: 10px;
-  padding-top: 3px;
-}
-
 table.text_vrednost {
   text-align: center;
   font-size: 10px;

resources/sass/admin_new/pages/survey_edit/branching.scss

@@ -158,27 +158,62 @@ $branching_main_size_small: calc(100% - #{$branching_settings_size} - #{$branchi
 
 	.variable_name {
 		cursor: move;
+        margin-top: -2px;
 	}
 
 
-    #bottom_icons_holder{
+    /* font awesom za admin */
-        display: none;
+    #variable_holder input[type="checkbox"].enka-admin-custom,
+    #variable_holder input[type="radio"].enka-admin-custom  {
+        display: none !important;
     }
+    #variable_holder input[type="checkbox"].enka-admin-custom+ span.enka-checkbox-radio:before,
+    #variable_holder input[type="radio"].enka-admin-custom + span.enka-checkbox-radio:before {
+        font-family: $fontawesome;
+        display: inline-block;
+        font-size: 16px;
+        color: $dark-gray2;
+
+        font-weight: 400;
+    }
+    #variable_holder input[type="checkbox"].enka-admin-custom.enka-inline + span.enka-checkbox-radio:before,
+    #variable_holder input[type="radio"].enka-admin-custom.enka-inline + span.enka-checkbox-radio:before {
+        display: inline-block;
+        float: left;
+        padding-top: 4px;
+        padding-left: 4px;
+        
+        font-weight: 400;
     }
 
-
+    #variable_holder input[type="checkbox"].enka-admin-custom + span.enka-checkbox-radio:before{
-
+        /*content: "\f096";*/
-.branchinghover {
+        content: "\f0c8";
-	background: url('../../../admin/survey/img_0/hover_background.png') repeat-x top left !important;
+        letter-spacing: 10px;
     }
-.blockSwitch {
+    #variable_holder input[type="radio"].enka-admin-custom + span.enka-checkbox-radio:before{
-	position: relative;
+        /*content: "\f10c";*/
-	margin: 10px auto 0;
+        content: "\f111";
-	text-align: center;
+        letter-spacing: 8px;
-	p {
+    }
-		display: inline;
+    /* select, checked */
+    #variable_holder input[type="checkbox"].enka-admin-custom:checked + span.enka-checkbox-radio:before{
+        /*content: "\f046";*/
+        content: "\f14a";
+        color: $dark-gray2;
+        letter-spacing: 8px;
+    }
+    #variable_holder input[type="radio"].enka-admin-custom:checked + span.enka-checkbox-radio:before{
+        /*content: "\f192";*/
+        content: "\f192";
+        color: $dark-gray2;
+    }
+
+    span.faicon.delete_circle::before {
         font-size: 14px;
     }
+    span.faicon.add::before {
+        font-size: 14px;
     }
 
 
@@ -186,36 +221,32 @@ $branching_main_size_small: calc(100% - #{$branching_settings_size} - #{$branchi
     .empty_vrivanje {
         display: flex;
         flex-direction: column;
-    align-items: flex-start;
+        justify-content: center;
         
-	margin: 20px 0px 20px 45px !important;
+        height: auto !important;
-	padding: 60px 0 !important;
+        box-sizing: border-box;
+        margin: 32px 0 24px 0;
+        padding: 60px 0;
         
         text-align: center;
-	font-weight: 600;
+        font-weight: 400;
+        font-size: 18px;
         
-    border: 1px solid $blue;
+        background: $white;
+        border: 1px solid $gray;
         
         .empty_vrivanje_title {
-        margin: 0 auto;
+            margin: 0 auto 32px auto;
-		padding: 8px 20px;
-        
-        font-size: 16px;
-        font-weight: 500;
-        color: $blue;
-
-		background-color: $blue;
-		border: 1px solid $blue;
         }
         
-	.empty_vrivanje_subtitle{
+        .empty_vrivanje_buttons{
-        margin: 15px auto 0 auto;
+            display: flex;
+            justify-content: center;
+
+            button{
+                margin: 0 8px;
 
-		font-size: 14px;
                 font-weight: 400;
-        
-		a{
-			font-weight: 500;
             }
         }
     }
@@ -237,3 +268,27 @@ $branching_main_size_small: calc(100% - #{$branching_settings_size} - #{$branchi
             border-color: white;
         }
     }
+
+
+    #bottom_icons_holder{
+        /*display: none;*/
+    }
+}
+
+
+
+.branchinghover {
+	background: url('../../../admin/survey/img_0/hover_background.png') repeat-x top left !important;
+}
+.blockSwitch {
+	position: relative;
+	margin: 10px auto 0;
+	text-align: center;
+	p {
+		display: inline;
+		font-size: 14px;
+	}
+}
+
+
+

resources/sass/admin_new/pages/survey_edit/other.scss

@@ -25,12 +25,7 @@ and open the template in the editor.
 		vertical-align: bottom;
 	}
 }
-.intro_concl {
+
-	float: left;
-	font-size: 12px;
-	color: $gray;
-	padding: 4px;
-}
 .save_button {
 	float: right;
 	margin: 10px 0px;

resources/sass/admin_new/pages/survey_edit/questions/question_box.scss

@@ -165,7 +165,8 @@ li.spr{
                 display: flex;
                 font-size: 14px;
 
-                span{
+                span,
+                div{
                     padding-left: 16px;
                     font-size: 14px;
                 }
@@ -275,7 +276,8 @@ li.spr{
 
         .grid_inline,
         .vrednost_inline,
-        .naslov{
+        .naslov,
+        .info_inline{
             box-sizing: border-box;
 
             padding: 4px 8px;
@@ -285,6 +287,14 @@ li.spr{
                 padding: 0;
                 font-size: 14px;
             }
+
+            &.info_inline{
+                font-size: 12px;
+
+                p{
+                    font-size: 12px;
+                }
+            }
         }
 
         div[contenteditable] {
@@ -551,16 +561,7 @@ li {
 	}
 }
 
-#spr_settings_intro_concl {
+
-	float: left;
-	width: auto;
-	vertical-align: bottom;
-	padding-left: 10px;
-	img {
-		padding-left: 10px;
-		padding-top: 3px;
-	}
-}
 table.text_vrednost {
 	text-align: center;
 	font-size: 10px;

resources/sass/admin_new/pages/survey_edit/survey_edit.scss

@@ -1,50 +1,3 @@
-/* font awesom za admin */
-#variable_holder input[type="checkbox"].enka-admin-custom,
-#variable_holder input[type="radio"].enka-admin-custom  {
-	display: none !important;
-}
-#variable_holder input[type="checkbox"].enka-admin-custom+ span.enka-checkbox-radio:before,
-#variable_holder input[type="radio"].enka-admin-custom + span.enka-checkbox-radio:before {
-	font-family: $fontawesome;
-	display: inline-block;
-	font-size: 14px;
-	color: $gray;
-
-	font-weight: 400;
-}
-#variable_holder input[type="checkbox"].enka-admin-custom.enka-inline + span.enka-checkbox-radio:before,
-#variable_holder input[type="radio"].enka-admin-custom.enka-inline + span.enka-checkbox-radio:before {
-	display: inline-block;
-	float: left;
-	padding-top: 4px;
-	padding-left: 4px;
-	
-	font-weight: 400;
-}
-
-#variable_holder input[type="checkbox"].enka-admin-custom + span.enka-checkbox-radio:before{
-	/*content: "\f096";*/
-	content: "\f0c8";
-	letter-spacing: 10px;
-}
-#variable_holder input[type="radio"].enka-admin-custom + span.enka-checkbox-radio:before{
-	/*content: "\f10c";*/
-	content: "\f111";
-	letter-spacing: 8px;
-}
-/* select, checked */
-#variable_holder input[type="checkbox"].enka-admin-custom:checked + span.enka-checkbox-radio:before{
-	/*content: "\f046";*/
-	content: "\f14a";
-	color: $gray;
-	letter-spacing: 8px;
-}
-#variable_holder input[type="radio"].enka-admin-custom:checked + span.enka-checkbox-radio:before{
-	/*content: "\f192";*/
-	content: "\f192";
-	color: $gray;
-}
-
 // Urejanje ankete
 @import "branching";
 @import "toolbox";

resources/sass/admin_new/pages/survey_edit/toolbox.scss

@@ -116,14 +116,29 @@
         }
         
         &#toolbox_advanced_settings {
-            background-color: $dark-gray2;
             
-            .toolbox_item:hover{
+            .toolbox_item{
+                background-color: $dark-gray2 !important;
+
+                &:hover{
                     background-color: $dark-gray !important;
                 }
             }
         }
 
+        /*&#toolbox_basic {
+
+            .toolbox_item.new_if,
+            .toolbox_item.new_block{
+                background-color: $dark-gray2 !important;
+
+                &:hover{
+                    background-color: $dark-gray !important;
+                }
+            }
+        }*/
+    }
+
 
     // Nastavitve, ki se razprejo pri hoverju na toolbox item
     .toolbox_expand{