Fix chat log theme to inherit interface theme (#1544)

lang/en.json

@@ -2085,6 +2085,7 @@
                 "tier4": "tier 4",
                 "domains": "Domains",
                 "downtime": "Downtime",
+                "itemFeatures": "Item Features",
                 "roll": "Roll",
                 "rules": "Rules",
                 "partyMembers": "Party Members",

module/applications/dialogs/d20RollDialog.mjs

@@ -123,7 +123,7 @@ export default class D20RollDialog extends HandlebarsApplicationMixin(Applicatio
             context.formula = this.roll.constructFormula(this.config);
             if (this.actor?.system?.traits) context.abilities = this.getTraitModifiers();
 
-            context.showReaction = !this.config.roll?.type && context.rollType === 'DualityRoll';
+            context.showReaction = !this.config.roll?.type || context.rollType === 'DualityRoll';
             context.reactionOverride = this.reactionOverride;
         }
 

module/applications/sidebar/tabs/daggerheartMenu.mjs

@@ -25,7 +25,7 @@ export default class DaggerheartMenu extends HandlebarsApplicationMixin(Abstract
 
     /** @override */
     static DEFAULT_OPTIONS = {
-        classes: ['dh-style'],
+        classes: ['dh-style', 'directory'],
         window: {
             title: 'SIDEBAR.TabSettings'
         },

module/applications/ui/chatLog.mjs

@@ -92,6 +92,19 @@ export default class DhpChatLog extends foundry.applications.sidebar.tabs.ChatLo
         super.close(options);
     }
 
+    /** Ensure the chat theme inherits the interface theme */
+    _replaceHTML(result, content, options) {
+        const themedElement = result.log?.querySelector(".chat-log");
+        themedElement?.classList.remove("themed", "theme-light", "theme-dark");
+        super._replaceHTML(result, content, options);
+    }
+
+    /** Remove chat log theme from notifications area */
+    async _onFirstRender(result, content) {
+        await super._onFirstRender(result, content);
+        document.querySelector("#chat-notifications .chat-log")?.classList.remove("themed", "theme-light", "theme-dark")
+    }
+
     async onRollSimple(event, message) {
         const buttonType = event.target.dataset.type ?? 'damage',
             total = message.rolls.reduce((a, c) => a + Roll.fromJSON(c).total, 0),

styles/less/global/chat.less

@@ -2,20 +2,18 @@
 @import '../utils/fonts.less';
 @import '../utils/mixin.less';
 
-.theme-light {
-    .daggerheart.chat-sidebar .chat-log,
-    #chat-notifications .chat-log {
-        .chat-message {
-            background-image: url('../assets/parchments/dh-parchment-light.png');
+.daggerheart.chat-sidebar.theme-light,
+#interface.theme-light {
+    .chat-log .chat-message {
+        background-image: url('../assets/parchments/dh-parchment-light.png');
 
-            .message-header .message-header-metadata .message-metadata,
-            .message-header .message-header-main .message-sub-header-container {
-                color: @dark;
-            }
+        .message-header .message-header-metadata .message-metadata,
+        .message-header .message-header-main .message-sub-header-container {
+            color: @dark;
+        }
 
-            .message-header .message-header-main .message-sub-header-container h4 {
-                color: @dark-blue;
-            }
+        .message-header .message-header-main .message-sub-header-container h4 {
+            color: @dark-blue;
         }
     }
 }

styles/less/ui/chat/ability-use.less

@@ -2,6 +2,7 @@
 @import '../../utils/fonts.less';
 @import '../../utils/spacing.less';
 
+.daggerheart.chat-sidebar.theme-light,
 #interface.theme-light {
     .daggerheart.chat.domain-card {
         .domain-card-move .domain-card-header {

styles/less/ui/chat/action.less

@@ -2,6 +2,7 @@
 @import '../../utils/fonts.less';
 @import '../../utils/spacing.less';
 
+.daggerheart.chat-sidebar.theme-light,
 #interface.theme-light {
     .daggerheart.chat.action {
         .action-move .action-section {

styles/less/ui/chat/chat.less

@@ -2,9 +2,9 @@
 @import '../../utils/fonts.less';
 @import '../../utils/spacing.less';
 
+.daggerheart.chat-sidebar.theme-light,
 #interface.theme-light {
-    .daggerheart.chat-sidebar .chat-log,
-    #chat-notifications .chat-log {
+    .chat-log {
         --text-color: @dark-blue;
         --bg-color: @dark-blue-40;
 

styles/less/ui/chat/damage-summary.less

@@ -1,5 +1,6 @@
 @import '../../utils/colors.less';
 
+.daggerheart.chat-sidebar.theme-light,
 #interface.theme-light {
     .daggerheart.chat.damage-summary .token-target-container {
         &:hover {

styles/less/ui/chat/downtime.less

@@ -2,6 +2,7 @@
 @import '../../utils/fonts.less';
 @import '../../utils/spacing.less';
 
+.daggerheart.chat-sidebar.theme-light,
 #interface.theme-light {
     .daggerheart.chat.downtime {
         .downtime-moves-list .downtime-move {

styles/less/ui/chat/effect-summary.less

@@ -1,5 +1,6 @@
 @import '../../utils/colors.less';
 
+.daggerheart.chat-sidebar.theme-light,
 #interface.theme-light {
     .daggerheart.chat.effect-summary {
         .effect-header,

styles/less/ui/chat/group-roll.less

@@ -125,9 +125,9 @@
 
                         .group-roll-trait {
                             padding: 2px 8px;
-                            border: 1px solid light-dark(white, white);
+                            border: 1px solid light-dark(@dark-blue, white);
                             border-radius: 6px;
-                            color: light-dark(white, white);
+                            color: light-dark(@dark-blue, white);
                             background: light-dark(@beige-80, @beige-80);
                         }
                     }

styles/less/ui/chat/sheet.less

@@ -1,6 +1,7 @@
 @import '../../utils/colors.less';
 @import '../../utils/fonts.less';
 
+.daggerheart.chat-sidebar.theme-light,
 #interface.theme-light {
     .chat-message:not(.duality) .message-content {
         color: @dark;

styles/less/ui/sidebar/daggerheartMenu.less

@@ -5,6 +5,8 @@
         display: flex;
         flex-direction: column;
         gap: 8px;
+        overflow: auto;
+        height: 100%;
     }
 
     h2 {

system.json

@@ -2,7 +2,7 @@
     "id": "daggerheart",
     "title": "Daggerheart",
     "description": "An unofficial implementation of the Daggerheart system",
-    "version": "1.5.0",
+    "version": "1.5.1",
     "compatibility": {
         "minimum": "13.346",
         "verified": "13.351",