From a3fa5443d63d885daa1297bbb297afe2c3055cc3 Mon Sep 17 00:00:00 2001 From: Azgaar Date: Thu, 24 Oct 2019 22:27:41 +0300 Subject: [PATCH] v1.2.02 --- index.css | 24 +++++++------ index.html | 62 +++++++++++++++------------------- modules/relief-icons.js | 16 ++++----- modules/save-and-load.js | 11 ++++-- modules/ui/3d.js | 2 +- modules/ui/cultures-editor.js | 12 ++++--- modules/ui/editors.js | 2 +- modules/ui/general.js | 2 +- modules/ui/heightmap-editor.js | 37 ++++++++++---------- modules/ui/layers.js | 9 +++-- modules/ui/measurers.js | 2 +- modules/ui/options.js | 31 ++++++++++------- modules/ui/provinces-editor.js | 5 +-- modules/ui/religions-editor.js | 1 + modules/ui/style.js | 22 +++++++----- modules/ui/tools.js | 12 +++++-- 16 files changed, 137 insertions(+), 113 deletions(-) diff --git a/index.css b/index.css index 90be984f6..34bc38897 100644 --- a/index.css +++ b/index.css @@ -70,10 +70,12 @@ button, select, a { #biomes { stroke-width: .7; + fill-rule: evenodd; } #landmass { mask: url(#land); + fill-rule: evenodd; } #lakes, #coastline { @@ -86,6 +88,11 @@ button, select, a { text-anchor: middle; dominant-baseline: central; text-shadow: 0px 0px 10px white; + fill-rule: evenodd; +} + +#oceanLayers { + fill-rule: evenodd; } #coastline { @@ -99,7 +106,7 @@ button, select, a { #statesBody, #provincesBody { stroke-width: 2; - + fill-rule: evenodd; mask: url(#land); } @@ -620,14 +627,8 @@ fieldset { cursor: default; } -#cellInfo>div { - margin: 3px 0px 3px 3px; - display: inline-block; - vertical-align: top; -} - -#cellInfo>div:nth-child(2) { - width: 50%; +#cellInfo { + user-select: text; } #tooltip { @@ -1582,7 +1583,7 @@ div.states > div.biomeArea { #ruler .planimeter { fill: lightblue; - + fill-rule: evenodd; fill-opacity: 0.5; stroke: #737373; } @@ -1831,8 +1832,9 @@ svg.button { #alertMessage { -moz-user-select: text; user-select: text; - max-height: 75vh; + max-height: 70vh; max-width: 75vw; + overflow: auto; } #alertMessage ul { diff --git a/index.html b/index.html index 37ec6898a..13c01acae 100644 --- a/index.html +++ b/index.html @@ -1249,7 +1249,7 @@ Style @@ -1520,9 +1520,9 @@

Map settings (new map to apply):

- + - + - + @@ -1581,7 +1581,7 @@ - + @@ -1692,7 +1692,7 @@ - + @@ -1805,6 +1805,7 @@

Click to overview:

+ @@ -1834,30 +1835,6 @@
- -

Cell info:

-
@@ -1995,8 +1972,8 @@
-
- Map size:
+
+ Canvas size:
px =
@@ -2503,7 +2480,7 @@ - + @@ -3238,6 +3215,23 @@
+ +
Map sizeCanvas size width @@ -1530,11 +1530,11 @@ - +