From c0a634bec100e86aa4d3c4cc50fd411ba7a91e41 Mon Sep 17 00:00:00 2001 From: Azgaar Date: Sun, 8 Sep 2019 21:40:48 +0300 Subject: [PATCH 01/26] v1.0.15 --- modules/save-and-load.js | 3 +++ modules/ui/layers.js | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/modules/save-and-load.js b/modules/save-and-load.js index 36cf9505..07a06504 100644 --- a/modules/save-and-load.js +++ b/modules/save-and-load.js @@ -668,6 +668,9 @@ function parseLoadedData(data) { if (!s.diplomacy) continue; s.diplomacy = s.diplomacy.map(r => r === "Sympathy" ? "Friendly" : r); } + + // labels should be toggled via style attribute, so remove display attribute + labels.attr("display", null); } }() diff --git a/modules/ui/layers.js b/modules/ui/layers.js index 939881cf..0a2b5657 100644 --- a/modules/ui/layers.js +++ b/modules/ui/layers.js @@ -1011,11 +1011,11 @@ function toggleMarkers() { function toggleLabels() { if (!layerIsOn("toggleLabels")) { turnButtonOn("toggleLabels"); - labels.attr("display", null) + labels.style("display", null) invokeActiveZooming(); } else { turnButtonOff("toggleLabels"); - labels.attr("display", "none"); + labels.style("display", "none"); } } From 5a1b747da8192a4ab0b5ac3022c16798a4b85ef8 Mon Sep 17 00:00:00 2001 From: Azgaar Date: Tue, 10 Sep 2019 02:44:34 +0300 Subject: [PATCH 02/26] v1.0.16 --- index.css | 9 ++- index.html | 8 +-- libs/jquery-ui.css | 1 + main.js | 2 +- modules/religions-generator.js | 65 +++++++++++------ modules/save-and-load.js | 6 ++ modules/ui/general.js | 5 +- modules/ui/layers.js | 2 +- modules/ui/options.js | 7 +- modules/ui/religions-editor.js | 126 ++++++++++++++++++++++++++++----- modules/utils.js | 2 +- 11 files changed, 182 insertions(+), 51 deletions(-) diff --git a/index.css b/index.css index ef7d7712..4e1ead20 100644 --- a/index.css +++ b/index.css @@ -200,6 +200,13 @@ i.icon-lock { cursor: pointer; } +#religionInfo { + text-align: center; + font-family: sans-serif; + font-style: italic; + font-size: 1.2em; +} + #burgLabels { dominant-baseline: alphabetic; text-anchor: middle; @@ -1921,7 +1928,7 @@ svg.button { #legend { cursor: move; -moz-user-select: none; - user-select: none; + user-select: none; } .dontAsk { diff --git a/index.html b/index.html index 2e392b41..5690ea5c 100644 --- a/index.html +++ b/index.html @@ -1163,8 +1163,7 @@ Size - - 10 + (52 mi) @@ -1599,7 +1598,7 @@ - + @@ -2780,7 +2779,8 @@ - + +