From ac007af8a9dab80ef130de6437b1ea9b8c7cbe32 Mon Sep 17 00:00:00 2001
From: tejagerjovic <teja.gerjovic@fdv.uni-lj.si>
Date: Tue, 22 Mar 2022 19:03:30 +0100
Subject: [PATCH] [Redizajn 1KA] - Urejanje --> Oblika --> Prilagoditev teme -
 v2

---
 .../classes/class.SurveyThemeEditor.php       |   8 +-
 public/css/admin_new.css                      | 148 ++-------------
 .../pages/my_surveys/oblika_teme.scss         | 171 ++----------------
 3 files changed, 33 insertions(+), 294 deletions(-)

diff --git a/admin/survey/classes/class.SurveyThemeEditor.php b/admin/survey/classes/class.SurveyThemeEditor.php
index d1c543153..e5f9d2b01 100644
--- a/admin/survey/classes/class.SurveyThemeEditor.php
+++ b/admin/survey/classes/class.SurveyThemeEditor.php
@@ -271,12 +271,12 @@ class SurveyThemeEditor {
             elseif($type == 16)
                 echo ''.$lang['srv_te_custom_icon_mobile_color'].': ';
 			
-			if ($row['value'] == '') echo '<span><a href="#" onclick="$(\'#color-'.$id.'-'.$type.'\').show(); $(this).parent().hide(); return false;" title="'.$lang['edit4'].'">'.$lang['srv_te_default'].' <span class="faicon edit"></span></a></span>';
+			if ($row['value'] == '') echo '<div class="input_box"><a href="#" onclick="$(\'#color-'.$id.'-'.$type.'\').show(); $(this).parent().hide(); return false;" title="'.$lang['edit4'].'">'.$lang['srv_te_default'].' <span class="faicon edit"></span></a></div>';
 			
-			echo '<span id="color-'.$id.'-'.$type.'" '.($row['value']==''?'style="display:none;"':'').'>';
+			echo '<div id="color-'.$id.'-'.$type.'" '.($row['value']==''?'style="display:none;"':'').'>';
 			echo '<input type="text" class="text large colorwell auto-save" id="color'.$id.'-'.$type.'" name="color'.$id.'-'.$type.'" value="'.$value.'" data-id="'.$id.'" data-type="'.$type.'"> ';
-			echo '<a href="#" onclick="te_remove_setting(\''.$id.'\', \''.$type.'\'); return false;" title="'.$lang['srv_te_remove_setting'].'"><span class="sprites arrow_undo"></span></a>';
-			echo '</span>';
+			echo '<a href="#" onclick="te_remove_setting(\''.$id.'\', \''.$type.'\'); return false;" title="'.$lang['srv_te_remove_setting'].'"></a>';
+			echo '</div>';
 			echo '</div>';
 		
 		// velikost pisave
diff --git a/public/css/admin_new.css b/public/css/admin_new.css
index 4d6a6d281..3f88c1338 100644
--- a/public/css/admin_new.css
+++ b/public/css/admin_new.css
@@ -10556,7 +10556,7 @@ div#theme-edit-wrap div#theme-editor h3:after {
   border-top: 1px solid #E5E5E5;
 }
 div#theme-edit-wrap div#theme-editor h3:first-of-type {
-  margin-top: 0px;
+  margin-top: 16px;
 }
 div#theme-edit-wrap div#theme-editor input#skin-name {
   width: 319px;
@@ -10598,6 +10598,8 @@ div#theme-edit-wrap div#theme-editor div.columns div.setting_box div.input_box {
   height: 32px;
   font-size: 14px;
   padding: 7px 8px;
+  display: flex;
+  align-items: center;
 }
 div#theme-edit-wrap div#theme-editor div.columns div.setting_box div.input_box {
   border: 1px solid #C4C4C4;
@@ -10605,6 +10607,15 @@ div#theme-edit-wrap div#theme-editor div.columns div.setting_box div.input_box {
   border-radius: 2px;
   margin-top: 4px;
 }
+div#theme-edit-wrap div#theme-editor div.columns div.setting_box div.input_box a {
+  color: inherit;
+  text-decoration: none;
+}
+div#theme-edit-wrap div#theme-editor div.columns div.setting_box div.input_box a span.faicon {
+  margin-left: 8px;
+  font-size: inherit;
+  color: #1E88E5;
+}
 div#theme-edit-wrap div#theme-editor #picker {
   /*max-height: 90vh;
   overflow-y: scroll;*/
@@ -10821,141 +10832,6 @@ fieldset#theme-upload h2 span.name {
   text-transform: none;
 }
 
-.theme_header {
-  font-weight: 600;
-  font-size: 16px;
-  color: #1E88E5;
-}
-.theme_header .bold {
-  padding-right: 30px;
-  color: #FF0000;
-}
-.theme_header a {
-  padding-right: 20px;
-}
-
-#div_theme_groups {
-  display: inline-block;
-  width: 100%;
-  vertical-align: middle;
-}
-
-#div_theme_group_holder {
-  display: block;
-  clear: both;
-  height: auto;
-}
-
-#div_theme_group.custom .custom_theme_holder {
-  width: 420px;
-  padding: 3px 10px 3px 10px;
-}
-#div_theme_group.custom .custom_theme_holder:hover {
-  background-color: #1E88E5;
-}
-#div_theme_group.custom .custom_theme_holder .custom_theme_title {
-  display: inline;
-  cursor: pointer;
-  text-align: left;
-  color: #1E88E5;
-  font-size: 13px;
-}
-#div_theme_group.custom .custom_theme_holder .custom_theme_title:hover {
-  color: #FF0000;
-}
-#div_theme_group.custom .custom_theme_holder span.custom_theme_preview {
-  margin-left: 15px;
-  float: right;
-}
-#div_theme_group.custom .custom_theme_holder span.custom_theme_delete {
-  margin-left: 15px;
-  float: right;
-}
-#div_theme_group.custom .custom_theme_holder span.custom_theme_edit {
-  margin-left: 15px;
-  float: right;
-}
-#div_theme_group.custom .custom_theme_holder.active {
-  background-color: white;
-}
-#div_theme_group.custom .custom_theme_holder.active .custom_theme_title {
-  color: #FF0000;
-  font-weight: 600;
-}
-
-#div_theme_fullscreen {
-  position: absolute;
-  top: 0;
-  height: auto;
-  width: auto;
-  background-color: white;
-  border: 9px solid #1E88E5;
-  border-radius: 7px;
-  -moz-border-radius: 7px 7px 7px 7px;
-  -webkit-border-radius: 7px;
-  box-shadow: 0 0 15px rgba(0, 0, 0, 0.8);
-  -moz-box-shadow: 0 0 15px rgba(0, 0, 0, 0.8);
-  -webkit-box-shadow: 0 0 15px rgba(0, 0, 0, 0.8);
-}
-
-.div_theme_fullscreen_content {
-  padding: 10px;
-  margin-bottom: 45px;
-  overflow: auto;
-  height: auto;
-  min-width: 250px;
-  min-height: 50px;
-}
-.div_theme_fullscreen_content input {
-  width: 300px;
-}
-
-.div_theme_fullscreen_btm {
-  width: 100%;
-  background-color: white;
-  border-top: 1px solid #1E88E5;
-  height: 25px;
-  padding: 10px 0px 10px 0px !important;
-  position: fixed;
-  position: absolute;
-  bottom: 0;
-  left: 0;
-  right: 0;
-  z-index: 1000;
-}
-
-.custom div.theme_label img {
-  width: 100px;
-  height: 75px;
-}
-
-div.theme_label.span_theme_current img {
-  border-color: #FF0000;
-  color: #FF0000;
-}
-
-#theme-editor-warning {
-  font-size: 13px;
-  color: #FF0000;
-  font-weight: 600;
-}
-
-#new_theme_alert {
-  position: absolute;
-  top: 0;
-  left: 50%;
-  width: 400px;
-  margin-left: -200px;
-  background-color: #FF0000;
-  color: white;
-  height: 50px;
-  text-align: center;
-}
-#new_theme_alert p {
-  margin: 0;
-  line-height: 50px;
-}
-
 div#vabila div.top_note {
   position: relative;
 }
diff --git a/resources/sass/admin_new/pages/my_surveys/oblika_teme.scss b/resources/sass/admin_new/pages/my_surveys/oblika_teme.scss
index 657f97ac3..6ac79245c 100644
--- a/resources/sass/admin_new/pages/my_surveys/oblika_teme.scss
+++ b/resources/sass/admin_new/pages/my_surveys/oblika_teme.scss
@@ -278,7 +278,7 @@ div#theme-edit-wrap{
             margin-bottom: 16px;
             margin-top: 24px;
             &:first-of-type {
-                margin-top: 0px;
+                margin-top: 16px;
             }
         }
 
@@ -333,13 +333,28 @@ div#theme-edit-wrap{
                     font-size: 14px;
         
                     padding: 7px 8px;
-                }
 
+                    display: flex;
+                    align-items: center;
+                }
+                
+                //Za 1. fazo - box za barvo
                 div.input_box {
                     border: 1px solid $dark-gray;
                     box-sizing: border-box;
                     border-radius: 2px;
                     margin-top: 4px;
+
+                    a {
+                        color: inherit;
+                        text-decoration: none;
+                        
+                        span.faicon {
+                            margin-left: 8px;
+                            font-size: inherit;
+                            color: $blue;
+                        }
+                    }
                 }
             }
         }
@@ -418,156 +433,4 @@ fieldset#theme-upload {
         }
     }
 
-}
-
-//////////////////////////////////////////////////////////
-
-// Skopiran stari styling
-
-$color_6: #990000;
-$background_color_2: #EFF2F7;
-$background_color_3: #FAFFF0;
-$background_color_4: #f2f2f2;
-$background_color_5: green;
-$background_color_6: #E9E7E7;
-$border_color_1: #1F356C;
-$selectors: $green;
-
-$skin_selector_border: $blue;
-$skin_selector: $red;
-
-.theme_header {
-	font-weight: 600;
-	font-size: 16px;
-	color: $blue;
-	.bold {
-		padding-right: 30px;
-		color: $red;
-	}
-	a {
-		padding-right: 20px;
-	}
-}
-#div_theme_groups {
-	display: inline-block;
-	width: 100%;
-	vertical-align: middle;
-}
-#div_theme_group_holder {
-	display: block;
-	clear: both;
-	height: auto;
-}
-
-
-#div_theme_group.custom {
-	.custom_theme_holder {
-		width: 420px;
-		padding: 3px 10px 3px 10px;
-		&:hover {
-			background-color: $blue;
-		}
-		.custom_theme_title {
-			display: inline;
-			cursor: pointer;
-			text-align: left;
-			color: $blue;
-			font-size: 13px;
-			&:hover {
-				color: $red;
-			}
-		}
-		span.custom_theme_preview {
-			margin-left: 15px;
-			float: right;
-		}
-		span.custom_theme_delete {
-			margin-left: 15px;
-			float: right;
-		}
-		span.custom_theme_edit {
-			margin-left: 15px;
-			float: right;
-		}
-	}
-	.custom_theme_holder.active {
-		background-color: white;
-		.custom_theme_title {
-			color: $red;
-			font-weight: 600;
-		}
-	}
-}
-#div_theme_fullscreen {
-	position: absolute;
-	top: 0;
-	height: auto;
-	width: auto;
-	background-color: white;
-	border: 9px solid $blue;
-	border-radius: 7px;
-	-moz-border-radius: 7px 7px 7px 7px;
-	-webkit-border-radius: 7px;
-	box-shadow: 0 0 15px rgba(0, 0, 0, 0.8);
-	-moz-box-shadow: 0 0 15px rgba(0, 0, 0, 0.8);
-	-webkit-box-shadow: 0 0 15px rgba(0, 0, 0, 0.8);
-}
-.div_theme_fullscreen_content {
-	padding: 10px;
-	margin-bottom: 45px;
-	overflow: auto;
-	height: auto;
-	min-width: 250px;
-	min-height: 50px;
-	input {
-		width: 300px;
-	}
-}
-.div_theme_fullscreen_btm {
-	width: 100%;
-	background-color: white;
-	border-top: 1px solid $blue;
-	height: 25px;
-	padding: 10px 0px 10px 0px !important;
-	position: fixed;
-	position: absolute;
-	bottom: 0;
-	left: 0;
-	right: 0;
-	z-index: 1000;
-}
-.custom {
-	div.theme_label {
-		img {
-			width: 100px;
-			height: 75px;
-		}
-	}
-}
-div.theme_label.span_theme_current {
-	img {
-		border-color: $skin_selector;
-		color: $skin_selector;
-	}
-}
-#theme-editor-warning {
-	font-size: 13px;
-	color: $red;
-	font-weight: 600;
-}
-
-#new_theme_alert {
-	position: absolute;
-	top: 0;
-	left: 50%;
-	width: 400px;
-	margin-left: -200px;
-	background-color: $red;
-	color: white;
-	height: 50px;
-	text-align: center;
-	p {
-		margin: 0;
-		line-height: 50px;
-	}
 }
\ No newline at end of file