n0rdye/puzzle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

modified: public/lib/inter.js

Browse Source 
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
This commit is contained in:
n0rdye 2023-11-24 10:11:42 +00:00
parent 0a9bbd60c2
commit b568c7acc1
5 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
public/lib/inter.js
View File

@ -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){

4
views/admin/objects/group_object.ejs
View File

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

4
views/admin/objects/object_colors.ejs
View File

@ -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;">

6
views/project.ejs
View File

@ -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);

4
views/template.ejs
View File

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