From 7b81932bc701be1bbb08be4da6a363c07f8ab145 Mon Sep 17 00:00:00 2001
From: rsek <hello@rsek.ca>
Date: Sat, 3 Dec 2022 01:53:27 -0800
Subject: [PATCH] initial commit

---
 package-lock.json                             | 33 +++++++++++++++++++
 package.json                                  |  3 ++
 .../vue/components/rules-text/rules-text.vue  |  2 ++
 src/styles/assets.less                        |  4 +++
 src/styles/fvtt/tooltip.less                  |  3 ++
 src/styles/mixins.less                        |  9 +++++
 src/styles/themes/starforged.less             |  6 +++-
 7 files changed, 59 insertions(+), 1 deletion(-)

diff --git a/package-lock.json b/package-lock.json
index a7065e9a3..4e3f5d4d6 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -10,6 +10,9 @@
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
+        "@fontsource/encode-sans": "^4.5.9",
+        "@fontsource/encode-sans-condensed": "^4.5.9",
+        "@fontsource/exo": "^4.5.10",
         "@league-of-foundry-developers/foundry-vtt-types": "^9.269.0",
         "@tinymce/tinymce-vue": "^5.0.0",
         "@types/lodash": "^4.14.170",
@@ -603,6 +606,21 @@
         "url": "https://opencollective.com/eslint"
       }
     },
+    "node_modules/@fontsource/encode-sans": {
+      "version": "4.5.9",
+      "resolved": "https://registry.npmjs.org/@fontsource/encode-sans/-/encode-sans-4.5.9.tgz",
+      "integrity": "sha512-6tLI1FeCMYGtEMy5+1aRgmzgVTCfWL1b2MywvWFaxQGWnqjf4kO/YFnf99kFe52/XXcaCzkl09gxivVcsrxfAg=="
+    },
+    "node_modules/@fontsource/encode-sans-condensed": {
+      "version": "4.5.9",
+      "resolved": "https://registry.npmjs.org/@fontsource/encode-sans-condensed/-/encode-sans-condensed-4.5.9.tgz",
+      "integrity": "sha512-EUVjRFtmNDk5odH3Jx9O7vUqGymMpnF97s06ucwtYv84iWfZZ6wer8s8uXo2NF7lGgfc3o3Y3e9Ub+bu70VJdA=="
+    },
+    "node_modules/@fontsource/exo": {
+      "version": "4.5.10",
+      "resolved": "https://registry.npmjs.org/@fontsource/exo/-/exo-4.5.10.tgz",
+      "integrity": "sha512-3zPblPonL+DLFVW3eiZAIV6WrdGO6YNUgo2O80iKH4tNRncGqneHvz2BZYqvFRARKdNhqOVyjLZmEn7KF8RnDw=="
+    },
     "node_modules/@humanwhocodes/config-array": {
       "version": "0.10.7",
       "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.10.7.tgz",
@@ -7212,6 +7230,21 @@
         "strip-json-comments": "^3.1.1"
       }
     },
+    "@fontsource/encode-sans": {
+      "version": "4.5.9",
+      "resolved": "https://registry.npmjs.org/@fontsource/encode-sans/-/encode-sans-4.5.9.tgz",
+      "integrity": "sha512-6tLI1FeCMYGtEMy5+1aRgmzgVTCfWL1b2MywvWFaxQGWnqjf4kO/YFnf99kFe52/XXcaCzkl09gxivVcsrxfAg=="
+    },
+    "@fontsource/encode-sans-condensed": {
+      "version": "4.5.9",
+      "resolved": "https://registry.npmjs.org/@fontsource/encode-sans-condensed/-/encode-sans-condensed-4.5.9.tgz",
+      "integrity": "sha512-EUVjRFtmNDk5odH3Jx9O7vUqGymMpnF97s06ucwtYv84iWfZZ6wer8s8uXo2NF7lGgfc3o3Y3e9Ub+bu70VJdA=="
+    },
+    "@fontsource/exo": {
+      "version": "4.5.10",
+      "resolved": "https://registry.npmjs.org/@fontsource/exo/-/exo-4.5.10.tgz",
+      "integrity": "sha512-3zPblPonL+DLFVW3eiZAIV6WrdGO6YNUgo2O80iKH4tNRncGqneHvz2BZYqvFRARKdNhqOVyjLZmEn7KF8RnDw=="
+    },
     "@humanwhocodes/config-array": {
       "version": "0.10.7",
       "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.10.7.tgz",
diff --git a/package.json b/package.json
index a15a78825..7959613a2 100644
--- a/package.json
+++ b/package.json
@@ -16,6 +16,9 @@
   "license": "MIT",
   "private": true,
   "dependencies": {
+    "@fontsource/encode-sans": "^4.5.9",
+    "@fontsource/encode-sans-condensed": "^4.5.9",
+    "@fontsource/exo": "^4.5.10",
     "@league-of-foundry-developers/foundry-vtt-types": "^9.269.0",
     "@tinymce/tinymce-vue": "^5.0.0",
     "@types/lodash": "^4.14.170",
diff --git a/src/module/vue/components/rules-text/rules-text.vue b/src/module/vue/components/rules-text/rules-text.vue
index d1c1a91ea..d6ccfa3b4 100644
--- a/src/module/vue/components/rules-text/rules-text.vue
+++ b/src/module/vue/components/rules-text/rules-text.vue
@@ -13,10 +13,12 @@
   </WithRolllisteners>
 </template>
 <style lang="less">
+@import (reference) '../../../../styles/mixins.less';
 .rules-text {
   display: flex;
   flex-direction: column;
   gap: 0.5em;
+  .textCompactMixin();
 }
 .rules-text-main {
   display: flex;
diff --git a/src/styles/assets.less b/src/styles/assets.less
index 926fb54d3..7c8cc73e6 100644
--- a/src/styles/assets.less
+++ b/src/styles/assets.less
@@ -1,4 +1,5 @@
 @import (reference) './themes/mixins/decorations.less';
+@import (reference) './mixins.less';
 
 @asset_spacer: 0.5em;
 
@@ -32,6 +33,7 @@
       line-height: 1;
       font-style: italic;
       transition: inherit;
+      .textCompactMixin();
     }
     .asset-controls {
       justify-items: flex-end;
@@ -59,6 +61,7 @@
         .asset-field-label {
           padding: 0;
           margin: 0;
+          .textCompactMixin();
         }
         .asset-field-value {
           margin: 0;
@@ -75,6 +78,7 @@
         display: flex;
         flex-direction: row;
         gap: @asset_spacer;
+        .textCompactMixin();
       }
     }
   }
diff --git a/src/styles/fvtt/tooltip.less b/src/styles/fvtt/tooltip.less
index cc37e36d0..d0d34e624 100644
--- a/src/styles/fvtt/tooltip.less
+++ b/src/styles/fvtt/tooltip.less
@@ -1,3 +1,5 @@
+@import (reference) '../mixins.less';
+
 #tooltip {
   // TODO: currently this isn't really changing much, but i'd like to revisit it for the dark theme.
   background: var(--ironsworn-color-dark-90);
@@ -9,4 +11,5 @@
   border-radius: 3px;
   box-shadow: 0 0 4px #000;
   pointer-events: none;
+  .textCompactMixin();
 }
diff --git a/src/styles/mixins.less b/src/styles/mixins.less
index 9cd19f9fe..5e9c8e0cf 100644
--- a/src/styles/mixins.less
+++ b/src/styles/mixins.less
@@ -319,3 +319,12 @@
   );
   background-blend-mode: screen;
 }
+
+.textCompactMixin {
+  font-family: var(--font-compact);
+  letter-spacing: 0.015em;
+  word-spacing: 0.015em;
+}
+
+.textDisplayMixin {
+}
diff --git a/src/styles/themes/starforged.less b/src/styles/themes/starforged.less
index bbea46b51..d4c12e614 100644
--- a/src/styles/themes/starforged.less
+++ b/src/styles/themes/starforged.less
@@ -1,5 +1,7 @@
 // Dark theme for Starforged, with aggressive restyling of FVTT's stock UX elements.
 
+@import '@fontsource/encode-sans-condensed/latin';
+@import '@fontsource/encode-sans/latin';
 @import './starforged-font.css'; // HACK to avoid import error
 @import (reference) '../mixins.less';
 @import (reference) './mixins/colors.less';
@@ -13,7 +15,9 @@
   .ironswornDarkThemeMixin(ironsworn-color);
   .softBorderMixin(ironsworn-color);
   .interactiveTintMixin(ironsworn-color-clickable-block,ironsworn-color);
-  --font-primary: 'Carrois Gothic SC', sans-serif;
+  // --font-primary: 'Carrois Gothic SC', sans-serif;
+  --font-primary: 'Encode Sans', sans-serif;
+  --font-compact: 'Encode Sans Condensed', sans-serif;
 
   --ironsworn-color-text-stroke: var(--ironsworn-color-bg);