Fix for province pattern painting bug and moved the color picker forward. (#362)

* Fix for 3d heightmap / 3d view conflict

* Fix for provinces painting patterns over color and color picker now in front of edit window
This commit is contained in:
evolvedexperiment 2019-11-12 21:31:53 +02:00 committed by Azgaar
parent 257cf11986
commit 41643ee5ac
2 changed files with 2 additions and 1 deletions

View file

@ -43,6 +43,7 @@ input {
#pickerContainer { #pickerContainer {
position: absolute; position: absolute;
z-index: 100;
} }
input, button, select, a, textarea { input, button, select, a, textarea {

View file

@ -644,7 +644,7 @@ function editProvinces() {
const provinceNew = +selected.dataset.id; const provinceNew = +selected.dataset.id;
const state = pack.provinces[provinceNew].state; const state = pack.provinces[provinceNew].state;
const fill = pack.provinces[provinceNew].color || "#ffffff"; const fill = pack.provinces[provinceNew].color || "#ffffff";
const stroke = d3.color(fill).darker(.2).hex(); const stroke = fill.startsWith("#") ? d3.color(fill).darker(.2).hex() : "#000000";
selection.forEach(i => { selection.forEach(i => {
if (!pack.cells.state[i] || pack.cells.state[i] !== state) return; if (!pack.cells.state[i] || pack.cells.state[i] !== state) return;