(Maintenance) Re-organize sass files, update release flow

.github/workflows/main.yml

@@ -28,7 +28,7 @@ jobs:
           download: https://github.com/${{github.repository}}/releases/download/${{github.event.release.tag_name}}/module.zip
 
       # Create a zip file with all files required by the module to add to the release
-      - run: zip -r ./module.zip module.json CHANGELOG.md README.md LICENSE styles/ templates/ languages/ modules/ img/
+      - run: zip -r ./module.zip module.json CHANGELOG.md README.md LICENSE styles/ templates/ languages/ modules/ img/ fonts/
 
       # Create a release for this specific version
       - name: Update Release with Files
@@ -51,7 +51,7 @@ jobs:
         run: npx @ghost-fvtt/foundry-publish
         env:
           FVTT_MANIFEST_PATH: "module.json"
-          FVTT_PACKAGE_ID: 2350
+          FVTT_PACKAGE_ID: 1906
           FVTT_USERNAME: ${{ secrets.FOUNDRY_ADMIN_USERNAME }}
           FVTT_PASSWORD: ${{ secrets.FOUNDRY_ADMIN_PASSWORD }}
           FVTT_MANIFEST_URL: https://github.com/${{github.repository}}/releases/download/${{github.event.release.tag_name}}/module.json

CHANGELOG.md

@@ -1,3 +1,7 @@
+# 1.11.5
+
+- (Maintenance) Re-organize sass files, update release flow
+
 # 1.11.4
 
 - (Fix) Fix Adventure Importers with fancy frames getting overwritten. The logic that was formerly used for only Journals is now applied to all windows.

dorako.ui.css

@@ -0,0 +1,19 @@
+/* Error: Undefined mixin.
+ *    ,
+ * 11 |   @include glass;
+ *    |   ^^^^^^^^^^^^^^
+ *    '
+ *   sass/foundry/_app-ui.scss 11:3  @use
+ *   sass/foundry/_index.scss 1:1    @use
+ *   sass/dorako-ui.scss 2:1         root stylesheet */
+
+body::before {
+  font-family: "Source Code Pro", "SF Mono", Monaco, Inconsolata, "Fira Mono",
+      "Droid Sans Mono", monospace, monospace;
+  white-space: pre;
+  display: block;
+  padding: 1em;
+  margin-bottom: 1em;
+  border-bottom: 2px solid black;
+  content: "Error: Undefined mixin.\a    \2577 \a 11 \2502    @include glass;\a    \2502    ^^^^^^^^^^^^^^\a    \2575 \a   sass/foundry/_app-ui.scss 11:3  @use\a   sass/foundry/_index.scss 1:1    @use\a   sass/dorako-ui.scss 2:1         root stylesheet";
+}

module.json

@@ -57,7 +57,7 @@
       "path": "languages/ja.json"
     }
   ],
-  "styles": ["styles/fonts.css"],
+  "styles": ["styles/fonts.css", "styles/dorako-ui.css"],
   "esmodules": [
     "modules/misc-hooks.js",
     "modules/settings/settings.js",

modules/base-theme-hooks.js

@@ -1,4 +1,4 @@
-import { baseThemeApplications, baseThemePf2eSheets, premiumModuleSelector } from "./consts.js";
+import { baseThemeApplications, baseThemePf2eSheets, MODULE_NAME, premiumModuleSelector } from "./consts.js";
 
 // Debugging
 Hooks.on("renderApplication", (app, html, data) => {

modules/consts.js

@@ -17,7 +17,7 @@ export const darkThemeIncompatibleApplications = ["JournalTextTinyMCESheetPF2e",
 export const exclusivelyDarkApplications = ["FABattlemaps", "FADownloader"]
 
 // prettier-ignore
-export const baseThemeCoreFoundryApplications = ["ImagePopout","ChatMessage","SceneControls", "SidebarTab", "PlayerList", "HeadsUpDisplay", "Notifications", "TokenHUD", "Sidebar","SceneNavigation"];
+export const baseThemeCoreFoundryApplications = ["ImagePopout","SceneControls", "SidebarTab", "PlayerList", "HeadsUpDisplay", "Notifications", "TokenHUD", "Sidebar","SceneNavigation"];
 // prettier-ignore
 export const baseThemePf2eApplications = ["HotbarPF2e", "EffectsPanel", "SceneDarknessAdjuster"]; // "JournalSheetPF2e",
 // prettier-ignore

modules/dark-theme-hooks.js

@@ -3,6 +3,7 @@ import {
   exclusivelyDarkApplications,
   darkThemeCompatibleApplications,
   baseThemePf2eSheets,
+  MODULE_NAME,
 } from "./consts.js";
 
 // Supported dark theme

modules/message-hooks.js

@@ -30,6 +30,7 @@ Hooks.on("renderChatMessage", (chatMessage, html, messageData) => {
   }
 
   let html0 = html[0];
+  html0.classList.add("dorako-ui");
 
   if (game.settings.get("pf2e-dorako-ui", "ux.restructure-card-info")) {
     let uuid = chatMessage?.flags?.pf2e?.origin?.uuid;

modules/settings/settings.js

@@ -80,12 +80,6 @@ Hooks.once("init", async () => {
 
   util.debug("registered settings");
 
-  injectCSS("dorako-ui");
-  injectCSS("reset");
-  injectCSS("module-support");
-  injectCSS("compact-ui");
-  injectCSS("chat-bubbles");
-
   const root = document.querySelector(":root").style;
 
   root.setProperty("--avatar-size", game.settings.get("pf2e-dorako-ui", "avatar.size").toString() + "px");