diff --git a/.vscode/launch.json b/.vscode/launch.json new file mode 100644 index 00000000..6afdcc7d --- /dev/null +++ b/.vscode/launch.json @@ -0,0 +1,11 @@ +{ + "version": "0.1.0", + "configurations": [ + { + "name": "Debug", + "type": "chrome", + "request": "launch", + "file": "${workspaceFolder}/index.html" + } + ] +} \ No newline at end of file diff --git a/icons.css b/icons.css index 01b6a6ca..8592ca9f 100644 --- a/icons.css +++ b/icons.css @@ -250,7 +250,9 @@ .icon-smooth:before {font-weight: bold;content:'∼';} .icon-disrupt:before {font-weight: bold;content:'෴';} .icon-if:before {font-style: italic; font-weight: bold;content:'if';} -.icon-fleur:before {content: '⚜'; font-size: 1.1em; margin: -2px;} +/* .icon-coa:before {content: '⚜'; font-size: 1.1em; margin: -2px;} */ +.icon-coa:before {content:'\f3ed'; font-size: .9em; color: #999;} /* '' */ +.icon-half:before {font-weight: bold;content:'½';} .icon-curve:before {content: 'C';} .icon-area:before {content: 'O';} .icon-curve:before, diff --git a/index.css b/index.css index bb6a8878..2449ca92 100644 --- a/index.css +++ b/index.css @@ -10,16 +10,40 @@ body { height: 100%; } +t { + pointer-events: none; +} + input, select, button { font-size: 1em; } +input, select, textarea { + border: 0.5px solid #DBDFE6; + border-radius: .5px; + box-sizing: border-box; +} + select { height: 1.6em; + border-top-color: #abadb3; + padding: 0; + text-indent: 0px; } input { - height: 1.1em; + border-top-color: #abadb3; + padding: 2px; + text-indent: 1px; +} + +input:read-only { + cursor: default; +} + +textarea { + padding: 2px; + text-indent: 1px; } #map { @@ -50,11 +74,7 @@ input, button, select, a, textarea { outline: none; } -button, select, a { - cursor: pointer; -} - -.pointer { +button, select, a, .pointer { cursor: pointer; } @@ -79,7 +99,7 @@ button, select, a { fill-rule: evenodd; } -#lakes, #coastline { +#lakes, #coastline, #armies { cursor: pointer; } @@ -101,10 +121,15 @@ button, select, a { stroke-linejoin: round; } -#regions, #provs, #terrs, #biomes, #tooltip, #temperature, #texture, #landmass { +#regions, #cults, #relig, #biomes, #provs, #terrs, #biomes, #tooltip, #temperature, #texture, #landmass { pointer-events: none; } +#armies text { + pointer-events: none; + user-select: none; +} + #statesBody, #provincesBody, #relig, #biomes, #cults { stroke-width: .6; fill-rule: evenodd; @@ -231,8 +256,8 @@ i.icon-lock { marker-end: url(#end-arrow); stroke: #333333; stroke-dasharray: 5; - stroke-dashoffset: 100; - animation: dash 8s linear backwards; + stroke-dashoffset: 1000; + animation: dash 80s linear backwards; } @keyframes dash { @@ -375,6 +400,8 @@ input[type="color"]::-webkit-color-swatch-wrapper { -moz-appearance: none; -webkit-appearance: none; margin-left: 0; + border: 0; + padding: 0; } #options input[type="range"]::-webkit-slider-thumb { @@ -412,17 +439,12 @@ input[type="color"]::-webkit-color-swatch-wrapper { } #options input[type="number"] { - height: 1.3em; - line-height: 1.2em; font-size: .8em; } #options input[type="text"] { border: 0px; - padding-left: 3px; width: 62%; - height: 1.1em; - line-height: 1.3em; font-size: smaller; } @@ -441,8 +463,8 @@ input[type="color"]::-webkit-color-swatch-wrapper { #optionsContent input[type=number]::-webkit-inner-spin-button, #optionsContent input[type=number]::-webkit-outer-spin-button { - -webkit-appearance: none; - margin: 0; + -webkit-appearance: none; + margin: 0; } #optionsContent input[type="number"]:hover { @@ -450,8 +472,6 @@ input[type="color"]::-webkit-color-swatch-wrapper { } #optionsContent input.paired { - width: 2.5em; - margin-left: -.3em; text-align: center; background-color: white; } @@ -460,8 +480,6 @@ input[type="color"]::-webkit-color-swatch-wrapper { width: 100%; background-color: white; text-align: left; - padding-left: 0.4em; - box-sizing: border-box; height: 1.5em; } @@ -509,7 +527,7 @@ input[type="color"]::-webkit-color-swatch-wrapper { #styleElements input[type="number"] { width: 52px; border: 0; - padding-left: 2.5px; + padding-left: 2.5px; } #sticked button { @@ -1006,6 +1024,7 @@ i.resetButton:active { } .ui-dialog input[type="range"] { + padding: 0; height: 2px; background: #d4d4d4; top: -.35em; @@ -1035,8 +1054,7 @@ i.resetButton:active { } .ui-dialog input[type="number"] { - width: 2.5em; - height: 1.1em; + width: 3.5em; } .ui-dialog .disabled { @@ -1136,6 +1154,9 @@ div.header > div { font-size: .9em; display: inline-block; position: sticky; + white-space: nowrap; + overflow-x: hidden; + vertical-align: bottom; } .sortable { @@ -1168,7 +1189,8 @@ div.states:hover { } div.states > *, -div.states sup { +div.states sup, +div.totalLine > div { display: inline-block; } @@ -1182,15 +1204,8 @@ div.states div { width: 3.2em; } -div.states .statePower { - width: 3.2em; - line-height: 1.4em; - -moz-appearance: textfield; -} - -div.states .biomeHabitability { - width: 3.6em; - line-height: 1.4em; +div.states .statePower, div.states .biomeHabitability { + width: 4em; -moz-appearance: textfield; } @@ -1209,13 +1224,9 @@ div.states>.statePopulation { div.states .icon-pencil, div.states .icon-trash-empty, div.states .icon-eye, -div.states .icon-pin { - cursor: pointer; -} - +div.states .icon-pin, div.states .icon-flag-empty { cursor: pointer; - font-size: .9em; } div.states .icon-resize-vertical { @@ -1332,18 +1343,22 @@ div.states>input.riverType { line-height: 1.4em; } -#stateNameEditor input, -#provinceNameEditor input { - padding-left: .3em; -} - #stateNameEditor div.label, #provinceNameEditor div.label, -#burgBody div.label { +#burgBody div.label, +#regimentBody div.label { display: inline-block; width: 5.5em; } +#regimentBody div { + margin: .1em 0; +} + +#regimentBody input[type="number"] { + width: 5em; +} + .burgFeature { font-size: 1.2em; padding: 1px 2px; @@ -1401,6 +1416,7 @@ div.states.Self { border-color: #858b8e; background-image: linear-gradient(to right, #f2f2f2 0%, #b0c6d9 100%); font-style: italic; + font-weight: bold; margin-bottom: .2em; cursor: default !important; } @@ -1423,18 +1439,21 @@ rect.fillRect { stroke-width: 2; } -#militaryBody div.states > div { - width: 4em; +#militaryHeader > div, +#regimentsHeader > div { + width: 5.2em; } -#militaryBody div.states > input.militaryArmy { +#militaryBody div.states > input { + -moz-appearance: textfield; +} + +#militaryBody div.states > input, +#militaryBody div.states > div, +#regimentsBody div.states > div { width: 5em; } -#militaryBody div.states > input.militaryFleet { - width: 3.3em; -} - #picker text { cursor: default; } @@ -1522,6 +1541,7 @@ rect.fillRect { #unitsBody>div>* { display: inline-block; + margin-bottom: .2em; } .unitsHeader { @@ -1550,7 +1570,6 @@ rect.fillRect { width: 11.32em; } - #unitsBody>div>input[type="number"] { width: 3.4em; } @@ -1570,8 +1589,9 @@ rect.fillRect { } #barBackColor { - width: 3.45em; + width: 3.5em; padding: 0px; + height: 1.2em; } #ruler { @@ -1627,6 +1647,20 @@ rect.fillRect { font-family: Georgia; } +#militaryOptionsTable select { + border: 1px solid #d4d4d4; +} + +#militaryOptionsTable input { + width: 9em; + padding-left: 3px; + border: 1px solid #d4d4d4; +} + +#militaryOptionsTable input[type="number"] { + width: 4em; +} + #gridOverlay { fill: none; } @@ -1686,34 +1720,6 @@ input[type="checkbox"] { color: #333333; } -.shadowed { - position: absolute; - top: 0; - left: 0; - right: 0; - bottom: 0; - display: flex; - align-items: center; - justify-content: center; - z-index: 10; - pointer-events: none; - text-align: center; - background: rgba(0, 0, 0, .5); -} - -#map-dragged p { - font-size: 2.4em; - color: #fff5da; - text-shadow: 0px 1px 4px #4c3a35; -} - -#map-dragged p:before { - content: ''; - display: inline-block; - vertical-align: middle; - height: 100%; -} - div.textual select, div.textual textarea { font-family: Copperplate, monospace; @@ -2010,6 +2016,24 @@ svg.button { border: dashed 1px #5d4651; } +#mapOverlay { + position: absolute; + display: flex; + top: 0; + left: 0; + right: 0; + bottom: 0; + align-items: center; + justify-content: center; + z-index: 10; + pointer-events: none; + text-align: center; + background: rgba(0, 0, 0, .5); + font-size: 2.4em; + color: #fff5da; + text-shadow: 0px 1px 4px #4c3a35; +} + #debug { font-size: 1px; opacity: .8; diff --git a/index.html b/index.html index b6ec21d2..32c132f3 100644 --- a/index.html +++ b/index.html @@ -25,20 +25,20 @@ @keyframes spin {0% {transform: rotate(0deg);} 100% {transform: rotate(359deg);}} #loading {opacity:1; font-size: 11px; color:#fff5da; text-align:center; text-shadow:0px 1px 4px #4c3a35; width:80%; max-width:600px; position:fixed; top:50%; left:50%; transform:translate(-50%, -50%); pointer-events:none;} #loading-text {font-size: 1.8em; margin: 0.2em 0 0 1em;} - #title_name {text-align: left;font-size: 3em;margin-left: 5%;} + #titleName {text-align: left;font-size: 3em;margin-left: 5%;} #title {font-size: 7em;margin: -12px 0 -6px 0;} #version {text-align: right;font-size: 2em;margin-right: 3%;} #loading-text > span {font-size: 1.3em; padding-left: 1px; line-height: 0px;} - #loading-text > span, #uploading-map span {animation: 3s infinite both blink;} - #loading-text span:nth-child(2) {animation-delay: 1s;} - #loading-text span:nth-child(3) {animation-delay: 2s;} + #loading-text > span, #mapOverlay > span {animation: 3s infinite both blink;} + #loading-text span:nth-child(2), #mapOverlay > span:nth-child(2) {animation-delay: 1s;} + #loading-text span:nth-child(3), #mapOverlay > span:nth-child(3) {animation-delay: 2s;} @keyframes blink {0% {opacity: 0;} 20% {opacity: 1;} 100% {opacity: .1;}} - - + + - - + + @@ -890,36 +890,36 @@ - +
-
Azgaar's
-
Fantasy Map Generator
-
v. 1.2
-

LOADING...

+
Azgaar's
+
Fantasy Map Generator
+
v. 1.3
+

LOADING...

- - + +
@@ -2308,17 +2341,17 @@
- + - + - + @@ -2367,6 +2400,34 @@ + + @@ -2548,7 +2610,7 @@