backups/Fantasy-Map-Generator
1
0
Fork 0
mirror of https://github.com/Azgaar/Fantasy-Map-Generator.git synced 2026-04-03 22:17:24 +02:00
Code Issues Projects Releases Packages Wiki Activity

Address review feedback: remove duplicate header, set width 600px, add reverse map-hover highlight

Browse source 
Co-authored-by: Azgaar <26469650+Azgaar@users.noreply.github.com>
This commit is contained in:
copilot-swe-agent[bot] 2026-02-26 17:35:50 +00:00
parent 59fe113ba3
commit 914c3a62bb
3 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
public/index.css
View file

@ -1437,6 +1437,10 @@ div.states.hovered {
background-image: linear-gradient(to right, #dedede 100%, #f2f2f2 50%, #fcfcfc 0%); background-image: linear-gradient(to right, #dedede 100%, #f2f2f2 50%, #fcfcfc 0%);
} }
#mergeStatesForm div[data-id].hovered {
background-image: linear-gradient(to right, #dedede 100%, #f2f2f2 50%, #fcfcfc 0%);
}
div.states > *, div.states > *,
div.states sup, div.states sup,
div.totalLine > div { div.totalLine > div {

3
public/modules/dynamic/editors/states-editor.js
View file

@ -1301,7 +1301,6 @@ function openStateMergeDialog() {
alertMessage.innerHTML = /* html */ ` alertMessage.innerHTML = /* html */ `
<form id='mergeStatesForm' style="overflow: hidden; display: flex; flex-direction: column; gap: 1em;"> <form id='mergeStatesForm' style="overflow: hidden; display: flex; flex-direction: column; gap: 1em;">
<header style='font-weight:bold;'>Merge states</header>
<p style="margin:0"> <p style="margin:0">
Check the <b>checkbox</b> next to each state you want to merge. Check the <b>checkbox</b> next to each state you want to merge.
Use the <b>radio button</b> to pick the <em>ruling state</em> that will absorb all others (its name, color, and capital will be kept). Use the <b>radio button</b> to pick the <em>ruling state</em> that will absorb all others (its name, color, and capital will be kept).
@ -1349,7 +1348,7 @@ function openStateMergeDialog() {
} }
$("#alert").dialog({ $("#alert").dialog({
width: fitContent(), width: 600,
title: `Merge states`, title: `Merge states`,
close: stateHighlightOff, close: stateHighlightOff,
buttons: { buttons: {

1
public/modules/ui/general.js
View file

@ -238,6 +238,7 @@ function showMapTooltip(point, e, i, g) {
if (document.getElementById("diplomacyEditor")?.offsetParent) highlightEditorLine(diplomacyEditor, state); if (document.getElementById("diplomacyEditor")?.offsetParent) highlightEditorLine(diplomacyEditor, state);
if (document.getElementById("militaryOverview")?.offsetParent) highlightEditorLine(militaryOverview, state); if (document.getElementById("militaryOverview")?.offsetParent) highlightEditorLine(militaryOverview, state);
if (document.getElementById("provincesEditor")?.offsetParent) highlightEditorLine(provincesEditor, province); if (document.getElementById("provincesEditor")?.offsetParent) highlightEditorLine(provincesEditor, province);
if (document.getElementById("mergeStatesForm")?.offsetParent) highlightEditorLine(byId("mergeStatesForm"), state);
} else if (layerIsOn("toggleCultures") && pack.cells.culture[i]) { } else if (layerIsOn("toggleCultures") && pack.cells.culture[i]) {
const culture = pack.cells.culture[i]; const culture = pack.cells.culture[i];
tip("Culture: " + pack.cultures[culture].name); tip("Culture: " + pack.cultures[culture].name);