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

admin/survey/classes/class.SurveyTheme.php

@@ -799,6 +799,8 @@ class SurveyTheme {
 					echo ' (CSS)';					
 				echo '</span>';
 
+				echo '<div class="buttons_flex">';
+
 				// Prilagodi - samo ce je tema aktivna
                 if($is_current_skin || $is_current_mobile_skin){
 
@@ -817,7 +819,7 @@ class SurveyTheme {
 				echo '  <span class="faicon fa-desktop"></span>';
 				echo '</div>';
 
-
+				echo '</div>'; // div.buttons_flex
 				
 				echo '</div>';
 				

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

@@ -265,6 +265,14 @@ div.page_tema {
                         }
 
                     }
+
+                    .buttons_flex{
+                        display: flex;
+
+                        .button.palette{
+                            margin-right: 8px;
+                        }
+                    }
     
     
                     div.button {