refactor(1.89.18): cleanup fonts usage

This commit is contained in:
Azgaar 2023-05-13 15:55:08 +04:00
parent d55125cd12
commit e2af899792
6 changed files with 109 additions and 61 deletions

View file

@ -1,3 +1,9 @@
:root {
--monospace: Consolas, monospace;
--serif: Georgia, serif;
--sans-serif: Helvetica, Arial, sans-serif;
}
input,
select,
button {
@ -119,7 +125,7 @@ a {
}
#temperature {
font-family: sans-serif;
font-family: var(--sans-serif);
font-weight: 700;
text-anchor: middle;
dominant-baseline: central;
@ -160,7 +166,7 @@ t,
text-shadow: 0 0 4px #000;
dominant-baseline: central;
text-anchor: middle;
font-family: Helvetica;
font-family: var(--sans-serif);
fill-opacity: 1;
}
@ -249,7 +255,7 @@ i.icon-lock {
.chartInfo {
text-align: center;
font-family: sans-serif;
font-family: var(--sans-serif);
font-style: italic;
font-size: 12px;
}
@ -356,7 +362,7 @@ text.drag {
#options {
position: absolute;
font-family: Consolas, monospace;
font-family: var(--monospace);
border: solid 1px #5e4fa2;
margin: 10px;
padding-bottom: 0.3em;
@ -366,7 +372,7 @@ text.drag {
#options input,
#options select,
#options button {
font-family: Consolas, monospace;
font-family: var(--monospace);
}
#collapsible {
@ -387,7 +393,7 @@ text.drag {
div.tab > button#optionsHide {
width: auto;
font-family: Arial;
font-family: var(--sans-serif);
padding: 0.6em 0.45em;
}
@ -421,6 +427,7 @@ button.options:hover {
#aboutContent p {
font-weight: normal;
font-style: normal;
}
#aboutContent a {
@ -657,7 +664,7 @@ input[type="color"]::-webkit-color-swatch-wrapper {
border: none;
padding: 0.45em 0.75em;
margin: 0.4em 0;
font-family: Consolas, monospace;
font-family: var(--monospace);
animation: glowing 2s infinite;
}
@ -936,7 +943,7 @@ fieldset {
padding: 0.1em 0.5em;
float: left;
font-size: 1.2em;
font-family: monospace;
font-family: var(--monospace);
}
#brushesButtons > button {
@ -995,7 +1002,7 @@ fieldset {
background-color: #ffffff95;
color: #05044d;
font-style: italic;
font-family: monospace;
font-family: var(--monospace);
}
#templateBody select {
@ -1721,7 +1728,7 @@ div.editorLine {
fill: #f8ffff;
font-size: 12px;
font-weight: bold;
font-family: Arial, Helvetica, sans-serif;
font-family: var(--sans-serif);
cursor: move !important;
}
@ -1734,7 +1741,7 @@ div.editorLine {
#pickerCloseText {
fill: #f8ffff;
font-size: 10px;
font-family: Arial, Helvetica, sans-serif;
font-family: var(--sans-serif);
pointer-events: none;
}
@ -1869,7 +1876,7 @@ div.editorLine {
}
#ruler text {
font-family: "Georgia";
font-family: var(--serif);
fill: #3d3d3d;
text-anchor: middle;
text-shadow: 0 0 4px white;
@ -1892,7 +1899,7 @@ div.editorLine {
#scaleBar text {
fill: #353540;
text-anchor: middle;
font-family: Georgia;
font-family: var(--serif);
}
#militaryOptionsTable select {
@ -1918,7 +1925,7 @@ div.editorLine {
#coordinateLabels {
fill: #333333;
font-family: monospace;
font-family: var(--monospace);
text-shadow: 0 0 4px white;
stroke-width: 0;
dominant-baseline: central;
@ -1973,7 +1980,7 @@ input[type="checkbox"] {
div.textual select,
div.textual textarea,
div.textual input {
font-family: monospace;
font-family: var(--monospace);
}
div.textual fieldset {
@ -1988,13 +1995,13 @@ div.textual span,
}
#namesbaseExamples {
font-family: monospace;
font-family: var(--monospace);
cursor: pointer;
}
#markers {
cursor: pointer;
font-family: monospace;
font-family: var(--monospace);
user-select: none;
text-anchor: middle;
dominant-baseline: central;
@ -2054,7 +2061,7 @@ div.textual span,
outline: 0;
overflow-y: auto;
padding: 0.6em;
font-family: monospace;
font-family: var(--monospace);
background-color: #fff;
border: 1px solid #dedede;
color: #000;
@ -2184,14 +2191,14 @@ svg.button {
#globaAxisLabels {
font-style: italic;
font-size: 9px;
font-family: monospace;
font-family: var(--monospace);
stroke: none;
fill: #001754;
}
#globeLatLabels {
font-size: 12px;
font-family: monospace;
font-family: var(--monospace);
stroke: none;
fill: #001754;
}
@ -2252,7 +2259,7 @@ svg.button {
#errorBox {
font-size: 0.9em;
font-family: Consolas, monospace;
font-family: var(--monospace);
color: #920303;
background-color: #dabdbd91;
padding: 2px;
@ -2287,7 +2294,7 @@ svg.button {
#promptText {
padding: 0 0 0.6em 0;
font-weight: bold;
font-family: sans-serif;
font-family: var(--sans-serif);
}
#mapOverlay {

View file

@ -2257,7 +2257,7 @@
<a data-tip="Click to see list of supporters" onclick="showSupporters()">all supporters</a> on Patreon!
</p>
<div style="display: flex; justify-content: center; padding: 0.4em">
<div style="display: flex; justify-content: center; padding: 0.8em 0.4em 0.4em; font-family: cursive">
<a
href="https://war.ukraine.ua/support-ukraine"
style="width: 80%"
@ -7871,7 +7871,7 @@
<script src="libs/polylabel.min.js"></script>
<script src="libs/lineclip.min.js"></script>
<script src="libs/alea.min.js"></script>
<script src="modules/fonts.js"></script>
<script src="modules/fonts.js?v=1.89.18"></script>
<script src="modules/ui/layers.js"></script>
<script src="modules/ui/measurers.js?v=1.87.02"></script>
<script src="modules/ui/stylePresets.js?v=1.89.11"></script>

4
libs/jquery-ui.css vendored
View file

@ -421,13 +421,13 @@ body .ui-dialog {
/* Component containers
----------------------------------*/
.ui-widget {
font-family: Arial, Helvetica, sans-serif;
font-family: var(--sans-serif);
}
.ui-widget input,
.ui-widget select,
.ui-widget textarea,
.ui-widget button {
font-family: Arial, Helvetica, sans-serif;
font-family: var(--sans-serif);
font-size: 1em;
}
.ui-widget button[class^="icon-"] {

View file

@ -2,15 +2,19 @@
const fonts = [
{family: "Arial"},
{family: "Times New Roman"},
{family: "Georgia"},
{family: "Garamond"},
{family: "Lucida Sans Unicode"},
{family: "Courier New"},
{family: "Verdana"},
{family: "Impact"},
{family: "Brush Script MT"},
{family: "Century Gothic"},
{family: "Comic Sans MS"},
{family: "Copperplate"},
{family: "Courier New"},
{family: "Garamond"},
{family: "Georgia"},
{family: "Herculanum"},
{family: "Impact"},
{family: "Papyrus"},
{family: "Party LET"},
{family: "Times New Roman"},
{family: "Verdana"},
{
family: "Almendra SC",
src: "url(https://fonts.gstatic.com/s/almendrasc/v13/Iure6Yx284eebowr7hbyTaZOrLQ.woff2)",
@ -38,12 +42,14 @@ const fonts = [
{
family: "Architects Daughter",
src: "url(https://fonts.gstatic.com/s/architectsdaughter/v8/RXTgOOQ9AAtaVOHxx0IUBM3t7GjCYufj5TXV5VnA2p8.woff2)",
unicodeRange: "U+0000-00FF, U+0131, U+0152-0153, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2212, U+2215"
unicodeRange:
"U+0000-00FF, U+0131, U+0152-0153, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2212, U+2215"
},
{
family: "Bitter",
src: "url(https://fonts.gstatic.com/s/bitter/v12/zfs6I-5mjWQ3nxqccMoL2A.woff2)",
unicodeRange: "U+0000-00FF, U+0131, U+0152-0153, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2212, U+2215"
unicodeRange:
"U+0000-00FF, U+0131, U+0152-0153, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2212, U+2215"
},
{
family: "Caesar Dressing",
@ -54,12 +60,14 @@ const fonts = [
{
family: "Cinzel",
src: "url(https://fonts.gstatic.com/s/cinzel/v7/zOdksD_UUTk1LJF9z4tURA.woff2)",
unicodeRange: "U+0000-00FF, U+0131, U+0152-0153, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2212, U+2215"
unicodeRange:
"U+0000-00FF, U+0131, U+0152-0153, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2212, U+2215"
},
{
family: "Dancing Script",
src: "url(https://fonts.gstatic.com/s/dancingscript/v9/KGBfwabt0ZRLA5W1ywjowUHdOuSHeh0r6jGTOGdAKHA.woff2)",
unicodeRange: "U+0000-00FF, U+0131, U+0152-0153, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2212, U+2215"
unicodeRange:
"U+0000-00FF, U+0131, U+0152-0153, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2212, U+2215"
},
{
family: "Faster One",
@ -82,12 +90,14 @@ const fonts = [
{
family: "Gloria Hallelujah",
src: "url(https://fonts.gstatic.com/s/gloriahallelujah/v9/CA1k7SlXcY5kvI81M_R28cNDay8z-hHR7F16xrcXsJw.woff2)",
unicodeRange: "U+0000-00FF, U+0131, U+0152-0153, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2212, U+2215"
unicodeRange:
"U+0000-00FF, U+0131, U+0152-0153, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2212, U+2215"
},
{
family: "Great Vibes",
src: "url(https://fonts.gstatic.com/s/greatvibes/v5/6q1c0ofG6NKsEhAc2eh-3Y4P5ICox8Kq3LLUNMylGO4.woff2)",
unicodeRange: "U+0000-00FF, U+0131, U+0152-0153, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2212, U+2215"
unicodeRange:
"U+0000-00FF, U+0131, U+0152-0153, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2212, U+2215"
},
{
family: "Henny Penny",
@ -98,7 +108,8 @@ const fonts = [
{
family: "IM Fell English",
src: "url(https://fonts.gstatic.com/s/imfellenglish/v7/xwIisCqGFi8pff-oa9uSVAkYLEKE0CJQa8tfZYc_plY.woff2)",
unicodeRange: "U+0000-00FF, U+0131, U+0152-0153, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2212, U+2215"
unicodeRange:
"U+0000-00FF, U+0131, U+0152-0153, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2212, U+2215"
},
{
family: "Kelly Slab",
@ -121,7 +132,8 @@ const fonts = [
{
family: "Kaushan Script",
src: "url(https://fonts.gstatic.com/s/kaushanscript/v6/qx1LSqts-NtiKcLw4N03IEd0sm1ffa_JvZxsF_BEwQk.woff2)",
unicodeRange: "U+0000-00FF, U+0131, U+0152-0153, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2212, U+2215"
unicodeRange:
"U+0000-00FF, U+0131, U+0152-0153, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2212, U+2215"
},
{
family: "Macondo",
@ -150,7 +162,8 @@ const fonts = [
{
family: "Montez",
src: "url(https://fonts.gstatic.com/s/montez/v8/aq8el3-0osHIcFK6bXAPkw.woff2)",
unicodeRange: "U+0000-00FF, U+0131, U+0152-0153, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2212, U+2215"
unicodeRange:
"U+0000-00FF, U+0131, U+0152-0153, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2212, U+2215"
},
{
family: "Nova Script",
@ -161,7 +174,8 @@ const fonts = [
{
family: "Orbitron",
src: "url(https://fonts.gstatic.com/s/orbitron/v9/HmnHiRzvcnQr8CjBje6GQvesZW2xOQ-xsNqO47m55DA.woff2)",
unicodeRange: "U+0000-00FF, U+0131, U+0152-0153, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2212, U+2215"
unicodeRange:
"U+0000-00FF, U+0131, U+0152-0153, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2212, U+2215"
},
{
family: "Oregano",
@ -184,12 +198,14 @@ const fonts = [
{
family: "Satisfy",
src: "url(https://fonts.gstatic.com/s/satisfy/v8/2OzALGYfHwQjkPYWELy-cw.woff2)",
unicodeRange: "U+0000-00FF, U+0131, U+0152-0153, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2212, U+2215"
unicodeRange:
"U+0000-00FF, U+0131, U+0152-0153, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2212, U+2215"
},
{
family: "Shadows Into Light",
src: "url(https://fonts.gstatic.com/s/shadowsintolight/v7/clhLqOv7MXn459PTh0gXYFK2TSYBz0eNcHnp4YqE4Ts.woff2)",
unicodeRange: "U+0000-00FF, U+0131, U+0152-0153, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2212, U+2215"
unicodeRange:
"U+0000-00FF, U+0131, U+0152-0153, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2212, U+2215"
},
{
family: "Tapestry",
@ -218,7 +234,8 @@ const fonts = [
{
family: "Yellowtail",
src: "url(https://fonts.gstatic.com/s/yellowtail/v8/GcIHC9QEwVkrA19LJU1qlPk_vArhqVIZ0nv9q090hN8.woff2)",
unicodeRange: "U+0000-00FF, U+0131, U+0152-0153, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2212, U+2215"
unicodeRange:
"U+0000-00FF, U+0131, U+0152-0153, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2212, U+2215"
}
];

View file

@ -44,7 +44,12 @@ function editEmblem(type, id, el) {
function defineEmblemData(e) {
const parent = e.target.parentNode;
const [g, t] = parent.id === "burgEmblems" ? [pack.burgs, "burg"] : parent.id === "provinceEmblems" ? [pack.provinces, "province"] : [pack.states, "state"];
const [g, t] =
parent.id === "burgEmblems"
? [pack.burgs, "burg"]
: parent.id === "provinceEmblems"
? [pack.provinces, "province"]
: [pack.states, "state"];
const i = +e.target.dataset.i;
type = t;
id = type + "COA" + i;
@ -88,8 +93,12 @@ function editEmblem(type, id, el) {
emblemBurgs.options.length = 0;
emblemBurgs.options.add(new Option("", 0, false, !burg));
const burgList = validBurgs.filter(burg => (province ? pack.cells.province[burg.cell] === province : burg.state === state));
burgList.forEach(b => emblemBurgs.options.add(new Option(b.capital ? "👑 " + b.name : b.name, b.i, false, b.i === burg)));
const burgList = validBurgs.filter(burg =>
province ? pack.cells.province[burg.cell] === province : burg.state === state
);
burgList.forEach(b =>
emblemBurgs.options.add(new Option(b.capital ? "👑 " + b.name : b.name, b.i, false, b.i === burg))
);
emblemBurgs.options[0].disabled = true;
COArenderer.trigger(id, el.coa);
@ -224,12 +233,18 @@ function editEmblem(type, id, el) {
}
function upload(type) {
const input = type === "image" ? document.getElementById("emblemImageToLoad") : document.getElementById("emblemSVGToLoad");
const input =
type === "image" ? document.getElementById("emblemImageToLoad") : document.getElementById("emblemSVGToLoad");
const file = input.files[0];
input.value = "";
if (file.size > 500000) {
tip(`File is too big, please optimize file size up to 500kB and re-upload. Recommended size is 200x200 px and up to 100kB`, true, "error", 5000);
tip(
`File is too big, please optimize file size up to 500kB and re-upload. Recommended size is 200x200 px and up to 100kB`,
true,
"error",
5000
);
return;
}
@ -257,7 +272,11 @@ function editEmblem(type, id, el) {
const svg = el.querySelector("svg");
if (!svg) {
tip("The file should be prepated for load to FMG. Please use Armoria or other relevant tools", false, "error");
tip(
"The file should be prepated for load to FMG. Please use Armoria or other relevant tools",
false,
"error"
);
return;
}
@ -351,7 +370,9 @@ function editEmblem(type, id, el) {
validStates
.map(state => {
const el = document.getElementById("stateCOA" + state.i);
return `<figure id="state_${state.i}"><a href="#provinces_${state.i}"><figcaption>${state.fullName}</figcaption>${getSVG(el, 200)}</a></figure>`;
return `<figure id="state_${state.i}"><a href="#provinces_${state.i}"><figcaption>${
state.fullName
}</figcaption>${getSVG(el, 200)}</a></figure>`;
})
.join("") +
`</div>`;
@ -362,13 +383,14 @@ function editEmblem(type, id, el) {
const figures = stateProvinces
.map(province => {
const el = document.getElementById("provinceCOA" + province.i);
return `<figure id="province_${province.i}"><a href="#burgs_${province.i}"><figcaption>${province.fullName}</figcaption>${getSVG(
el,
200
)}</a></figure>`;
return `<figure id="province_${province.i}"><a href="#burgs_${province.i}"><figcaption>${
province.fullName
}</figcaption>${getSVG(el, 200)}</a></figure>`;
})
.join("");
return stateProvinces.length ? `<div id="provinces_${state.i}">${back}<h2>${state.fullName} provinces</h2>${figures}</div>` : "";
return stateProvinces.length
? `<div id="provinces_${state.i}">${back}<h2>${state.fullName} provinces</h2>${figures}</div>`
: "";
})
.join("");
@ -385,7 +407,9 @@ function editEmblem(type, id, el) {
return `<figure id="burg_${burg.i}"><figcaption>${burg.name}</figcaption>${getSVG(el, 200)}</figure>`;
})
.join("");
return provinceBurgs.length ? `<div id="burgs_${province.i}">${back}<h2>${province.fullName} burgs</h2>${provinceBurgFigures}</div>` : "";
return provinceBurgs.length
? `<div id="burgs_${province.i}">${back}<h2>${province.fullName} burgs</h2>${provinceBurgFigures}</div>`
: "";
})
.join("");
@ -464,7 +488,7 @@ function editEmblem(type, id, el) {
}
div > a {
float: right;
font-family: monospace;
font-family: var(--monospace);
margin-top: 0.8em;
}
</style>

View file

@ -1,7 +1,7 @@
"use strict";
// version and caching control
const version = "1.89.17"; // generator version, update each time
const version = "1.89.18"; // generator version, update each time
{
document.title += " v" + version;