From b568c7acc132efaa71eed095254c0e509a3c222d Mon Sep 17 00:00:00 2001
From: n0rdye <dev@n0r.su>
Date: Fri, 24 Nov 2023 10:11:42 +0000
Subject: [PATCH] 	modified:   public/lib/inter.js 	modified:  
 views/admin/objects/group_object.ejs 	modified:  
 views/admin/objects/object_colors.ejs 	modified:   views/project.ejs 
 modified:   views/template.ejs     changes: color pallet size change

---
 public/lib/inter.js                   | 4 ++++
 views/admin/objects/group_object.ejs  | 4 ++--
 views/admin/objects/object_colors.ejs | 4 ++--
 views/project.ejs                     | 6 ++++--
 views/template.ejs                    | 4 ++--
 5 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/public/lib/inter.js b/public/lib/inter.js
index 4ae3d21..3ee988b 100644
--- a/public/lib/inter.js
+++ b/public/lib/inter.js
@@ -123,6 +123,10 @@ function obj_click(id){
 function obj_selection(clear = false){
     cur_obj = (clear == true)? null:cur_obj;
     let drags = document.getElementsByClassName("drag");
+    // let layer_inp = document.getElementsByClassName("layer_inp");
+    // let obj_color = document.getElementsByClassName("obj_color_div");
+    // layer_inp.value = 0;
+    // obj_color.style.display = "none";
     Object.values(drags).forEach(element => {
         // console.log(element.id,cur_obj);
         if (element.id != cur_obj){
diff --git a/views/admin/objects/group_object.ejs b/views/admin/objects/group_object.ejs
index ce67a34..380f7c1 100644
--- a/views/admin/objects/group_object.ejs
+++ b/views/admin/objects/group_object.ejs
@@ -187,10 +187,10 @@
 <div style="display:flex; justify-content: space-around;"></div>
 
 
-<div class="inputs" style="display: flex;justify-content: space-between;height: 5vh;">
+<div class="inputs" style="display: flex;justify-content: space-between;height: 6vh;">
     <div id="obj_color_div" style="justify-content: space-evenly; width: 50vw;display: none;transform: translateX(30%);">
         <label for="obj_colors" style="min-width: 10vw;">цвет объекта</label>
-        <div id="obj_colors" style="display: flex; width: 30vw;overflow: auto;height: 50px;"></div>      
+        <div id="obj_colors" style="display: flex; width: 30vw;overflow: auto;height: 100%;"></div>      
         <!-- <input id="obj_color" type="color" onchange="obj_color_change(event)"> -->
     </div>
 </div>
diff --git a/views/admin/objects/object_colors.ejs b/views/admin/objects/object_colors.ejs
index 15d125c..243706a 100644
--- a/views/admin/objects/object_colors.ejs
+++ b/views/admin/objects/object_colors.ejs
@@ -1,7 +1,7 @@
-<div id="admin_colors" style="display: flex;justify-content: space-between;margin-top: 4vh;">
+<div id="admin_colors" style="display: flex;justify-content: space-between;height: 6vh;">
     <div id="obj_color_div" style="justify-content: space-between; width: 50vw;display: flex;">
         <label for="obj_colors" style="min-width: 10vw;float: left;">цвет объекта</label>
-        <div id="obj_colors" style="display: flex; width: 30vw;overflow: auto;height: 50px;"></div>      
+        <div id="obj_colors" style="display: flex; width: 30vw;overflow: auto;height: 100%;"></div>      
     </div>
     <div id="inp">
         <input type="color" id="new_color" style="margin: auto;">
diff --git a/views/project.ejs b/views/project.ejs
index 555059d..7a9c635 100644
--- a/views/project.ejs
+++ b/views/project.ejs
@@ -196,10 +196,10 @@
 <div style="display:flex; justify-content: space-around;"></div>
 
 
-<div class="inputs" style="display: flex;justify-content: space-between;height: 5vh;">
+<div class="inputs" style="display: flex;justify-content: space-between;height: 6vh;">
     <div id="obj_color_div" style="justify-content: space-evenly; width: 50vw;display: none;transform: translateX(30%);">
         <label for="obj_colors" style="min-width: 10vw;">цвет объекта</label>
-        <div id="obj_colors" style="display: flex; width: 30vw;overflow: auto;height: 50px;"></div>      
+        <div id="obj_colors" style="display: flex; width: 30vw;overflow: auto;height: 100%;"></div>      
         <!-- <input id="obj_color" type="color" onchange="obj_color_change(event)"> -->
     </div>
 </div>
@@ -427,6 +427,7 @@
     }
 
     function go_back(){
+        obj_selection(true)
         if(objs_back.length > 0){
             objs_forw.push(objs);
             objs = objs_back.at(-1);
@@ -436,6 +437,7 @@
         }
     }
     function go_forw(){
+        obj_selection(true)
         if(objs_forw.length > 0){
             objs_back.push(objs);
             objs = objs_forw.at(-1);
diff --git a/views/template.ejs b/views/template.ejs
index c144093..15427ee 100644
--- a/views/template.ejs
+++ b/views/template.ejs
@@ -187,10 +187,10 @@
 <div style="display:flex; justify-content: space-around;"></div>
 
 
-<div class="inputs" style="display: flex;justify-content: space-between;height: 5vh;">
+<div class="inputs" style="display: flex;justify-content: space-between;height: 6vh;">
     <div id="obj_color_div" style="justify-content: space-evenly; width: 50vw;display: none;transform: translateX(30%);">
         <label for="obj_colors" style="min-width: 10vw;">цвет объекта</label>
-        <div id="obj_colors" style="display: flex; width: 30vw;overflow: auto;height: 4.5vh;"></div>      
+        <div id="obj_colors" style="display: flex; width: 30vw;overflow: auto;height: 100%;"></div>      
         <!-- <input id="obj_color" type="color" onchange="obj_color_change(event)"> -->
     </div>
 </div>