3.3.6

CHANGELOG.md

@@ -1,3 +1,8 @@
+# 3.3.6
+
+- (Fix) Fixed an issue where the 'no theme' option for chat message theme didn't work.
+- (Maintenance) Updated PC sheet styling to be compatible with newest System version.
+
 # 3.3.5
 
 - (Fix) Fixed logspam conflict with Force Client Settings (Courtesy of @JDCalvert)

esmodules/consts.js

@@ -26,4 +26,4 @@ export const unlimitedScopeApplications = ["PlaylistDirectory"];
 /* ----------------------------------------- */
 /* Excluded                                  */
 /* ----------------------------------------- */
-export const excludedApplications = ["MixerApp","EnhancedJournal","PartyOverviewApp","KingdomBuilder","ChatLogPF2e","ItemMenuApp","LevelsUI", "SpecialEffectsManagement", "ParticleEffectsManagement", "FilterEffectsManagementConfig"]; //
+export const excludedApplications = ["GmScreenApplicationDrawer","MixerApp","EnhancedJournal","PartyOverviewApp","KingdomBuilder","ChatLogPF2e","ItemMenuApp","LevelsUI", "SpecialEffectsManagement", "ParticleEffectsManagement", "FilterEffectsManagementConfig"]; //

esmodules/message-hooks.js

@@ -21,6 +21,13 @@ Hooks.on("renderChatMessage", (chatMessage, html, messageData) => {
 
   const isSecretDisposition =
     game?.scenes?.get(chatMessage?.speaker?.scene)?.tokens?.get(chatMessage?.speaker?.token)?.disposition == -2;
+  const isOpposition = chatMessage?.actor?.alliance === "opposition" && !isSecretDisposition;
+  if (isOpposition && game.settings.get("pf2e-dorako-ui", "theme.chat-message-opposition-theme") === "no-theme") {
+    return;
+  }
+  if (!isOpposition && game.settings.get("pf2e-dorako-ui", "theme.chat-message-standard-theme") === "no-theme") {
+    return;
+  }
   const { dorakoUiTheme, colorScheme } =
     chatMessage?.actor?.alliance === "opposition" && !isSecretDisposition
       ? lookupThemeAndSchemeForKey(game.settings.get("pf2e-dorako-ui", "theme.chat-message-opposition-theme"))
@@ -57,7 +64,7 @@ const headerStyleColors = {
   blue: "#191F65",
   green: "#002A17",
   red: "#540C06",
-}
+};
 
 function getHeaderColor(html, message) {
   const headerStyle = game.settings.get("pf2e-dorako-ui", "theme.chat-message-header-style");
@@ -73,7 +80,7 @@ function invertColor(color) {
 
 function calcHeaderTextColor(headerColor) {
   if (headerColor === headerStyleColors.none) {
-    return "dark"
+    return "dark";
   }
 
   var r = parseInt(headerColor.substr(1, 2), 16);

module.json

@@ -23,7 +23,7 @@
         "type": "system",
         "compatibility": {
           "minimum": "5.6.0",
-          "verified": "5.10.1"
+          "verified": "5.12.0"
         }
       },
       {

sass/ui-theme/foundry-core/_app-ui.scss

@@ -413,6 +413,11 @@
     @include dui-input;
   }
 
+  &.app.tag-selector form input[type="search"],
+  &.app.tag-selector form input[type="text"] {
+    @include dui-input;
+  }
+
   textarea {
     color: var(--input-text-color);
     background: var(--input-background);

sass/ui-theme/pf2e-system/_actor-sheet.scss

@@ -10,6 +10,19 @@
     border-radius: 3px;
   }
 
+  &.actor.sheet .window-content .inventory ul.items > li > .data .item-controls > a.toggle-invested.active,
+  &.actor.sheet .window-content .inventory ul.items > li > .data .item-controls > a.item-carry-type.active {
+    --secondary: var(--accent-color);
+    --fa-inverse: var(--accent-text-color);
+  }
+
+  &.actor.sheet .window-content .inventory ul.items > li > .data .item-controls > a.toggle-invested,
+  &.actor.sheet .window-content .inventory ul.items > li > .data .item-controls > a.item-carry-type,
+  &.actor.sheet .inventory .list-row .item-controls .item-control.toggle-invested,
+  &.actor.sheet .inventory .list-row .item-controls .item-control.item-carry-type {
+    // Do system PR to fix this constant
+  }
+
   // nav.sheet-tabs {
   //   background: unset;
   //   box-shadow: unset;

sass/ui-theme/pf2e-system/_npc-sheet.scss

@@ -57,9 +57,9 @@
   }
 
   // prettier-ignore
-  &.actor.sheet.character .crb-style .sheet-body .sheet-content .tab.actions ol.actions-list li.strike .ammo select.linked {
-    padding: 3px;
-  }
+  // &.actor.sheet.character .crb-style .sheet-body .sheet-content .tab.actions ol.actions-list li.strike .ammo select.linked {
+  //   padding: 3px;
+  // }
 
   &.actor.npc.sheet form .sheet-body .actions-list li.action:not(:last-child),
   &.actor.npc.sheet form .sheet-body .attacks-list li.action:not(:last-child) {

sass/ui-theme/pf2e-system/_pc-sheet.scss

@@ -1,5 +1,6 @@
 [data-theme] {
   // prettier-ignore
+  &.actor.sheet .crb-style .sheet-body .sheet-content ul.option-toggles,
   &.actor.sheet .crb-style .sheet-body .sheet-content .tab.actions ol.actions-list li.action .item-summary,
   &.actor.sheet .crb-style .sheet-body .sheet-content .tab.actions ol.actions-list li.strike .item-summary,
   &.sheet.party [data-tab=overview] .summary,
@@ -48,6 +49,10 @@
 
 [data-theme] {
   &.actor.sheet[data-theme-color] {
+    .crb-style aside select {
+      background-color: var(--theme-color);
+    }
+    .crb-style .sheet-body .sheet-content ol.spell-list > li .item-summary,
     .window-content .inventory ul.items > li .item-summary,
     .inventory .item-summary {
       background: color-mix(in srgb, var(--theme-color) 25%, transparent);
@@ -66,10 +71,6 @@
           );
           background-color: var(--secondary);
         }
-
-        .initiative-select select {
-          background-color: var(--theme-color);
-        }
       }
     }
     nav.sheet-navigation {
@@ -273,8 +274,17 @@
 /* Theme                                     */
 /* ----------------------------------------- */
 [data-theme][data-dorako-ui-scope="limited"]:not([data-theme^="crb"][data-color-scheme="light"]) {
-  --color-text-dark-4: var(--text-color-5);
+  --color-text-dark-4: var(--text-color-4);
+  --color-text-dark-3: var(--text-color-5);
+  --color-text-dark-2: var(--text-color-2);
   --color-pf-primary: var(--color-primary-1);
+  --color-pf-alternate: red;
+  --color-pf-alternate-dark: var(--text-color-2);
+
+  .tags.light > .tag,
+  .tags > .tag.light {
+    --tag-color: var(--text-color-2);
+  }
 
   &.actor.sheet .crb-style .sheet-body {
     background: unset;
@@ -366,6 +376,10 @@
     }
   }
 
+  &.actor.sheet.character .crb-style .sheet-body .sheet-content .tab.feats li.feat-item .item-name .feat-slot-title {
+    --color-pf-secondary: var(--accent-color);
+  }
+
   &.actor.sheet .crb-style .sheet-body .sheet-content ol.spell-list > li.spell-level-header input,
   &.actor.sheet .crb-style .sheet-body .sheet-content ol.spell-list > li .uses input {
     @include dui-input;
@@ -409,11 +423,8 @@
     color: var(--text-color-5);
   }
 
-  &.actor.sheet .inventory .list-row .item-controls .item-control.toggle-invested,
-  &.actor.sheet .inventory .list-row .item-controls .item-control.item-carry-type {
-    // Do system PR to fix this constant
-  }
-
+  &.actor.sheet.character .crb-style .sheet-body .sheet-content .tab.proficiencies ul.proficiencies-list li .modifier,
+  &.actor.sheet.character .crb-style .sheet-body .sheet-content .tab.proficiencies ul.proficiencies-list li .dc,
   &.actor.sheet.character .crb-style .sheet-body .sheet-content .tab.proficiencies ul.proficiencies-list li .modifier {
     --primary: var(--accent-color);
   }
@@ -435,8 +446,8 @@
     --primary: var(--color-primary-2);
     .button-group {
       button {
-        --primary: var(--system-primary);
-        --secondary: var(--system-secondary);
+        --color-pf-primary: var(--system-primary);
+        --color-pf-secondary: var(--system-secondary);
       }
     }
   }
@@ -469,3 +480,12 @@
     --color-border-light-2: var(--color-secondary-4);
   }
 }
+
+[data-theme] {
+  &.attribute-builder .window-content .title {
+    --primary: var(--accent-color);
+  }
+  &.attribute-builder .window-content .summary-row .hint-container h3 {
+    --color-pf-primary: var(--text-color-1);
+  }
+}

sass/ui-theme/themes/_bg3.scss

@@ -390,6 +390,7 @@
   &.actor.sheet .crb-style .sheet-body .sheet-content ol.spell-list > li .item-name h4:hover,
   &.actor.sheet.character .crb-style .sheet-body .sheet-content .tab.spellcasting .spellcasting-entry .spell-ability-data .skill-score {
       --secondary: var(--bg3-text-1);
+      --color-pf-secondary: var(--bg3-text-1);
       --fa-inverse: black;
   }
 

sass/ui-theme/themes/_crb-dark.scss

@@ -80,6 +80,7 @@
 
   --input-text-color: var(--text-color-3);
   --input-background: var(--glass-bg);
+  --input-box-shadow: var(--glassy);
   --input-border-color: transparent;
   --input-focus-text-color: var(--text-color-2);
   --input-placeholder-color: var(--text-color-5);

sass/ui-theme/themes/_discord.scss

@@ -344,6 +344,7 @@
   &.actor.sheet .crb-style .sheet-body .sheet-content ol.spell-list > li .item-name h4:hover,
   &.actor.sheet.character .crb-style .sheet-body .sheet-content .tab.spellcasting .spellcasting-entry .spell-ability-data .skill-score {
       --secondary: var(--discord-green);
+      --color-pf-secondary: var(--discord-green);
       --fa-inverse: white;
   }